AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7a04670e53
qt5base-lts/qmake/generators/win32
History
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +02:00
..
cesdkhandler.cpp Fix incorrect pass by value. 2015-04-21 11:37:54 +00:00
cesdkhandler.h Fix incorrect pass by value. 2015-04-21 11:37:54 +00:00
mingw_make.cpp Introduce qmake RC_DEFINES for RC preprocessor defines 2015-06-02 03:37:07 +00:00
mingw_make.h fix quoting issues. all of them. (*) 2015-02-17 18:27:29 +00:00
msbuild_objectmodel.cpp WinRT: Add qmake support for Windows 10 2015-05-26 11:09:41 +00:00
msbuild_objectmodel.h Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
msvc_nmake.cpp WinRT: Add qmake support for Windows 10 2015-05-26 11:09:41 +00:00
msvc_nmake.h Update copyright headers 2015-02-11 06:49:51 +00:00
msvc_objectmodel.cpp make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
msvc_objectmodel.h WinRT: Add qmake support for Windows 10 2015-05-26 11:09:41 +00:00
msvc_vcproj.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
msvc_vcproj.h remove superfluous method re-implementation 2015-04-27 13:25:27 +00:00
msvc_vcxproj.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
msvc_vcxproj.h Update copyright headers 2015-02-11 06:49:51 +00:00
winmakefile.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
winmakefile.h fix quoting issues. all of them. (*) 2015-02-17 18:27:29 +00:00