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 16:42:28 +0100 |
| commit | 1b08a485889aed6f2e9147257595383d60d22e77 (patch) | |
| tree | 35be877ccef44aa364f97cf12c4c8baeaf55f707 /src/corelib/Qt5CoreConfigExtras.cmake.in | |
| parent | 7e970eb58c71dc08981575c648a04d258dbf0684 (diff) | |
Only define QT_NAMESPACE if it is used.
Fixes non-namespaced builds.
Change-Id: I0ec3c29f58042313dfa864f15c2b2d47914cdedb
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib/Qt5CoreConfigExtras.cmake.in')
| -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() |