whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/qmake/generators
History
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
 		2015-07-01 11:05:26 +02:00
..
mac pbuilder_pbx: disable bit code for Xcode projects 2015-06-16 11:33:47 +00:00
unix Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
win32 Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
makefile.cpp fix quoting of qmake parameters in 'qmake' target 2015-05-22 19:04:21 +00:00
makefile.h make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
makefiledeps.cpp replace incorrect uses of fixPathToLocalOS() (mostly) 2015-02-17 18:27:44 +00:00
makefiledeps.h Update copyright headers 2015-02-11 06:49:51 +00:00
metamakefile.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
metamakefile.h Update copyright headers 2015-02-11 06:49:51 +00:00
projectgenerator.cpp make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
projectgenerator.h Update copyright headers 2015-02-11 06:49:51 +00:00
xmloutput.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
xmloutput.h Update copyright headers 2015-02-11 06:49:51 +00:00