summaryrefslogtreecommitdiffstats
path: root/mkspecs/freebsd-g++
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-10-13 12:09:10 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2010-10-13 18:03:01 (GMT)
commit86636e0c4ab91bfb60be1e18d6daff34d41a5927 (patch)
treeee89e8d15a27377afb45e7b6fb9ee0e4ef42bc8a /mkspecs/freebsd-g++
parent2def16770a623df4e5fc0dcd5f0e55c485251992 (diff)
downloadQt-86636e0c4ab91bfb60be1e18d6daff34d41a5927.zip
Qt-86636e0c4ab91bfb60be1e18d6daff34d41a5927.tar.gz
Qt-86636e0c4ab91bfb60be1e18d6daff34d41a5927.tar.bz2
Refactor GCC mkspecs to share more configuration options
The g++ and llvm mkspecs now share the common parts in common/gcc-base.conf Each top level mkspec includes a platform-specific version of this base, either common/gcc-base-unix.conf or common/gcc-base-mac.conf, and these platform specific bases will include the cross-platform one. The same pattern is then used for the g++ specific configurations, which are split up into common/g++.conf, common/g++-unix.conf and common/g++-mac.conf The qplatformdefs.h for mac was also shared where possible. The test in tests/manual/mkspecs was used to ensure that the final output of all the mkspecs was the same after the refactoring as before. Reviewed-by: ossi
Diffstat (limited to 'mkspecs/freebsd-g++')
-rw-r--r--mkspecs/freebsd-g++/qmake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index 9de93d4..9d7c443 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -48,6 +48,7 @@ QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
-include(../common/g++.conf)
include(../common/unix.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
load(qt_config)