diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-07 08:43:47 -0300 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-07 08:43:47 -0300 |
| commit | 987dd978d5fd341d57dba0a735c08caff2807609 (patch) | |
| tree | c0281348eee7494a780a9b7ec25876b93972ff53 /tests/client | |
| parent | cba9178ec3d1956798e730585f89ecc363040085 (diff) | |
| parent | 21a895254bc08f111b5173f8b6b85f8271935020 (diff) | |
| download | qmenumodel-987dd978d5fd341d57dba0a735c08caff2807609.tar.gz qmenumodel-987dd978d5fd341d57dba0a735c08caff2807609.tar.bz2 qmenumodel-987dd978d5fd341d57dba0a735c08caff2807609.zip | |
Merged 'lp:~renatofilho/girden/debian-dh' branch.
Diffstat (limited to 'tests/client')
| -rw-r--r-- | tests/client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/client/actiongrouptest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/convertertest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/menuchangestest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/modeltest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/qmltest.cpp | 4 | ||||
| -rw-r--r-- | tests/client/servicetest.cpp | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index e9f95fd..d946fad 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -15,7 +15,7 @@ macro(declare_test testname) --ignore-return)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${CTEST_TESTING_TIMEOUT}
- ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH}")
+ ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};QT_QPA_PLATFORM=minimal")
endmacro(declare_test testname)
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 5f1bf60..6598d2e 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -24,7 +24,7 @@ #include <QObject> #include <QSignalSpy> -#include <QtTestGui> +#include <QtTest> #include <QDebug> class ActionGroupTest : public QObject diff --git a/tests/client/convertertest.cpp b/tests/client/convertertest.cpp index 633ecf1..5301653 100644 --- a/tests/client/convertertest.cpp +++ b/tests/client/convertertest.cpp @@ -24,7 +24,7 @@ extern "C" { #include "converter.h" #include <QObject> -#include <QtTestGui> +#include <QtTest> #include <QDebug> class ConverterTest : public QObject diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp index 6ef5879..2e4ef6e 100644 --- a/tests/client/menuchangestest.cpp +++ b/tests/client/menuchangestest.cpp @@ -22,7 +22,7 @@ #include <QObject> #include <QSignalSpy> -#include <QtTestGui> +#include <QtTest> #include <QDebug> class MenuChangesTest : public QObject diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index 2cb64b0..c6b2f0e 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -22,7 +22,7 @@ #include <QObject> #include <QSignalSpy> -#include <QtTestGui> +#include <QtTest> #include <QDebug> class ModelTest : public QObject diff --git a/tests/client/qmltest.cpp b/tests/client/qmltest.cpp index ce77f6f..1f1e494 100644 --- a/tests/client/qmltest.cpp +++ b/tests/client/qmltest.cpp @@ -27,7 +27,7 @@ extern "C" { #include <QObject> #include <QSignalSpy> -#include <QtTestGui> +#include <QtTest> #include <QDebug> #include <QQmlContext> @@ -77,7 +77,6 @@ private Q_SLOTS: view->engine()->rootContext()->setContextProperty("globalBusName", MENU_SERVICE_NAME); view->engine()->rootContext()->setContextProperty("globalObjectPath", MENU_OBJECT_PATH); view->setSource(QUrl::fromLocalFile(LOADMODEL_QML)); - view->show(); QTest::qWait(500); view->engine()->rootContext()->setContextProperty("resetModel", true); QTest::qWait(500); @@ -99,7 +98,6 @@ private Q_SLOTS: view->engine()->rootContext()->setContextProperty("globalBusName", MENU_SERVICE_NAME); view->engine()->rootContext()->setContextProperty("globalObjectPath", MENU_OBJECT_PATH); view->setSource(QUrl::fromLocalFile(LOADMODEL2_QML)); - view->show(); QTest::qWait(500); m_script.unpublishMenu(); diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp index 4d238c4..f61f5a1 100644 --- a/tests/client/servicetest.cpp +++ b/tests/client/servicetest.cpp @@ -22,7 +22,7 @@ #include <QObject> #include <QSignalSpy> -#include <QtTestGui> +#include <QtTest> #include <QDebug> class ServiceTest : public QObject |