1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispose of library-bound feature files

Browse Source 
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:
Oswald Buddenhagen 2012-03-01 18:10:22 +01:00
parent 8b3499c577
commit 812adb58ba
7 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/designer.prf
View File

@ -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
View File

@ -0,0 +1 @@
plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS

3
mkspecs/features/help.prf
View File

@ -1,3 +0,0 @@
QT += sql
qtAddModule(help, true)

2
mkspecs/features/qdbus.prf
View File

@ -1,2 +0,0 @@
qtAddLibrary(QtDBus)
CONFIG += dbusadaptors dbusinterfaces

21
mkspecs/features/qt.prf
View File

@ -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 !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 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 # Figure out from which modules we're wanting to use the private headers
unset(using_privates) unset(using_privates)
NEWQT = NEWQT =

4
mkspecs/features/qtestlib.prf
View File

@ -1,4 +0,0 @@
CONFIG += console
qtAddLibrary(QtTest)

13
mkspecs/features/uitools.prf
View File

@ -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