set version in qglobal header during configuration

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23c3326..8d4b99e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,7 +213,11 @@ configure_file(
     ${CMAKE_BINARY_DIR}/include/qconfig.cpp
 )
 configure_file(
-    ${CMAKE_SOURCE_DIR}/src/core/global/qglobal.h
+    ${CMAKE_SOURCE_DIR}/src/core/global/qglobal.h.cmake
+    ${CMAKE_BINARY_DIR}/include/QtCore/qglobal.h
+)
+configure_file(
+    ${CMAKE_SOURCE_DIR}/src/core/global/qglobal.h.cmake
     ${CMAKE_BINARY_DIR}/include/qtglobal.h
 )
 

diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index 9b02156..3f2f276 100644 (file)
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -2,6 +2,7 @@ string(TIMESTAMP KATIE_DATE "%Y-%m-%d")
 set(KATIE_MAJOR "4")
 set(KATIE_MINOR "8")
 set(KATIE_MICRO "7")
+set(KATIE_HEX "0x040807")
 set(KATIE_NAME "Katie")
 set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
 set(KATIE_STRING "qt4 ${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")

diff --git a/src/core/global/global.cmake b/src/core/global/global.cmake
index 6ad4f43..36f6c78 100644 (file)
--- a/src/core/global/global.cmake
+++ b/src/core/global/global.cmake
@@ -1,6 +1,5 @@
 set(CORE_HEADERS
     ${CORE_HEADERS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/global/qglobal.h
     ${CMAKE_CURRENT_SOURCE_DIR}/global/qnamespace.h
     ${CMAKE_CURRENT_SOURCE_DIR}/global/qendian.h
     ${CMAKE_CURRENT_SOURCE_DIR}/global/qnumeric.h

diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index bb0f00d..4c895de 100644 (file)
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -268,7 +268,4 @@
 #cmakedefine QT_NO_TREEWIDGET
 #cmakedefine QT_NO_VALIDATOR
 
-/* Windows */
-#cmakedefine QT_NO_WIN_ACTIVEQT
-
 #endif
\ No newline at end of file

diff --git a/src/core/global/qglobal.h b/src/core/global/qglobal.h.cmake
similarity index 99%
rename from src/core/global/qglobal.h
rename to src/core/global/qglobal.h.cmake
index 8f9696c..e7794bf 100644 (file)
--- a/src/core/global/qglobal.h
+++ b/src/core/global/qglobal.h.cmake
@@ -47,11 +47,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define QT_VERSION_STR   "4.8.7"
+#define QT_VERSION_STR   "${KATIE_VERSION}"
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x040807
+#define QT_VERSION ${KATIE_HEX}
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
 */
@@ -145,9 +145,7 @@
 #  error Unable to detect target endianness
 #endif
 
-#if !defined(QT_BUILD_MOC)
 #include <QtCore/qconfig.h>
-#endif
 
 #ifdef __cplusplus