AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5e8ae03578
qt5base-lts/examples/widgets
History
Frederik Gladhorn 5e8ae03578 Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	configure
	qmake/generators/mac/pbuilder_pbx.cpp
	src/corelib/kernel/qtimerinfo_unix.cpp
	src/plugins/platforms/cocoa/qcocoabackingstore.mm
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/xcb/qglxintegration.cpp

Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac
2013-03-05 13:42:11 +01:00
..
animation Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
desktop Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
dialogs Compile fix when QT_NO_PRINTDIALOG is defined 2013-02-26 13:31:45 +01:00
doc Merge remote-tracking branch 'origin/stable' into dev 2013-02-14 14:24:57 +01:00
draganddrop Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
effects Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
graphicsview Merge remote-tracking branch 'origin/stable' into dev 2013-03-05 13:42:11 +01:00
itemviews Compile fix when QT_NO_PRINTDIALOG is defined 2013-02-26 13:31:45 +01:00
layouts Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
mainwindows Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
painting Compile fix when QT_NO_PRINTDIALOG is defined 2013-02-26 13:31:45 +01:00
richtext Compile fix when QT_NO_PRINTDIALOG is defined 2013-02-26 13:31:45 +01:00
scroller Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
statemachine Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
tools Merge remote-tracking branch 'origin/stable' into dev 2013-02-14 14:24:57 +01:00
tutorials Merge branch 'release' into stable 2013-01-31 18:55:53 +01:00
widgets Compile fix when QT_NO_PRINTDIALOG is defined 2013-02-26 13:31:45 +01:00
windowcontainer Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00
widgets.pro Merge remote-tracking branch 'origin/stable' into dev 2013-02-14 14:24:57 +01:00