summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin
diff options
context:
space:
mode:
authorNikolaos Korkakakis <nikolaos.korkakakis@diasemi.com>2011-07-26 08:58:46 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-07-26 08:59:59 (GMT)
commitc5eaa8ce8df78de97e2d148af247865dfdee3e90 (patch)
tree78fa837d96a9d7ac24e531a5fc38211010b63f48 /src/corelib/plugin
parent5842d19cf3dff37a85cbdb31ab5a170ceaf5c7fb (diff)
downloadQt-c5eaa8ce8df78de97e2d148af247865dfdee3e90.zip
Qt-c5eaa8ce8df78de97e2d148af247865dfdee3e90.tar.gz
Qt-c5eaa8ce8df78de97e2d148af247865dfdee3e90.tar.bz2
Fix the compilation error when QT_NO_PLUGIN_CHECK was set.
Merge-request: 1307 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r--src/corelib/plugin/qlibrary.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 314ccd7..f1ed8e4 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -649,7 +649,12 @@ bool qt_get_verificationdata(QtPluginQueryVerificationDataFunction pfn, uint *qt
#else
szData = pfn();
#endif
- return qt_parse_pattern(szData, qt_version, debug, key);
+
+#ifdef QT_NO_PLUGIN_CHECK
+ return true;
+#else
+ return qt_parse_pattern(szData, qt_version, debug, key);
+#endif
}
bool QLibraryPrivate::isPlugin(QSettings *settings)