diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.h | 6 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qcoloringmessagehandler.cpp | 3 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 98148f7..363d6d3 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -92,10 +92,8 @@ namespace QPatternist }; void *pointer() const { - /* Constructing to qptrdiff means we avoid warnings. - */ - char *null = 0; - return null + qptrdiff(data); + // Constructing via qptrdiff avoids warnings: + return reinterpret_cast<void*>(qptrdiff(data)); } Data additionalData; diff --git a/src/xmlpatterns/api/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp index 59be099..f55f96d 100644 --- a/src/xmlpatterns/api/qcoloringmessagehandler.cpp +++ b/src/xmlpatterns/api/qcoloringmessagehandler.cpp @@ -136,12 +136,11 @@ void ColoringMessageHandler::handleMessage(QtMsgType type, break; } case QtCriticalMsg: - case QtTraceMsg: /* Fallthrough. */ case QtDebugMsg: { Q_ASSERT_X(false, Q_FUNC_INFO, - "message() is not supposed to receive QtCriticalMsg, QtTraceMsg or QtDebugMsg."); + "message() is not supposed to receive QtCriticalMsg or QtDebugMsg."); return; } } diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index dc0a265..599f864 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -2,6 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) # Name of the project which must match the outputdir. Determines the .index file project = QtXmlPatterns +url = http://qt-project.org/doc/qt-$QT_VER # Directories in which to search for files to document and images. # By default set to the root directory of the project for sources |