diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-17 12:35:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-17 12:35:11 +0100 |
| commit | 59fcb154aaf2d3e476e900c47d75e0f2a16db9a2 (patch) | |
| tree | c97ba06ca74bcda49c36985cd0df2adc0373e9cd | |
| parent | dd24538f3e020d8ad6b4fdb7b4641f4421bc61e6 (diff) | |
| parent | c8d6f78710198afb83dfac1af3c8026eabed1cca (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I10c63184c38e20703113bf798aab2701ecdf9d68
| -rw-r--r-- | qtmacextras.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qtmacextras.pro b/qtmacextras.pro index 58c33f2..869d07f 100644 --- a/qtmacextras.pro +++ b/qtmacextras.pro @@ -1 +1,2 @@ +requires(qtHaveModule(gui)) load(qt_parts) |