diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-24 13:38:22 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 19:01:45 +0200 |
commit | ae95f289975636ba6cacc147f6723615b6d36cfa (patch) | |
tree | 80fc241feb5beea74152c2001d91cc97eeca6983 | |
parent | 684028a64075030b42ce5f3d78d5cb35b936d5b1 (diff) |
bye-bye .qmake.cache
well, not really - qt_parts.prf will still create one, but it will be
empty.
apart from being cleaner, this now finally makes it possible to load an
unconfigured qt source tree into qtcreator without random parts of the
tree being missing from the project explorer.
Change-Id: Ida7ee77ecb450af05bfa66106caf2067b02f1a7f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | .qmake.conf | 3 | ||||
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 11 |
3 files changed, 3 insertions, 29 deletions
diff --git a/.qmake.conf b/.qmake.conf index 17dbc553bb..b6433664d8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,8 @@ load(qt_build_config) CONFIG += qt_example_installs +QT_SOURCE_TREE = $$PWD +QT_BUILD_TREE = $$shadowed($$PWD) + # In qtbase, all modules follow qglobal.h MODULE_VERSION = $$QT_VERSION @@ -6669,24 +6669,6 @@ else fi #------------------------------------------------------------------------------- -# save configuration into .qmake.cache -#------------------------------------------------------------------------------- - -CACHEFILE="$outpath/.qmake.cache" -[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" -cat >>"$CACHEFILE.tmp" <<EOF -QT_SOURCE_TREE = \$\$quote($relpath) -QT_BUILD_TREE = \$\$quote($outpath) -EOF - -# replace .qmake.cache if it differs from the newly created temp file -if cmp -s "$CACHEFILE.tmp" "$CACHEFILE"; then - rm -f "$CACHEFILE.tmp" -else - mv -f "$CACHEFILE.tmp" "$CACHEFILE" -fi - -#------------------------------------------------------------------------------- # give feedback on configuration #------------------------------------------------------------------------------- exec 3>&1 1>$outpath/config.summary # redirect output temporarily to config.summary diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index de91a1558d..7a14043d75 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2812,17 +2812,6 @@ void Configure::generateOutputVars() void Configure::generateCachefile() { - // Generate .qmake.cache - { - FileWriter cacheStream(buildPath + "/.qmake.cache"); - - cacheStream << "QT_SOURCE_TREE = " << formatPath(dictionary["QT_SOURCE_TREE"]) << endl; - cacheStream << "QT_BUILD_TREE = " << formatPath(dictionary["QT_BUILD_TREE"]) << endl; - - if (!cacheStream.flush()) - dictionary[ "DONE" ] = "error"; - } - // Generate qmodule.pri { FileWriter moduleStream(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri"); |