From 556dd0228aca07dfe8443fd99e9f2ead4e13ab22 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 6 Feb 2012 10:36:48 +0100
Subject: Add JSON support to the bootstrap library
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The JSON support will get used in moc to support
the creation of plugin metadata that's embedded
into the plugin itself.

Change-Id: I3bc52b16ca0a43bc8bf9141b450045c6183b7823
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/plugin/quuid.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/corelib/plugin/quuid.h')

diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h
index a55d6af3eb..dee97d93a5 100644
--- a/src/corelib/plugin/quuid.h
+++ b/src/corelib/plugin/quuid.h
@@ -43,7 +43,6 @@
 #define QUUID_H
 
 #include <QtCore/qstring.h>
-#include <QtCore/qcryptographichash.h>
 
 QT_BEGIN_HEADER
 
@@ -175,6 +174,7 @@ public:
     }
 #endif
     static QUuid createUuid();
+#ifndef QT_BOOTSTRAPPED
     static QUuid createUuidV3(const QUuid &ns, const QByteArray &baseData);
     static QUuid createUuidV5(const QUuid &ns, const QByteArray &baseData);
 #ifndef QT_NO_QUUID_STRING
@@ -188,6 +188,7 @@ public:
         return QUuid::createUuidV5(ns, baseData.toUtf8());
     }
 
+#endif
 #endif
 
     QUuid::Variant variant() const;
-- 
cgit v1.2.3