Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +01:00
..
moc	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
qdbuscpp2xml	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusxml2cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qmake	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
rcc	Add extra declarations to make rcc output pass -Wmissing-declarations	2014-10-25 11:48:43 +02:00
uic	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
tools.pro	test: Disable tst_uic when -no-widgets is used	2013-04-22 16:24:44 +02:00