Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I2fa26fa061cbf5d2bded203a299a19b7d1c31d0a
Showing
- configure.json 7 additions, 1 deletionconfigure.json
- configure.pri 2 additions, 0 deletionsconfigure.pri
- dist/changes-5.11.2 129 additions, 0 deletionsdist/changes-5.11.2
- mkspecs/common/macx.conf 2 additions, 0 deletionsmkspecs/common/macx.conf
- mkspecs/features/mac/default_post.prf 38 additions, 0 deletionsmkspecs/features/mac/default_post.prf
- mkspecs/features/mac/sdk.mk 12 additions, 0 deletionsmkspecs/features/mac/sdk.mk
- src/corelib/tools/qrect.cpp 4 additions, 4 deletionssrc/corelib/tools/qrect.cpp
- src/gui/opengl/qopenglpaintengine.cpp 1 addition, 0 deletionssrc/gui/opengl/qopenglpaintengine.cpp
- src/gui/opengl/qopengltextureglyphcache_p.h 5 additions, 0 deletionssrc/gui/opengl/qopengltextureglyphcache_p.h
- src/plugins/platforms/cocoa/qcocoaintegration.mm 0 additions, 21 deletionssrc/plugins/platforms/cocoa/qcocoaintegration.mm
- src/plugins/styles/mac/qmacstyle_mac.mm 31 additions, 5 deletionssrc/plugins/styles/mac/qmacstyle_mac.mm
- src/widgets/widgets/qmaccocoaviewcontainer_mac.mm 5 additions, 0 deletionssrc/widgets/widgets/qmaccocoaviewcontainer_mac.mm
- src/xml/dom/qdom.cpp 0 additions, 2 deletionssrc/xml/dom/qdom.cpp
- tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp 54 additions, 0 deletions.../auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
Please register or sign in to comment