diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-01 16:32:09 +1000 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-01 07:54:01 +0100 |
commit | a236006b703a4e24b33cdd85abe1fb8c387d6eed (patch) | |
tree | 4916388b2ed8c732e6b716679fa3dd2fbb05781d /tests/auto/declarative/qdeclarativesystempalette | |
parent | 9fad486e88b12c232f9a4a08a3aedf7d6f61913b (diff) |
Fix QDeclarativeSystemPalette test failure.
Include the QApplication header to ensure we're using the QApplication
from QtWidgets rather than an alias for QGuiApplication.
Change-Id: Iddfd5e5ff386ed3a7ba93dd1c26a4627d5df551d
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativesystempalette')
-rw-r--r-- | tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro index 3e2a44e6..00ab2ac2 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesystempalette QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui +contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp index 6ee3fd41..9b5961ab 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp +++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp @@ -45,6 +45,7 @@ #include <QtQuick1/qdeclarativecomponent.h> #include <private/qdeclarativesystempalette_p.h> #include <qpalette.h> +#include <QApplication> #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir |