9 files changed, 25 insertions, 71 deletions
diff --git a/src/lib/corelib/parser/parser.pri b/src/lib/corelib/parser/parser.pri
deleted file mode 100644
index e6a8a5345..000000000
--- a/src/lib/corelib/parser/parser.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-HEADERS += \
-    $$PWD/qmljsast_p.h \
-    $$PWD/qmljsastfwd_p.h \
-    $$PWD/qmljsastvisitor_p.h \
-    $$PWD/qmljsengine_p.h \
-    $$PWD/qmljsgrammar_p.h \
-    $$PWD/qmljslexer_p.h \
-    $$PWD/qmljsmemorypool_p.h \
-    $$PWD/qmljsparser_p.h \
-    $$PWD/qmljsglobal_p.h \
-    $$PWD/qmlerror.h \
-    $$PWD/qmljskeywords_p.h \
-
-SOURCES += \
-    $$PWD/qmljsast.cpp \
-    $$PWD/qmljsastvisitor.cpp \
-    $$PWD/qmljsengine_p.cpp \
-    $$PWD/qmljsgrammar.cpp \
-    $$PWD/qmljslexer.cpp \
-    $$PWD/qmljsparser.cpp \
-    $$PWD/qmlerror.cpp \
diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp
index d9fbdd703..42ef8ea29 100644
--- a/src/lib/corelib/parser/qmlerror.cpp
+++ b/src/lib/corelib/parser/qmlerror.cpp
@@ -95,16 +95,12 @@ QmlErrorPrivate::QmlErrorPrivate()
 /*!
     Creates an empty error object.
 */
-QmlError::QmlError()
-: d(nullptr)
-{
-}
+QmlError::QmlError() = default;
 
 /*!
     Creates a copy of \a other.
 */
 QmlError::QmlError(const QmlError &other)
-: d(nullptr)
 {
     *this = other;
 }
@@ -118,10 +114,9 @@ QmlError &QmlError::operator=(const QmlError &other)
         return *this;
 
     if (!other.d) {
-        delete d;
         d = nullptr;
     } else {
-        if (!d) d = new QmlErrorPrivate;
+        if (!d) d = qbs::Internal::makePimpl<QmlErrorPrivate>();
         d->url = other.d->url;
         d->description = other.d->description;
         d->line = other.d->line;
@@ -133,10 +128,7 @@ QmlError &QmlError::operator=(const QmlError &other)
 /*!
     \internal
 */
-QmlError::~QmlError()
-{
-    delete d; d = nullptr;
-}
+QmlError::~QmlError() = default;
 
 /*!
     Returns true if this error is valid, otherwise false.
@@ -160,7 +152,7 @@ QUrl QmlError::url() const
 */
 void QmlError::setUrl(const QUrl &url)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) d = qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->url = url;
 }
 
@@ -178,7 +170,7 @@ QString QmlError::description() const
 */
 void QmlError::setDescription(const QString &description)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) d = qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->description = description;
 }
 
@@ -196,7 +188,7 @@ int QmlError::line() const
 */
 void QmlError::setLine(int line)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->line = line;
 }
 
@@ -214,7 +206,7 @@ int QmlError::column() const
 */
 void QmlError::setColumn(int column)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->column = column;
 }
 
diff --git a/src/lib/corelib/parser/qmlerror.h b/src/lib/corelib/parser/qmlerror.h
index cfac506bb..4f7bf8a07 100644
--- a/src/lib/corelib/parser/qmlerror.h
+++ b/src/lib/corelib/parser/qmlerror.h
@@ -40,7 +40,7 @@
 #ifndef QQMLERROR_H
 #define QQMLERROR_H
 
-
+#include <tools/pimpl.h>
 
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
@@ -73,7 +73,7 @@ public:
 
     QString toString() const;
 private:
-    QmlErrorPrivate *d;
+    qbs::Internal::Pimpl<QmlErrorPrivate> d;
 };
 
 } // namespace QbsQmlJS
