Move a lot of qmake independent classes to a new plugin qtsupport

Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

5 files changed, 60 insertions, 10 deletions

diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h
index 4c3b86e3ec..9a782269d6 100644
--- a/src/shared/proparser/profileevaluator.h
+++ b/src/shared/proparser/profileevaluator.h
@@ -33,6 +33,7 @@
 #ifndef PROFILEEVALUATOR_H
 #define PROFILEEVALUATOR_H
 
+#include "proparser_global.h"
 #include "proitems.h"
 
 #include <QtCore/QHash>
@@ -50,7 +51,7 @@ QT_BEGIN_NAMESPACE
 struct ProFileOption;
 class ProFileParser;
 
-class ProFileEvaluatorHandler
+class PROPARSER_EXPORT ProFileEvaluatorHandler
 {
 public:
     // qmake/project configuration error
@@ -66,7 +67,7 @@ public:
 };
 
 
-class ProFileEvaluator
+class PROPARSER_EXPORT ProFileEvaluator
 {
     class Private;
 
@@ -145,7 +146,7 @@ private:
 Q_DECLARE_OPERATORS_FOR_FLAGS(ProFileEvaluator::LoadFlags)
 
 // This struct is from qmake, but we are not using everything.
-struct ProFileOption
+struct PROPARSER_EXPORT ProFileOption
 {
     ProFileOption();
     ~ProFileOption();
diff --git a/src/shared/proparser/profileparser.h b/src/shared/proparser/profileparser.h
index 2dbc73c3e0..3f4593aa25 100644
--- a/src/shared/proparser/profileparser.h
+++ b/src/shared/proparser/profileparser.h
@@ -33,8 +33,8 @@
 #ifndef PROFILEPARSER_H
 #define PROFILEPARSER_H
 
+#include "proparser_global.h"
 #include "proitems.h"
-
 #include <QtCore/QHash>
 #include <QtCore/QStack>
 #ifdef PROPARSER_THREAD_SAFE
@@ -52,8 +52,7 @@
 #endif
 
 QT_BEGIN_NAMESPACE
-
-class ProFileParserHandler
+class PROPARSER_EXPORT ProFileParserHandler
 {
 public:
     // Some error during parsing
@@ -62,7 +61,7 @@ public:
 
 class ProFileCache;
 
-class ProFileParser
+class PROPARSER_EXPORT ProFileParser
 {
 public:
     // Call this from a concurrency-free context
@@ -146,7 +145,7 @@ private:
     friend class ProFileCache;
 };
 
-class ProFileCache
+class PROPARSER_EXPORT ProFileCache
 {
 public:
     ProFileCache() {}
diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h
index 9a77ae8b38..4967b2733c 100644
--- a/src/shared/proparser/proitems.h
+++ b/src/shared/proparser/proitems.h
@@ -33,6 +33,7 @@
 #ifndef PROITEMS_H
 #define PROITEMS_H
 
+#include "proparser_global.h"
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
@@ -190,7 +191,7 @@ enum ProToken {
     TokNewStr = 0x200   // Next stringlist element
 };
 
-class ProFile
+class PROPARSER_EXPORT ProFile
 {
 public:
     explicit ProFile(const QString &fileName);
diff --git a/src/shared/proparser/proparser_global.h b/src/shared/proparser/proparser_global.h
new file mode 100644
index 0000000000..dd3114b2a6
--- /dev/null
+++ b/src/shared/proparser/proparser_global.h
@@ -0,0 +1,48 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef PROPARSER_GLOBAL_H
+#define PROPARSER_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(PROPARSER_AS_LIBRARY)
+#  if defined(PROPARSER_LIBRARY)
+#    define PROPARSER_EXPORT Q_DECL_EXPORT
+#  else
+#    define PROPARSER_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define PROPARSER_EXPORT
+#endif
+
+#endif
diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h
index df8785cd9d..ac8917a8fc 100644
--- a/src/shared/proparser/prowriter.h
+++ b/src/shared/proparser/prowriter.h
@@ -33,6 +33,7 @@
 #ifndef PROWRITER_H
 #define PROWRITER_H
 
+#include "proparser_global.h"
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
@@ -43,7 +44,7 @@ QT_END_NAMESPACE
 namespace Qt4ProjectManager {
 namespace Internal {
 
-class ProWriter
+class PROPARSER_EXPORT ProWriter
 {
 public:
     enum PutFlag {