diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 13:31:27 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 13:31:27 +0200 |
| commit | 810b486bd899a349f8773e68506a9491c199ffa0 (patch) | |
| tree | 1985c868612e6ea419c3e6c4894823a76c63aa95 /.qmake.conf | |
| parent | f5164ec8f20d6ae06fe2482a15482e0dd4267202 (diff) | |
| parent | 03a6177a3223f928a5f329c8b1fc4d5fe376deed (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/charts/common.pri
One side added to a file the other removed, claiming it is redundant.
Change-Id: I57e2901ec14dd9c02c409cf5714a2f553932fb30
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 aa9ded07..aefa1e70 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.8.0 |