AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
371c2e4786
qt5base-lts/tools/configure
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
..
configure_pch.h Update copyright headers 2015-02-11 06:49:51 +00:00
configure.pro Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
configureapp.cpp Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
configureapp.h Merge remote-tracking branch 'origin/5.6' into dev 2015-10-14 15:45:35 +02:00
environment.cpp Remove support for MSVC earlier than 2012 2015-10-27 23:26:52 +00:00
environment.h Add mingw GCC Version to qconfig.pri 2015-03-25 11:13:19 +00:00
main.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
Makefile.mingw Mingw: Build configure.exe with C++11 support 2015-11-16 19:07:51 +00:00
Makefile.win32 Remove support for MSVC earlier than 2012 2015-10-27 23:26:52 +00:00
tools.cpp Run license checker in qmake 2015-05-27 10:23:10 +00:00
tools.h Update copyright headers 2015-02-11 06:49:51 +00:00