AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33a43cdbf2
qt5base-lts/qmake
History
Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
2015-09-25 14:02:04 +02:00
..
doc Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
generators fix race in debug_and_release builds of static libs for Unix 2015-09-22 14:12:32 +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