diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-25 01:00:25 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 11:30:04 +0100 |
| commit | 58c69df4d38324644bc49ec5f42ee8343a454b2d (patch) | |
| tree | de0a1ce603292dcaff134d4e1e8ab064295515a2 /src/widgets/widgets.pro | |
| parent | 03b1d2c44940322208c12c7bceee376b51d8e852 (diff) | |
| parent | 59a705e3710b0ba93bb698e3223241cfac932948 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/tools/qhash.h
src/gui/kernel/qevent.h
src/widgets/kernel/qshortcut.cpp
src/widgets/kernel/qshortcut.h
Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620
Diffstat (limited to 'src/widgets/widgets.pro')
| -rw-r--r-- | src/widgets/widgets.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 2aa56ded93..2d5ba05d40 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -9,8 +9,6 @@ msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x65000000 TRACEPOINT_PROVIDER = $$PWD/qtwidgets.tracepoints CONFIG += qt_tracepoints -CONFIG += metatypes install_metatypes - QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf #platforms @@ -47,3 +45,5 @@ testcocoon { MODULE_PLUGIN_TYPES += \ styles load(qt_module) + +CONFIG += metatypes install_metatypes |