diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 09:05:17 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 09:05:17 (GMT) |
| commit | 26139fcacc05b4a74fce1ef4e0db819118765310 (patch) | |
| tree | 75ce453868e95faa72b8f3b871c58969bbeb2a7e /tests/auto/qsqldatabase | |
| parent | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (diff) | |
| parent | b8238ec7e41d483a9166eb7aebbf911f36976cdc (diff) | |
| download | Qt-26139fcacc05b4a74fce1ef4e0db819118765310.zip Qt-26139fcacc05b4a74fce1ef4e0db819118765310.tar.gz Qt-26139fcacc05b4a74fce1ef4e0db819118765310.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
Diffstat (limited to 'tests/auto/qsqldatabase')
| -rw-r--r-- | tests/auto/qsqldatabase/qsqldatabase.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro index 6381219..066c24f 100644 --- a/tests/auto/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/qsqldatabase/qsqldatabase.pro @@ -13,7 +13,7 @@ win32: { wince*: { DEPLOYMENT_PLUGIN += qsqlite - testData.sources = testdata + testData.files = testdata testData.path = . DEPLOYMENT += testData @@ -26,7 +26,7 @@ symbian { qt_not_deployed { contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { sqlite.path = /sys/bin - sqlite.sources = sqlite3.dll + sqlite.files = sqlite3.dll DEPLOYMENT += sqlite } } |