Merge lp:~nicolas-doffay/unity8/search-history-persist into lp:unity8

[Nicolas d'Offay]

Search history is now persistent across all scopes and remains in QML.

[Michał Sawicz (saviq)]

Please add a test for this.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/unity8-ci/1577/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/436/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3093
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1061

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1577/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/unity8-ci/1586/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/515/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/503/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/110
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/476/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/503
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/503/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3156/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1136

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1586/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/unity8-ci/1591/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/531/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/519/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/115
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/490/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/531
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/531/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/519
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/519/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2987/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3169/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1151
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1152

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1591/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/unity8-ci/1595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/558
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/558/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/546
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/3012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3194
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1207
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1208

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1595/rebuild

review: Approve (continuous-integration)

[Nicolas d'Offay (nicolas-doffay)]

Mock scopes do not have a mock page header implemented. Holding off on tests as advised.

[Albert Astals Cid (aacid)]

property alias searchHistory: scopeView.searchHistory
in DashApps is basically an alias to itself, no?

review: Needs Fixing

[Nicolas d'Offay (nicolas-doffay)]

That was my assumption too, but if I don't add that alias the searchHistory is null.

[Albert Astals Cid (aacid)]

True, please add a comment since that seems some limitation/bug in Qt, maybe something like https://bugreports.qt-project.org/browse/QTBUG-30493

[Albert Astals Cid (aacid)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/695/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3220/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/746
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/734/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/81
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/734
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/734/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3363/console
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1452

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/unity8-autolanding/711/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/816/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/288/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/816/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/unity8-ci/1668/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/830/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/818/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/290/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/830/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/818/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1668/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Needs remerging

review: Needs Fixing

[lp:~nicolas-doffay/unity8/search-history-persist]

502. By Nicolas d'Offay on 2013-11-19

Merged trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity8-ci/1672/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/196
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/196/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/195
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/864
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/864/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/852
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3453
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1542

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/1672/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Merge looks good to me. Ci seems to be acting weird, will keep retriggering CI runs until we can safely land it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity8-ci/1677/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/900/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/883/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/201
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/200
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/810/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/900
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/900/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/883
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/883/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3484/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1573

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/1677/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity8-ci/1681/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/903
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/205
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/919/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/903
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/903/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3502
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1592

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/1681/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity8-ci/1687/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/926
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/211
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/942
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/942/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/926
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/926/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3521
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1620

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/1687/rebuild

review: Approve (continuous-integration)

=== modified file 'Components/PageHeader.qml'
--- Components/PageHeader.qml	2013-11-11 11:29:19 +0000
+++ Components/PageHeader.qml	2013-11-19 14:34:01 +0000
@@ -30,7 +30,7 @@
 
     property bool searchEntryEnabled: false
     property alias searchQuery: searchField.text
-    property ListModel searchHistory: SearchHistoryModel {}
+    property ListModel searchHistory
     property Scope scope
 
     height: units.gu(8.5)

=== modified file 'Dash/Dash.qml'
--- Dash/Dash.qml	2013-10-25 11:24:50 +0000
+++ Dash/Dash.qml	2013-11-19 14:34:01 +0000
@@ -26,6 +26,8 @@
 
     visible: shown
 
+    property ListModel searchHistory: SearchHistoryModel {}
+
     property alias contentProgress: dashContent.contentProgress
     property string showScopeOnLoaded: "home.scope"
     property real contentScale: 1.0
@@ -63,6 +65,7 @@
         anchors.fill: parent
         model: filteredScopes
         scopes: scopes
+        searchHistory: dash.searchHistory
         onMovementStarted: dashbar.startNavigation()
         onMovementEnded: dashbar.stopNavigation()
         onContentFlickStarted: dashbar.finishNavigation()

=== modified file 'Dash/DashApps.qml'
--- Dash/DashApps.qml	2013-10-03 11:48:24 +0000
+++ Dash/DashApps.qml	2013-11-19 14:34:01 +0000
@@ -30,6 +30,9 @@
     property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
     property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
 
+    //FIXME an alias to itself shouldn't be required. More than likely a Qt bug. Try removing with newer Qt.
+    property alias searchHistory: scopeView.searchHistory
+
     ListModel {
         id: dummyVisibilityModifier
 

=== modified file 'Dash/DashContent.qml'
--- Dash/DashContent.qml	2013-10-21 08:15:28 +0000
+++ Dash/DashContent.qml	2013-11-19 14:34:01 +0000
@@ -27,6 +27,7 @@
     property alias currentIndex: dashContentList.currentIndex
 
     property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
+    property ListModel searchHistory
 
     signal movementStarted()
     signal movementEnded()
@@ -127,7 +128,7 @@
                 onLoaded: {
                     item.scope = Qt.binding(function() { return scope })
                     item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
-                    item.searchHistory = Qt.binding(function() { return shell.searchHistory })
+                    item.searchHistory = Qt.binding(function() { return dashContent.searchHistory })
                     dashContentList.movementStarted.connect(item.movementStarted)
                     dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
                     dashContent.scopeLoaded(item.scope.id)

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-11-19 10:44:14 +0000
+++ Dash/GenericScopeView.qml	2013-11-19 14:34:01 +0000
@@ -293,6 +293,7 @@
             text: scopeView.scope.name
             searchEntryEnabled: true
             scope: scopeView.scope
+            searchHistory: scopeView.searchHistory
         }
     }
 

=== modified file 'Shell.qml'
--- Shell.qml	2013-11-08 08:48:11 +0000
+++ Shell.qml	2013-11-19 14:34:01 +0000
@@ -61,8 +61,6 @@
         }
     }
 
-    property ListModel searchHistory: SearchHistoryModel {}
-
     property var applicationManager: ApplicationManagerWrapper {}
 
     Binding {

=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
--- tests/qmltests/Components/tst_PageHeader.qml	2013-11-08 16:24:45 +0000
+++ tests/qmltests/Components/tst_PageHeader.qml	2013-11-19 14:34:01 +0000
@@ -214,6 +214,7 @@
             scope: scopeMock
 
             searchEntryEnabled: true
+            searchHistory: SearchHistoryModel {}
             text: "%^$%^%^&%^&%^$%GHR%"
         }
 

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2013-11-14 14:59:16 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2013-11-19 14:34:01 +0000
@@ -26,8 +26,6 @@
     width: units.gu(40)
     height: units.gu(80)
 
-    property ListModel searchHistory: ListModel {}
-
     Item {
         // Fake. Make a few components less noisy
         id: greeter
@@ -60,6 +58,7 @@
         scopes : scopesModel
 
         scopeMapper : scopeDelegateMapper
+        searchHistory: ListModel {}
     }
 
     ScopeDelegateMapper {