whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/widgets/styles
History
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
..
images QLineEdit: Use High DPI pixmap for clear button. 2016-03-22 09:25:00 +00:00
qandroidstyle.cpp Android: don't iterate over .keys() 2016-04-25 05:11:35 +00:00
qandroidstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qcommonstyle.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qcommonstyle.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qcommonstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qcommonstylepixmaps_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qdrawutil.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-05 19:33:26 +02:00
qdrawutil.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qfusionstyle.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qfusionstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qfusionstyle_p_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qmacstyle.qdoc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
qmacstyle_mac.mm Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qmacstyle_mac_p.h Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qmacstyle_mac_p_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qpixmapstyle.cpp Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qpixmapstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qpixmapstyle_p_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qproxystyle.cpp QtWidgets: Introduce delegating constructors. 2016-05-02 07:56:25 +00:00
qproxystyle.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qproxystyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstyle.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
qstyle.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstyle.qrc QLineEdit: Use High DPI pixmap for clear button. 2016-03-22 09:25:00 +00:00
qstyle_p.h
…
qstyleanimation.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
qstyleanimation_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstylefactory.cpp Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qstylefactory.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstylehelper.cpp fix build with various QT_NO_* defines 2016-08-26 07:39:53 +00:00
qstylehelper_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstyleoption.cpp Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qstyleoption.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
qstylepainter.cpp
…
qstylepainter.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstyleplugin.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
qstyleplugin.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qstylesheetstyle.cpp Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qstylesheetstyle_default.cpp
…
qstylesheetstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qwindowsstyle.cpp Support C++17 fallthrough attribute 2016-08-19 18:38:53 +00:00
qwindowsstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qwindowsstyle_p_p.h Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qwindowsvistastyle.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-08-29 15:30:17 +02:00
qwindowsvistastyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qwindowsvistastyle_p_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qwindowsxpstyle.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qwindowsxpstyle_p.h Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
qwindowsxpstyle_p_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
styles.pri Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00