diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:02:36 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:35:36 +0200 |
| commit | 90bb25e2132aded600cf68337f2390e3eb7d7a0d (patch) | |
| tree | 1f780841b11e358a79f6a6c608ca5d2880b7e1ec | |
| parent | 3d6a360730a8d6563e35dfee65ce4ef7b7416ab2 (diff) | |
| parent | e87065b17b9797aaeb0405a9c4b6191d1745d505 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I0949f4de88e34271b38c7ebd639a8991b22002fc
| -rw-r--r-- | .qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4838aa4..097d8b9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) MODULE_VERSION = 5.12.0 - |