Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e		2014-02-07 13:07:25 +01:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qtableview.pro	Disabling some concurrency in widget tests	2013-05-10 17:31:52 +02:00
tst_qtableview.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00