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

Allow building Qt examples with qmake in-source

Browse 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:
Kai Köhne 2021-06-08 08:47:00 +02:00
parent 1f242e0ab0
commit 646d698ffe
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/features/qt_example_installs.prf
View File

@ -25,18 +25,10 @@ defineTest(addInstallFiles) {
export($$1) export($$1)
} }
moduleRoot = $$dirname(_QMAKE_CONF_) probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
probase = $$relative_path($$_PRO_FILE_PWD_, $$moduleRoot/examples)
isEmpty(probase)|contains(probase, ^\\..*): \ isEmpty(probase)|contains(probase, ^\\..*): \
return() 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.*"): \ contains(TEMPLATE, "vc.*"): \
return() return()