Clean up the EXPORT macros in qglobal.h.

QtPlatformSupport is a static library. It should never export
anything, so Q_PLATFORMSUPPORT_EXPORT is unnecessary.

QtSql, QtXml, QtDBus, QtOpenGL and QtPrintSupport now have the macros
on their own source trees. It's possible these modules might be
separated out from qtbase in the future. For QtDBus, the macros are
moving back to where they used to be. This also leaves qglobal.h only
creating the macros for QtCore, QtGui, QtWidgets and QtNetwork, the
core libraries.

Q_CANVAS_EXPORT, Q_OPENVG_EXPORT and Q_COMPAT_EXPORT aren't used
anywhere in the Qt sources, so simply delete them. And the
Q_QUICK1_EXPORT macro in the static section was wrong, so remove it
too.

Change-Id: I50bdf86e783338f814903b25979721f788a7becf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

24 files changed, 241 insertions, 63 deletions

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 1710e7bb3e..77aecc6db5 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Intel Corporation.
 ** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -499,51 +500,23 @@ class QDataStream;
 #    else
 #      define Q_WIDGETS_EXPORT Q_DECL_IMPORT
 #    endif
-#    if defined(QT_BUILD_PLATFORMSUPPORT_LIB)
-#      define Q_PLATFORMSUPPORT_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_PLATFORMSUPPORT_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_PRINTSUPPORT_LIB)
-#      define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_SQL_LIB)
-#      define Q_SQL_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_SQL_EXPORT Q_DECL_IMPORT
-#    endif
 #    if defined(QT_BUILD_NETWORK_LIB)
 #      define Q_NETWORK_EXPORT Q_DECL_EXPORT
 #    else
 #      define Q_NETWORK_EXPORT Q_DECL_IMPORT
 #    endif
+
+// ### Remove the following once their modules have been updated
 #    if defined(QT_BUILD_SVG_LIB)
 #      define Q_SVG_EXPORT Q_DECL_EXPORT
 #    else
 #      define Q_SVG_EXPORT Q_DECL_IMPORT
 #    endif
-#    if defined(QT_BUILD_OPENGL_LIB)
-#      define Q_OPENGL_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_OPENGL_EXPORT Q_DECL_IMPORT
-#    endif
 #    if defined(QT_BUILD_MULTIMEDIA_LIB)
 #      define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
 #    else
 #      define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
 #    endif
-#    if defined(QT_BUILD_OPENVG_LIB)
-#      define Q_OPENVG_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_OPENVG_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_XML_LIB)
-#      define Q_XML_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_XML_EXPORT Q_DECL_IMPORT
-#    endif
 #    if defined(QT_BUILD_XMLPATTERNS_LIB)
 #      define Q_XMLPATTERNS_EXPORT Q_DECL_EXPORT
 #    else
@@ -559,42 +532,16 @@ class QDataStream;
 #    else
 #      define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT
 #    endif
-#    if defined(QT_BUILD_CANVAS_LIB)
-#      define Q_CANVAS_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_CANVAS_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_COMPAT_LIB)
-#      define Q_COMPAT_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_COMPAT_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_DBUS_LIB)
-#      define Q_DBUS_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_DBUS_EXPORT Q_DECL_IMPORT
-#    endif
 #  endif
 #else
 #  define Q_CORE_EXPORT
 #  define Q_GUI_EXPORT
 #  define Q_WIDGETS_EXPORT
-#  define Q_PLATFORMSUPPORT_EXPORT
-#  define Q_PRINTSUPPORT_EXPORT
-#  define Q_SQL_EXPORT
 #  define Q_NETWORK_EXPORT
 #  define Q_SVG_EXPORT
-#  define Q_QUICK1_EXPORT
-#  define Q_DECLARATIVE_EXPORT
-#  define Q_OPENGL_EXPORT
 #  define Q_MULTIMEDIA_EXPORT
-#  define Q_OPENVG_EXPORT
-#  define Q_XML_EXPORT
 #  define Q_SCRIPT_EXPORT
 #  define Q_SCRIPTTOOLS_EXPORT
