AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1fe728fa5
qt5base-lts/qmake
History
Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformintegration.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/sql/doc/src/sql-driver.qdoc
	src/widgets/widgets/qtoolbararealayout.cpp

Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
2014-02-07 13:07:25 +01:00
..
doc Doc: Fix broken links 2014-02-04 01:30:24 +01:00
generators Merge remote-tracking branch 'origin/stable' into dev 2014-02-07 13:07:25 +01:00
library don't turn = into += in cumulative mode 2014-01-15 21:32:41 +01:00
cachekeys.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
main.cpp support s///i option in built-in sed 2013-12-04 17:18:38 +01:00
Makefile.unix Merge remote-tracking branch 'origin/stable' into dev 2013-12-24 00:56:59 +01:00
Makefile.win32 Fix configure & qmake compilation with a future MSVC version 2014-02-01 06:56:45 +01:00
meta.cpp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
meta.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
option.cpp expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
option.h qmake: Expose qmake arguments as QMAKE_ARGS 2013-10-24 20:20:59 +02:00
project.cpp implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
project.h qmake: cleanup DISTFILES 2014-01-17 14:32:19 +01:00
property.cpp fix signedness warnings 2013-11-04 19:49:55 +01:00
property.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmake_pch.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmake-docs.pro move qmake docs into qtbase 2013-06-17 15:41:55 +02:00
qmake.pri Replace win32-g++ with mingw scope 2014-01-17 12:08:24 +01:00
qmake.pro bring fake qmake project up to snuff 2013-11-04 19:50:07 +01:00