AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: remove support for pre-5.6 qt module pris

Browse Source 
it seems rather obsolete by now.

Change-Id: I43a84367fbe9f82c3adc0e3825d14198e69eaa1f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-12-19 17:54:46 +01:00 committed by Lars Schmertmann
parent 49c8595bf8
commit e0926ca426
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mkspecs/features/qt.prf
View File

@ -198,28 +198,6 @@ for(ever) {
MODULE_LIBS_ADD = $$MODULE_LIBS
MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
!contains(MODULE_CONFIG, v2) {
# Backwards compatibility with pre-5.6 module .pri files
contains(MODULE_CONFIG, lib_bundle) {
MODULE_FRAMEWORKS = $$MODULE_LIBS
inc = $$MODULE_LIBS/$${MODULE_NAME}.framework/Headers
MODULE_INCLUDES = $$inc
contains(MODULE_CONFIG, internal_module): \
MODULE_INCLUDES += \
$$inc/$$eval(QT.$${QTLIB}.VERSION) \
$$inc/$$eval(QT.$${QTLIB}.VERSION)/$$MODULE_NAME
} else {
# Re-insert the major version in the library name (cf qt5LibraryTarget above)
MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION,
}
# Only link to this module if a libs directory is set, else this is just a module
# to give access to sources or include files, and not for linking.
!isEmpty(MODULE_LIBS):!contains(MODULE_CONFIG, no_link): \
MODULE_MODULE = $${MODULE_NAME}$${QT_LIBINFIX}
}
# Frameworks shouldn't need include paths, but much code does not use
# module-qualified #includes, so by default we add paths which point
# directly into the frameworks. Private modules have somewhat convoluted