From c5eaa8ce8df78de97e2d148af247865dfdee3e90 Mon Sep 17 00:00:00 2001
From: Nikolaos Korkakakis <nikolaos.korkakakis@diasemi.com>
Date: Tue, 26 Jul 2011 10:58:46 +0200
Subject: Fix the compilation error when QT_NO_PLUGIN_CHECK was set.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 1307
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/corelib/plugin/qlibrary.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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)
-- 
cgit v0.12