diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
| commit | 0fcce50af009f97efa2a5c5f2c74415c92830962 (patch) | |
| tree | f8abf0e4f445fed9480b426b2f856b50911f1210 /mkspecs/features/qt_build_config.prf | |
| parent | 74d46a669badc5bf32187686102ca4e644a3c0af (diff) | |
| parent | c54f7720d09e7d00f3309736bbeaaa6a81967ec1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/qt.prf
src/plugins/platforms/xcb/qxcbwindow.h
src/tools/qdoc/qdocindexfiles.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
Diffstat (limited to 'mkspecs/features/qt_build_config.prf')
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 0bf90cc297..5fece28ca3 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -59,7 +59,6 @@ CONFIG += \ create_prl link_prl \ prepare_docs qt_docs_targets \ no_private_qt_headers_warning QTDIR_build \ - no_dll \ # Qt modules get compiled without exceptions enabled by default. # However, testcases should be still built with exceptions. exceptions_off testcase_exceptions |