changeset 82:420f2aab9ab6

temporary fix for "::" in duic for all types
author eldar
date Sun, 24 May 2009 17:07:11 +0000
parents 1750a803af74
children c64698c80409
files tools/duic/CMakeLists.txt tools/duic/d/dwriteinitialization.cpp
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tools/duic/CMakeLists.txt	Sun May 24 15:45:33 2009 +0000
+++ b/tools/duic/CMakeLists.txt	Sun May 24 17:07:11 2009 +0000
@@ -3,6 +3,8 @@
 
 ## TODO: Is this definition correct?  
 add_definitions(-DQDESIGNER_UILIB_LIBRARY)
+set (QT_USE_QTXML true)
+include (${QT_USE_FILE})
 include_directories( ${QT_INCLUDE_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}/d )
--- a/tools/duic/d/dwriteinitialization.cpp	Sun May 24 15:45:33 2009 +0000
+++ b/tools/duic/d/dwriteinitialization.cpp	Sun May 24 17:07:11 2009 +0000
@@ -1177,7 +1177,6 @@
                 scope += QLatin1String("::");
                 propertyValue.prepend(scope);
             }
-            propertyValue = propertyValue.replace("::", "."); // qtd
             break;
         case DomProperty::Set:
             propertyValue = p->elementSet();
@@ -1354,6 +1353,8 @@
         case DomProperty::Unknown:
             break;
         }
+        
+        propertyValue = propertyValue.replace("::", "."); // qtd
 
         if (propertyValue.size()) {
             const char* defineC = 0;