diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:56:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:56:05 +0100 |
| commit | 616207ec9783cf58661f35782fee6f8c825f205f (patch) | |
| tree | 54a0c8b75d194563f9c49fcfe7870fd10f018187 /tools | |
| parent | e92a1ce71a355a620b809317778c5d8208906d9c (diff) | |
| parent | 99611af4845e4c7893a03c0b13f2fd2275f318e3 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/activeqt/webbrowser/main.cpp
examples/activeqt/webbrowser/webaxwidget.h
Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dumpcpp/dumpcpp.pro | 1 | ||||
| -rw-r--r-- | tools/dumpdoc/dumpdoc.pro | 1 | ||||
| -rw-r--r-- | tools/testcon/changeproperties.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/dumpcpp/dumpcpp.pro b/tools/dumpcpp/dumpcpp.pro index 9dd6d27..aaaf5f8 100644 --- a/tools/dumpcpp/dumpcpp.pro +++ b/tools/dumpcpp/dumpcpp.pro @@ -3,4 +3,5 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS SOURCES = main.cpp +QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp" load(qt_tool) diff --git a/tools/dumpdoc/dumpdoc.pro b/tools/dumpdoc/dumpdoc.pro index f96ecc5..b879a68 100644 --- a/tools/dumpdoc/dumpdoc.pro +++ b/tools/dumpdoc/dumpdoc.pro @@ -2,4 +2,5 @@ QT += axcontainer widgets SOURCES += main.cpp +QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc" load(qt_tool) 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 |