From 9b532a999944c70c2e8f57d9156c1887867ad9f1 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Mon, 29 Jun 2009 13:38:13 +0200 Subject: Support the -qtlibinfix parameter already on Unix/Mac The configuration option was not added to the Windows configure. Reviewed-by: hjk --- mkspecs/features/win32/windows.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index f037c1a713..cf813880d2 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -6,8 +6,8 @@ contains(TEMPLATE, ".*app"){ qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { isEqual(entryLib, -lqtmain): { - CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d - else: QMAKE_LIBS += $${entryLib} + CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d + else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} } else { QMAKE_LIBS += $${entryLib} } -- cgit v1.2.1 From 42e63a7e65d4dbfb2a79133eb63a561f50760344 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 1 Jul 2009 15:39:01 +0300 Subject: Added temporary include file generation to symbian-sbsv2 generator and cleaned related functionality up a bit. --- .../flm/qt/qmake_generate_temp_dirs.flm | 22 ++++++++++++++++++++++ mkspecs/symbian-sbsv2/flm/qt/qt.xml | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm (limited to 'mkspecs') diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm new file mode 100644 index 0000000000..97fc6b3b82 --- /dev/null +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_generate_temp_dirs.flm @@ -0,0 +1,22 @@ +# /**************************************************************************** +# ** +# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# ** Contact: Qt Software Information (qt-info@nokia.com) +# ** +# ** This file is part of symbian-sbsv2 mkspec. +# ** +# ****************************************************************************/ + +include $(FLMHOME)/metaflm.mk + +SINGLETON:=$(call sanitise,TEMP_DIRS_$(EXTENSION_ROOT)) + +ifeq ($($(SINGLETON)),) +$(SINGLETON):=1 +$(call makepath,$(DIRS)) +$(eval $(call GenerateStandardCleanTarget,'',$(DIRS))) +endif + + + + diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index a5ed1411ef..ff12761c99 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -34,4 +34,9 @@ + + + + -- cgit v1.2.1 From f3869caa41d452ef607bcba168bf7bdeb8ac9a45 Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 6 Jul 2009 09:40:25 +0200 Subject: Started suppressing some rather pointless warnings from RVCT. --- mkspecs/common/symbian/armcc_warnings.prf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mkspecs/common/symbian/armcc_warnings.prf (limited to 'mkspecs') diff --git a/mkspecs/common/symbian/armcc_warnings.prf b/mkspecs/common/symbian/armcc_warnings.prf new file mode 100644 index 0000000000..95b3bc0869 --- /dev/null +++ b/mkspecs/common/symbian/armcc_warnings.prf @@ -0,0 +1,10 @@ +# 111: Statement is unreachable +# 185: Dynamic initialization in unreachable code +# 191: Type qualifier is meaningless on cast type +# 368: class "" defines no constructor to initialize the following: +# (Disabled because there are other ways of assigning besides constructors) +# 1293: Assignment in condition +# 1294: pre-ANSI C style functions declarations (used a lot in 3rd party code) +# 2874: may be used before being set (this one sounds useful, but +# it's output also for class instances, making it useless in practice) +QMAKE_CFLAGS.ARMCC += --diag_suppress 111,185,191,368,1293,1294,2874 -- cgit v1.2.1 From 3aef8eaffb8959a1559b0b3b01a423a2ac42c8eb Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 7 Jul 2009 11:18:19 +0200 Subject: Fixed qmake "not found" error. --- mkspecs/common/symbian/armcc_warnings.prf | 10 ---------- mkspecs/features/symbian/armcc_warnings.prf | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 mkspecs/common/symbian/armcc_warnings.prf create mode 100644 mkspecs/features/symbian/armcc_warnings.prf (limited to 'mkspecs') diff --git a/mkspecs/common/symbian/armcc_warnings.prf b/mkspecs/common/symbian/armcc_warnings.prf deleted file mode 100644 index 95b3bc0869..0000000000 --- a/mkspecs/common/symbian/armcc_warnings.prf +++ /dev/null @@ -1,10 +0,0 @@ -# 111: Statement is unreachable -# 185: Dynamic initialization in unreachable code -# 191: Type qualifier is meaningless on cast type -# 368: class "" defines no constructor to initialize the following: -# (Disabled because there are other ways of assigning besides constructors) -# 1293: Assignment in condition -# 1294: pre-ANSI C style functions declarations (used a lot in 3rd party code) -# 2874: may be used before being set (this one sounds useful, but -# it's output also for class instances, making it useless in practice) -QMAKE_CFLAGS.ARMCC += --diag_suppress 111,185,191,368,1293,1294,2874 diff --git a/mkspecs/features/symbian/armcc_warnings.prf b/mkspecs/features/symbian/armcc_warnings.prf new file mode 100644 index 0000000000..95b3bc0869 --- /dev/null +++ b/mkspecs/features/symbian/armcc_warnings.prf @@ -0,0 +1,10 @@ +# 111: Statement is unreachable +# 185: Dynamic initialization in unreachable code +# 191: Type qualifier is meaningless on cast type +# 368: class "" defines no constructor to initialize the following: +# (Disabled because there are other ways of assigning besides constructors) +# 1293: Assignment in condition +# 1294: pre-ANSI C style functions declarations (used a lot in 3rd party code) +# 2874: may be used before being set (this one sounds useful, but +# it's output also for class instances, making it useless in practice) +QMAKE_CFLAGS.ARMCC += --diag_suppress 111,185,191,368,1293,1294,2874 -- cgit v1.2.1