Oswald Buddenhagen 68316e6584 Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: doc/global/manifest-meta.qdocconf src/corelib/global/qnamespace.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qtools_p.h src/sql/drivers/psql/qsql_psql.cpp Change-Id: I23a15ac84e03ad61d865e3df872b013eb0752949		2015-07-17 17:53:19 +02:00
..
android	Update copyright headers	2015-02-11 06:49:51 +00:00
bic/data	bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64	2015-02-14 06:54:20 +00:00
cmake	CMake: Fix regression with quoted OPTIONS parameter	2015-03-11 07:31:33 +00:00
compilerwarnings/data	Fixed license headers	2015-02-17 18:46:09 +00:00
concurrent	Fix build of tests on QNX.	2015-03-14 07:05:34 +00:00
corelib	QDir::removeRecursively(): Retry file deletion with write permission set.	2015-07-17 11:06:28 +00:00
dbus	Make sure we don't call dbus_connection_can_send_type on too old libdbus	2015-05-26 07:20:35 +00:00
gui	Add test for invalid exif data	2015-07-17 11:37:02 +00:00
guiapplauncher	Fix path to examples part of tst_GuiAppLauncher	2015-02-13 07:28:15 +00:00
installed_cmake	Add a unit test for testing Qt in its install location.	2013-07-02 23:08:54 +02:00
network	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-07-17 17:53:19 +02:00
opengl	Update copyright headers	2015-02-11 06:49:51 +00:00
other	Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into refs/staging/5.5	2015-06-28 07:46:47 +00:00
printsupport	Update copyright headers	2015-02-11 06:49:51 +00:00
shared	Update copyright headers	2015-02-11 06:49:51 +00:00
sql	fix usage of wince scope	2015-06-05 10:29:10 +00:00
testlib	TestCase: Also check main source path when looking for test data	2015-05-05 07:06:52 +00:00
tools	Make QDir::relativeFilePath() return "." for a path to itself.	2015-06-24 15:43:58 +00:00
widgets	Stabilize tst_QListView::batchedMode().	2015-07-17 10:30:39 +00:00
xml	Update copyright headers	2015-02-11 06:49:51 +00:00
auto.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
network-settings.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qtest-config.h	Update copyright headers	2015-02-11 06:49:51 +00:00
test.pl	Update copyright headers	2015-02-11 06:49:51 +00:00