Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/qt53-fixes into lp:ubuntu-ui-toolkit/staging

  1. qt53-fixes
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1102
Merged at revision: 1101
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/qt53-fixes
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 244 lines (+47/-14)
12 files modified
modules/Ubuntu/Components/OrientationHelper.qml (+1/-1)
modules/Ubuntu/Components/plugin/inversemouseareatype.cpp (+10/-7)
modules/Ubuntu/Components/plugin/inversemouseareatype.h (+2/-1)
modules/Ubuntu/Components/plugin/uctheme.cpp (+6/-1)
tests/launcher/launcher.cpp (+4/-1)
tests/unit/unit.pro (+0/-2)
tests/unit_x11/tst_components/tst_hide_chrome.qml (+5/-0)
tests/unit_x11/tst_components/tst_popover.qml (+1/-0)
tests/unit_x11/tst_components/tst_textarea.qml (+2/-0)
tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml (+3/-0)
tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp (+4/-0)
tests/unit_x11/unit_x11.pro (+9/-1)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/qt53-fixes
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+222475@code.launchpad.net

Commit message

Qt5.3 related fixes.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1101
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/358/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/190
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1404
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1404/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/830/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/358/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

InverseMouseArea::update() had to be renamed as collides with QQuickItem::update(), which is bad.

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Aside from the ppc64el problem this is really good. I guess for ppc64el almost any solution is ok.

Build logs at:
https://launchpad.net/~ci-train-ppa-service/+archive/landing-005/+sourcepub/4225605/+listing-archive-extra

review: Approve
lp:~zsombi/ubuntu-ui-toolkit/qt53-fixes updated
1102. By Zsombor Egri

flaky test on ppc64el removed

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Full approve now, also ppc64el succeeded!

