1
=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
2
--- debian/ubuntu-ui-toolkit-autopilot.install	2014-02-21 23:39:43 +0000
3
+++ debian/ubuntu-ui-toolkit-autopilot.install	2014-05-28 13:36:57 +0000
4
@@ -1,2 +1,3 @@
5
1
usr/lib/python3
1
usr/lib/python3
6
2
usr/lib/ubuntu-ui-toolkit/launcher
7
2
usr/lib/python2.7
3
usr/lib/python2.7
8
3
4
9
=== added directory 'tests/launcher'
10
=== added file 'tests/launcher/launcher.cpp'
11
--- tests/launcher/launcher.cpp	1970-01-01 00:00:00 +0000
12
+++ tests/launcher/launcher.cpp	2014-05-28 13:36:57 +0000
13
@@ -0,0 +1,143 @@
14
1
/*
15
2
 * Copyright 2014 Canonical Ltd.
16
3
 *
17
4
 * This program is free software; you can redistribute it and/or modify
18
5
 * it under the terms of the GNU Lesser General Public License as published by
19
6
 * the Free Software Foundation; version 3.
20
7
 *
21
8
 * This program is distributed in the hope that it will be useful,
22
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
23
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24
11
 * GNU Lesser General Public License for more details.
25
12
 *
26
13
 * You should have received a copy of the GNU Lesser General Public License
27
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
28
15
 *
29
16
 * QML launcher with the ability to setup the QQuickView/ QQmlEngine differently
30
17
 *
31
18
 * Rationale: Different variants of qmlscene exist as well as C++ and Go apps
32
19
 * This is to write Autopilot test cases that exhibit specific behavior
33
20
 */
