diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-04-17 17:53:37 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 10:40:31 (GMT) |
| commit | 8f55516ce694dfde63bea4b00c1942481fadf56d (patch) | |
| tree | e5d4c0b4d26010798900e88a9c12243eb083a1bf | |
| parent | 6878047681820124e58d33355f35a7fc114a47bc (diff) | |
| download | Qt-8f55516ce694dfde63bea4b00c1942481fadf56d.zip Qt-8f55516ce694dfde63bea4b00c1942481fadf56d.tar.gz Qt-8f55516ce694dfde63bea4b00c1942481fadf56d.tar.bz2 | |
mkspecs: Rename freebsd-g++40 to freebsd-g++46.
lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the
lang/gcc port, which provides a stable GCC version newer than the one in
the base system, is currently pointing to the 4.6 series.
Cherry-picked from c7b52e2a2a46047b7b6bca74a39c81cf43f1c864 to
qt5/qtbase.
Change-Id: I085e8495d449f47c1cfcf74e7f6511b2a8e3caa1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/freebsd-g++46/qmake.conf (renamed from mkspecs/freebsd-g++40/qmake.conf) | 6 | ||||
| -rw-r--r-- | mkspecs/freebsd-g++46/qplatformdefs.h (renamed from mkspecs/freebsd-g++40/qplatformdefs.h) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/freebsd-g++40/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf index 4050fda..6eb19c1 100644 --- a/mkspecs/freebsd-g++40/qmake.conf +++ b/mkspecs/freebsd-g++46/qmake.conf @@ -1,5 +1,5 @@ # -# qmake configuration for freebsd-g++40 (using g++40 from ports/lang/gcc40) +# qmake configuration for freebsd-g++46 (using g++46 from ports/lang/gcc) # MAKEFILE_GENERATOR = UNIX @@ -12,9 +12,9 @@ QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CC = gcc40 +QMAKE_CC = gcc46 -QMAKE_CXX = g++40 +QMAKE_CXX = g++46 # Addon software goes into /usr/local on the BSDs, by default we will look there QMAKE_INCDIR = /usr/local/include diff --git a/mkspecs/freebsd-g++40/qplatformdefs.h b/mkspecs/freebsd-g++46/qplatformdefs.h index 3f6b1f4..3f6b1f4 100644 --- a/mkspecs/freebsd-g++40/qplatformdefs.h +++ b/mkspecs/freebsd-g++46/qplatformdefs.h |