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
..
q_func_info	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qflags	Use Q_DECL_RELAXED_CONSTEXPR in QFlags	2014-10-31 09:54:15 +01:00
qgetputenv	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qglobal	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qglobalstatic	Fix Q_GLOBAL_STATIC support for exceptions	2013-02-28 23:43:46 +01:00
qhooks	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qlogging	Remove trailing '\n' in qFormatLogMessage output	2014-10-27 08:59:02 +01:00
qnumeric	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qrand	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qtendian	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
global.pro	Add a more reliable replacement for qt_add/removeObject().	2014-04-15 17:50:20 +02:00