qt5base-lts/src/corelib/global
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +01:00
..
archdetect.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
global.pri corelib: Fix a faulty 5.4->dev merge. 2015-01-28 15:51:44 +00:00
qcompilerdetection.h Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
qconfig-dist.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qconfig-large.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qconfig-medium.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qconfig-minimal.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qconfig-nacl.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qconfig-small.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qendian.h Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev 2015-01-21 11:14:34 +01:00
qendian.qdoc Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qfeatures.txt QPrinter - Make PDF support required for QPrinter 2013-11-27 21:06:30 +01:00
qflags.h QFlags: plaster API with Q_DECL_NOTHROW 2015-01-05 13:05:00 +01:00
qglobal.cpp Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
qglobal.h Centralize use of __attribute__((noinline)) 2015-01-29 13:42:07 +00:00
qglobalstatic.cpp Doc: Use title case in section1 titles 2014-09-30 13:52:51 +02:00
qglobalstatic.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qhooks_p.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qhooks.cpp QIODevice: remove ineffective caching members 2015-01-20 10:37:59 +01:00
qisenum.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qlibraryinfo.cpp Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01:00
qlibraryinfo.h introduce /dev variants of qmake properties 2015-02-05 14:27:06 +00:00
qlogging.cpp qlogging: Fix build on FreeBSD after 63cd16d. 2015-01-28 16:12:14 +00:00
qlogging.h Get rid of QT_NO_QWARNING_MACRO 2015-01-09 13:14:11 +01:00
qmalloc.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnamespace.h Use Q_ENUM and Q_FLAG in the Qt namespace 2015-02-04 14:59:22 +00:00
qnamespace.qdoc Itemviews: add ItemIsUserTristate flag 2015-01-25 12:37:41 +01:00
qnumeric_p.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnumeric.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnumeric.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qprocessordetection.h Use __aarch64__ instead of __arm64__ to detect AArch64 2014-11-04 10:06:14 +01:00
qsysinfo.h Introduce Windows version 10. 2015-01-08 06:28:04 +01:00
qsystemdetection.h Haiku: Make corelib compile on Haiku 2015-01-10 15:26:00 +01:00
qt_pch.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qt_windows.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qtypeinfo.h Remove qSwap specialization from Q_DECLARE_SHARED 2015-01-10 08:43:02 +01:00
qtypetraits.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00