AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7c99231c55
qt5base-lts/examples/widgets
History
Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev 
Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d5

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
2014-07-01 16:25:19 +02:00
..
animation Fix warning about unused member 2014-03-06 12:21:14 +01:00
desktop Remove warnings about examples not running in the Qt Simulator 2013-10-09 21:45:31 +02:00
dialogs Remove warnings about examples not running in the Qt Simulator 2013-10-09 21:45:31 +02:00
doc Merge remote-tracking branch 'origin/stable' into 5.3 2014-06-14 18:11:52 +02:00
draganddrop Remove warnings about examples not running in the Qt Simulator 2013-10-09 21:45:31 +02:00
effects Fix MSVC-warnings about stray */* in sources. 2014-01-24 18:50:05 +01:00
gestures Polish the image gestures example. 2014-03-28 12:59:13 +01:00
graphicsview Disable some more qtbase examples for dynamic gl builds 2014-06-30 10:35:27 +02:00
itemviews simpletreemodel example: rename parent() to parentItem() for clarity 2014-05-25 12:32:56 +02:00
layouts expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
mac fix qmaccocoaviewcontainer example 2014-06-05 17:11:58 +02:00
mainwindows Add a menu item to mainwindow example to toggle unified toolbars. 2014-05-21 21:07:58 +02:00
painting Disable some more qtbase examples for dynamic gl builds 2014-06-30 10:35:27 +02:00
richtext Use the new unified toolbar implementation in examples on OS X. 2014-05-12 21:40:43 +02:00
scroller Fix warning about float truncation in scroller example (CLANG). 2013-03-06 21:50:28 +01:00
statemachine Remove warnings about examples not running in the Qt Simulator 2013-10-09 21:45:31 +02:00
tools Doc: correction link, example and parameter issues qtbase 2014-03-10 16:02:19 +01:00
tutorials Update AddressBook Example 2014-04-28 13:54:44 +02:00
widgets Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
windowcontainer Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00