https://launchpad.net/~ci-train-ppa-service/+archive/landing-005/+sourcepub/4228202/+listing-archive-extra

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1102
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/724
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/194
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/194/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1458
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1458/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/863
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/863/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/362/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
2--- modules/Ubuntu/Components/OrientationHelper.qml 2014-04-23 09:39:11 +0000
3+++ modules/Ubuntu/Components/OrientationHelper.qml 2014-06-10 14:23:00 +0000
4@@ -121,7 +121,7 @@
5 http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
6 */
7 function applyOrientation() {
8- if (windowActive)
9+ if (windowActive && window)
10 window.contentOrientation = Screen.orientation
11 }
12
13
14=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
15--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-04-25 12:53:58 +0000
16+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-06-10 14:23:00 +0000
17@@ -244,11 +244,6 @@
18 */
19 QObject::connect(this, &QQuickMouseArea::windowChanged,
20 this, &InverseMouseAreaType::resetFilterOnWindowUpdate);
21-
22- if (!m_sensingArea) {
23- // get sensing area upon parent change
24- QObject::connect(this, SIGNAL(parentChanged(QQuickItem*)), this, SLOT(update()));
25- }
26 }
27
28 InverseMouseAreaType::~InverseMouseAreaType()
29@@ -281,7 +276,7 @@
30 \internal
31 Slot connected to enabledChanged signal to update the state of the handler.
32 */
33-void InverseMouseAreaType::update()
34+void InverseMouseAreaType::updateArea()
35 {
36 if (!m_ready) {
37 return;
38@@ -302,13 +297,21 @@
39 updateEventFilter(m_topmostItem);
40 }
41
42+void InverseMouseAreaType::itemChange(ItemChange change, const ItemChangeData &data)
43+{
44+ if (change == ItemParentHasChanged && data.item) {
45+ updateArea();
46+ }
47+ QQuickMouseArea::itemChange(change, data);
48+}
49+
50 void InverseMouseAreaType::componentComplete()
51 {
52 QQuickMouseArea::componentComplete();
53 // by now the parents should have been resolved so we can look after the
54 // topmost component for the sensingArea in case it has not been set yet
55 m_ready = true;
56- update();
57+ updateArea();
58 }
59
60 /*
61
62=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
63--- modules/Ubuntu/Components/plugin/inversemouseareatype.h 2014-03-20 10:01:21 +0000
64+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h 2014-06-10 14:23:00 +0000
65@@ -32,6 +32,7 @@
66 Q_INVOKABLE virtual bool contains(const QPointF &point) const;
67
68 protected:
69+ void itemChange(ItemChange, const ItemChangeData &);
70 void componentComplete();
71 bool eventFilter(QObject *, QEvent *);
72
73@@ -52,7 +53,7 @@
74 void topmostItemChanged();
75
76 private Q_SLOTS:
77- void update();
78+ void updateArea();
79 void resetFilterOnWindowUpdate(QQuickWindow *win);
80
81 private:
82
83=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
84--- modules/Ubuntu/Components/plugin/uctheme.cpp 2014-04-23 08:50:20 +0000
85+++ modules/Ubuntu/Components/plugin/uctheme.cpp 2014-06-10 14:23:00 +0000
86@@ -81,7 +81,12 @@
87 QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
88 if (pathList.isEmpty()) {
89 // get the default path list from generic data location, which contains
90- // ~/.local/share and XDG_DATA_DIRS
91+ // XDG_DATA_DIRS
92+ QString xdgDirs = QLatin1String(getenv("XDG_DATA_DIRS"));
93+ if (!xdgDirs.isEmpty()) {
94+ pathList << xdgDirs.split(':', QString::SkipEmptyParts);
95+ }
96+ // ~/.local/share
97 pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
98 }
99 // fix folders
100
101=== modified file 'tests/launcher/launcher.cpp'
102--- tests/launcher/launcher.cpp 2014-05-28 13:35:45 +0000
103+++ tests/launcher/launcher.cpp 2014-06-10 14:23:00 +0000
104@@ -51,8 +51,11 @@
105 // Oxide and QWebEngine need a shared context
106 QScopedPointer<QOpenGLContext> shareContext;
107 shareContext.reset(new QOpenGLContext);
108+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
109 QSGContext::setSharedOpenGLContext(shareContext.data());
110-
111+#else
112+ QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
113+#endif
114 QGuiApplication::setApplicationName("UITK Launcher");
115 QGuiApplication application(argc, (char**)argv);
116 QStringList args (application.arguments());
117
118=== modified file 'tests/unit/unit.pro'
119--- tests/unit/unit.pro 2013-12-03 10:36:54 +0000
120+++ tests/unit/unit.pro 2014-06-10 14:23:00 +0000
121@@ -18,9 +18,7 @@
122 tst_scaling_image_provider \
123 tst_qquick_image_extension \
124 tst_performance \
125- tst_ubuntu_shape \
126 tst_mainview \
127- tst_page \
128 tst_i18n \
129 tst_arguments \
130 tst_argument \
131
132=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
133--- tests/unit_x11/tst_components/tst_hide_chrome.qml 2014-04-25 05:28:37 +0000
134+++ tests/unit_x11/tst_components/tst_hide_chrome.qml 2014-06-10 14:23:00 +0000
135@@ -61,6 +61,11 @@
136 when: windowShown
137 id: testCase
138
139+ function cleanup() {
140+ // clean buffers
141+ waitForRendering(mainView, 500);
142+ }
143+
144 function openToolbar() {
145 var toolbar = mainView.__propagated.toolbar;
146 toolbar.open();
147
148=== renamed file 'tests/unit/tst_components/tst_page.qml' => 'tests/unit_x11/tst_components/tst_page.qml'
149=== modified file 'tests/unit_x11/tst_components/tst_popover.qml'
150--- tests/unit_x11/tst_components/tst_popover.qml 2014-04-17 14:14:43 +0000
151+++ tests/unit_x11/tst_components/tst_popover.qml 2014-06-10 14:23:00 +0000
152@@ -61,6 +61,7 @@
153 function cleanup() {
154 popoverSpy.target = null;
155 popoverSpy.clear();
156+ waitForRendering(main, 500);
157 }
158
159 function test_dismiss_on_click_data() {
160
161=== renamed file 'tests/unit/tst_components/tst_quickutils.qml' => 'tests/unit_x11/tst_components/tst_quickutils.qml'
162=== modified file 'tests/unit_x11/tst_components/tst_textarea.qml'
163--- tests/unit_x11/tst_components/tst_textarea.qml 2014-04-30 07:10:06 +0000
164+++ tests/unit_x11/tst_components/tst_textarea.qml 2014-06-10 14:23:00 +0000
165@@ -555,6 +555,7 @@
166 }
167
168 function test_scroll_with_selected_text() {
169+ skip("Flaky test, feature needs rewrite");
170 longText.focus = true;
171 var handler = findChild(longText, "input_handler");
172 verify(handler);
173@@ -629,6 +630,7 @@
174 }
175
176 function test_press_and_hold_over_selected_text() {
177+ skip("Flaky test, feature will be rewritten");
178 longText.focus = true;
179 var handler = findChild(longText, "input_handler");
180 var y = longText.height / 2;
181
182=== renamed file 'tests/unit/tst_components/tst_toolbaritems.qml' => 'tests/unit_x11/tst_components/tst_toolbaritems.qml'
183=== modified file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml'
184--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml 2014-04-23 08:50:20 +0000
185+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml 2014-06-10 14:23:00 +0000
186@@ -21,6 +21,7 @@
187 Item{
188 id: root
189 property string log: ""
190+// onLogChanged: print("LOG", log)
191 width: units.gu(100)
192 height: units.gu(100)
193
194@@ -28,9 +29,11 @@
195 objectName: "isawindow"
196 width: units.gu(50)
197 height: units.gu(50)
198+ visible: true
199
200 Item {
201 id: clickArea
202+ objectName: "clickArea"
203 anchors {
204 left: parent.left
205 right: parent.right
206
207=== modified file 'tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp'
208--- tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp 2014-04-15 21:37:57 +0000
209+++ tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp 2014-06-10 14:23:00 +0000
210@@ -167,10 +167,14 @@
211 InverseMouseAreaType *area = testArea("InverseMouseAreaInWindow.qml");
212 QVERIFY(area);
213 quickView->show();
214+ QTest::qWaitForWindowExposed(quickView);
215
216 QList<QQuickWindow *> l = quickView->rootObject()->findChildren<QQuickWindow*>("isawindow");
217 QVERIFY(l.count());
218
219+ QQuickItem *clickArea = quickView->rootObject()->findChild<QQuickItem*>("clickArea");
220+ QVERIFY(clickArea);
221+
222 QTest::mouseClick(l[0], Qt::LeftButton, 0, QPoint(20, 10));
223 QTest::waitForEvents();
224 QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));
225
226=== renamed directory 'tests/unit/tst_page' => 'tests/unit_x11/tst_page'
227=== renamed directory 'tests/unit/tst_ubuntu_shape' => 'tests/unit_x11/tst_ubuntu_shape'
228=== modified file 'tests/unit_x11/unit_x11.pro'
229--- tests/unit_x11/unit_x11.pro 2013-12-29 19:15:15 +0000
230+++ tests/unit_x11/unit_x11.pro 2014-06-10 14:23:00 +0000
231@@ -1,4 +1,12 @@
232 TEMPLATE = subdirs
233
234-SUBDIRS += tst_components tst_test tst_inversemousearea tst_recreateview tst_statesaver tst_theme_engine tst_orientation tst_layouts \
235+SUBDIRS += tst_components \
236+ tst_ubuntu_shape \
237+ tst_page \
238+ tst_test \
239+ tst_inversemousearea \
240+ tst_recreateview \
241+ tst_statesaver \
242+ tst_theme_engine \
243+ tst_orientation tst_layouts \
244 tst_mousefilters

Subscribers

People subscribed via source and target branches