From e0593c828b540f30f3d0b85d44d8cff5e174e9a2 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Thu, 1 Dec 2011 02:48:15 +0100
Subject: Make the Qt5 part of the target name namespace style.

As it was in Qt4 and discussed on the cmake list.

Change-Id: Ide77c2525a261a5d658d7cb661010a67d3386341
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 mkspecs/cmake/Qt5BasicConfig.cmake.in | 18 +++++++++---------
 mkspecs/features/create_cmake.prf     |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in
index 2a491974d8..41cafc5c63 100644
--- a/mkspecs/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in
@@ -5,7 +5,7 @@ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_MAJOR "$$eval(QT.$${MODULE}.MAJOR_VERSION)"
 set(Qt5$${CMAKE_MODULE_NAME}_VERSION_MINOR "$$eval(QT.$${MODULE}.MINOR_VERSION)")
 set(Qt5$${CMAKE_MODULE_NAME}_VERSION_PATCH "$$eval(QT.$${MODULE}.PATCH_VERSION)")
 
-set(Qt5$${CMAKE_MODULE_NAME}_LIBRARY Qt5$${CMAKE_MODULE_NAME})
+set(Qt5$${CMAKE_MODULE_NAME}_LIBRARY Qt5::$${CMAKE_MODULE_NAME})
 
 set(Qt5$${CMAKE_MODULE_NAME}_HEADER_DIR \"${_qt5_install_prefix}/$$CMAKE_INCLUDE_DIR\" )
 
@@ -29,33 +29,33 @@ endif()
 
 if (NOT _Qt5$${CMAKE_MODULE_NAME}_target)
     set(_Qt5$${CMAKE_MODULE_NAME}_target 1)
-    add_library(Qt5$${CMAKE_MODULE_NAME} SHARED IMPORTED)
+    add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
     if (NOT \"$${CMAKE_BUILD_IS_FRAMEWORK}\" STREQUAL \"\")
-        set_property(TARGET Qt5$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
+        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
     endif()
 endif()
 
 if (NOT \"$${debug_type}\" STREQUAL \"\")
-    set_property(TARGET Qt5$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_target_properties(Qt5$${CMAKE_MODULE_NAME} PROPERTIES
+    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
         IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG \"$${CMAKE_QT5_MODULE_DEPS}\"
         IMPORTED_LOCATION_DEBUG \"${_qt5_install_prefix}/$$CMAKE_LIB_DIR/$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
     )
     if (NOT \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" STREQUAL \"\")
-        set_target_properties(Qt5$${CMAKE_MODULE_NAME} PROPERTIES
+        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
             IMPORTED_IMPLIB_DEBUG \"${_qt5_install_prefix}/$$CMAKE_LIB_DIR/$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\"
         )
     endif()
 endif()
 
 if (NOT \"$${release_type}\" STREQUAL \"\")
-    set_property(TARGET Qt5$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_target_properties(Qt5$${CMAKE_MODULE_NAME} PROPERTIES
+    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
         IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE \"$${CMAKE_QT5_MODULE_DEPS}\"
         IMPORTED_LOCATION_RELEASE \"${_qt5_install_prefix}/$$CMAKE_LIB_DIR/$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
     )
     if (NOT \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" STREQUAL \"\")
-        set_target_properties(Qt5$${CMAKE_MODULE_NAME} PROPERTIES
+        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
             IMPORTED_IMPLIB_RELEASE \"${_qt5_install_prefix}/$$CMAKE_LIB_DIR/$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\"
         )
     endif()
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index 092a8eae32..6691e3f49c 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -18,8 +18,8 @@ defineReplace(cmakeModuleList) {
 CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE})
 
 CMAKE_MODULE_DEPS = $$cmakeModuleList($$eval(QT.$${MODULE}.depends))
-CMAKE_PARTIAL_MODULE_DEPS = $$replace(CMAKE_MODULE_DEPS, ";", ";Qt5")
-!isEmpty(CMAKE_PARTIAL_MODULE_DEPS):CMAKE_QT5_MODULE_DEPS = "Qt5$${CMAKE_PARTIAL_MODULE_DEPS}"
+CMAKE_PARTIAL_MODULE_DEPS = $$replace(CMAKE_MODULE_DEPS, ";", ";Qt5::")
+!isEmpty(CMAKE_PARTIAL_MODULE_DEPS):CMAKE_QT5_MODULE_DEPS = "Qt5::$${CMAKE_PARTIAL_MODULE_DEPS}"
 
 CMAKE_INCLUDE_DIR = include
 CMAKE_LIBS = $$eval(QT.$${MODULE}.libs)
-- 
cgit v1.2.3