# HG changeset patch # User eldar # Date 1243184831 0 # Node ID 420f2aab9ab6e2eff8491142fcf07443b0491715 # Parent 1750a803af7430021d8c4e3f802d9b34d226f0df temporary fix for "::" in duic for all types diff -r 1750a803af74 -r 420f2aab9ab6 tools/duic/CMakeLists.txt --- 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 ) diff -r 1750a803af74 -r 420f2aab9ab6 tools/duic/d/dwriteinitialization.cpp --- 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;