diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-30 21:16:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-03 15:56:28 +0100 |
commit | 4315545f89b26a102bcbf68805e0360c731a9efd (patch) | |
tree | c2d5d763bf79deca58fc7219453ec88db686f85a /mkspecs | |
parent | d902b3a4813804c045ec0d0929e6ec3a0d1c63c1 (diff) |
remove support for hand-written module pri files
all modules have been migrated to auto-generation
Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt_module.prf | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index eb46481c70..0b6ad86ae1 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -35,14 +35,6 @@ else: \ MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES load(qt_build_paths) - -# This check will be removed soon. Weird indentation to avoid reindenting the code later. -!isEmpty(MODULE_PRI) { - !build_pass:warning("$$_PRO_FILE_ still sets MODULE_PRI. Not auto-generating module .pri file.") - MODULE_PRI = $$absolute_path($$MODULE_PRI, $$_PRO_FILE_PWD_) - exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.") -} else { - MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri !build_pass { @@ -97,8 +89,6 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri } # !build_pass -} # isEmpty(MODULE_PRI) - load(qt_module_fwdpri) INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}.private_includes) |