Changeset 513

Timestamp:

Feb 4, 2010, 1:25:34 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Revert to a static build that doesn't depend on Qt DLLs to simplify the build process (other tools like moc.exe are static too so it makes even less sense to put the dependency on one of them).

Location:

trunk

Files:

• projects.pro (modified) (2 diffs)
• qmake/Makefile.os2-g++ (modified) (1 diff)
• qmake/qmake.pro (modified) (1 diff)

trunk/projects.pro ¶

@@ -15 +15 @@
        QT_BUILD_PARTS = tools $$QT_BUILD_PARTS
    }
-   os2:contains(QT_BUILD_PARTS, qmake) {
-       # non-bootstrapped qmake needs libs so don't put it before
-       QT_BUILD_PARTS -= qmake
-       QT_BUILD_PARTS = qmake $$QT_BUILD_PARTS
-   }
    contains(QT_BUILD_PARTS, libs) {
        QT_BUILD_PARTS -= libs
        QT_BUILD_PARTS = libs $$QT_BUILD_PARTS
    }
-   !os2:contains(QT_BUILD_PARTS, qmake) {
+   contains(QT_BUILD_PARTS, qmake) {
        QT_BUILD_PARTS -= qmake
        QT_BUILD_PARTS = qmake $$QT_BUILD_PARTS
@@ -45 +40 @@
        contains(QT_BUILD_PARTS, tools):include(translations/translations.pri)
     } else:isEqual(PROJECT, qmake) {
-       os2:SUBDIRS += qmake
+       SUBDIRS += qmake
     } else {
        message(Unknown PROJECT: $$PROJECT)

trunk/qmake/Makefile.os2-g++ ¶

@@ -38 +38 @@
 endif
 
-OBJECTS_DIR = release-bootstrap
+# make sure the output dir matches the one in qmake.pro
+OBJECTS_DIR = release-shared
 
 # qmake code

trunk/qmake/qmake.pro ¶

@@ -4 +4 @@
 #platform than either of the generic makefiles
 
-os2 {
-  # using this .pro, we build non-bootstrapped qmake which links to Qt DLLs
-  CONFIG += console
-  CONFIG -= uic
-} else {
-  CONFIG += console bootstrap
-  CONFIG -= qt shared app_bundle uic
-  DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
-  OBJECTS_DIR = .
-  MOC_DIR = .
-}
+CONFIG += console bootstrap
+CONFIG -= qt shared app_bundle uic
+DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
 DESTDIR = ../bin/
+
+OBJECTS_DIR = .
+MOC_DIR = .
 
 #guts