don't explicitly inject qt header/library paths
the modules already do that on demand. Change-Id: I889a5cd7b62631e2551ada4b096f20b3b79b2c75 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
4816ca6c56
commit
8b75fc7bac
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user