diff options
| author | axis <qt-info@nokia.com> | 2009-10-07 09:32:30 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-07 11:52:09 (GMT) |
| commit | 5ce632d3a8354f118225911103628e602559124e (patch) | |
| tree | 56c1c751b1fa12392953cddbc6215568199a4557 /tests/auto/qsqltablemodel | |
| parent | 330dc1e5895a8950615a9bbf26154f5387b023b1 (diff) | |
| download | Qt-5ce632d3a8354f118225911103628e602559124e.zip Qt-5ce632d3a8354f118225911103628e602559124e.tar.gz Qt-5ce632d3a8354f118225911103628e602559124e.tar.bz2 | |
Fixed deployment when using cetest.
Cetest (and other programs that upload dlls manually without using a
package) need to deploy some plugins for specific tests. If those
tests are deployed in a normal package however, the installation will
fail because the plugins are already included in the Qt installation.
Fixed that by putting the deployment inside a scope that cetest will
define.
RevBy: Miikka Heikkinen
Diffstat (limited to 'tests/auto/qsqltablemodel')
| -rw-r--r-- | tests/auto/qsqltablemodel/qsqltablemodel.pro | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro index a046fb1..9a23237 100644 --- a/tests/auto/qsqltablemodel/qsqltablemodel.pro +++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro @@ -9,10 +9,12 @@ wince*: { DEPLOYMENT += plugFiles LIBS += -lws2 }else:symbian { - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - sqlite.path = /sys/bin - sqlite.sources = sqlite3.dll - DEPLOYMENT += sqlite + 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 + DEPLOYMENT += sqlite + } } }else { win32:LIBS += -lws2_32 |