diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
| commit | c39b126a77e27296ef82a1634753c775cc5a93fb (patch) | |
| tree | 235d9568e21e59b7c70f8be81518c3ea184cf552 /tests/manual | |
| parent | dc2603562a36241c9beac0c9c4c08bcbfed7b6a2 (diff) | |
| parent | 430fe83ecb7106118cbebd735637aee9e9253914 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickrangeslider_p.h
src/quicktemplates2/qquickswipeview_p.h
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextfield_p.h
Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
Diffstat (limited to 'tests/manual')
| -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/\\\" |