diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-02-15 22:12:41 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 05:27:31 +0100 |
commit | 7e11fdd6e6668a3dd8d9355c2222fb6a34b9f3cd (patch) | |
tree | 9c5065a6cbb33b03068c7bbb9760ccf544673605 | |
parent | b1004b6f8380a46c379b819ef4a5c7ba555f6666 (diff) |
Only define QT_NAMESPACE if it is used.
Fixes non-namespaced builds.
Change-Id: Ie743fc57e7f208fdd50c61b08dc8a4b150de3930
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
-rw-r--r-- | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 155961bc9a..440d5e92bb 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -12,5 +12,7 @@ if (NOT \"$${CMAKE_ADD_FPIE_FLAGS}\" STREQUAL \"\") set(Qt5Core_COMPILE_FLAGS "-fPIE") endif() -list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE) -list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE) +if (NOT \"$$QT_NAMESPACE\" STREQUAL \"\") + list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE) + list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE) +endif() |