diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-17 15:04:23 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-17 15:04:23 (GMT) |
| commit | c29533ab2094c38bb63d50dd6306cfe6ccacc868 (patch) | |
| tree | e539b2062c870dd431f522d1d1e0677008eaa717 /tests/auto/qmake/qmake.pro | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (diff) | |
| download | Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.zip Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.gz Qt-c29533ab2094c38bb63d50dd6306cfe6ccacc868.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'tests/auto/qmake/qmake.pro')
| -rw-r--r-- | tests/auto/qmake/qmake.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qmake/qmake.pro b/tests/auto/qmake/qmake.pro index 59cc2be..8cae6be 100644 --- a/tests/auto/qmake/qmake.pro +++ b/tests/auto/qmake/qmake.pro @@ -2,8 +2,6 @@ load(qttest_p4) HEADERS += testcompiler.h SOURCES += tst_qmake.cpp testcompiler.cpp -contains(QT_CONFIG, qt3support): QT += qt3support - cross_compile: DEFINES += QMAKE_CROSS_COMPILED |