From de9de96d81cdbad4880cc06fcfbe928606c3143e Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Date: Thu, 18 Feb 2016 15:28:14 +0100
Subject: Add QResource to the bootstrap library

It's very useful for bootstrapped tools to be able to include resources.
Those can now be accessed through the QResource API.

Change-Id: Ie8247877a9a4a81cec006bab2b58331270487aef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/corelib/io/qresource.cpp | 2 ++
 src/corelib/io/qresource.h   | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src/corelib')

diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 0303933de8..ad24b43568 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -1185,6 +1185,7 @@ QResource::unregisterResource(const uchar *rccData, const QString &resourceRoot)
     return false;
 }
 
+#if !defined(QT_BOOTSTRAPPED)
 //resource engine
 class QResourceFileEnginePrivate : public QAbstractFileEnginePrivate
 {
@@ -1490,5 +1491,6 @@ bool QResourceFileEnginePrivate::unmap(uchar *ptr)
     Q_UNUSED(ptr);
     return true;
 }
+#endif // !defined(QT_BOOTSTRAPPED)
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h
index e84ad03353..a50bbbdaca 100644
--- a/src/corelib/io/qresource.h
+++ b/src/corelib/io/qresource.h
@@ -44,6 +44,7 @@
 #include <QtCore/qlocale.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qlist.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3