dispose of library-bound feature files
specifically, qtestlib.prf, qdbus.prf, help.prf, designer.prf and quitools.prf - they have been obsoleted by modularization. add noisy backwards compat hack to qt.prf. Change-Id: I26f84fdd51798265471e20dd1f40efec59b1087e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
parent
8b3499c577
commit
812adb58ba
@ -1,6 +0,0 @@
|
||||
QT += xml
|
||||
!isEmpty(QT.script.name): QT += script
|
||||
!isEmpty(QT.designer.name): QT += designer
|
||||
qt:load(qt)
|
||||
|
||||
plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS
|
1
mkspecs/features/designer_defines.prf
Normal file
1
mkspecs/features/designer_defines.prf
Normal file
@ -0,0 +1 @@
|
||||
plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS
|
@ -1,3 +0,0 @@
|
||||
QT += sql
|
||||
|
||||
qtAddModule(help, true)
|
@ -1,2 +0,0 @@
|
||||
qtAddLibrary(QtDBus)
|
||||
CONFIG += dbusadaptors dbusinterfaces
|
@ -125,6 +125,27 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
|
||||
!isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
|
||||
QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
|
||||
|
||||
qtestlib {
|
||||
warning("CONFIG+=qtestlib is deprecated. Use QT+=testlib instead.")
|
||||
QT += testlib
|
||||
}
|
||||
qdbus {
|
||||
warning("CONFIG+=qdbus is deprecated. Use QT+=dbus instead.")
|
||||
QT += dbus
|
||||
}
|
||||
help {
|
||||
warning("CONFIG+=help is deprecated. Use QT+=help instead.")
|
||||
QT += help-private # sic!
|
||||
}
|
||||
designer {
|
||||
warning("CONFIG+=desiger is deprecated. Use QT+=designer instead.")
|
||||
QT += designer
|
||||
}
|
||||
uitools {
|
||||
warning("CONFIG+=uitools is deprecated. Use QT+=uitools instead.")
|
||||
QT += uitools
|
||||
}
|
||||
|
||||
# Figure out from which modules we're wanting to use the private headers
|
||||
unset(using_privates)
|
||||
NEWQT =
|
||||
|
@ -1,4 +0,0 @@
|
||||
|
||||
CONFIG += console
|
||||
|
||||
qtAddLibrary(QtTest)
|
@ -1,13 +0,0 @@
|
||||
QT += xml
|
||||
qt:load(qt)
|
||||
|
||||
# Include the correct version of the UiLoader library
|
||||
QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
|
||||
|
||||
CONFIG(debug, debug|release) {
|
||||
mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
|
||||
win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
|
||||
}
|
||||
LIBS += $$QTUITOOLS_LINKAGE
|
||||
|
||||
INCLUDEPATH = $$QT.uitools.includes $$INCLUDEPATH
|
Loading…
x
Reference in New Issue
Block a user