AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove mention of Trolltech in qlibrary autotest.

Browse Source 
Task-number: QTBUG-19653

Change-Id: I8cf21bac41b08187528ba7004a7a23b9baa64b17
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-12-21 11:47:28 +10:00 committed by Qt by Nokia
parent 9e0479496e
commit 1e7296f3f2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/plugin/qlibrary/.gitignore vendored
View File

@ -7,4 +7,4 @@ mylib2.dll
mylib2.exp
mylib2.lib
mylib_noextension
system.trolltech.test.mylib.dll
system.qt.test.mylib.dll

4
tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
View File

@ -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

10
tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
View File

@ -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
}