diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-13 10:40:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-03 12:01:29 +0000 |
| commit | 508e5bcb6c46707b0d00da9692b3e6388dc48d77 (patch) | |
| tree | 60c436fbaa28be79befb7ffb43e51d99bc25d61e | |
| parent | 18ce37852facce2c5d333bcb837d9308ff039614 (diff) | |
Manual tests viewinqwidget: Fix build
The resource file gallery.qrc was removed, load from path instead.
Change-Id: I167c3f967f8a73bf0de9ffe1658c00970b3d8075
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | tests/manual/viewinqwidget/main.cpp | 6 | ||||
| -rw-r--r-- | tests/manual/viewinqwidget/viewinqwidget.pro | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/viewinqwidget/main.cpp index c7050bc1..80cbb415 100644 --- a/tests/manual/viewinqwidget/main.cpp +++ b/tests/manual/viewinqwidget/main.cpp @@ -39,6 +39,7 @@ #include <QVBoxLayout> #include <QDebug> #include <QDesktopWidget> +#include <QDir> #include <QGroupBox> #include <QQmlApplicationEngine> #include <QQmlError> @@ -66,8 +67,9 @@ int main(int argc, char *argv[]) } hLayout->addWidget(groupBox); - const QUrl gallerySource(QLatin1String("qrc:/gallery.qml")); - QQmlApplicationEngine engine(gallerySource); + const QString gallerySource = + QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml")); + QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource)); QObject *root = engine.rootObjects().value(0, nullptr); if (!root || !root->isWindowType()) { qWarning() << "Load error" << gallerySource; diff --git a/tests/manual/viewinqwidget/viewinqwidget.pro b/tests/manual/viewinqwidget/viewinqwidget.pro index 9b7cba00..649829d4 100644 --- a/tests/manual/viewinqwidget/viewinqwidget.pro +++ b/tests/manual/viewinqwidget/viewinqwidget.pro @@ -2,5 +2,5 @@ QT += qml quick widgets quickwidgets TARGET = viewinqwidget SOURCES += $$PWD/main.cpp OTHER_FILES += main.qml -RESOURCES += viewinqwidget.qrc \ - ../../../examples/controls/gallery/gallery.qrc +RESOURCES += viewinqwidget.qrc +DEFINES += SRCDIR=\\\"$$PWD/\\\" |