diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 08:52:49 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 09:02:33 +0300 |
| commit | 7e91db5b1e01ffeeaa566ebb5b8230dcdc6b514f (patch) | |
| tree | 61c14c9b0a44d66fd60096ac82dbf0ac930af4c5 /tools | |
| parent | cd063bc1bd2765080127045b4601f0082f413d6d (diff) | |
| parent | bc84731cd487d9b77ebda247cc3e8487cc22af99 (diff) | |
Merge remote-tracking branch 'origin/2.0' into 3.0
Conflicts:
src/libs/installer/downloadfiletask.cpp
Change-Id: Ie4b07c402a63c7a12ecf24e52e197507bbb2c5df
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 1 | ||||
| -rw-r--r-- | tools/binarycreator/rcc/rcc.cpp | 1 | ||||
| -rw-r--r-- | tools/common/repositorygen.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 7ffbe9bc9..e74f8a18c 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -43,6 +43,7 @@ #include <QDirIterator> #include <QDomDocument> #include <QProcess> +#include <QRegExp> #include <QSettings> #include <QTemporaryFile> #include <QTemporaryDir> diff --git a/tools/binarycreator/rcc/rcc.cpp b/tools/binarycreator/rcc/rcc.cpp index 0c30d9161..2361e43e0 100644 --- a/tools/binarycreator/rcc/rcc.cpp +++ b/tools/binarycreator/rcc/rcc.cpp @@ -36,6 +36,7 @@ #include <QtCore/QFile> #include <QtCore/QIODevice> #include <QtCore/QLocale> +#include <QtCore/QRegExp> #include <QtCore/QStack> #include <QXmlStreamReader> diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index d1b3c8eec..4c7dba3b4 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -42,6 +42,7 @@ #include <updater.h> #include <QtCore/QDirIterator> +#include <QtCore/QRegExp> #include <QtXml/QDomDocument> |