Make Qt UiTools a dynamic library

[ChangeLog][General] Qt UiTools is now built as a dynamic library (instead
of a static one), and therefore has to be deployed along with the other
Qt libraries.

Fixes: QTBUG-437
Change-Id: Ib69915c9d6f6b3466f58dcf8787a1773dc7007bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

5 files changed, 67 insertions, 6 deletions

diff --git a/src/designer/src/uitools/qtuitoolsglobal.h b/src/designer/src/uitools/qtuitoolsglobal.h
new file mode 100644
index 000000000..40827b3ab
--- /dev/null
+++ b/src/designer/src/uitools/qtuitoolsglobal.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt UI Tools library of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTUITOOLSGLOBAL_H
+#define QTUITOOLSGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_UITOOLS_LIB)
+#    define Q_UITOOLS_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_UITOOLS_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_UITOOLS_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QTUITOOLSGLOBAL_H
+
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index 5a858f091..058912f4f 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Designer of the Qt Toolkit.
+** This file is part of the Qt UI Tools library of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h
index 14c8f4af6..7d632ab0b 100644
--- a/src/designer/src/uitools/quiloader.h
+++ b/src/designer/src/uitools/quiloader.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Designer of the Qt Toolkit.
+** This file is part of the Qt UI Tools library of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -40,6 +40,7 @@
 #ifndef QUILOADER_H
 #define QUILOADER_H
 
+#include <QtUiTools/qtuitoolsglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qscopedpointer.h>
 
@@ -54,7 +55,7 @@ class QIODevice;
 class QDir;
 
 class QUiLoaderPrivate;
-class QUiLoader : public QObject
+class Q_UITOOLS_EXPORT QUiLoader : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h
index 84152eb71..632eb6eff 100644
--- a/src/designer/src/uitools/quiloader_p.h
+++ b/src/designer/src/uitools/quiloader_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Designer of the Qt Toolkit.
+** This file is part of the Qt UI Tools library of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtUiTools/qtuitoolsglobal.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 
@@ -95,7 +96,7 @@ namespace QFormInternal
 {
 #endif
 
-extern const QUiItemRolePair qUiItemRoles[];
+extern const Q_UITOOLS_EXPORT QUiItemRolePair qUiItemRoles[];
 
 #ifdef QFORMINTERNAL_NAMESPACE
 }
diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro
index 8a71fa8b1..169211f9e 100644
--- a/src/designer/src/uitools/uitools.pro
+++ b/src/designer/src/uitools/uitools.pro
@@ -1,5 +1,4 @@
 TARGET = QtUiTools
-CONFIG += static
 
 include(../lib/uilib/uilib.pri)