qt5base-lts/tests/auto/other
Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
2015-02-24 21:02:08 +01:00
..
android Update copyright headers 2015-02-11 06:49:51 +00:00
atwrapper Update copyright headers 2015-02-11 06:49:51 +00:00
baselineexample Update copyright headers 2015-02-11 06:49:51 +00:00
compiler Update copyright headers 2015-02-11 06:49:51 +00:00
gestures Update copyright headers 2015-02-11 06:49:51 +00:00
headersclean headersclean: process private modules correctly 2013-07-03 15:31:13 +02:00
lancelot Update copyright headers 2015-02-11 06:49:51 +00:00
languagechange Update copyright headers 2015-02-11 06:49:51 +00:00
macgui Update copyright headers 2015-02-11 06:49:51 +00:00
macnativeevents Update copyright headers 2015-02-11 06:49:51 +00:00
macplist Update copyright headers 2015-02-11 06:49:51 +00:00
modeltest Update copyright headers 2015-02-11 06:49:51 +00:00
networkselftest Update copyright headers 2015-02-11 06:49:51 +00:00
qaccessibility Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
qaccessibilitylinux Update copyright headers 2015-02-11 06:49:51 +00:00
qaccessibilitymac Fixed license headers 2015-02-17 18:46:09 +00:00
qcomplextext Update copyright headers 2015-02-11 06:49:51 +00:00
qfocusevent Update copyright headers 2015-02-11 06:49:51 +00:00
qnetworkaccessmanager_and_qprogressdialog Update copyright headers 2015-02-11 06:49:51 +00:00
qobjectperformance Update copyright headers 2015-02-11 06:49:51 +00:00
qobjectrace Update copyright headers 2015-02-11 06:49:51 +00:00
qprocess_and_guieventloop Update copyright headers 2015-02-11 06:49:51 +00:00
qsharedpointer_and_qwidget Update copyright headers 2015-02-11 06:49:51 +00:00
qtokenautomaton Update copyright headers 2015-02-11 06:49:51 +00:00
qvariant_common Update copyright headers 2015-02-11 06:49:51 +00:00
toolsupport Update copyright headers 2015-02-11 06:49:51 +00:00
windowsmobile Update copyright headers 2015-02-11 06:49:51 +00:00
other.pro Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00