AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add QResource to the bootstrap library

Browse Source 
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>
This commit is contained in:
Erik Verbruggen 2016-02-18 15:28:14 +01:00
parent 28ee76fd0b
commit de9de96d81
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qresource.cpp
View File

@ -1185,6 +1185,7 @@ QResource::unregisterResource(const uchar *rccData, const QString &resourceRoot)
return false; return false;
} }
#if !defined(QT_BOOTSTRAPPED)
//resource engine //resource engine
class QResourceFileEnginePrivate : public QAbstractFileEnginePrivate class QResourceFileEnginePrivate : public QAbstractFileEnginePrivate
{ {
@ -1490,5 +1491,6 @@ bool QResourceFileEnginePrivate::unmap(uchar *ptr)
Q_UNUSED(ptr); Q_UNUSED(ptr);
return true; return true;
} }
#endif // !defined(QT_BOOTSTRAPPED)
QT_END_NAMESPACE QT_END_NAMESPACE

1
src/corelib/io/qresource.h
View File

@ -44,6 +44,7 @@
#include <QtCore/qlocale.h> #include <QtCore/qlocale.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qscopedpointer.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/tools/bootstrap/bootstrap.pro
View File

@ -54,6 +54,7 @@ SOURCES += \
../../corelib/io/qfsfileengine_iterator.cpp \ ../../corelib/io/qfsfileengine_iterator.cpp \
../../corelib/io/qiodevice.cpp \ ../../corelib/io/qiodevice.cpp \
../../corelib/io/qfiledevice.cpp \ ../../corelib/io/qfiledevice.cpp \
../../corelib/io/qresource.cpp \
../../corelib/io/qtemporaryfile.cpp \ ../../corelib/io/qtemporaryfile.cpp \
../../corelib/io/qtextstream.cpp \ ../../corelib/io/qtextstream.cpp \
../../corelib/io/qstandardpaths.cpp \ ../../corelib/io/qstandardpaths.cpp \