From 2b18939f83d596e8fff3da56314966d656ccfa0c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 20 Jul 2015 15:10:33 +0200 Subject: Fix building with QT_NO_LIBRARY If QT_NO_LIBRARY isn't set we cannot test QCoreApplication's library path functions and none of the plugin and library related tests are applicable. Also, examples that rely on dynamic plugin loading for their core functionality obviously don't work. Change-Id: I2d381ee1bc8d944e1181557895a7e92a364fd778 Reviewed-by: Thiago Macieira --- tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp') diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index cecc02bf25..a0cadc9a2f 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -903,6 +903,7 @@ void tst_QCoreApplication::threadedEventDelivery() QCOMPARE(receiver.recordedEvents.contains(QEvent::User + 1), eventsReceived); } +#ifndef QT_NO_LIBRARY void tst_QCoreApplication::addRemoveLibPaths() { QStringList paths = QCoreApplication::libraryPaths(); @@ -929,6 +930,7 @@ void tst_QCoreApplication::addRemoveLibPaths() QCoreApplication::setLibraryPaths(replace); QCOMPARE(QCoreApplication::libraryPaths(), replace); } +#endif static void createQObjectOnDestruction() { -- cgit v1.2.3