Changeset 84

Timestamp:

Apr 15, 2006, 5:52:50 PM (19 years ago)

Author:

dmik

Message:

Preparations to change the build process of Qt on OS/2:

• OS2/GNUMAKE Backend: when CONFIG contains 'qt' (i.e. the app using Qt is being built), the Qt library defined in qmake.spec is used instead of some tricky procedure to find the highest version at runtime.
• OS2/GNUMAKE Backend: the VERSION variable is no more used to define a suffix of the DLL being built.
• 'build_qt' is used to tell QMAKE the Qt library is being built.
• '-mt' is no more in the Qt library name to indicate a multi-threaded version.

Location:

trunk

Files:

• qmake/generators/os2/gnumake.cpp (modified) (3 diffs)
• src/qt.pro (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -435 +435 @@
     }
 
-    bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+    bool is_qt = project->isActiveConfig( "build_qt" );
     project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
 
@@ -546 +546 @@
                 else
                     project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_DLL"];
-                int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
-                if ( hver == -1 )
-                    hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt-mt");
-                if(hver != -1) {
-                    QString ver;
-                    ver.sprintf("qt%s" QTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
-                    QStringList &libs = project->variables()["QMAKE_LIBS"];
-                    for(QStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit)
-                        (*libit).replace(QRegExp("qt(-mt)?(\\.lib)?"), ver);
-                }
             }
             if ( !project->isEmpty( "QMAKE_LIBS_QT_ENTRY" ) ) { 
@@ -578 +568 @@
         project->variables()["QMAKE_LFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_LFLAGS_CONSOLE_DLL"];
         project->variables()["QMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["QMAKE_LFLAGS_WINDOWS_DLL"];
-        if ( !project->variables()["QMAKE_LIB_FLAG"].isEmpty()) {
-            project->variables()["TARGET_EXT"].append(
-                QStringList::split('.',project->first("VERSION")).join("") + ".dll");
-        } else {
-            project->variables()["TARGET_EXT"].append(".dll");
-        }
+        project->variables()["TARGET_EXT"].append(".dll");
     } else {
         project->variables()["QMAKE_CFLAGS_CONSOLE_ANY"] = project->variables()["QMAKE_CFLAGS_CONSOLE"];

trunk/src/qt.pro

@@ -1 +1 @@
 # Qt project file
+#
+# :mode=makefile:tabSize=8:indentSize=4:noTabs=false:
+ 
 TEMPLATE        = lib
 TARGET          = qt
 embedded:TARGET = qte
 VERSION         = 3.3.1
+os2:VERSION     = $${VERSION}.0.6
 DESTDIR         = $$QMAKE_LIBDIR_QT
 DLLDESTDIR      = ../bin
@@ -157 +161 @@
 
 thread {
-        !win32-borland:TARGET = qt-mt
-        win32-borland:TARGET = qtmt
-        embedded:TARGET = qte-mt
+        !os2 {
+                !win32-borland:TARGET = qt-mt
+                win32-borland:TARGET = qtmt
+                embedded:TARGET = qte-mt
+        }
         DEFINES += QT_THREAD_SUPPORT
 }