Changeset 513 for trunk/projects.pro

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).

File:

• trunk/projects.pro (modified) (2 diffs)

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)