From f7270e31493cdcd62c95bc97925927189a7e0fc7 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 15 Feb 2016 15:26:16 +0100 Subject: qt5: version bump 5.4.2 -> 5.6.0 Signed-off-by: Michael Olbrich --- config/qt5/linux-ptx-g++/qmake.conf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'config/qt5') 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) -- cgit v1.2.3