Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: config.tests/win/msvc_version.cpp configure.pri mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf src/corelib/io/qsettings_mac.cpp src/corelib/json/qjsondocument.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.h src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/qiosintegration.h src/plugins/platforms/minimalegl/qminimaleglintegration.cpp tests/auto/gui/painting/qpainter/tst_qpainter.cpp tools/configure/environment.cpp Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843		2016-11-01 06:02:55 +01:00
..
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
gl2paintengineex	Standardize some "We mean it" comments	2016-08-17 19:51:40 +00:00
opengl.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qgl.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
qgl.h	…
qgl_p.h	…
qglbuffer.cpp	…
qglbuffer.h	…
qglcolormap.cpp	…
qglcolormap.h	…
qglframebufferobject.cpp	…
qglframebufferobject.h	…
qglframebufferobject_p.h	Standardize some "We mean it" comments	2016-08-17 19:51:40 +00:00
qglfunctions.cpp	…
qglfunctions.h	…
qglpaintdevice.cpp	…
qglpaintdevice_p.h	…
qglpixelbuffer.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
qglpixelbuffer.h	…
qglpixelbuffer_p.h	Standardize some "We mean it" comments	2016-08-17 19:51:40 +00:00
qglshaderprogram.cpp	QtBase (remainder): use printf-style qWarning/qDebug where possible (I)	2016-03-12 17:29:36 +00:00
qglshaderprogram.h	…
qgraphicsshadereffect.cpp	…
qgraphicsshadereffect_p.h	…
qtopenglglobal.h	…