diff options
| -rw-r--r-- | src/xmlpatterns/api/qabstractmessagehandler.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qabstracturiresolver.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h index bd07c82..c6f84a2 100644 --- a/src/xmlpatterns/api/qabstractmessagehandler.h +++ b/src/xmlpatterns/api/qabstractmessagehandler.h @@ -51,7 +51,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractMessageHandler : public QObject { Q_OBJECT public: - QAbstractMessageHandler(QObject *parent = 0); + QAbstractMessageHandler(QObject *parent = Q_NULLPTR); virtual ~QAbstractMessageHandler(); void message(QtMsgType type, diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h index e668ea8..7fc08c2 100644 --- a/src/xmlpatterns/api/qabstracturiresolver.h +++ b/src/xmlpatterns/api/qabstracturiresolver.h @@ -53,7 +53,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractUriResolver : public QObject { Q_OBJECT public: - QAbstractUriResolver(QObject *parent = 0); + QAbstractUriResolver(QObject *parent = Q_NULLPTR); virtual ~QAbstractUriResolver(); virtual QUrl resolve(const QUrl &relative, diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 603c01c..6b6593d 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -104,7 +104,7 @@ namespace QPatternist { data = 0; additionalData = 0; - model = 0; + model = Q_NULLPTR; } }; } diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index b646928..1b53673 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -7,8 +7,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 QMAKE_DOCS = $$PWD/doc/qtxmlpatterns.qdocconf -load(qt_module) - include($$PWD/common.pri) include($$PWD/acceltree/acceltree.pri) include($$PWD/api/api.pri) @@ -37,3 +35,5 @@ wince* { QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ } } + +load(qt_module) |