diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-05 12:53:44 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-06 07:46:01 (GMT) |
commit | bba4b0caa9865ee021a3e477e1bb861c56000f68 (patch) | |
tree | 0951e3f9791f931e3a3b9cbdbfa561b51b6f75a2 /tests/auto/qpluginloader | |
parent | 64ca5d3ac1dc1b1e82c409cf011d97ca8f76f6ed (diff) | |
download | Qt-bba4b0caa9865ee021a3e477e1bb861c56000f68.zip Qt-bba4b0caa9865ee021a3e477e1bb861c56000f68.tar.gz Qt-bba4b0caa9865ee021a3e477e1bb861c56000f68.tar.bz2 |
Fix duplicate binary names issues in Symbian autotests
In Symbian each binary name must be unique as all binaries are stored
in the same directory on the device. Some autotests created helper
binaries that had same names on different tests, which caused
build and installation issues when building entire autotest project
tree.
Reviewed-by: Shane Kearns
Diffstat (limited to 'tests/auto/qpluginloader')
-rw-r--r-- | tests/auto/qpluginloader/lib/lib.pro | 2 | ||||
-rw-r--r-- | tests/auto/qpluginloader/tst/tst.pro | 2 | ||||
-rw-r--r-- | tests/auto/qpluginloader/tst_qpluginloader.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/qpluginloader/lib/lib.pro index 96a9732..ce9bf13 100644 --- a/tests/auto/qpluginloader/lib/lib.pro +++ b/tests/auto/qpluginloader/lib/lib.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += dll CONFIG -= staticlib SOURCES = mylib.c -TARGET = mylib +TARGET = tst_qpluginloaderlib DESTDIR = ../bin QT = core diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro index 2de0912..2d757e7 100644 --- a/tests/auto/qpluginloader/tst/tst.pro +++ b/tests/auto/qpluginloader/tst/tst.pro @@ -20,7 +20,7 @@ wince*: { } symbian: { - libDep.sources = mylib.dll + libDep.sources = tst_qpluginloaderlib.dll libDep.path = /sys/bin pluginDep.sources = theplugin.dll pluginDep.path = bin diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index 705e600..e913cb5 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -169,7 +169,7 @@ void tst_QPluginLoader::errorString() QCOMPARE(loader.errorString(), unknown); } { - QPluginLoader loader( sys_qualifiedLibraryName("mylib")); //not a plugin + QPluginLoader loader( sys_qualifiedLibraryName("tst_qpluginloaderlib")); //not a plugin bool loaded = loader.load(); #ifdef SHOW_ERRORS qDebug() << loader.errorString(); |