Liang Qi fcfd31c9fd Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0		2015-06-01 17:46:58 +02:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-06-01 17:46:58 +02:00
pbuilder_pbx.h	fix quoting issues. all of them. (*)	2015-02-17 18:27:29 +00:00