diff options
author | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 10:26:40 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 10:34:22 +0300 |
commit | a42a15779a4c75431add40f0b88fc57c591b1efa (patch) | |
tree | 74f97639b2d39be0599f4239f67121bdde846415 /tools | |
parent | 2385184b8b1aeaac6d0b42739b44c4786a6e9cab (diff) | |
parent | 7e91db5b1e01ffeeaa566ebb5b8230dcdc6b514f (diff) |
Merge remote-tracking branch 'origin/3.0'
Change-Id: Ic3c8005de03b2cc71436aaa18486085a845dca78
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 85d89aab1..b9497f533 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 0465d8126..2942728c2 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -44,6 +44,7 @@ #include <updater.h> #include <QtCore/QDirIterator> +#include <QtCore/QRegExp> #include <QtXml/QDomDocument> |