diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-29 09:05:36 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-29 09:06:37 +0200 |
| commit | 1491065506eb97c9def93b908db1df9fcdf3fff0 (patch) | |
| tree | 8241e72cc1016b41c08f9d14e81fb63c07e6a5ba /tests/auto/tools/qmake/testdata/operators/operators.pro | |
| parent | 551e1e63d9da18787ae72fc3f0e76f28dbe5f7e3 (diff) | |
| parent | 61c775684fe38f3c1e1bc7599e21054aedba523c (diff) | |
Merge branch 'buildsystem' (second round)
refactoring and cleanup. fixes x-builds between different os families.
Conflicts:
mkspecs/features/qt.prf
Change-Id: I0205e6f07f77c9b015cf055dd87a471883949a91
Diffstat (limited to 'tests/auto/tools/qmake/testdata/operators/operators.pro')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/operators/operators.pro | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/tools/qmake/testdata/operators/operators.pro b/tests/auto/tools/qmake/testdata/operators/operators.pro index 5285c1a982..d6eb3d13c7 100644 --- a/tests/auto/tools/qmake/testdata/operators/operators.pro +++ b/tests/auto/tools/qmake/testdata/operators/operators.pro @@ -1,24 +1,24 @@ -CONFIG = qt thread +VAR = qt thread -CONFIG += debug -!contains( CONFIG, debug ) { +VAR += debug +!contains( VAR, debug ) { message( "FAILED: +=" ) } -CONFIG -= thread -contains( CONFIG, thread ) { +VAR -= thread +contains( VAR, thread ) { message( "FAILED: -=" ) } -CONFIG = thread -CONFIG *= thread -!count( CONFIG, 1 ) { +VAR = thread +VAR *= thread +!count( VAR, 1 ) { message( "FAILED: *=" ) } -CONFIG = thread QT_DLL debug -CONFIG ~= s/QT_+/Q_ -!contains( CONFIG, Q_DLL ) { +VAR = thread QT_DLL debug +VAR ~= s/QT_+/Q_ +!contains( VAR, Q_DLL ) { message( "FAILED: ~=" ) } |