AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3746eedeab
qt5base-lts/tests/auto/tools/moc
History
Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev 
Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d5

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
2014-07-01 16:25:19 +02:00
..
task71021 Moved autotests in category 'tools' into new directory structure 2011-09-12 10:08:29 +02:00
Test.framework/Headers Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
testproject Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
.gitattributes Moved autotests in category 'tools' into new directory structure 2011-09-12 10:08:29 +02:00
.gitignore Moved autotests in category 'tools' into new directory structure 2011-09-12 10:08:29 +02:00
assign-namespace.h Add missing header guards 2014-01-20 17:08:24 +01:00
backslash-newlines.h Add missing header guards 2014-01-20 17:08:24 +01:00
c-comments.h Add missing header guards 2014-01-20 17:08:24 +01:00
cstyle-enums.h Add missing header guards 2014-01-20 17:08:24 +01:00
cxx11-enums.h Add missing header guards 2014-01-20 17:08:24 +01:00
cxx11-explicit-override-control.h Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
cxx11-final-classes.h Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
dir-in-include-path.h Add missing header guards 2014-01-20 17:08:24 +01:00
dollars.h Add missing header guards 2014-01-20 17:08:24 +01:00
error-on-wrong-notify.h Add missing header guards 2014-01-20 17:08:24 +01:00
escapes-in-string-literals.h Add missing header guards 2014-01-20 17:08:24 +01:00
extraqualification.h Add missing header guards 2014-01-20 17:08:24 +01:00
forgotten-qinterface.h Add missing header guards 2014-01-20 17:08:24 +01:00
forward-declared-param.h Add missing header guards 2014-01-20 17:08:24 +01:00
function-with-attributes.h Add missing header guards 2014-01-20 17:08:24 +01:00
gadgetwithnoenums.h Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
Header Moved autotests in category 'tools' into new directory structure 2011-09-12 10:08:29 +02:00
interface-from-framework.h Add missing header guards 2014-01-20 17:08:24 +01:00
interface-from-include.h moc: add unittest for --ignore-option-clashes 2013-07-30 09:36:25 +02:00
macro-on-cmdline.h Add missing header guards 2014-01-20 17:08:24 +01:00
moc.pro Fix lack of deterministic behavior in moc. 2014-01-22 08:27:50 +01:00
namespaced-flags.h Add missing header guards 2014-01-20 17:08:24 +01:00
no-keywords.h Add missing header guards 2014-01-20 17:08:24 +01:00
oldstyle-casts.h Rename a test class to a bit more verbose name. 2014-01-20 17:08:28 +01:00
os9-newlines.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
parse-boost.h Add missing header guards 2014-01-20 17:08:24 +01:00
parse-defines.h moc: Fix parsing of complex defines defined via command line 2014-01-17 01:36:37 +01:00
plugin_metadata.h moc: add -M<key=value> to ease static qml plugin linking 2013-09-13 11:48:08 +02:00
pp-dollar-signs.h Add missing header guards 2014-01-20 17:08:24 +01:00
pure-virtual-signals.h Add missing header guards 2014-01-20 17:08:24 +01:00
qinvokable.h Add missing header guards 2014-01-20 17:08:24 +01:00
qprivateslots.h Add missing header guards 2014-01-20 17:08:24 +01:00
qtbug-35657-gadget.h Add missing header guards 2014-01-20 17:08:24 +01:00
related-metaobjects-in-gadget.h Add missing header guards 2014-01-20 17:08:24 +01:00
related-metaobjects-in-namespaces.h Add missing header guards 2014-01-20 17:08:24 +01:00
related-metaobjects-name-conflict.h Fix lack of deterministic behavior in moc. 2014-01-22 08:27:50 +01:00
single_function_keyword.h Add missing header guards 2014-01-20 17:08:24 +01:00
single-quote-digit-separator-n3781.h Add missing header guards 2014-01-20 17:08:24 +01:00
slots-with-void-template.h Add missing header guards 2014-01-20 17:08:24 +01:00
task87883.h Add missing header guards 2014-01-20 17:08:24 +01:00
task189996.h Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
task192552.h Add missing header guards 2014-01-20 17:08:24 +01:00
task234909.h Add missing header guards 2014-01-20 17:08:24 +01:00
task240368.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
template-gtgt.h Add missing header guards 2014-01-20 17:08:24 +01:00
trigraphs.h Add missing header guards 2014-01-20 17:08:24 +01:00
tst_moc.cpp Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
unterminated-function-macro.h Add missing header guards 2014-01-20 17:08:24 +01:00
using-namespaces.h Add missing header guards 2014-01-20 17:08:24 +01:00
warn-on-multiple-qobject-subclasses.h Add missing header guards 2014-01-20 17:08:24 +01:00
warn-on-property-without-read.h Add missing header guards 2014-01-20 17:08:24 +01:00
win-newlines.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00