diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-26 11:51:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-28 09:45:57 +0000 |
| commit | 9cda8d4384825bd93b949f31953548beda165ef8 (patch) | |
| tree | 2f0edac480d7557c918badb64b07bce7c6447b5a /tools/qmake | |
| parent | 54b7425c356378018c511bd9087f06767d0bc708 (diff) | |
Restore ability to build with Qt 5.7v5.8.0-alpha1
Defines the qtConfig() test for older Qt versions, and fix
conflict between two QSGRectangle definitions.
Change-Id: Icf4ef2f88d9e98e7aea4e88d777827bf69a4c281
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 590d521e8..f6d4f676b 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -1,3 +1,18 @@ +defineTest(isQtMinimum) { + !equals(QT_MAJOR_VERSION, $$1): return(false) + count(ARGS, 1, greaterThan) { + lessThan(QT_MINOR_VERSION, $$2): return(false) + } + return(true) +} + +!isQtMinimum(5, 8) { + defineTest(qtConfig) { + contains(QT_CONFIG, $$1): return(true) + return(false) + } +} + defineTest(isPlatformSupported) { linux { !gcc:!clang { |