34
21
35
22
#include <iostream>
36
23
#include <QtCore/qdebug.h>
37
24
#include <QtQuick/QQuickView>
38
25
#include <QtGui/QGuiApplication>
39
26
#include <QtQml/QQmlEngine>
40
27
#include <QtQml/QQmlContext>
41
28
#include <QtCore/QFileInfo>
42
29
#include <QLibrary>
43
30
#include <QOpenGLContext>
44
31
#include <QtGui/private/qopenglcontext_p.h>
45
32
#include <QtQuick/private/qsgcontext_p.h>
46
33
47
34
int usage()
48
35
{
49
36
    QString self(QGuiApplication::instance()->arguments().at(0));
50
37
    std::cout << "Usage\n  "
51
38
        << qPrintable(self)
52
39
        << " -testability -frameless -engine"
53
40
        << " --desktop_file_path=DESKTOP_FILE"
54
41
        << " -I MODULE_PATH FILENAME\n";
55
42
    return 1;
56
43
}
57
44
58
45
int main(int argc, const char *argv[])
59
46
{
60
47
    // QPlatformIntegration::ThreadedOpenGL
61
48
    setenv("QML_FORCE_THREADED_RENDERER", "1", 1);
62
49
    // QPlatformIntegration::BufferQueueingOpenGL
63
50
    setenv("QML_FIXED_ANIMATION_STEP", "1", 1);
64
51
    // Oxide and QWebEngine need a shared context
65
52
    QScopedPointer<QOpenGLContext> shareContext;
66
53
    shareContext.reset(new QOpenGLContext);
67
54
    QSGContext::setSharedOpenGLContext(shareContext.data());
68
55
69
56
    QGuiApplication::setApplicationName("UITK Launcher");
70
57
    QGuiApplication application(argc, (char**)argv);
71
58
    QStringList args (application.arguments());
72
59
73
60
    int _testability(args.indexOf("-testability"));
74
61
    args.removeAt(_testability);
75
62
    int _frameless(args.indexOf("-frameless"));
76
63
    args.removeAt(_frameless);
77
64
    int _engine(args.indexOf("-engine"));
78
65
    args.removeAt(_engine);
79
66
80
67
    Q_FOREACH(QString arg, args) {
81
68
        if (arg.startsWith("--desktop_file_hint")) {
82
69
            // This will not be used - it only needs to be ignored
83
70
            int _desktop_file_hint(args.indexOf(arg));
84
71
            args.removeAt(_desktop_file_hint);
85
72
        }
86
73
    }
87
74
88
75
    // Testability is only supported out of the box by QApplication not QGuiApplication
89
76
    if (_testability > -1 || getenv("QT_LOAD_TESTABILITY")) {
90
77
        QLibrary testLib(QLatin1String("qttestability"));
91
78
        if (testLib.load()) {
92
79
            typedef void (*TasInitialize)(void);
93
80
            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
94
81
            if (initFunction) {
95
82
                initFunction();
96
83
            } else {
97
84
                qCritical("Library qttestability resolve failed!");
98
85
                return 1;
99
86
            }
100
87
        } else {
101
88
            qCritical("Library qttestability load failed!");
102
89
            return 1;
103
90
        }
104
91
    }
105
92
106
93
    QQmlEngine* engine;
107
94
    // The default constructor affects the components tree (autopilot vis)
108
95
    QQuickView* view;
109
96
    if (_engine > -1) {
110
97
        view = new QQuickView();
111
98
        engine = view->engine();
112
99
    } else {
113
100
        engine = new QQmlEngine();
114
101
        view = new QQuickView(engine, NULL);
115
102
    }
116
103
117
104
    int _import(args.indexOf("-I"));
118
105
    args.removeAt(_import);
119
106
    if (_import > -1) {
120
107
        if (args.count() > _import) {
121
108
            QString importPath(args.at(_import));
122
109
            args.removeAt(_import);
123
110
            engine->addImportPath(importPath);
124
111
        }
125
112
    }
126
113
127
114
    view->setResizeMode(QQuickView::SizeRootObjectToView);
128
115
    view->setTitle("UI Toolkit QQuickView");
129
116
    if (_frameless > -1) {
130
117
        view->setFlags(Qt::FramelessWindowHint);
131
118
    }
132
119
133
120
    // The remaining unnamed argument must be a filename
134
121
    if (args.count() == 1) {
135
122
        qCritical() << "Missing filename";
136
123
        return usage();
137
124
    }
138
125
    QString filename(args.at(1));
139
126
    // The first argument is the launcher itself
140
127
    args.removeAt(0);
141
128
142
129
    QUrl source(QUrl::fromLocalFile(filename));
143
130
    view->setSource(source);
144
131
    if (view->errors().count() > 0) {
145
132
        return usage();
146
133
    }
147
134
    view->show();
148
135
149
136
    if (args.count() > 1) {
150
137
        qCritical() << "Invalid arguments passed" << args;
151
138
        return usage();
152
139
    }
153
140
154
141
    return application.exec();
155
142
}
156
143
157
0
144
158
=== added file 'tests/launcher/launcher.pro'
159
--- tests/launcher/launcher.pro	1970-01-01 00:00:00 +0000
160
+++ tests/launcher/launcher.pro	2014-05-28 13:36:57 +0000
161
@@ -0,0 +1,11 @@
162
1
TEMPLATE = app
163
2
QT += qml quick
164
3
# For setSharedOpenGLContext
165
4
QT += core-private gui-private quick-private
166
5
CONFIG += no_keywords
167
6
SOURCES += \
168
7
    launcher.cpp
169
8
launcher.path = /usr/lib/ubuntu-ui-toolkit
170
9
launcher.files = launcher
171
10
INSTALLS += launcher
172
11
173
0
12
174
=== modified file 'tests/tests.pro'
175
--- tests/tests.pro	2014-02-21 23:39:43 +0000
176
+++ tests/tests.pro	2014-05-28 13:36:57 +0000
177
@@ -7,4 +7,6 @@
178
7
autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
7
autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
179
8
autopilot2_module.files = autopilot/ubuntuuitoolkit/*
8
autopilot2_module.files = autopilot/ubuntuuitoolkit/*
180
9
9
181
10
SUBDIRS += launcher
182
11
183
10
INSTALLS += autopilot_module autopilot2_module
12
INSTALLS += autopilot_module autopilot2_module
Status:	Merged
Approved by:	Cris Dywan on 2014-05-29
Approved revision:	1045
Merged at revision:	1089
Proposed branch:	lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/engineLauncher
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	183 lines (+157/-0) 4 files modified debian/ubuntu-ui-toolkit-autopilot.install (+1/-0) tests/launcher/launcher.cpp (+143/-0) tests/launcher/launcher.pro (+11/-0) tests/tests.pro (+2/-0)
To merge this branch:	bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/engineLauncher
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-05-28
Leo Arias (community)	tried with my unity test	2014-05-08	Approve on 2014-05-28
Tim Peeters		2014-05-08	Approve on 2014-05-14
Review via email: mp+218772@code.launchpad.net