AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ca524e5b70
qt5base-lts/examples/widgets
History
Frederik Gladhorn ca524e5b70 Merge remote-tracking branch 'origin/5.3' into 5.4 
Manually included changes from
3a347a4e70
in src/opengl/qgl.cpp.

Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/android/androidjnimain.cpp

Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929
2014-08-12 13:05:02 +02:00
..
animation Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
desktop Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
dialogs Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
doc Merge remote-tracking branch 'origin/stable' into 5.3 2014-06-14 18:11:52 +02:00
draganddrop Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
effects Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
gestures Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
graphicsview Make QOpenGLWidget public 2014-08-01 17:13:59 +02:00
itemviews Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
layouts Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
mac fix qmaccocoaviewcontainer example 2014-06-05 17:11:58 +02:00
mainwindows Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
painting Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
richtext Merge remote-tracking branch 'origin/5.3' into 5.4 2014-08-12 13:05:02 +02:00
scroller Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
statemachine Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
tools Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
tutorials Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
widgets Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
windowcontainer Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00