diff options
| author | Chris Adams <chris.adams@qinetic.com.au> | 2018-07-12 10:32:51 +1000 |
|---|---|---|
| committer | Christopher Adams <chris.adams@jollamobile.com> | 2018-07-20 05:19:49 +0000 |
| commit | 93123aa03dbe1ee1ff4616c281c892ca4c63363f (patch) | |
| tree | f6f6aa03e8f5eda9530e120e5ab6bc5ea0f089c7 | |
| parent | 565810baf9b73b24a4ef97a335dcd339e505b193 (diff) | |
Disable build on QNX, INTEGRITY, VxWorks, WinRT
Change-Id: I44ad9b8ad63c72393e27138532cab110b9862a1a
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
| -rw-r--r-- | qtpim.pro | 4 | ||||
| -rw-r--r-- | src/contacts/qcontactdetail_p.h | 4 | ||||
| -rw-r--r-- | src/contacts/qcontactspluginsearch_p.h | 5 |
3 files changed, 12 insertions, 1 deletions
@@ -1,2 +1,6 @@ +requires(!qnx) +requires(!vxworks) +requires(!integrity) +requires(!winrt) load(qt_parts) diff --git a/src/contacts/qcontactdetail_p.h b/src/contacts/qcontactdetail_p.h index c2cf23108..e75de64e2 100644 --- a/src/contacts/qcontactdetail_p.h +++ b/src/contacts/qcontactdetail_p.h @@ -382,6 +382,8 @@ public: case Variant: return equal<QVariant>(us, them, member); default: qFatal("Unsupported field type"); } + Q_UNREACHABLE(); + return false; } template<typename Subclass> @@ -406,6 +408,8 @@ public: case Variant: return *memberVariable<QVariant>(us, member.offset); default: qFatal("Unsupported field type"); } + Q_UNREACHABLE(); + return false; } private: diff --git a/src/contacts/qcontactspluginsearch_p.h b/src/contacts/qcontactspluginsearch_p.h index 29ce0a93a..b10c88e84 100644 --- a/src/contacts/qcontactspluginsearch_p.h +++ b/src/contacts/qcontactspluginsearch_p.h @@ -70,7 +70,10 @@ inline QStringList mobilityPlugins(const QString& plugintype) const bool showDebug = qgetenv("QT_DEBUG_PLUGINS").toInt() > 0; #endif - QStringList paths = QCoreApplication::libraryPaths(); + QStringList paths; +#ifndef QT_NO_LIBRARY + paths = QCoreApplication::libraryPaths(); +#endif #ifdef QTM_PLUGIN_PATH paths << QLatin1String(QTM_PLUGIN_PATH); #endif |