diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:42:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:48:01 +0100 |
| commit | c9acfe0bc8dbaec1065614fa2039ebe7e05b4bda (patch) | |
| tree | 6ced392965bf01be840da14e7f1606b0b5b2293d /tools | |
| parent | f263d206341472e23e0e1ad536faa1b0a22286c0 (diff) | |
| parent | cacf666f95df9790cebf5d5cdb0609cee257fab3 (diff) | |
| download | qtactiveqt-c9acfe0bc8dbaec1065614fa2039ebe7e05b4bda.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testcon/changeproperties.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp index 384ebab..7382c0a 100644 --- a/tools/testcon/changeproperties.cpp +++ b/tools/testcon/changeproperties.cpp @@ -33,6 +33,7 @@ #include <QtCore/qt_windows.h> #include <QtCore/QMetaObject> #include <QtCore/QMetaProperty> +#include <QtCore/QRegExp> #include <ActiveQt/QAxWidget> QT_BEGIN_NAMESPACE |