Merge branch '1.0.0'

Conflicts: tests/auto/cplusplus/shared/shared.pri tests/auto/cplusplus/shared/shared.pro
2009-02-09 10:54:36 +01:00
parent 1f9bcd86e0 3b7c35fa9b
commit 1dcabe5a3a
15 changed files with 55 additions and 55 deletions
@@ -1,4 +1,5 @@
-load(qttest_p4)
+TEMPLATE = app
+CONFIG += qt warn_on console depend_includepath
+QT = core testlib
 include(../shared/shared.pri)
-QT = core
 SOURCES += tst_ast.cpp
@@ -1,5 +1,6 @@
-load(qttest_p4)
+TEMPLATE = app
+CONFIG += qt warn_on console depend_includepath
+QT = core testlib
 include(../shared/shared.pri)
-QT = core

 SOURCES += tst_semantic.cpp