diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-05 14:50:00 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-05 14:58:41 (GMT) |
| commit | 9ffa8e5585bb7469034149c28f8d4f639f58f1f4 (patch) | |
| tree | c5a017d2c56a828855bc81c486db4fe4d7757dc6 /mkspecs | |
| parent | 65a2801c18b5de9f3eec941837e4999b989eed20 (diff) | |
| download | Qt-9ffa8e5585bb7469034149c28f8d4f639f58f1f4.zip Qt-9ffa8e5585bb7469034149c28f8d4f639f58f1f4.tar.gz Qt-9ffa8e5585bb7469034149c28f8d4f639f58f1f4.tar.bz2 | |
mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior
Reviewed-by: ossi
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/g++.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf index 0ca4fbd..c5a34a9 100644 --- a/mkspecs/common/g++.conf +++ b/mkspecs/common/g++.conf @@ -7,5 +7,6 @@ warning($$escape_expand("Your mkspec is including 'common/g++.conf', but the mkspecs have been refactored\\n\\tTo fix this include 'common/gcc-base-$${TARGET_PLATFORM}.conf and 'common/g++-$${TARGET_PLATFORM}.conf' instead")) -# We include g++-unix.conf to keep the behavior of the old g++.conf -include(g++-unix.conf)
\ No newline at end of file +# We include gcc-base-unix.conf and g++-unix.conf to keep the behavior of the old g++.conf +include(gcc-base-unix.conf) +include(g++-unix.conf) |