diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:33:19 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:33:53 +0200 |
| commit | d2d5d24f86f12a2d1b0a6bc46c0d48306d7d2130 (patch) | |
| tree | d67555a6c699c49a89ea10863b6c0e4c0c3f5cae /.qmake.conf | |
| parent | f9e951d0946fe0fcd51e9015108f92c46ecc8138 (diff) | |
| parent | 42d864c86d8c85db7b2d42f8505d962a642e4c77 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
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 3442ea6e1..52fc5b4ea 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,5 @@ QMAKEPATH += $$PWD/tools/qmake load(qt_build_config) -CONFIG += qt_example_installs CONFIG += warning_clean MODULE_VERSION = 5.7.0 |