diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-05 08:27:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-05 08:27:56 +0000 |
| commit | d8f41bdc2efa36dd9e2f80e23d7cb4874c019452 (patch) | |
| tree | 254f8c661318ac73ddc128eb06498a8ab4d7babe /tests/auto/corelib/plugin | |
| parent | f7f55c0b294f03932b205f8eae4335928647f57b (diff) | |
| parent | 4159ee840549df11287294f0928e90f35f3e06ff (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/plugin')
| -rw-r--r-- | tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp index c613653557..8ac4125145 100644 --- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp +++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp @@ -413,15 +413,6 @@ void tst_QLibrary::loadHints_data() QTest::addColumn<bool>("result"); QLibrary::LoadHints lh; -#if defined(Q_OS_AIX) - if (QFile::exists("/usr/lib/libGL.a") || QFile::exists("/usr/X11R6/lib/libGL.a")) { -# if QT_POINTER_SIZE == 4 - QTest::newRow( "ok03 (Archive member)" ) << "libGL.a(shr.o)" << int(QLibrary::LoadArchiveMemberHint) << true; -# else - QTest::newRow( "ok03 (Archive member)" ) << "libGL.a(shr_64.o)" << int(QLibrary::LoadArchiveMemberHint) << true; -#endif - } -#endif QString appDir = QCoreApplication::applicationDirPath(); |