diff options
| -rw-r--r-- | cmake/QtBuild.cmake | 5 | ||||
| -rw-r--r-- | src/corelib/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index c904743b8a4..9766e7f683f 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -367,11 +367,6 @@ set(QT_PLATFORM_DEFINITION_DIR "${QT_DEFAULT_PLATFORM_DEFINITION_DIR}" set(QT_PLATFORM_DEFINITION_DIR_ABSOLUTE "${QT_DEFAULT_PLATFORM_DEFINITION_DIR_ABSOLUTE}" CACHE INTERNAL "Path to directory that contains qplatformdefs.h") set(QT_NAMESPACE "" CACHE STRING "Qt Namespace") -if(QT_NAMESPACE STREQUAL "") - set(QT_HAS_NAMESPACE OFF) -else() - set(QT_HAS_NAMESPACE ON) -endif() include(QtGlobalStateHelpers) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 1a9a690f427..54b756d2a60 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -273,8 +273,7 @@ add_dependencies(Core ${QT_CMAKE_EXPORT_NAMESPACE}::rcc) add_dependencies(CorePrivate ${QT_CMAKE_EXPORT_NAMESPACE}::moc) add_dependencies(CorePrivate ${QT_CMAKE_EXPORT_NAMESPACE}::rcc) -if (QT_NAMESPACE STREQUAL "") -else() +if (NOT QT_NAMESPACE STREQUAL "") target_compile_definitions(Core PUBLIC "QT_NAMESPACE=${QT_NAMESPACE}") endif() |