diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-12-09 10:39:17 +1000 |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-12-09 10:40:25 +1000 |
| commit | ee8c0f87ef97dd4a201fde74a6b586fe399fbe21 (patch) | |
| tree | d403d587335a813ec34844f8bd79a1119425cf3d | |
| parent | 2b3d1477069b73f592f206b2ee8f2293c317f87e (diff) | |
Move headers to QtQuickTest directory
This should help make the user application code and
the example code the same.
| -rw-r--r-- | doc/testcases.txt | 2 | ||||
| -rw-r--r-- | src/quicktestlib/QtQuickTest/quicktest.h (renamed from src/quicktestlib/quicktest.h) | 2 | ||||
| -rw-r--r-- | src/quicktestlib/QtQuickTest/quicktestglobal.h (renamed from src/quicktestlib/quicktestglobal.h) | 0 | ||||
| -rw-r--r-- | src/quicktestlib/quicktestlib.pro | 6 | ||||
| -rw-r--r-- | src/quicktestlib/quicktestresult_p.h | 2 | ||||
| -rw-r--r-- | tests/qmlauto/tst_qmlauto.cpp | 3 | ||||
| -rw-r--r-- | tests/qmlexample/tst_qmlexample.cpp | 3 |
7 files changed, 9 insertions, 9 deletions
diff --git a/doc/testcases.txt b/doc/testcases.txt index ac7e579..8fbf832 100644 --- a/doc/testcases.txt +++ b/doc/testcases.txt @@ -31,7 +31,7 @@ Organization of test cases The test cases are launched by a C++ harness that consists of the following code: - #include <QtQuickTest/qdeclarativetest.h> + #include <QtQuickTest/quicktest.h> QTEST_QUICK_MAIN(qmlexample) Where "qmlexample" is an identifier to use to uniquely identify diff --git a/src/quicktestlib/quicktest.h b/src/quicktestlib/QtQuickTest/quicktest.h index 4cf64be..b68c554 100644 --- a/src/quicktestlib/quicktest.h +++ b/src/quicktestlib/QtQuickTest/quicktest.h @@ -42,7 +42,7 @@ #ifndef QUICKTEST_H #define QUICKTEST_H -#include "quicktestglobal.h" +#include <QtQuickTest/quicktestglobal.h> #include <QtGui/qwidget.h> #ifdef QT_OPENGL_LIB #include <QtOpenGL/qgl.h> diff --git a/src/quicktestlib/quicktestglobal.h b/src/quicktestlib/QtQuickTest/quicktestglobal.h index 0c71b5c..0c71b5c 100644 --- a/src/quicktestlib/quicktestglobal.h +++ b/src/quicktestlib/QtQuickTest/quicktestglobal.h diff --git a/src/quicktestlib/quicktestlib.pro b/src/quicktestlib/quicktestlib.pro index e319c56..52a249e 100644 --- a/src/quicktestlib/quicktestlib.pro +++ b/src/quicktestlib/quicktestlib.pro @@ -24,12 +24,14 @@ symbian { } } +INCLUDEPATH += $$PWD/QtQuickTest + SOURCES += \ quicktest.cpp \ quicktestresult.cpp HEADERS += \ - quicktestglobal.h \ - quicktest.h + QtQuickTest/quicktestglobal.h \ + QtQuickTest/quicktest.h PRIVATE_HEADERS += \ quicktestresult_p.h diff --git a/src/quicktestlib/quicktestresult_p.h b/src/quicktestlib/quicktestresult_p.h index 4896b01..4a283ea 100644 --- a/src/quicktestlib/quicktestresult_p.h +++ b/src/quicktestlib/quicktestresult_p.h @@ -42,7 +42,7 @@ #ifndef QUICKTESTRESULT_P_H #define QUICKTESTRESULT_P_H -#include "quicktestglobal.h" +#include <QtQuickTest/quicktestglobal.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> #include <QtCore/qscopedpointer.h> diff --git a/tests/qmlauto/tst_qmlauto.cpp b/tests/qmlauto/tst_qmlauto.cpp index 0e1bd7a..1ff2f46 100644 --- a/tests/qmlauto/tst_qmlauto.cpp +++ b/tests/qmlauto/tst_qmlauto.cpp @@ -39,6 +39,5 @@ ** ****************************************************************************/ -#include "quicktest.h" - +#include <QtQuickTest/quicktest.h> QTEST_QUICK_MAIN(qmlauto) diff --git a/tests/qmlexample/tst_qmlexample.cpp b/tests/qmlexample/tst_qmlexample.cpp index 4d9cc40..3cc5b2f 100644 --- a/tests/qmlexample/tst_qmlexample.cpp +++ b/tests/qmlexample/tst_qmlexample.cpp @@ -39,6 +39,5 @@ ** ****************************************************************************/ -#include "quicktest.h" - +#include <QtQuickTest/quicktest.h> QTEST_QUICK_MAIN(qmlexample) |