diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-14 04:58:37 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-14 04:58:37 (GMT) |
| commit | 117e65f1f13ff3c453ab7ed8a88d042cc7eeebee (patch) | |
| tree | a7f85cbaceab459ff67e80cf1f1defda405f5dea /tests/auto/declarative/sql/tst_sql.cpp | |
| parent | 6d4769d09400dbefe3dc05b1b3a214dfecdd737a (diff) | |
| parent | f04560cb0879a91b52a15afe42a40ab6499f6997 (diff) | |
| download | Qt-117e65f1f13ff3c453ab7ed8a88d042cc7eeebee.zip Qt-117e65f1f13ff3c453ab7ed8a88d042cc7eeebee.tar.gz Qt-117e65f1f13ff3c453ab7ed8a88d042cc7eeebee.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/sql/tst_sql.cpp')
| -rw-r--r-- | tests/auto/declarative/sql/tst_sql.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp index 1bab2d2..c8b8dc3 100644 --- a/tests/auto/declarative/sql/tst_sql.cpp +++ b/tests/auto/declarative/sql/tst_sql.cpp @@ -196,7 +196,7 @@ void tst_sql::testQml() QFETCH(QString, jsfile); QString qml= - "import Qt 4.6\n" + "import Qt 4.7\n" "import \""+jsfile+"\" as JS\n" "Text { text: JS.test() }"; |