diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:58:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:58:35 +0200 |
| commit | 03a6177a3223f928a5f329c8b1fc4d5fe376deed (patch) | |
| tree | ed57f892924d1bda89559682e34d4f86ec6d13fc /.qmake.conf | |
| parent | 0464d42b101eaf60c62be751785009d09065f2cf (diff) | |
| parent | d137ae33ccf01882f80770919b1daa199dec7019 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/charts/charts.pro
src/charts/qchartglobal.h
src/chartsqml2/chartsqml2.pro
tests/auto/chartdataset/tst_chartdataset.cpp
tests/auto/domain/tst_domain.cpp
Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index ddabfeab..1fe224d4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION=5.7.0 |