diff --git a/src/lib/corelib/parser/qmljsastvisitor_p.h b/src/lib/corelib/parser/qmljsastvisitor_p.h
index bec174c65..4b7911aa4 100644
--- a/src/lib/corelib/parser/qmljsastvisitor_p.h
+++ b/src/lib/corelib/parser/qmljsastvisitor_p.h
@@ -58,7 +58,7 @@
 namespace QbsQmlJS {
 namespace AST {
 
-class QBS_AUTOTEST_EXPORT Visitor
+class QML_PARSER_EXPORT Visitor
 {
 public:
     Visitor();
diff --git a/src/lib/corelib/parser/qmljsengine_p.h b/src/lib/corelib/parser/qmljsengine_p.h
index 2a616126d..9c603ee5c 100644
--- a/src/lib/corelib/parser/qmljsengine_p.h
+++ b/src/lib/corelib/parser/qmljsengine_p.h
@@ -93,7 +93,7 @@ public:
     QString message;
 };
 
-class QBS_AUTOTEST_EXPORT Engine
+class QML_PARSER_EXPORT Engine
 {
     Lexer *_lexer{nullptr};
     Directives *_directives{nullptr};
diff --git a/src/lib/corelib/parser/qmljsglobal_p.h b/src/lib/corelib/parser/qmljsglobal_p.h
index c3d198ea5..02e0b38e4 100644
--- a/src/lib/corelib/parser/qmljsglobal_p.h
+++ b/src/lib/corelib/parser/qmljsglobal_p.h
@@ -41,31 +41,14 @@
 
 #include <QtCore/qglobal.h>
 
-// Force QML_PARSER_EXPORT to be always empty.
-#ifndef QT_CREATOR
-#   define QT_CREATOR
-#endif
-#ifdef QML_BUILD_STATIC_LIB
-#   undef QML_BUILD_STATIC_LIB
-#endif
-#define QML_BUILD_STATIC_LIB 1
-
-#ifdef QT_CREATOR
-#  ifdef QMLJS_BUILD_DIR
-#    define QML_PARSER_EXPORT Q_DECL_EXPORT
-#  elif QML_BUILD_STATIC_LIB
-#    define QML_PARSER_EXPORT
-#  else
-#    define QML_PARSER_EXPORT Q_DECL_IMPORT
-#  endif // QMLJS_BUILD_DIR
-
-#else // !QT_CREATOR
-#  if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
-     // QmlDevTools is a static library
-#    define QML_PARSER_EXPORT
-#  else
-#    define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
-#  endif
-#endif // QT_CREATOR
+#ifdef QBS_STATIC_LIB
+#define QML_PARSER_EXPORT
+#else
+#ifdef QBS_LIBRARY
+#define QML_PARSER_EXPORT Q_DECL_EXPORT
+#else
+#define QML_PARSER_EXPORT Q_DECL_IMPORT
+#endif // QBS_LIBRARY
+#endif // QBS_STATIC_LIB
 
 #endif // QMLJSGLOBAL_P_H
diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index 684be9317..e148652ad 100644
--- a/src/lib/corelib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
@@ -1071,7 +1071,7 @@ bool Lexer::scanDirectives(Directives *directives)
 
         const int lineNumber = tokenStartLine();
 
-        if (! (_tokenKind == T_IDENTIFIER || _tokenKind == T_RESERVED_WORD))
+        if (_tokenKind != T_IDENTIFIER && _tokenKind != T_RESERVED_WORD)
             return false; // expected a valid QML/JS directive
 
         const QString directiveName = tokenText();
@@ -1083,7 +1083,7 @@ bool Lexer::scanDirectives(Directives *directives)
         // it must be a pragma or an import directive.
         if (directiveName == QLatin1String("pragma")) {
             // .pragma library
-            if (! (lex() == T_IDENTIFIER && tokenText() == QLatin1String("library")))
+            if (lex() != T_IDENTIFIER || tokenText() != QLatin1String("library"))
                 return false; // expected `library
 
             // we found a .pragma library directive
@@ -1126,7 +1126,7 @@ bool Lexer::scanDirectives(Directives *directives)
             //
             // recognize the mandatory `as' followed by the module name
             //
-            if (! (lex() == T_RESERVED_WORD && tokenText() == QLatin1String("as")))
+            if (lex() != T_RESERVED_WORD || tokenText() != QLatin1String("as"))
                 return false; // expected `as'
 
             if (lex() != T_IDENTIFIER)
diff --git a/src/lib/corelib/parser/qmljslexer_p.h b/src/lib/corelib/parser/qmljslexer_p.h
index aef68e0c5..c9801c0f5 100644
--- a/src/lib/corelib/parser/qmljslexer_p.h
+++ b/src/lib/corelib/parser/qmljslexer_p.h
@@ -86,7 +86,7 @@ public:
     }
 };
 
-class QBS_AUTOTEST_EXPORT Lexer: public QmlJSGrammar
+class QML_PARSER_EXPORT Lexer : public QmlJSGrammar
 {
 public:
     enum {
diff --git a/src/lib/corelib/parser/qmljsparser_p.h b/src/lib/corelib/parser/qmljsparser_p.h
index c761bb25b..9744a7eb6 100644
--- a/src/lib/corelib/parser/qmljsparser_p.h
+++ b/src/lib/corelib/parser/qmljsparser_p.h
@@ -70,7 +70,7 @@ namespace QbsQmlJS {
 
 class Engine;
 
-class QBS_AUTOTEST_EXPORT Parser: protected QmlJSGrammar
+class QML_PARSER_EXPORT Parser : protected QmlJSGrammar
 {
 public:
     union Value {