diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-18 20:45:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-18 20:50:35 +0100 |
| commit | 4fe2fbcf827ae6bec976b0b8dcaa5d14bd05dc33 (patch) | |
| tree | d1ba753b45b09b417a9447ebdfe2fa6fc47dba69 /mkspecs/unsupported/freebsd-g++46/qmake.conf | |
| parent | c1da6347e8d3ba73de20ab8fb3e50ec3359b75ac (diff) | |
| parent | 4889269ff0fb37130b332863e82dd7c19564116c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
This also reverts commit 018e670a26ff5a61b949100ae080f5e654e7bee8.
The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.
Conflicts:
.qmake.conf
src/corelib/io/qstandardpaths_mac.mm
src/corelib/tools/qsharedpointer_impl.h
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4
Diffstat (limited to 'mkspecs/unsupported/freebsd-g++46/qmake.conf')
| -rw-r--r-- | mkspecs/unsupported/freebsd-g++46/qmake.conf | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/mkspecs/unsupported/freebsd-g++46/qmake.conf b/mkspecs/unsupported/freebsd-g++46/qmake.conf new file mode 100644 index 0000000000..11041dee3d --- /dev/null +++ b/mkspecs/unsupported/freebsd-g++46/qmake.conf @@ -0,0 +1,44 @@ +# +# qmake configuration for freebsd-g++46 (using g++46 from ports/lang/gcc) +# + +MAKEFILE_GENERATOR = UNIX +QMAKE_PLATFORM = freebsd bsd + +include(../../common/unix.conf) + +QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +# Addon software goes into /usr/local on the BSDs, by default we will look there +QMAKE_INCDIR = /usr/local/include +QMAKE_LIBDIR = /usr/local/lib + +QMAKE_LFLAGS_THREAD = -pthread + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_EXECINFO = -lexecinfo +QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_OPENGL = -lGL +QMAKE_LIBS_THREAD = + +QMAKE_AR = ar cqs +QMAKE_OBJCOPY = objcopy +QMAKE_NM = nm -P +QMAKE_RANLIB = + +include(../../common/gcc-base-unix.conf) +include(../../common/g++-unix.conf) + +# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX +# to gcc and g++, respectively. +QMAKE_CC = gcc46 +QMAKE_CXX = g++46 +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + +load(qt_config) |