Mercurial > mxe-octave

comparison src/qt-1-win32.patch @ 1100:ef9fcd8df707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package qt: fix failure of -debug-and-release configure option By default, Qt is configured with "-release" in mingw-cross-env. But, it was recently brought to my attention that "-debug-and-release" did not work. This patch allows it to work. The "-debug-and-release" configure option means that both release and debug libraries are built.
author Mark Brand <mabrand@mabrand.nl>
date Mon, 30 Aug 2010 01:58:37 +0200
parents 93745bdf9745
children 3cd158b49847
comparison
equal deleted inserted replaced
1099:be4292f84a3b 1100:ef9fcd8df707
1105 +} 1105 +}
1106 + 1106 +
1107 contains(QT_CONFIG, embedded):CONFIG += embedded 1107 contains(QT_CONFIG, embedded):CONFIG += embedded
1108 1108
1109 CONFIG(QTDIR_build) { 1109 CONFIG(QTDIR_build) {
1110
1111 commit 94675dbcdb6abcc9d3ed4be2bdd188af65970966
1112 Author: Mark Brand <mabrand@mabrand.nl>
1113 Date: Mon Aug 30 01:12:55 2010 +0200
1114
1115 fix -debug-and-release in configure script for cross target MinGW
1116
1117 Fixed two issues in the configure script that prevented
1118 -debug-and-release from working correctly:
1119
1120 We now allow dual debug and release mode for MinGW.
1121
1122 We follow configure.exe in *not* settting PRECOMPILED_DIR. This gives
1123 qmake the freedom to put the debug and release precompiled headers in
1124 separate directories.
1125
1126 diff --git a/configure b/configure
1127 index e6b9476..a0cff96 100755
1128 --- a/configure
1129 +++ b/configure
1130 @@ -2275,7 +2275,7 @@ fi
1131
1132 # detect build style
1133 if [ "$CFG_DEBUG" = "auto" ]; then
1134 - if [ "$PLATFORM_MAC" = "yes" ]; then
1135 + if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
1136 CFG_DEBUG_RELEASE=yes
1137 CFG_DEBUG=yes
1138 elif [ "$CFG_DEV" = "yes" ]; then
1139 @@ -6536,7 +6536,11 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
1140 QT_CONFIG="$QT_CONFIG embedded"
1141 rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes
1142 fi
1143 -QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR"
1144 +if [ "$XPLATFORM_MINGW" != "yes" ]; then
1145 + # Do not set this here for Windows. Let qmake do it so
1146 + # debug and release precompiled headers are kept separate.
1147 + QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR"
1148 +fi
1149 QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR"
1150 QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR"
1151 QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR"