David Faure 672fcbe9c6 QMimeDatabase: Fix handling of duplicate mimetype definitions (2/2). ... 7721c3d27c fixed the case where two similar definitions are in the same directory. This commit fixes the case where two similar definitions are in different directories, both in the search path (GenericDataLocation). If the file extension gives us the same mimetype twice, there's no conflict, i.e. no reason to fallback to determination from contents. Change-Id: I72c56004b6d5e88964159e53ec160ce8b06c2264 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>		2013-08-03 14:44:12 +02:00
..
android	Fix Qt tests for Android.	2013-04-03 10:15:40 +02:00
bic/data	test: Add 5.1.0 bic data for linux-gcc-ia32	2013-07-08 21:47:36 +02:00
cmake	Don't check for the existence of private include directories.	2013-07-22 15:41:45 +02:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	QtConcurrent tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:25 +01:00
corelib	QMimeDatabase: Fix handling of duplicate mimetype definitions (2/2).	2013-08-03 14:44:12 +02:00
dbus	Expose invokables that are not slots in the xml	2013-07-30 20:34:11 +02:00
gui	Cocoa: Make sure that resizeEvent is invoked after calling resize	2013-07-30 17:24:15 +02:00
guiapplauncher
installed_cmake	Add a unit test for testing Qt in its install location.	2013-07-02 23:08:54 +02:00
network	Ignore or suppress warning and debug messages in tst_QLocalSocket	2013-07-20 00:22:07 +02:00
opengl	Add object names to QGLWidget-reparenting test.	2013-06-14 15:13:26 +02:00
other	Update Info.plist templates to use the current standard plist format.	2013-08-02 05:42:37 +02:00
printsupport	QPrintPreviewDialog: Prevent changing of page in resize handling.	2013-05-23 09:31:27 +02:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Remove Nokia-domains in commented-out test code.	2013-07-12 12:41:30 +02:00
testlib	QtTest: Output correct library name	2013-05-27 00:41:46 +02:00
tools	make split_value_list() even less sane again	2013-07-03 21:38:37 +02:00
widgets	test: Remove insignificant mark from tst_qfilesystemmodel	2013-07-26 14:47:47 +02:00
xml	tst_qdom: Fix warning about character conversion,	2013-06-08 10:29:34 +02:00
auto.pro	Make the CMake tests run sequentially, not in parallel.	2013-07-08 14:48:03 +02:00
network-settings.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtest-config.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
test.pl	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00