summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt_installs.prf3
-rw-r--r--mkspecs/features/qt_module_config.prf1
2 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index b0de7b8fd8..8b17aa90fb 100644
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@@ -11,8 +11,7 @@ qt_install_headers {
INSTALL_HEADERS = $$SYNCQT.HEADER_FILES
equals(TARGET, QtCore) {
#headers created by configure
- INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h \
- $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH/arch
+ INSTALL_HEADERS *= $$QT_BUILD_TREE/src/corelib/global/qconfig.h
}
equals(TARGET, phonon) {
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index 4da1666fc5..a8439198df 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -17,7 +17,6 @@ INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES
INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET
INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat
!isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR
-isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) {
VERSION=5.0.0