fix misnomer: qt_module.prf => qt_build_config.prf

qt_module suggests to be congruent to qt_plugin. Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953
2012-06-04 17:10:11 +02:00 · 2012-06-04 17:10:11 +02:00 · 1ee462604b
commit 1ee462604b
parent b3a497d781
16 changed files with 49 additions and 47 deletions
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@ -0,0 +1,32 @@
+!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
+    QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri
+    !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) {
+        error("Cannot load qmodule.pri!")
+    } else {
+        debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)")
+    }
+} else {
+    debug(1, "Not loading qmodule.pri twice")
+}
+
+mac {
+   !isEmpty(QMAKE_RPATHDIR){
+       CONFIG += absolute_library_soname
+   }
+}
+
+# Qt modules get compiled without exceptions enabled by default
+CONFIG += exceptions_off
+
+#SIMD defines:
+sse2:DEFINES += QT_COMPILER_SUPPORTS_SSE2
+sse3:DEFINES += QT_COMPILER_SUPPORTS_SSE3
+ssse3:DEFINES += QT_COMPILER_SUPPORTS_SSSE3
+sse4_1:DEFINES += QT_COMPILER_SUPPORTS_SSE4_1
+sse4_2:DEFINES += QT_COMPILER_SUPPORTS_SSE4_2
+avx:DEFINES += QT_COMPILER_SUPPORTS_AVX
+avx2:DEFINES += QT_COMPILER_SUPPORTS_AVX2
+iwmmxt:DEFINES += QT_COMPILER_SUPPORTS_IWMMXT
+neon:DEFINES += QT_COMPILER_SUPPORTS_NEON
+mips_dsp:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSP
+mips_dspr2:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSPR2
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@ -1,32 +1,2 @@
-!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
-    QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri
-    !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) {
-        error("Cannot load qmodule.pri!")
-    } else {
-        debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)")
-    }
-} else {
-    debug(1, "Not loading qmodule.pri twice")
-}
-
-mac {
-   !isEmpty(QMAKE_RPATHDIR){
-       CONFIG += absolute_library_soname
-   }
-}
-
-# Qt modules get compiled without exceptions enabled by default
-CONFIG += exceptions_off
-
-#SIMD defines:
-sse2:DEFINES += QT_COMPILER_SUPPORTS_SSE2
-sse3:DEFINES += QT_COMPILER_SUPPORTS_SSE3
-ssse3:DEFINES += QT_COMPILER_SUPPORTS_SSSE3
-sse4_1:DEFINES += QT_COMPILER_SUPPORTS_SSE4_1
-sse4_2:DEFINES += QT_COMPILER_SUPPORTS_SSE4_2
-avx:DEFINES += QT_COMPILER_SUPPORTS_AVX
-avx2:DEFINES += QT_COMPILER_SUPPORTS_AVX2
-iwmmxt:DEFINES += QT_COMPILER_SUPPORTS_IWMMXT
-neon:DEFINES += QT_COMPILER_SUPPORTS_NEON
-mips_dsp:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSP
-mips_dspr2:DEFINES += QT_COMPILER_SUPPORTS_MIPS_DSPR2
+warning("Use load(qt_build_config) instead of load(qt_module).")
+load(qt_build_config)
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@ -1,12 +1,12 @@
 !no_qt_module_warning:!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
    QMAKE_ACTUAL_PRO_FILE = $$basename(_PRO_FILE_)
    isEmpty(QMAKE_ACTUAL_PRO_FILE): QMAKE_ACTUAL_PRO_FILE=.pro
-    warning("You should probably load(qt_module) first in $$QMAKE_ACTUAL_PRO_FILE for $$TARGET, as it also load()s qt_module_config.")
+    warning("You should probably load(qt_build_config) first in $$QMAKE_ACTUAL_PRO_FILE for $$TARGET, as it also load()s qt_module_config.")
    message("Not doing so may lead to qt_module_config.prf overriding compiler/linker options in your .pro file.")
    message("Ignore this warning with CONFIG+=no_qt_module_warning if you know what you are doing.")
    unset(QMAKE_ACTUAL_PRO_FILE)
 }
-load(qt_module) # loads qmodule.pri if hasn't been loaded already
+load(qt_build_config) # loads qmodule.pri if hasn't been loaded already

 isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0)
 isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}")
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET     = QtConcurrent
 QT         = core-private
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET	   = QtCore
 QT         =
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET = QtDBus
 QT = core-private
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET     = QtGui
 QT = core-private
--- a/src/network/network.pro
+++ b/src/network/network.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET   = QtNetwork
 QT = core-private
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET     = QtOpenGL
 QT         = core-private gui-private widgets-private
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 TARGET     = QtPlatformSupport
 QT         = core-private gui-private

--- a/src/printsupport/printsupport.pro
+++ b/src/printsupport/printsupport.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET     = QtPrintSupport
 QT = core-private gui-private widgets-private
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET	   = QtSql
 QT         = core-private
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET = QtTest
 QT = core-private
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET     = QtWidgets
 QT = core-private gui-private
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 # Additional Qt project file for qtmain lib on Windows
 !win32:error("$$_FILE_ is intended only for Windows!")
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)

 TARGET     = QtXml
 QT         = core-private