AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9808b53fde
qt5base-lts/tests/auto/tools/moc
History
Edward Welbourne 6c5de416c9 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/corelib/io/qtemporarydir.cpp
One side encapsulated a repeated piece of #if-ery in a local define;
the other added to the #if-ery.  Made its addition to the other's.

	src/corelib/kernel/qeventdispatcher_unix_p.h
One side moved some members into a struct; this collided with a #undef
check that neither side now has.  Discarded the #undef part.

	src/gui/opengl/qopengltexturehelper_p.h
5.7 deleted a bunch of methods; not clear why merge got confused.

	src/tools/moc/moc.cpp
One added a name to the copyright header; another changed its URL.

Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
2016-07-26 10:43:29 +02:00
..
task71021
Test.framework/Headers Updated license headers 2016-01-21 18:55:18 +00:00
testproject Updated license headers 2016-01-21 18:55:18 +00:00
.gitattributes
.gitignore
assign-namespace.h Updated license headers 2016-01-21 18:55:18 +00:00
backslash-newlines.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
c-comments.h Updated license headers 2016-01-21 18:55:18 +00:00
cstyle-enums.h Updated license headers 2016-01-21 18:55:18 +00:00
cxx11-enums.h Updated license headers 2016-01-21 18:55:18 +00:00
cxx11-explicit-override-control.h Updated license headers 2016-01-21 18:55:18 +00:00
cxx11-final-classes.h Updated license headers 2016-01-21 18:55:18 +00:00
dir-in-include-path.h Updated license headers 2016-01-21 18:55:18 +00:00
dollars.h Updated license headers 2016-01-21 18:55:18 +00:00
error-on-wrong-notify.h Updated license headers 2016-01-21 18:55:18 +00:00
escapes-in-string-literals.h Updated license headers 2016-01-21 18:55:18 +00:00
extraqualification.h Updated license headers 2016-01-21 18:55:18 +00:00
forgotten-qinterface.h Updated license headers 2016-01-21 18:55:18 +00:00
forward-declared-param.h Update the Intel copyright year 2016-01-21 22:44:16 +00:00
function-with-attributes.h Updated license headers 2016-01-21 18:55:18 +00:00
gadgetwithnoenums.h Updated license headers 2016-01-21 18:55:18 +00:00
grand-parent-gadget-class.h Updated license headers 2016-01-21 18:55:18 +00:00
Header
interface-from-framework.h Updated license headers 2016-01-21 18:55:18 +00:00
interface-from-include.h Updated license headers 2016-01-21 18:55:18 +00:00
macro-on-cmdline.h Updated license headers 2016-01-21 18:55:18 +00:00
moc.pro Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
namespaced-flags.h Updated license headers 2016-01-21 18:55:18 +00:00
no-keywords.h tst_Moc: restore signals/slots/emit to the Q_UPPERCASE values 2016-05-30 14:02:19 +00:00
non-gadget-parent-class.h Updated license headers 2016-01-21 18:55:18 +00:00
oldstyle-casts.h Updated license headers 2016-01-21 18:55:18 +00:00
os9-newlines.h Updated license headers 2016-01-21 18:55:18 +00:00
parse-boost.h Updated license headers 2016-01-21 18:55:18 +00:00
parse-defines.h Updated license headers 2016-01-21 18:55:18 +00:00
plugin_metadata.h Updated license headers 2016-01-21 18:55:18 +00:00
pp-dollar-signs.h Updated license headers 2016-01-21 18:55:18 +00:00
pure-virtual-signals.h Updated license headers 2016-01-21 18:55:18 +00:00
qinvokable.h Updated license headers 2016-01-21 18:55:18 +00:00
qprivateslots.h Updated license headers 2016-01-21 18:55:18 +00:00
qtbug-35657-gadget.h Updated license headers 2016-01-21 18:55:18 +00:00
related-metaobjects-in-gadget.h Updated license headers 2016-01-21 18:55:18 +00:00
related-metaobjects-in-namespaces.h Updated license headers 2016-01-21 18:55:18 +00:00
related-metaobjects-name-conflict.h Updated license headers 2016-01-21 18:55:18 +00:00
single_function_keyword.h Updated license headers 2016-01-21 18:55:18 +00:00
single-quote-digit-separator-n3781.h Updated license headers 2016-01-21 18:55:18 +00:00
slots-with-void-template.h Updated license headers 2016-01-21 18:55:18 +00:00
task87883.h Updated license headers 2016-01-21 18:55:18 +00:00
task189996.h Updated license headers 2016-01-21 18:55:18 +00:00
task192552.h Updated license headers 2016-01-21 18:55:18 +00:00
task234909.h Updated license headers 2016-01-21 18:55:18 +00:00
task240368.h Updated license headers 2016-01-21 18:55:18 +00:00
template-gtgt.h Updated license headers 2016-01-21 18:55:18 +00:00
trigraphs.h Updated license headers 2016-01-21 18:55:18 +00:00
tst_moc.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-26 10:43:29 +02:00
unterminated-function-macro.h Updated license headers 2016-01-21 18:55:18 +00:00
using-namespaces.h Updated license headers 2016-01-21 18:55:18 +00:00
warn-on-multiple-qobject-subclasses.h Updated license headers 2016-01-21 18:55:18 +00:00
warn-on-property-without-read.h Updated license headers 2016-01-21 18:55:18 +00:00
win-newlines.h Updated license headers 2016-01-21 18:55:18 +00:00