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 <thiago.macieira@intel.com>
This commit is contained in:
Ulf Hermann 2015-07-20 15:10:33 +02:00
parent 2a70677b64
commit 2b18939f83
5 changed files with 22 additions and 3 deletions

View File

@ -18,3 +18,11 @@ SUBDIRS = \
contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n
plugandpaint.depends = plugandpaintplugins
load(qfeatures)
contains(QT_DISABLED_FEATURES, library) {
SUBDIRS -= \
echoplugin \
plugandpaintplugins \
plugandpaint
}

View File

@ -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()
{

View File

@ -63,7 +63,9 @@ private slots:
void applicationEventFilters_auxThread();
void threadedEventDelivery_data();
void threadedEventDelivery();
#ifndef QT_NO_LIBRARY
void addRemoveLibPaths();
#endif
};
#endif // TST_QCOREAPPLICATION_H

View File

@ -1,7 +1,10 @@
TEMPLATE=subdirs
SUBDIRS=\
qfactoryloader \
qlibrary \
qplugin \
qpluginloader \
quuid
load(qfeatures)
!contains(QT_DISABLED_FEATURES, library): SUBDIRS += \
qpluginloader \
qplugin \
qlibrary

View File

@ -133,9 +133,11 @@ private slots:
void testDeleteLater();
void testDeleteLaterProcessEvents();
#ifndef QT_NO_LIBRARY
void libraryPaths();
void libraryPaths_qt_plugin_path();
void libraryPaths_qt_plugin_path_2();
#endif
void sendPostedEvents();
@ -909,6 +911,7 @@ bool isPathListIncluded(const QStringList &l, const QStringList &r)
return j == r.count();
}
#ifndef QT_NO_LIBRARY
#define QT_TST_QAPP_DEBUG
void tst_QApplication::libraryPaths()
{
@ -1114,6 +1117,7 @@ void tst_QApplication::libraryPaths_qt_plugin_path_2()
qputenv("QT_PLUGIN_PATH", QByteArray());
}
}
#endif
class SendPostedEventsTester : public QObject
{