Changeset 86

Timestamp:

Apr 15, 2006, 6:49:05 PM (19 years ago)

Author:

dmik

Message:

• Added the internal CONFIG keyword 'qt_official_build' recognition. This keyword is intended to be manually added to the .qmake.conf file located in the installation directory to produce an official binary build of the Qt DLL. When it is present. the DLL and the import library will be named as 'qtXYZNN.dll' (XYZ = version number, NN = subversion number).

• Added the internal QMAKE variable QMAKE_QT_DLL_TARGET. When 'qt_official_build' is not present in CONFIG, this variable defines a name of the Qt DLL (and the import library) to build. The default name is 'myqt'.

Location:

trunk

Files:

• mkspecs/os2-g++/qmake.conf (modified) (2 diffs)
• src/qt.pro (modified) (1 diff)

trunk/mkspecs/os2-g++/qmake.conf

@@ -13 +13 @@
 CONFIG                  += qt warn_on release link_prl
 
+QMAKE_QT_DLL_TARGET     = myqt
+
 exists( $(QTDIR)\.qtos2config ) {
         include( $(QTDIR)\.qtos2config )
+}
+exists( $(QTDIR)\.build ) {
+        include( $(QTDIR)\.build )
 }
 
@@ -135 +140 @@
 QMAKE_LIBS_QT           = qt registry.dll socket
 QMAKE_LIBS_QT_THREAD    = qt registry.dll socket
-QMAKE_LIBS_QT_DLL       = qt
-QMAKE_LIBS_QT_THREAD_DLL= qt
+QMAKE_LIBS_QT_DLL       = $$QMAKE_QT_DLL_TARGET
+QMAKE_LIBS_QT_THREAD_DLL= $$QMAKE_QT_DLL_TARGET
 QMAKE_LIBS_QT_ENTRY     =
 

trunk/src/qt.pro

@@ -176 +176 @@
 }
 
+shared:os2:qt_official_build {
+        TARGET = qt$$split(VERSION,.,)
+        system( echo QMAKE_QT_DLL_TARGET = $$TARGET > ..\.build )
+} else {
+        TARGET = $$QMAKE_QT_DLL_TARGET
+}
+
 !cups:DEFINES += QT_NO_CUPS