From e89721bce16d6486e47b5b88d24467face5a11aa Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 2 Jun 2014 09:46:41 +0200 Subject: Cleanup to support Qt5 only. Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber --- installerfw.pri | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'installerfw.pri') diff --git a/installerfw.pri b/installerfw.pri index cc3cc1446..bde64c66f 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -92,23 +92,12 @@ macx:LIBS += -framework Carbon -framework Security } } -isEqual(QT_MAJOR_VERSION, 4) { - CONFIG += uitools - CONFIG(static, static|shared) { - QTPLUGIN += qico qtaccessiblewidgets - DEFINES += QT_STATIC - QT += script network xml - } -} else { - QT += uitools core-private - CONFIG(static, static|shared) { - QTPLUGIN += qico qtaccessiblewidgets - QT += concurrent network script xml - } - CONFIG += no_private_qt_headers_warning +QT += uitools core-private +CONFIG(static, static|shared) { + QTPLUGIN += qico qtaccessiblewidgets + QT += concurrent network script xml } - -CONFIG += depend_includepath +CONFIG += depend_includepath no_private_qt_headers_warning GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1" IFW_VERSION=$$IFW_VERSION -- cgit v1.2.3