Allow building Qt examples with qmake in-source
This reverts commit c686e885c004a48c90cff300c0ad1e817e43fb99 and commit d64abf8166d362b0fdc34c7f21aa32641063c01b. We don't feature .qmake.cache/.qmake.super files anymore in the source directory, so there's no problem anymore. Change-Id: Ib820a109fbfbad70d85b0f14ef72915882217ca3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
1f242e0ab0
commit
646d698ffe
@ -25,18 +25,10 @@ defineTest(addInstallFiles) {
|
||||
export($$1)
|
||||
}
|
||||
|
||||
moduleRoot = $$dirname(_QMAKE_CONF_)
|
||||
probase = $$relative_path($$_PRO_FILE_PWD_, $$moduleRoot/examples)
|
||||
probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
|
||||
isEmpty(probase)|contains(probase, ^\\..*): \
|
||||
return()
|
||||
|
||||
isEmpty(_QMAKE_CACHE_) {
|
||||
moduleRootRelativeToBuildDir = $$relative_path($$moduleRoot, $$OUT_PWD)
|
||||
# Check if OUT_PWD is inside module root
|
||||
equals(moduleRootRelativeToBuildDir, .)|contains(moduleRootRelativeToBuildDir, \(\.\./\)+\(\.\.\)?): \
|
||||
error("You cannot build examples inside the Qt source tree, except as part of a proper Qt build.")
|
||||
}
|
||||
|
||||
contains(TEMPLATE, "vc.*"): \
|
||||
return()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user