diff options
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/qtbase.pro b/qtbase.pro index 5fc9cb3888..9290d5adcd 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -39,9 +39,6 @@ confclean.depends += clean confclean.commands = unix { confclean.commands += (cd config.tests/unix/stl && $(MAKE) distclean); \ - (cd config.tests/unix/endian && $(MAKE) distclean); \ - (cd config.tests/unix/ipv6 && $(MAKE) distclean); \ - (cd config.tests/unix/largefile && $(MAKE) distclean); \ (cd config.tests/unix/ptrsize && $(MAKE) distclean); \ (cd config.tests/x11/notype && $(MAKE) distclean); \ (cd config.tests/unix/getaddrinfo && $(MAKE) distclean); \ @@ -50,7 +47,6 @@ unix { (cd config.tests/unix/mysql && $(MAKE) distclean); \ (cd config.tests/unix/mysql_r && $(MAKE) distclean); \ (cd config.tests/unix/nis && $(MAKE) distclean); \ - (cd config.tests/unix/nix && $(MAKE) distclean); \ (cd config.tests/unix/iodbc && $(MAKE) distclean); \ (cd config.tests/unix/odbc && $(MAKE) distclean); \ (cd config.tests/unix/oci && $(MAKE) distclean); \ @@ -98,7 +94,7 @@ CONFIG -= qt ### installations #### #qmake -qmake.path=$$[QT_INSTALL_BINS] +qmake.path = $$[QT_HOST_BINS] win32 { qmake.files=$$QT_BUILD_TREE/bin/qmake.exe } else { @@ -107,18 +103,18 @@ win32 { INSTALLS += qmake #syncqt -syncqt.path=$$[QT_INSTALL_BINS] +syncqt.path = $$[QT_HOST_BINS] syncqt.files=$$QT_BUILD_TREE/bin/syncqt win32:syncqt.files=$$QT_BUILD_TREE/bin/syncqt.bat INSTALLS += syncqt #qtmodule-configtests -configtests.path=$$[QT_INSTALL_BINS] +configtests.path = $$[QT_HOST_BINS] configtests.files=$$QT_BUILD_TREE/bin/qtmodule-configtests INSTALLS += configtests #mkspecs -mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs +mkspecs.path = $$[QT_HOST_DATA]/mkspecs mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_BUILD_TREE/mkspecs/qmodule.pri $$files($$QT_SOURCE_TREE/mkspecs/*) mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules unix { |