diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-06-08 08:47:00 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-06-12 11:06:10 +0200 |
| commit | 646d698ffe9cdb0e3dc80c39978661e05edac7dd (patch) | |
| tree | 21a3c8b29193fd5cd2eda382fb296bbfc079e1eb /mkspecs/features | |
| parent | 1f242e0ab0736c76515b95687858a0f0e9096a7d (diff) | |
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>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_example_installs.prf | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index a71966b12c..7f8a6ec69c 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -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() |