whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove pointless messing with CONFIG+=fix_output_dirs 

the function is automatically performed by debug_and_release.prf,
regardless what we do with this flag.

Change-Id: Iddec69b35e0e905fdf4133ee240af37d3a8ada0b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2012-10-23 20:52:09 +02:00 committed by The Qt Project
parent b8e7265a50
commit bc64a7a6f7
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

1
mkspecs/features/qt_module.prf
View File

@ -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

1
src/winmain/winmain.pro
View File

@ -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