diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 1 | ||||
| -rw-r--r-- | src/winmain/winmain.pro | 1 |
3 files changed, 1 insertions, 3 deletions
@@ -6074,7 +6074,7 @@ fi #------------------------------------------------------------------------------- QTMODULE="$outpath/mkspecs/qmodule.pri" -echo "CONFIG += $QMAKE_CONFIG create_prl link_prl fix_output_dirs no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp" +echo "CONFIG += $QMAKE_CONFIG create_prl link_prl no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp" echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" if [ -n "$QT_CFLAGS_PSQL" ]; then diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 50c7c74c82..b11ab1a316 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -103,7 +103,6 @@ win32:!wince*:exists($$[QT_INSTALL_PREFIX]/.qmake.cache): DLLDESTDIR = $$eval(QT CONFIG += qt warn_on depend_includepath CONFIG += qmake_cache target_qt -CONFIG -= fix_output_dirs !isEmpty(QMAKE_DOCS) { doc_subdir = doc diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 843a15989e..48837fb80a 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -6,7 +6,6 @@ TARGET = qtmain DESTDIR = $$QT.core.libs CONFIG += static warn_on depend_includepath -CONFIG -= fix_output_dirs QT = # qt.prf is still needed for some DEFINES, etc. contains(QT_CONFIG, build_all):CONFIG += build_all |