Update folderlistmodel import to version 2

To help distinguish the QtQuick 1 and QtQuick 2 versions of
folderlistmodel, the QtQuick 2 version is now version 2 of
folderlistmodel.

Depends on e824fa97e4a9fbaa0c850274b448568953692240 in qtdeclarative

Change-Id: Ic30c255ecb4c7b12dcf624b4b1d51cbc82b779df
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

diff --git a/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
index 6467ba0..4e995e4 100644 (file)
--- a/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
+++ b/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt.labs.folderlistmodel 1.0
+import Qt.labs.folderlistmodel 2.0
 
 Rectangle {
     id: fileBrowser

diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
index abaa3b4..d1e64da 100644 (file)
--- a/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
+++ b/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt.labs.folderlistmodel 1.0
+import Qt.labs.folderlistmodel 2.0
 
 Rectangle {
     id: fileBrowser