Merge lp:~zsombi/ubuntu-ui-toolkit/optimize-import into lp:ubuntu-ui-toolkit

[Zsombor Egri]

[theming] Changing stateful libraries to stateless to decrease time spent each time Ubuntu.Components module is imported.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/46/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-autolanding/46
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-autolanding/46

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/72/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/72
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/72

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/72/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/optimize-import]

500. By Zsombor Egri on 2013-05-18

failed test case on deprecated module

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/77/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/77
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/77

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/77/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/optimize-import]

501. By Zsombor Egri on 2013-05-20

trunk merge

502. By Zsombor Egri on 2013-05-20

componentUtils.js reverted to stateful library as will be removed due to deprecation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/85

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/85/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/PageWrapperUtils.js'
--- modules/Ubuntu/Components/PageWrapperUtils.js	2013-03-08 10:51:17 +0000
+++ modules/Ubuntu/Components/PageWrapperUtils.js	2013-05-20 05:07:27 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//.pragma library // FIXME: cannot refer to Component.Error if I use this.
+.pragma library // FIXME: cannot refer to Component.Error if I use this.
 
 /*!
   \internal
@@ -34,7 +34,8 @@
 
     var pageObject;
     if (pageComponent) {
-        if (pageComponent.status === Component.Error) {
+        // FIXME: Component.Error is the last in the enum, number 3
+        if (pageComponent.status === 3) {
             throw new Error("Error while loading page: " + pageComponent.errorString());
         } else {
             // create the object

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2013-05-09 15:05:55 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2013-05-20 05:07:27 +0000
@@ -152,7 +152,7 @@
 
         // private
         function updatePosition() {
-            var pos = new InternalPopupUtils.CallerPositioning(foreground, pointer, dismissArea, caller, pointerTarget, edgeMargins, callerMargin);
+            var pos = new InternalPopupUtils.CallerPositioning(foreground, pointer, dismissArea, caller, pointerTarget, edgeMargins, callerMargin, units.dp(2));
             pos.auto();
         }
     }

=== modified file 'modules/Ubuntu/Components/Popups/internalPopupUtils.js'
--- modules/Ubuntu/Components/Popups/internalPopupUtils.js	2013-02-21 15:29:49 +0000
+++ modules/Ubuntu/Components/Popups/internalPopupUtils.js	2013-05-20 05:07:27 +0000
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+.pragma library
+
 .import "../mathUtils.js" as MathUtils
 
 // Simple positioning on the screen, not relative to a caller Item.
@@ -69,7 +71,7 @@
     }
 
     // automatically position foreground on the screen
-    this.auto = function() {
+    this.auto = function(margin) {
         if (foreground.width >= area.width - 2*edgeMargins) {
             // the popover uses (almost) the full width of the screen
             this.autoSmallScreenPortrait();
@@ -86,7 +88,7 @@
 
 // caller is optional.
 // if caller is given, pointer and callerMargins must be specified, otherwise they are ignored.
-function CallerPositioning(foreground, pointer, area, caller, pointerTarget, edgeMargins, callerMargins) {
+function CallerPositioning(foreground, pointer, area, caller, pointerTarget, edgeMargins, callerMargins, pointerMargin) {
     var simplePos = new SimplePositioning(foreground, area, edgeMargins);
     // -1 values are not relevant.
 
@@ -187,7 +189,7 @@
             foreground.y = coord;
             foreground.x = this.horizontalAlign(foreground, caller);
             pointer.direction = "down";
-            pointer.y = this.above(pointer, callerMargins - pointer.height, caller) - units.dp(2);
+            pointer.y = this.above(pointer, callerMargins - pointer.height, caller) - pointerMargin;
             pointer.x = this.horizontalAlign(pointer, pointerTarget);
             return true;
         }

=== modified file 'modules/Ubuntu/Components/scrollbarUtils.js'
--- modules/Ubuntu/Components/scrollbarUtils.js	2013-01-09 13:58:22 +0000
+++ modules/Ubuntu/Components/scrollbarUtils.js	2013-05-20 05:07:27 +0000
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+.pragma library
+
 Qt.include("mathUtils.js")
 
 /*!

=== modified file 'modules/Ubuntu/Components/stack.js'
--- modules/Ubuntu/Components/stack.js	2012-10-10 15:13:44 +0000
+++ modules/Ubuntu/Components/stack.js	2013-05-20 05:07:27 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+.pragma library
 // By defining Stack as a function, we can make its variables private,
 // and force calls to Stack to make use of the functions we define.
 function Stack() {

=== added file 'tests/unit/tst_performance/TextWithImport.qml'
--- tests/unit/tst_performance/TextWithImport.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/TextWithImport.qml	2013-05-20 05:07:27 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Text {
+}

=== added file 'tests/unit/tst_performance/TextWithImportGrid.qml'
--- tests/unit/tst_performance/TextWithImportGrid.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/TextWithImportGrid.qml	2013-05-20 05:07:27 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Grid {
+    width: 800
+    height: 600
+    rows: 16
+    columns: 160
+    Repeater {
+        model: 16*160
+        TextWithImport {}
+    }
+}

=== added file 'tests/unit/tst_performance/TextWithImportPopups.qml'
--- tests/unit/tst_performance/TextWithImportPopups.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/TextWithImportPopups.qml	2013-05-20 05:07:27 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components.Popups 0.1
+
+Text {
+}

=== added file 'tests/unit/tst_performance/TextWithImportPopupsGrid.qml'
--- tests/unit/tst_performance/TextWithImportPopupsGrid.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/TextWithImportPopupsGrid.qml	2013-05-20 05:07:27 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Grid {
+    width: 800
+    height: 600
+    rows: 16
+    columns: 160
+    Repeater {
+        model: 16*160
+        TextWithImportPopups {}
+    }
+}

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2013-04-25 11:54:28 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2013-05-20 05:07:27 +0000
@@ -46,18 +46,6 @@
         return quickView->rootObject();
     }
 
-    QQuickItem *loadTest(const QString &document, const QUrl &theme = QUrl())
-    {
-        ThemeEngine::initializeEngine(quickEngine);
-        ThemeEngine::instance()->loadTheme(theme);
-        if (!ThemeEngine::instance()->error().isEmpty()) {
-            QWARN("Theme loading failed");
-            return 0;
-        }
-        return loadDocument(document);
-    }
-
-
 private Q_SLOTS:
 
     void initTestCase()
@@ -74,13 +62,9 @@
         quickView->setGeometry(0,0, 240, 320);
         //add modules folder so we have access to the plugin from QML
         QStringList imports = quickEngine->importPathList();
-        imports << QDir(modules).absolutePath() << QDir(themes).absolutePath();
+        imports.prepend(QDir(modules).absolutePath());
+        imports.prepend(QDir(themes).absolutePath());
         quickEngine->setImportPathList(imports);
-
-        bool result = (ThemeEngine::initializeEngine(quickEngine) != 0);
-        QVERIFY(result);
-        // check if theme gets loaded
-        QCOMPARE(ThemeEngine::instance()->error(), QString(""));
     }
 
     void cleanupTestCase()
@@ -126,6 +110,22 @@
             delete root;
     }
 
+    void benchmark_import_data()
+    {
+        QTest::addColumn<QString>("document");
+
+        QTest::newRow("importing Ubuntu.Components") << "TextWithImportGrid.qml";
+        QTest::newRow("importing Ubuntu.Components.Popups") << "TextWithImportGrid.qml";
+    }
+
+    void benchmark_import()
+    {
+        QFETCH(QString, document);
+        QBENCHMARK {
+            loadDocument(document);
+        }
+    }
+
 };
 
 QTEST_MAIN(tst_Performance)

=== modified file 'tests/unit/tst_performance/tst_performance.pro'
--- tests/unit/tst_performance/tst_performance.pro	2013-04-25 05:48:03 +0000
+++ tests/unit/tst_performance/tst_performance.pro	2013-05-20 05:07:27 +0000
@@ -17,4 +17,8 @@
     TextGrid.qml \
     RectangleGrid.qml \
     CustomTheme.qmltheme \
-    ButtonsWithStyledGrid.qml
+    ButtonsWithStyledGrid.qml \
+    TextWithImport.qml \
+    TextWithImportGrid.qml \
+    TextWithImportPopupsGrid.qml \
+    TextWithImportPopups.qml