diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mkspecs/freebsd-g++/qmake.conf (renamed from mkspecs/unsupported/freebsd-g++/qmake.conf) | 6 | ||||
| -rw-r--r-- | mkspecs/freebsd-g++/qplatformdefs.h (renamed from mkspecs/unsupported/freebsd-g++/qplatformdefs.h) | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -2872,7 +2872,7 @@ if [ -z "$PLATFORM" ]; then FreeBSD:*) PLATFORM=freebsd-clang PLATFORM_NOTES=" - - Also available for FreeBSD: freebsd-icc + - Also available for FreeBSD: freebsd-g++ " ;; OpenBSD:*) diff --git a/mkspecs/unsupported/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 527a94870c..282b6bdfa7 100644 --- a/mkspecs/unsupported/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd -include(../../common/unix.conf) +include(../common/unix.conf) QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE @@ -29,6 +29,6 @@ QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P QMAKE_RANLIB = -include(../../common/gcc-base-unix.conf) -include(../../common/g++-unix.conf) +include(../common/gcc-base-unix.conf) +include(../common/g++-unix.conf) load(qt_config) diff --git a/mkspecs/unsupported/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index b52be38b4e..aa51e08990 100644 --- a/mkspecs/unsupported/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -31,4 +31,4 @@ ** ****************************************************************************/ -#include "../../freebsd-clang/qplatformdefs.h" +#include "../freebsd-clang/qplatformdefs.h" |