AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72f5867f14
qt5base-lts/qmake
History
Liang Qi 72f5867f14 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/kernel/qcoreapplication.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/network/bearer/qnetworkconfiguration.cpp
	src/plugins/bearer/blackberry/qbbengine.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
	src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
	src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
	src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
	src/plugins/platforms/qnx/qqnxwindow.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	src/widgets/styles/qwindowsxpstyle.cpp
	src/widgets/widgets/qtoolbararealayout.cpp
	tests/auto/corelib/global/qflags/qflags.pro
	tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp

Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
2015-12-02 23:33:06 +01:00
..
doc Merge remote-tracking branch 'origin/5.6' into dev 2015-11-04 20:18:14 +01:00
generators qmake: Correctly handle shadow build of nested vcsubdirs projects. 2015-12-01 15:57:16 +00:00
library Merge remote-tracking branch 'origin/5.6' into dev 2015-11-04 20:18:14 +01: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 Move the official Qt version from qglobal.h to .qmake.conf 2015-10-14 20:12:57 +00:00
Makefile.win32 Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
meta.cpp make .prl processing less convoluted 2015-10-02 14:01:13 +00:00
meta.h make .prl processing less convoluted 2015-10-02 14:01:13 +00:00
option.cpp QMake: Add option to set qt.conf file. 2015-10-27 13:14:00 +00:00
option.h Distinguish between Objective-C and Objective-C++ sources 2015-10-09 15:15:17 +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-aux.pro configure: Separate host and build platform. 2015-10-30 13:14:51 +00: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