diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-23 20:45:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-01 22:27:09 +0100 |
| commit | 589a18597f9d513e3b46f975844282624c792acc (patch) | |
| tree | 3dbb34b4a800b00423c7e378ed83117c31fb67e7 /configure | |
| parent | b94cfa423610e5601674f713303db2cc264452cd (diff) | |
move remaining configure'd CONFIG flags to qmodule.pri
so they are uniformly available to all modules.
Change-Id: I734f703c5923c42cb26f1456ed960cecc01c4b41
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -6074,7 +6074,7 @@ fi #------------------------------------------------------------------------------- QTMODULE="$outpath/mkspecs/qmodule.pri" -echo "CONFIG += $QMAKE_CONFIG create_prl link_prl" >> "$QTMODULE.tmp" +echo "CONFIG += $QMAKE_CONFIG create_prl link_prl fix_output_dirs no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp" echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" if [ -n "$QT_CFLAGS_PSQL" ]; then @@ -6139,9 +6139,6 @@ cat >>"$CACHEFILE.tmp" <<EOF #paths QT_SOURCE_TREE = \$\$quote($relpath) QT_BUILD_TREE = \$\$quote($outpath) - -CONFIG += fix_output_dirs no_private_qt_headers_warning QTDIR_build - EOF # replace .qmake.cache if it differs from the newly created temp file |