AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0861c2176c
qt5base-lts/qmake/library
History
Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	mkspecs/common/linux-android.conf
	src/gui/opengl/qopengl.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/network/socket/qnativesocketengine_winrt_p.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	sync.profile

Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
2016-11-16 12:35:36 +01:00
..
ioutils.cpp Updated license headers 2016-01-21 18:55:18 +00:00
ioutils.h Updated license headers 2016-01-21 18:55:18 +00:00
proitems.cpp make QMakeEvaluator::isActiveConfig() take a QStringRef argument 2016-05-24 12:38:53 +00:00
proitems.h fix build with QT_NO_CAST_FROM_ASCII 2016-10-07 11:21:17 +00:00
qmake_global.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
qmakeevaluator_p.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakeevaluator.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-06 20:12:27 +02:00
qmakeevaluator.h add support for returning the command's exit status to $$system() 2016-08-10 15:42:29 +00:00
qmakeglobals.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
qmakeglobals.h introduce a new way to pass arbitrary arguments to the project file 2016-05-17 15:30:38 +00:00
qmakeparser.cpp add discard_from() function 2016-08-25 11:56:07 +00:00
qmakeparser.h add discard_from() function 2016-08-25 11:56:07 +00:00
qmakevfs.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
qmakevfs.h Updated license headers 2016-01-21 18:55:18 +00:00