diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:34:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:34:35 +0100 |
| commit | bada5f8ea74d6d9d2a60b35f4d271da143aced51 (patch) | |
| tree | 7b936bc66691fec2efee0a2f8685b06fdac36497 /qtactiveqt.pro | |
| parent | c550735ebeb937a36b82c161f0fed4e35b8776bb (diff) | |
| parent | 555527b6992374f8a5139674a316e819f9d5685f (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/activeqt/control/qaxserverbase.cpp
Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19
Diffstat (limited to 'qtactiveqt.pro')
| -rw-r--r-- | qtactiveqt.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qtactiveqt.pro b/qtactiveqt.pro index 039aaad..45b79f1 100644 --- a/qtactiveqt.pro +++ b/qtactiveqt.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + CONFIG += tests_need_tools load(qt_parts) |