diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-02-15 15:26:16 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-11 18:21:57 +0200 |
| commit | f7270e31493cdcd62c95bc97925927189a7e0fc7 (patch) | |
| tree | af49a0f1168c849f0b4c4d5ce19ca5b07a568056 /config | |
| parent | 5a0cb3815ccf560f8e3390fd07d7763580ca7125 (diff) | |
| download | ptxdist-f7270e31493cdcd62c95bc97925927189a7e0fc7.tar.gz ptxdist-f7270e31493cdcd62c95bc97925927189a7e0fc7.tar.xz | |
qt5: version bump 5.4.2 -> 5.6.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'config')
| -rw-r--r-- | config/qt5/linux-ptx-g++/qmake.conf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config/qt5/linux-ptx-g++/qmake.conf b/config/qt5/linux-ptx-g++/qmake.conf index 77a372507..9ac2ff81d 100644 --- a/config/qt5/linux-ptx-g++/qmake.conf +++ b/config/qt5/linux-ptx-g++/qmake.conf @@ -1,22 +1,26 @@ # # qmake configuration for linux-ptx-g++ # + MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib include(../common/linux.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) -# modifications to g++.conf +# modifications to g++-base.conf QMAKE_CC = @COMPILER_PREFIX@gcc +QMAKE_LINK_C = $$QMAKE_CC +QMAKE_LINK_C_SHLIB = $$QMAKE_CC QMAKE_CXX = @COMPILER_PREFIX@g++ -QMAKE_LINK = @COMPILER_PREFIX@g++ -QMAKE_LINK_SHLIB = @COMPILER_PREFIX@g++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX # modifications to linux.conf QMAKE_AR = @COMPILER_PREFIX@ar cqs QMAKE_OBJCOPY = @COMPILER_PREFIX@objcopy +QMAKE_NM = @COMPILER_PREFIX@nm -P load(qt_config) |