782ebeada1
Conflicts: qmake/library/qmakebuiltins.cpp qmake/library/qmakeevaluator.cpp qmake/library/qmakeevaluator.h qmake/project.h QMakeEvaluator: * evaluateConditional(): one side changed return type, the other changed a parameter type. * split_value_list(): one side changed a parameter adjacent to where ... * expandVariableReferences(): ... the other killed one overload and changed the survivor src/corelib/io/qlockfile_unix.cpp One side changed a #if condition, the other moved NETBSD's part of what it controlled. src/corelib/tools/qdatetime.cpp One side fixed a reachable Q_UNREACHABLE in toMSecsSinceEpoch(), the other moved it from the private class to the public one, in the midst of the "short date-time" optimization, which confused diff entirely. One side changed a QStringLiteral to QLatin1String, the other rewrote adjoining code. src/network/kernel/qauthenticator.cpp Both rewrote a line, equivalently; kept the dev version. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h One side changed #if-ery that the other removed. tools/configure/configureapp.cpp One side added a check to -target parsing; the other killed -target. tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml tests/auto/testlib/selftests/expected_cmptest.xunitxml Regenerated using generate_expected_output.py I note that quite a few other expected_* come out changed, now. There was no git-conflict in src/widgets/kernel/qformlayout.cpp but it didn't compile; one side removed some unused methods; the other found uses for one of them. Put FixedColumnMatrix<>::removeRow(int) back for its new user. Change-Id: I8cc2a71add48c0a848e13cfc47b5a7754e8ca584 |
||
---|---|---|
.. | ||
debugproxystyle.cpp | ||
debugproxystyle.h | ||
diaglib.pri | ||
eventfilter.cpp | ||
eventfilter.h | ||
glinfo.cpp | ||
glinfo.h | ||
logwidget.cpp | ||
logwidget.h | ||
nativewindowdump_win.cpp | ||
nativewindowdump.cpp | ||
nativewindowdump.h | ||
qwidgetdump.cpp | ||
qwidgetdump.h | ||
qwindowdump.cpp | ||
qwindowdump.h | ||
README.txt | ||
textdump.cpp | ||
textdump.h |
This is a collection of functions and classes helpful for diagnosing bugs in Qt 4 and Qt 5. It can be included in the application's .pro file by adding: include([path to Qt sources]/tests/manual/diaglib/diaglib.pri) For Qt 4, the environment variable QTDIR may be used: include($$(QTDIR)/tests/manual/diaglib/diaglib.pri) The .pri file adds the define QT_DIAG_LIB, so, diagnostic code can be enlosed within #ifdef to work without it as well. All functions and classes are in the QtDiag namespace. function dumpText() (textdump.h) Returns a string containing the input text split up in characters listing category, script, direction etc. Useful for analyzing non-Latin text. function dumpTextAsCode() (textdump.h) Returns a string containing a code snippet creating a QString by appending the unicode value of character of the input. This is useful for constructing non-Latin strings with purely ASCII source code. class EventFilter (eventfilter.h): An event filter that logs Qt events to qDebug() depending on configured categories (for example mouse, keyboard, etc). class DebugProxyStyle (debugproxystyle.h) A proxy style that wraps around an existing style and outputs the parameters and return values of its function calls, useful for debugging QStyle. class LogWidget (logwidget.h) A Log Widget inheriting QPlainTextEdit with convenience functions to install as a message handler. class LogFunctionGuard A guard class for use with LogWidget logging messages when a function is entered/left (indenting the log messages). Can be instantiated using: LogFunctionGuard guard(__FUNCTION__) or LogFunctionGuard guard(Q_FUNC_INFO) function glInfo() (glinfo.h): Returns a string describing the Open GL configuration (obtained by querying GL_VENDOR and GL_RENDERER). Available only when the QT qmake variable contains opengl. functions dumpNativeWindows(), dumpNativeQtTopLevels(): These functions du,p out the hierarchy of native Windows. Currently implemented for Windows only. function dumpAllWidgets() (qwidgetdump.h): Dumps the hierarchy of QWidgets including information about flags, visibility, geometry, etc. function dumpAllWindows() (qwindowdump.h): Dumps the hierarchy of QWindows including information about flags, visibility, geometry, etc.