Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ...

Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085

2015-08-06 10:54:01 +02:00

..

doc

Merge remote-tracking branch 'origin/5.5' into dev

2015-08-06 10:54:01 +02:00

generators

iOS: Refactor xcodebuild exclusive build logic into standalone makefile

2015-08-04 11:59:01 +00:00

library

qmake: mark some types movable

2015-07-08 12:31:00 +00:00

cachekeys.h

Update copyright headers

2015-02-11 06:49:51 +00:00

main.cpp

fix installing unix dll symlinks on windows hosts

2015-06-01 13:26:57 +00:00

Makefile.unix

Deinline QRingBuffer class

2015-05-20 13:49:00 +00:00

Makefile.win32

Deinline QRingBuffer class

2015-05-20 13:49:00 +00:00

meta.cpp

fix quoting issues. all of them. (*)

2015-02-17 18:27:29 +00:00

meta.h

Update copyright headers

2015-02-11 06:49:51 +00:00

option.cpp

Update copyright headers

2015-02-11 06:49:51 +00:00

option.h

Update copyright headers

2015-02-11 06:49:51 +00:00

project.cpp

make fileFixify() calling convention somewhat sane

2015-04-21 12:06:20 +00:00

project.h

make fileFixify() calling convention somewhat sane

2015-04-21 12:06:20 +00:00

property.cpp

Update copyright headers

2015-02-11 06:49:51 +00:00

property.h

Update copyright headers

2015-02-11 06:49:51 +00:00

qmake_pch.h

Update copyright headers

2015-02-11 06:49:51 +00:00

qmake-docs.pro

move qmake docs into qtbase

2013-06-17 15:41:55 +02:00

qmake.pri

nuke gbuild generator

2015-02-02 11:14:34 +00:00

qmake.pro

bring fake qmake project up to snuff

2013-11-04 19:50:07 +01:00