diff options
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/qtbase.pro b/qtbase.pro index 78f9b3a86c..88ff2de07c 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -4,7 +4,7 @@ load(qt_parts) -SUBDIRS += qmake/qmake-docs.pro doc +SUBDIRS += qmake/qmake-aux.pro doc cross_compile: CONFIG += nostrip @@ -28,6 +28,7 @@ QMAKE_DISTCLEAN += \ config.tests/.qmake.cache \ mkspecs/qconfig.pri \ mkspecs/qdevice.pri \ + mkspecs/qhost.pri \ mkspecs/qmodule.pri \ src/corelib/global/qconfig.h \ src/corelib/global/qconfig.cpp \ @@ -37,15 +38,6 @@ CONFIG -= qt ### installations #### -#qmake -qmake.path = $$[QT_HOST_BINS] -equals(QMAKE_HOST.os, Windows) { - qmake.files = $$OUT_PWD/bin/qmake.exe -} else { - qmake.files = $$OUT_PWD/bin/qmake -} -INSTALLS += qmake - #licheck licheck.path = $$[QT_HOST_BINS] licheck.files = $$PWD/bin/$$QT_LICHECK @@ -175,7 +167,8 @@ QMAKE_DISTCLEAN += \ #mkspecs mkspecs.path = $$[QT_HOST_DATA]/mkspecs mkspecs.files = \ - $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri $$OUT_PWD/mkspecs/qfeatures.pri \ + $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qfeatures.pri \ + $$OUT_PWD/mkspecs/qdevice.pri $$OUT_PWD/mkspecs/qhost.pri \ $$files($$PWD/mkspecs/*) mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs |