summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-01 08:23:47 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-01 08:23:55 +0100
commit24cd4a71905a481d937cbd5c4cb9fb8bb91532c9 (patch)
tree67195b6b5fd1a1ddabc0f622082383ad65c94dfb /src/tools
parentaeb169a48869f4f50237e384e57ccb406228f620 (diff)
parent1dd0c4bf1af1c90fde1449a81d41acbc62cf1934 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/bootstrap/bootstrap.pro1
1 files changed, 1 insertions, 0 deletions
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 \