fix debug/release detection via "hidden" parameter

Skycoder42 · Skycoder42 · commit 4939133bb264 · 2018-08-10T17:16:15.000+02:00
diff --git a/isdebughelper.cpp b/isdebughelper.cpp
diff --git a/qpluginfactory.cpp b/qpluginfactory.cpp
@@ -6,8 +6,6 @@
 #include <QDir>
 #include <QCoreApplication>
 
-extern bool __qpluginfactory_is_debug();
-
 class StaticPluginInfo : public QPluginFactoryBase::PluginInfo
 {
 public:
@@ -36,12 +34,13 @@ class DynamicPluginInfo : public QPluginFactoryBase::PluginInfo
 
 
 
-QPluginFactoryBase::QPluginFactoryBase(QString pluginType, QObject *parent) :
-	QPluginFactoryBase(std::move(pluginType), QByteArray(), parent)
+QPluginFactoryBase::QPluginFactoryBase(QString pluginType, QObject *parent, bool isDebugBuild) :
+	QPluginFactoryBase(std::move(pluginType), QByteArray(), parent, isDebugBuild)
 {}
 
-QPluginFactoryBase::QPluginFactoryBase(QString pluginType, QByteArray pluginIid, QObject *parent) :
+QPluginFactoryBase::QPluginFactoryBase(QString pluginType, QByteArray pluginIid, QObject *parent, bool isDebugBuild) :
 	QObject(parent),
+	_isDebugBuild{isDebugBuild},
 	_pluginType(std::move(pluginType)),
 	_pluginIid(std::move(pluginIid)),
 	_extraDirs(),
@@ -207,7 +206,7 @@ void QPluginFactoryBase::unload(const QString &key)
 
 QJsonArray QPluginFactoryBase::checkMeta(const QJsonObject &metaData, const QString &filename) const
 {
-	if(metaData[QStringLiteral("debug")].toBool() != __qpluginfactory_is_debug())
+	if(metaData[QStringLiteral("debug")].toBool() != _isDebugBuild)
 		return {};
 
 	auto iid = metaData.value(QStringLiteral("IID")).toString().toUtf8();
diff --git a/qpluginfactory.h b/qpluginfactory.h
@@ -7,6 +7,12 @@
 #include <QException>
 #include <QMutex>
 
+#ifdef QT_NO_DEBUG
+#define Q_PLUGIN_FACTORY_IS_DEBUG false
+#else
+#define Q_PLUGIN_FACTORY_IS_DEBUG true
+#endif
+
 class QPluginLoadException : public QException
 {
 public:
@@ -38,8 +44,8 @@ class QPluginFactoryBase : public QObject
 		virtual QObject *instance() = 0;
 	};
 
-	QPluginFactoryBase(QString pluginType, QObject *parent = nullptr);
-	QPluginFactoryBase(QString pluginType, QByteArray pluginIid, QObject *parent = nullptr);
+	QPluginFactoryBase(QString pluginType, QObject *parent = nullptr, bool isDebugBuild = Q_PLUGIN_FACTORY_IS_DEBUG);
+	QPluginFactoryBase(QString pluginType, QByteArray pluginIid, QObject *parent = nullptr, bool isDebugBuild = Q_PLUGIN_FACTORY_IS_DEBUG);
 
 	void addSearchDir(const QDir &dir, bool isTopLevel = false);
 
@@ -60,6 +66,7 @@ public slots:
 	void unload(const QString &key);
 
 private:
+	const bool _isDebugBuild;
 	const QString _pluginType;
 	QByteArray _pluginIid;
 	QList<QDir> _extraDirs;
diff --git a/qpluginfactory.prc b/qpluginfactory.prc
diff --git a/qpluginfactory.pri b/qpluginfactory.pri
@@ -6,6 +6,4 @@ HEADERS += \
 SOURCES += \
 	$$PWD/qpluginfactory.cpp
 
-!qpmx_static:include($$PWD/qpluginfactory.prc)
-
 TRANSLATIONS +=
diff --git a/qpm.json b/qpm.json
@@ -15,7 +15,7 @@
     },
     "version": {
         "fingerprint": "",
-        "label": "1.3.0",
+        "label": "1.3.1",
         "revision": ""
     },
     "webpage": "https://github.com/Skycoder42/QPluginFactory"
diff --git a/qpmx.json b/qpmx.json
@@ -5,7 +5,7 @@
         "file": "LICENSE",
         "name": "BSD_3_CLAUSE"
     },
-    "prcFile": "qpluginfactory.prc",
+    "prcFile": "",
     "priFile": "qpluginfactory.pri",
     "priIncludes": [
     ],
