diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-03-27 09:05:28 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-03-29 15:36:56 +0000 |
| commit | 945d8fdb118fc225e271a0507d9958e2aafbea18 (patch) | |
| tree | 6051eb7ec1bd43b94ddfb0273d440305dda9167a | |
| parent | 335d91e6d6c4ac21bcf39c4f5bb9a8bcd0e597bf (diff) | |
Fix build without QProcess and QLibrary support
Change-Id: Ifc36253a7c3f5bafcfd6febefcdba3ec51dd4a7d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/designer/src/lib/uilib/formbuilder.cpp | 3 | ||||
| -rw-r--r-- | src/designer/src/uitools/quiloader.cpp | 2 | ||||
| -rw-r--r-- | src/qtdiag/qtdiag.cpp | 4 | ||||
| -rw-r--r-- | src/src.pro | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index cdf3b74a2..c90c6b0a1 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -472,6 +472,7 @@ void QFormBuilder::updateCustomWidgets() { d->m_customWidgets.clear(); +#if QT_CONFIG(library) for (const QString &path : qAsConst(d->m_pluginPaths)) { const QDir dir(path); const QStringList candidates = dir.entryList(QDir::Files); @@ -489,6 +490,8 @@ void QFormBuilder::updateCustomWidgets() insertPlugins(loader.instance(), &d->m_customWidgets); } } +#endif // QT_CONFIG(library) + // Check statically linked plugins const QObjectList staticPlugins = QPluginLoader::staticInstances(); for (QObject *o : staticPlugins) diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index 678824819..74a03e3a9 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -646,6 +646,7 @@ QUiLoader::QUiLoader(QObject *parent) #endif // QT_NO_DATASTREAM d->builder.loader = this; +#if QT_CONFIG(library) QStringList paths; const QStringList &libraryPaths = QApplication::libraryPaths(); for (const QString &path : libraryPaths) { @@ -656,6 +657,7 @@ QUiLoader::QUiLoader(QObject *parent) } d->builder.setPluginPath(paths); +#endif // QT_CONFIG(library) } /*! diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 098c5b13b..71c3d3397 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -50,7 +50,9 @@ #include <QtCore/QVariant> #include <QtCore/QSysInfo> #include <QtCore/QLibraryInfo> -#include <QtCore/QProcessEnvironment> +#if QT_CONFIG(processenvironment) +# include <QtCore/QProcessEnvironment> +#endif #include <QtCore/QTextStream> #include <QtCore/QStandardPaths> #include <QtCore/QDir> diff --git a/src/src.pro b/src/src.pro index 0ef1d0284..41064a5d5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -16,7 +16,9 @@ SUBDIRS += linguist \ qdoc \ qtattributionsscanner -!android|android_app: SUBDIRS += qtplugininfo +qtConfig(library) { + !android|android_app: SUBDIRS += qtplugininfo +} if(!android|android_app):!uikit: SUBDIRS += qtpaths |