diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 18:22:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 18:22:17 (GMT) |
| commit | 576cb12c36f24917d674f4c0bf240441b4ac9b43 (patch) | |
| tree | 750db6cfdaec443ad49672b7e598ada16ba29d80 /tests/auto/declarative/qdeclarativepathview/data/datamodel.qml | |
| parent | 06dfdf230dfcebbf955cdb6bd302fad88fe0398f (diff) | |
| parent | 169a352dd796d79ba48dfd4d79966617a14452e4 (diff) | |
| download | Qt-576cb12c36f24917d674f4c0bf240441b4ac9b43.zip Qt-576cb12c36f24917d674f4c0bf240441b4ac9b43.tar.gz Qt-576cb12c36f24917d674f4c0bf240441b4ac9b43.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (324 commits)
changes-4.7.0 updated
Update Polish translation
Revert "QDialog: user-moved dialog would not show on the same place after hide"
MediaServices; Don't look at the debug info when looking for plugins.
Cocoa: Native QFileDialog has problems selecting name filter
Mac: improve mac native events autotest API
Ensure text document is created before we access it.
Fix attempted invocation of non-existent timerActivated() slot.
Plugins documentation.
Fix up qdocs for mediaservices namespace.
Fix update issue when an item has an effect and child.
Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.
Disallow "Qt" as namespace import
Don't "adjust" the z value of a delegate that has been cached.
Correctly inherit extension properties
Autotests
More QDeclarativeNetworkAccessManagerFactory doc clarification.
Fix QDeclarativeNetworkAccessManagerFactory docs.
Don't crash on invalid model remove signal.
Ensure scheduled layout can occur before testing.
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativepathview/data/datamodel.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativepathview/data/datamodel.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml index 8d07db2..a5c3772 100644 --- a/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml +++ b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 PathView { id: pathview |