diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
| commit | 2add2dbdaa9ff6ca6637ca22d6a9b7c7027751be (patch) | |
| tree | 585628b0ceacfbdef5b9661c4043b9f71dfe9b01 /src/plugins/platforms/cocoa/qcocoahelpers.mm | |
| parent | f792fed2ff519ffac1436e41e47cc0504d253a77 (diff) | |
| parent | 4eda22ea0db1fc571ae9f44a68825056e6245548 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/http2/hpacktable_p.h
Change-Id: Ie0c296667dfdebba84f4858056a1ac80c24ee7df
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoahelpers.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index d86e935788..9c705616ba 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcQpaWindow, "qt.qpa.window"); Q_LOGGING_CATEGORY(lcQpaDrawing, "qt.qpa.drawing"); -Q_LOGGING_CATEGORY(lcQpaMouse, "qt.qpa.input.mouse"); +Q_LOGGING_CATEGORY(lcQpaMouse, "qt.qpa.input.mouse", QtCriticalMsg); Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen"); // |