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
=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml 2014-04-23 09:39:11 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml 2014-06-10 14:23:00 +0000
@@ -121,7 +121,7 @@
121 http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop121 http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
122 */122 */
123 function applyOrientation() {123 function applyOrientation() {
124 if (windowActive)124 if (windowActive && window)
125 window.contentOrientation = Screen.orientation125 window.contentOrientation = Screen.orientation
126 }126 }
127127
128128
=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp 2014-06-10 14:23:00 +0000
@@ -244,11 +244,6 @@
244 */244 */
245 QObject::connect(this, &QQuickMouseArea::windowChanged,245 QObject::connect(this, &QQuickMouseArea::windowChanged,
246 this, &InverseMouseAreaType::resetFilterOnWindowUpdate);246 this, &InverseMouseAreaType::resetFilterOnWindowUpdate);
247
248 if (!m_sensingArea) {
249 // get sensing area upon parent change
250 QObject::connect(this, SIGNAL(parentChanged(QQuickItem*)), this, SLOT(update()));
251 }
252}247}
253248
254InverseMouseAreaType::~InverseMouseAreaType()249InverseMouseAreaType::~InverseMouseAreaType()
@@ -281,7 +276,7 @@
281 \internal276 \internal
282 Slot connected to enabledChanged signal to update the state of the handler.277 Slot connected to enabledChanged signal to update the state of the handler.
283 */278 */
284void InverseMouseAreaType::update()279void InverseMouseAreaType::updateArea()
285{280{
286 if (!m_ready) {281 if (!m_ready) {
287 return;282 return;
@@ -302,13 +297,21 @@
302 updateEventFilter(m_topmostItem);297 updateEventFilter(m_topmostItem);
303}298}
304299
300void InverseMouseAreaType::itemChange(ItemChange change, const ItemChangeData &data)
301{
302 if (change == ItemParentHasChanged && data.item) {
303 updateArea();
304 }
305 QQuickMouseArea::itemChange(change, data);
306}
307
305void InverseMouseAreaType::componentComplete()308void InverseMouseAreaType::componentComplete()
306{309{
307 QQuickMouseArea::componentComplete();310 QQuickMouseArea::componentComplete();
308 // by now the parents should have been resolved so we can look after the311 // by now the parents should have been resolved so we can look after the
309 // topmost component for the sensingArea in case it has not been set yet312 // topmost component for the sensingArea in case it has not been set yet
310 m_ready = true;313 m_ready = true;
311 update();314 updateArea();
312}315}
313316
314/*317/*
315318
=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.h 2014-03-20 10:01:21 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h 2014-06-10 14:23:00 +0000
@@ -32,6 +32,7 @@
32 Q_INVOKABLE virtual bool contains(const QPointF &point) const;32 Q_INVOKABLE virtual bool contains(const QPointF &point) const;
3333
34protected:34protected:
35 void itemChange(ItemChange, const ItemChangeData &);
35 void componentComplete();36 void componentComplete();
36 bool eventFilter(QObject *, QEvent *);37 bool eventFilter(QObject *, QEvent *);
3738
@@ -52,7 +53,7 @@
52 void topmostItemChanged();53 void topmostItemChanged();
5354
54private Q_SLOTS:55private Q_SLOTS:
55 void update();56 void updateArea();
56 void resetFilterOnWindowUpdate(QQuickWindow *win);57 void resetFilterOnWindowUpdate(QQuickWindow *win);
57 58
58private:59private:
5960
=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp 2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp 2014-06-10 14:23:00 +0000
@@ -81,7 +81,12 @@
81 QStringList pathList = envPath.split(':', QString::SkipEmptyParts);81 QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
82 if (pathList.isEmpty()) {82 if (pathList.isEmpty()) {
83 // get the default path list from generic data location, which contains83 // get the default path list from generic data location, which contains
84 // ~/.local/share and XDG_DATA_DIRS84 // XDG_DATA_DIRS
85 QString xdgDirs = QLatin1String(getenv("XDG_DATA_DIRS"));
86 if (!xdgDirs.isEmpty()) {
87 pathList << xdgDirs.split(':', QString::SkipEmptyParts);
88 }
89 // ~/.local/share
85 pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);90 pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
86 }91 }
87 // fix folders92 // fix folders
8893
=== modified file 'tests/launcher/launcher.cpp'
--- tests/launcher/launcher.cpp 2014-05-28 13:35:45 +0000
+++ tests/launcher/launcher.cpp 2014-06-10 14:23:00 +0000
@@ -51,8 +51,11 @@
51 // Oxide and QWebEngine need a shared context51 // Oxide and QWebEngine need a shared context
52 QScopedPointer<QOpenGLContext> shareContext;52 QScopedPointer<QOpenGLContext> shareContext;
53 shareContext.reset(new QOpenGLContext);53 shareContext.reset(new QOpenGLContext);
54#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
54 QSGContext::setSharedOpenGLContext(shareContext.data());55 QSGContext::setSharedOpenGLContext(shareContext.data());
5556#else
57 QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
58#endif
56 QGuiApplication::setApplicationName("UITK Launcher");59 QGuiApplication::setApplicationName("UITK Launcher");
57 QGuiApplication application(argc, (char**)argv);60 QGuiApplication application(argc, (char**)argv);
58 QStringList args (application.arguments());61 QStringList args (application.arguments());
5962
=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro 2013-12-03 10:36:54 +0000
+++ tests/unit/unit.pro 2014-06-10 14:23:00 +0000
@@ -18,9 +18,7 @@
18 tst_scaling_image_provider \18 tst_scaling_image_provider \
19 tst_qquick_image_extension \19 tst_qquick_image_extension \
20 tst_performance \20 tst_performance \
21 tst_ubuntu_shape \
22 tst_mainview \21 tst_mainview \
23 tst_page \
24 tst_i18n \22 tst_i18n \
25 tst_arguments \23 tst_arguments \
26 tst_argument \24 tst_argument \
2725
=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
--- tests/unit_x11/tst_components/tst_hide_chrome.qml 2014-04-25 05:28:37 +0000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml 2014-06-10 14:23:00 +0000
@@ -61,6 +61,11 @@
61 when: windowShown61 when: windowShown
62 id: testCase62 id: testCase
6363
64 function cleanup() {
65 // clean buffers
66 waitForRendering(mainView, 500);
67 }
68
64 function openToolbar() {69 function openToolbar() {
65 var toolbar = mainView.__propagated.toolbar;70 var toolbar = mainView.__propagated.toolbar;
66 toolbar.open();71 toolbar.open();
6772
=== renamed file 'tests/unit/tst_components/tst_page.qml' => 'tests/unit_x11/tst_components/tst_page.qml'
=== modified file 'tests/unit_x11/tst_components/tst_popover.qml'
--- tests/unit_x11/tst_components/tst_popover.qml 2014-04-17 14:14:43 +0000
+++ tests/unit_x11/tst_components/tst_popover.qml 2014-06-10 14:23:00 +0000
@@ -61,6 +61,7 @@
61 function cleanup() {61 function cleanup() {
62 popoverSpy.target = null;62 popoverSpy.target = null;
63 popoverSpy.clear();63 popoverSpy.clear();
64 waitForRendering(main, 500);
64 }65 }
6566
66 function test_dismiss_on_click_data() {67 function test_dismiss_on_click_data() {
6768
=== renamed file 'tests/unit/tst_components/tst_quickutils.qml' => 'tests/unit_x11/tst_components/tst_quickutils.qml'
=== modified file 'tests/unit_x11/tst_components/tst_textarea.qml'
--- tests/unit_x11/tst_components/tst_textarea.qml 2014-04-30 07:10:06 +0000
+++ tests/unit_x11/tst_components/tst_textarea.qml 2014-06-10 14:23:00 +0000
@@ -555,6 +555,7 @@
555 }555 }
556556
557 function test_scroll_with_selected_text() {557 function test_scroll_with_selected_text() {
558 skip("Flaky test, feature needs rewrite");
558 longText.focus = true;559 longText.focus = true;
559 var handler = findChild(longText, "input_handler");560 var handler = findChild(longText, "input_handler");
560 verify(handler);561 verify(handler);
@@ -629,6 +630,7 @@
629 }630 }
630631
631 function test_press_and_hold_over_selected_text() {632 function test_press_and_hold_over_selected_text() {
633 skip("Flaky test, feature will be rewritten");
632 longText.focus = true;634 longText.focus = true;
633 var handler = findChild(longText, "input_handler");635 var handler = findChild(longText, "input_handler");
634 var y = longText.height / 2;636 var y = longText.height / 2;
635637
=== renamed file 'tests/unit/tst_components/tst_toolbaritems.qml' => 'tests/unit_x11/tst_components/tst_toolbaritems.qml'
=== modified file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml 2014-04-23 08:50:20 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml 2014-06-10 14:23:00 +0000
@@ -21,6 +21,7 @@
21Item{21Item{
22 id: root22 id: root
23 property string log: ""23 property string log: ""
24// onLogChanged: print("LOG", log)
24 width: units.gu(100)25 width: units.gu(100)
25 height: units.gu(100)26 height: units.gu(100)
2627
@@ -28,9 +29,11 @@
28 objectName: "isawindow"29 objectName: "isawindow"
29 width: units.gu(50)30 width: units.gu(50)
30 height: units.gu(50)31 height: units.gu(50)
32 visible: true
3133
32 Item {34 Item {
33 id: clickArea35 id: clickArea
36 objectName: "clickArea"
34 anchors {37 anchors {
35 left: parent.left38 left: parent.left
36 right: parent.right39 right: parent.right
3740
=== modified file 'tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp'
--- tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp 2014-04-15 21:37:57 +0000
+++ tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp 2014-06-10 14:23:00 +0000
@@ -167,10 +167,14 @@
167 InverseMouseAreaType *area = testArea("InverseMouseAreaInWindow.qml");167 InverseMouseAreaType *area = testArea("InverseMouseAreaInWindow.qml");
168 QVERIFY(area);168 QVERIFY(area);
169 quickView->show();169 quickView->show();
170 QTest::qWaitForWindowExposed(quickView);
170171
171 QList<QQuickWindow *> l = quickView->rootObject()->findChildren<QQuickWindow*>("isawindow");172 QList<QQuickWindow *> l = quickView->rootObject()->findChildren<QQuickWindow*>("isawindow");
172 QVERIFY(l.count());173 QVERIFY(l.count());
173174
175 QQuickItem *clickArea = quickView->rootObject()->findChild<QQuickItem*>("clickArea");
176 QVERIFY(clickArea);
177
174 QTest::mouseClick(l[0], Qt::LeftButton, 0, QPoint(20, 10));178 QTest::mouseClick(l[0], Qt::LeftButton, 0, QPoint(20, 10));
175 QTest::waitForEvents();179 QTest::waitForEvents();
176 QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));180 QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));
177181
=== renamed directory 'tests/unit/tst_page' => 'tests/unit_x11/tst_page'
=== renamed directory 'tests/unit/tst_ubuntu_shape' => 'tests/unit_x11/tst_ubuntu_shape'
=== modified file 'tests/unit_x11/unit_x11.pro'
--- tests/unit_x11/unit_x11.pro 2013-12-29 19:15:15 +0000
+++ tests/unit_x11/unit_x11.pro 2014-06-10 14:23:00 +0000
@@ -1,4 +1,12 @@
1TEMPLATE = subdirs1TEMPLATE = subdirs
22
3SUBDIRS += tst_components tst_test tst_inversemousearea tst_recreateview tst_statesaver tst_theme_engine tst_orientation tst_layouts \3SUBDIRS += tst_components \
4 tst_ubuntu_shape \
5 tst_page \
6 tst_test \
7 tst_inversemousearea \
8 tst_recreateview \
9 tst_statesaver \
10 tst_theme_engine \
11 tst_orientation tst_layouts \
4 tst_mousefilters12 tst_mousefilters

Subscribers

People subscribed via source and target branches