make missing qt modules fatal

there is no point in continuing; it will error out later (in more
cryptic ways) anyway.

Change-Id: I2562eadc2d91bfaa6e85368dc3774da31409a141
This commit is contained in:
Oswald Buddenhagen 2012-06-06 13:01:45 +02:00
parent 0fdf7c3a43
commit 2f1762535b

View File

@ -153,10 +153,11 @@ for(QTLIB, QT) {
# Topological resolution of modules based on their QT.<module>.depends variable # Topological resolution of modules based on their QT.<module>.depends variable
QT = $$resolve_depends(NEWQT, "QT.") QT = $$resolve_depends(NEWQT, "QT.")
# Finally actually add the modules # Finally actually add the modules
unset(BAD_QT)
for(QTLIB, QT) { for(QTLIB, QT) {
QTLIBNAME = $$eval(QT.$${QTLIB}.name) QTLIBNAME = $$eval(QT.$${QTLIB}.name)
isEmpty(QTLIBNAME) { isEmpty(QTLIBNAME) {
message("Warning: unknown QT module: $$QTLIB") BAD_QT += $$QTLIB
next() next()
} }
@ -167,6 +168,7 @@ for(QTLIB, QT) {
qtAddModule($$QTLIB, $$eval(QT.$${QTLIB}.want_private)) qtAddModule($$QTLIB, $$eval(QT.$${QTLIB}.want_private))
} }
!isEmpty(BAD_QT):error("Unknown module(s) in QT: $$BAD_QT")
!isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) { !isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) {
message("This project is using private headers and will therefore be tied to this specific Qt module build version.") message("This project is using private headers and will therefore be tied to this specific Qt module build version.")