summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-12-21 11:47:28 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-28 04:48:06 +0100
commit1e7296f3f2e7346f52e8f70d4e531405a248aa8b (patch)
treed0a33e0ebc0e8a7d27d203a0fb420f08d3ae3c18 /tests/auto/corelib
parent9e0479496ed17ab0baca882e0928ff198c6cb7b0 (diff)
Remove mention of Trolltech in qlibrary autotest.
Task-number: QTBUG-19653 Change-Id: I8cf21bac41b08187528ba7004a7a23b9baa64b17 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/plugin/qlibrary/.gitignore2
-rw-r--r--tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro4
-rw-r--r--tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp10
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/.gitignore b/tests/auto/corelib/plugin/qlibrary/.gitignore
index 38963f2235..3841c7a33c 100644
--- a/tests/auto/corelib/plugin/qlibrary/.gitignore
+++ b/tests/auto/corelib/plugin/qlibrary/.gitignore
@@ -7,4 +7,4 @@ mylib2.dll
mylib2.exp
mylib2.lib
mylib_noextension
-system.trolltech.test.mylib.dll
+system.qt.test.mylib.dll
diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
index 7d319d644e..a15393b214 100644
--- a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
@@ -21,10 +21,10 @@ win32 {
} else {
src = $(DESTDIR_TARGET)
}
- files = mylib.dl2 system.trolltech.test.mylib.dll
+ files = mylib.dl2 system.qt.test.mylib.dll
} else {
src = $(DESTDIR)$(TARGET)
- files = libmylib.so2 system.trolltech.test.mylib.so
+ files = libmylib.so2 system.qt.test.mylib.so
}
# This project is testdata for tst_qlibrary
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index 5156070a32..6b786c9def 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -203,11 +203,11 @@ void tst_QLibrary::load_data()
# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << true;
QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << true;
- QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.dll" << true;
+ QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.qt.test.mylib.dll" << true;
# elif defined Q_OS_UNIX
QTest::newRow( "ok01 (with suffix)" ) << currDir + "/libmylib" SUFFIX << true;
QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/libmylib.so2" << true;
- QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.so" << true;
+ QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.qt.test.mylib.so" << true;
# endif // Q_OS_UNIX
}
@@ -334,7 +334,7 @@ void tst_QLibrary::isLibrary_data()
QTest::newRow("bad (libmylib.1.0.0.foo)") << QString("libmylib.1.0.0.foo") << false;
#elif defined(Q_OS_WIN)
- QTest::newRow("good (with many dots)" ) << "/system.trolltech.test.mylib.dll" << true;
+ QTest::newRow("good (with many dots)" ) << "/system.qt.test.mylib.dll" << true;
#endif
}
@@ -437,11 +437,11 @@ void tst_QLibrary::loadHints_data()
# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
QTest::newRow( "ok01 (with suffix)" ) << currDir + "/mylib.dll" << int(lh) << true;
QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/mylib.dl2" << int(lh) << true;
- QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.dll" << int(lh) << true;
+ QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.qt.test.mylib.dll" << int(lh) << true;
# elif defined Q_OS_UNIX
QTest::newRow( "ok01 (with suffix)" ) << currDir + "/libmylib" SUFFIX << int(lh) << true;
QTest::newRow( "ok02 (with non-standard suffix)" ) << currDir + "/libmylib.so2" << int(lh) << true;
- QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.trolltech.test.mylib.so" << int(lh) << true;
+ QTest::newRow( "ok03 (with many dots)" ) << currDir + "/system.qt.test.mylib.so" << int(lh) << true;
# endif // Q_OS_UNIX
}