-#  define Q_CANVAS_EXPORT
-#  define Q_COMPAT_EXPORT
-#  define Q_DBUS_EXPORT
 #endif
 
 /*
diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h
index a595e631a2..12b44af78f 100644
--- a/src/dbus/qdbusmacros.h
+++ b/src/dbus/qdbusmacros.h
@@ -57,13 +57,24 @@
 #include <QtCore/qvector.h>
 #endif
 
-// prevent syncqt complaints
-#ifndef QT_NO_DBUS
-
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_DBUS
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_DBUS_LIB)
+#    define Q_DBUS_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_DBUS_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_DBUS_EXPORT
+#endif
+
+#endif // QT_NO_DBUS
+
 QT_END_NAMESPACE
 QT_END_HEADER
 
-#endif // QT_NO_DBUS
 #endif
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 1649651ce7..8c291c862b 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -29,7 +29,7 @@ HEADERS += qgl.h \
            qglextensions_p.h \
            qglpaintdevice_p.h \
            qglbuffer.h \
-
+           qtopenglglobal.h
 
 SOURCES += qgl.cpp \
            qglcolormap.cpp \
diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h
index 93bdf9db89..a41217cc5b 100644
--- a/src/opengl/qglcolormap.h
+++ b/src/opengl/qglcolormap.h
@@ -44,6 +44,7 @@
 
 #include <QtGui/qcolor.h>
 #include <QtCore/qvector.h>
+#include <QtOpenGL/qtopenglglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h
index 10f657944c..2c9d3e711c 100644
--- a/src/opengl/qgraphicsshadereffect_p.h
+++ b/src/opengl/qgraphicsshadereffect_p.h
@@ -54,6 +54,7 @@
 //
 
 #include <QtWidgets/qgraphicseffect.h>
+#include <QtOpenGL/qtopenglglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/opengl/qtopenglglobal.h b/src/opengl/qtopenglglobal.h
new file mode 100644
index 0000000000..914ef3ed44
--- /dev/null
+++ b/src/opengl/qtopenglglobal.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Intel Corporation.
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** 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.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTOPENGLGLOBAL_H
+#define QTOPENGLGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_OPENGL_LIB)
+#    define Q_OPENGL_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_OPENGL_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_OPENGL_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QTOPENGLGLOBAL_H
diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
index 9217d488bc..4cac24ecfc 100644
--- a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
+++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QUnixEventDispatcherQPAPrivate;
 
-class Q_PLATFORMSUPPORT_EXPORT QUnixEventDispatcherQPA : public QEventDispatcherUNIX
+class QUnixEventDispatcherQPA : public QEventDispatcherUNIX
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QUnixEventDispatcherQPA)
diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.h b/src/printsupport/dialogs/qabstractpagesetupdialog.h
index 7f9286b676..6805db0e17 100644
--- a/src/printsupport/dialogs/qabstractpagesetupdialog.h
+++ b/src/printsupport/dialogs/qabstractpagesetupdialog.h
@@ -43,6 +43,7 @@
 #define QABSTRACTPAGESETUPDIALOG_H
 
 #include <QtWidgets/qdialog.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h
index 9d7318eedf..4708695706 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.h
+++ b/src/printsupport/dialogs/qabstractprintdialog.h
@@ -43,6 +43,7 @@
 #define QABSTRACTPRINTDIALOG_H
 
 #include <QtWidgets/qdialog.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h
index 18d0fcee1d..1e00930cf9 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.h
+++ b/src/printsupport/dialogs/qprintpreviewdialog.h
@@ -43,6 +43,7 @@
 #define QPRINTPREVIEWDIALOG_H
 
 #include <QtWidgets/qdialog.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
 
 #ifndef QT_NO_PRINTPREVIEWDIALOG
 
diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri
index e53e02bdc5..d3c266ca2d 100644
--- a/src/printsupport/kernel/kernel.pri
+++ b/src/printsupport/kernel/kernel.pri
@@ -7,7 +7,8 @@ HEADERS += \
         $$PWD/qprinterinfo.h \
         $$PWD/qprinterinfo_p.h \
         $$PWD/qplatformprintplugin.h \
-        $$PWD/qplatformprintersupport.h
+        $$PWD/qplatformprintersupport.h \
+        $$PWD/qtprintsupportglobal.h
 
 SOURCES += \
         $$PWD/qpaintengine_alpha.cpp \
diff --git a/src/printsupport/kernel/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h
index d519cc9676..2a5cb7bac2 100644
--- a/src/printsupport/kernel/qpaintengine_alpha_p.h
+++ b/src/printsupport/kernel/qpaintengine_alpha_p.h
@@ -55,6 +55,7 @@
 
 #ifndef QT_NO_PRINTER
 #include "private/qpaintengine_p.h"
+#include <QtPrintSupport/qtprintsupportglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/printsupport/kernel/qplatformprintplugin.h b/src/printsupport/kernel/qplatformprintplugin.h
index d7abfb65f8..1fa0f52de4 100644
--- a/src/printsupport/kernel/qplatformprintplugin.h
+++ b/src/printsupport/kernel/qplatformprintplugin.h
@@ -53,6 +53,7 @@
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h
index 23c7ccc40c..9bd117a9d6 100644
--- a/src/printsupport/kernel/qprinter.h
+++ b/src/printsupport/kernel/qprinter.h
@@ -45,6 +45,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtGui/qpagedpaintdevice.h>
+#include <QtPrintSupport/qtprintsupportglobal.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/printsupport/kernel/qtprintsupportglobal.h b/src/printsupport/kernel/qtprintsupportglobal.h
new file mode 100644
index 0000000000..b8eb279797
--- /dev/null
+++ b/src/printsupport/kernel/qtprintsupportglobal.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Intel Corporation.
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** 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.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTPRINTSUPPORTGLOBAL_H
+#define QTPRINTSUPPORTGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_PRINTSUPPORT_LIB)
+#    define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_PRINTSUPPORT_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QTPRINTSUPPORTGLOBAL_H
diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h
index e8f4d9eab1..2f3ce946a3 100644
--- a/src/sql/kernel/qsql.h
+++ b/src/sql/kernel/qsql.h
@@ -48,6 +48,15 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_SQL_LIB)
+#    define Q_SQL_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_SQL_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_SQL_EXPORT
+#endif
 
 namespace QSql
 {
diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h
index 4af9c8f73f..3e94b4c967 100644
--- a/src/sql/kernel/qsqldriverplugin.h
+++ b/src/sql/kernel/qsqldriverplugin.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
+#include <QtSql/qsql.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index 528eb482af..5a9cb50af0 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -43,6 +43,7 @@
 #define QSQLERROR_H
 
 #include <QtCore/qstring.h>
+#include <QtSql/qsql.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index f5cda7ea64..d5d6662b66 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -44,6 +44,7 @@
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qstring.h>
+#include <QtSql/qsql.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h
index 839c6ef898..ff05a22a1a 100644
--- a/src/sql/kernel/qsqlrecord.h
+++ b/src/sql/kernel/qsqlrecord.h
@@ -43,6 +43,7 @@
 #define QSQLRECORD_H
 
 #include <QtCore/qstring.h>
+#include <QtSql/qsql.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h
index 34c4b00636..d0d375b87d 100644
--- a/src/xml/dom/qdom.h
+++ b/src/xml/dom/qdom.h
@@ -42,6 +42,7 @@
 #ifndef QDOM_H
 #define QDOM_H
 
+#include <QtXml/qtxmlglobal.h>
 #include <QtCore/qstring.h>
 
 QT_BEGIN_HEADER
diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h
new file mode 100644
index 0000000000..030143aacf
--- /dev/null
+++ b/src/xml/qtxmlglobal.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Intel Corporation.
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** 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.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTXMLGLOBAL_H
+#define QTXMLGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_XML_LIB)
+#    define Q_XML_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_XML_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_XML_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QTXMLGLOBAL_H
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 62102c29e7..a714681bb4 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -42,6 +42,7 @@
 #ifndef QXML_H
 #define QXML_H
 
+#include <QtXml/qtxmlglobal.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qstring.h>
diff --git a/src/xml/xml.pro b/src/xml/xml.pro
index 5f4d844ea5..3899033fbb 100644
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@@ -8,6 +8,7 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
 
 load(qt_module_config)
 
+HEADERS += qtxmlglobal.h
 QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf
 QMAKE_DOCS_INDEX = ../../doc