AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29daa7645b
qt5base-lts/tests/auto/other
History
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +01:00
..
android Android: Don't open assets files in read/write mode 2015-01-28 12:20:54 +00:00
atwrapper Update license headers and add new license files 2014-09-24 12:26:19 +02:00
baselineexample Update license headers and add new license files 2014-09-24 12:26:19 +02:00
compiler Gcc 4.5.* build fix. 2014-10-10 13:20:30 +02:00
gestures Update license headers and add new license files 2014-09-24 12:26:19 +02:00
headersclean headersclean: process private modules correctly 2013-07-03 15:31:13 +02:00
lancelot Make it more obvious that Q_WS_ is dead code, and should perhaps be ported 2015-02-03 11:49:14 +00:00
languagechange Fix regression from Qt4 with layout direction 2015-02-05 14:27:22 +00:00
macgui Update license headers and add new license files 2014-09-24 12:26:19 +02:00
macnativeevents Update license headers and add new license files 2014-09-24 12:26:19 +02:00
macplist Update license headers and add new license files 2014-09-24 12:26:19 +02:00
modeltest Update license headers and add new license files 2014-09-24 12:26:19 +02:00
networkselftest Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qaccessibility Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
qaccessibilitylinux Do not include accessibility.pri twice 2015-01-21 20:38:22 +01:00
qaccessibilitymac Fix qaccessibilitymac test (title vs. description) 2015-01-17 09:58:14 +01:00
qcomplextext Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qfocusevent Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnetworkaccessmanager_and_qprogressdialog Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qobjectperformance Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qobjectrace Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qprocess_and_guieventloop Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
qsharedpointer_and_qwidget Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qtokenautomaton Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qvariant_common Update license headers and add new license files 2014-09-24 12:26:19 +02:00
toolsupport QIODevice: remove ineffective caching members 2015-01-20 10:37:59 +01:00
windowsmobile Update license headers and add new license files 2014-09-24 12:26:19 +02:00
other.pro Android: Don't open assets files in read/write mode 2015-01-28 12:20:54 +00:00