whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/qmake/library
History
Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
 		2015-01-21 11:10:14 +01:00
..
ioutils.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
ioutils.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
proitems.cpp work around MSVC2010 ICE 2014-10-29 09:37:17 +01:00
proitems.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmake_global.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakebuiltins.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakeevaluator.cpp Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
qmakeevaluator.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakeevaluator_p.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakeglobals.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakeglobals.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakeparser.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakeparser.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakevfs.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmakevfs.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00