diff options
| author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-02-18 15:28:14 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-02-25 08:20:07 +0000 |
| commit | de9de96d81cdbad4880cc06fcfbe928606c3143e (patch) | |
| tree | 4e1f1cabb5ea1d33f42cdf5c366fc0716925ceb5 | |
| parent | 28ee76fd0b9ce59291341c8a9937a6c98fcb926d (diff) | |
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>
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qresource.h | 1 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 1 |
3 files changed, 4 insertions, 0 deletions
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 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 4f2456cf79..522e13b17b 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -54,6 +54,7 @@ SOURCES += \ ../../corelib/io/qfsfileengine_iterator.cpp \ ../../corelib/io/qiodevice.cpp \ ../../corelib/io/qfiledevice.cpp \ + ../../corelib/io/qresource.cpp \ ../../corelib/io/qtemporaryfile.cpp \ ../../corelib/io/qtextstream.cpp \ ../../corelib/io/qstandardpaths.cpp \ |