diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-28 11:37:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-28 12:38:12 +0000 |
| commit | cc842ca4aa2d66cb19027ee6d144c6625a4ff0f0 (patch) | |
| tree | c12c162b4e2d7383751ba3d91ea8579597882a84 /mkspecs | |
| parent | d10c4f08d46cfe457e0e802b4f654f7911155cb0 (diff) | |
Enable the "use" option for library checks that come with a test
The "use" option was so far only available for tests, to define that
the test requires usage of a certain library. Extend this to libraries,
so they can also define that running the test for the library requires
usage of another lib.
Change-Id: I2749c21e27c08ad6e12040590317c06c97f493db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 7118a177fe..6b500c0f3e 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -602,6 +602,8 @@ defineTest(qtConfHandleLibrary) { defined($${lpfx}.result, var): return() qtConfEnsureTestTypeDeps("library") + qtConfTestPrepare_compile($$lpfx) + use_args = $$eval($${lpfx}.literal_args) qtConfLoadResult($${lpfx}, $$1) { $$eval($${lpfx}.result): \ @@ -636,7 +638,7 @@ defineTest(qtConfHandleLibrary) { # if the library defines a test, use it to verify the source. !isEmpty($${lpfx}.test) { - $${lpfx}.literal_args = $$qtConfLibraryArgs($$spfx) + $${lpfx}.literal_args = $$use_args $$qtConfLibraryArgs($$spfx) $${lpfx}.host = $$eval($${spfx}.host) !qtConfTest_compile($$lpfx) { qtLog(" => source failed verification.") |