From 8b75fc7bac9b090cd91c574baca4a49b6b736070 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Apr 2012 19:06:41 +0200 Subject: [PATCH] don't explicitly inject qt header/library paths the modules already do that on demand. Change-Id: I889a5cd7b62631e2551ada4b096f20b3b79b2c75 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt.prf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 1c9d61c55a..9a4fb2155e 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -37,9 +37,6 @@ plugin { #Qt plugins } } -#handle includes -INCLUDEPATH = $$[QT_INSTALL_HEADERS/get] $$INCLUDEPATH #prepending prevents us from picking up "stale" includes - QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) { @@ -119,9 +116,6 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { } } -#specific module settings -QMAKE_LIBDIR = $$[QT_INSTALL_LIBS/get] $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs - qtestlib { warning("CONFIG+=qtestlib is deprecated. Use QT+=testlib instead.") QT += testlib