Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

get rid of the static build restriction

Browse source 
plugins are build as shared libraries regardless of the build type

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-12-01 02:52:33 +00:00
parent 7cf693f589
commit f5f3c083a4
124 changed files with 303 additions and 632 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -79,10 +79,14 @@ if(NOT KATIE_SHELL)
message(FATAL_ERROR "Could not detect shell, supported are: sh, dash, mksh, ksh and ash")
endif()
# should be either STATIC or SHARED
set(KATIE_TYPE SHARED CACHE STRING "Build type")
# components and tools that will be build, changed depending on the requirements availability
# NOTE: excluding DesignerComponents as it was never used as public component, currently only
# used by the the designer tool. if it is ever needed for something it can just be added here
# and that's it - the rest of the build system has everything in place.
# used by the the designer tool. if it is ever needed for something it can just be added here,
# Q_DESIGNER_COMPONENTS_EXPORT must be introduced and genmap.py adjusted - the rest of the
# build system has everything in place.
set(KATIE_COMPONENTS "Core Gui Declarative Designer Network Sql Svg Xml Script ScriptTools Test UiTools")
set(KATIE_TOOLS "moc uic rcc designer qscript qtconfig")

2
cmake/KatieConfig.cmake
View file

@ -116,8 +116,6 @@ if(NOT KATIE_FOUND)
if(KATIE_TYPE STREQUAL SHARED)
set(_libsuffix "${CMAKE_SHARED_LIBRARY_SUFFIX}")
elseif(KATIE_TYPE STREQUAL MODULE)
set(_libsuffix "${CMAKE_SHARED_MODULE_SUFFIX}")
else()
set(_libsuffix "${CMAKE_STATIC_LIBRARY_SUFFIX}")
endif()

7
mkspecs/mkspecs.cmake
View file

@ -1,10 +1,3 @@
# KatieConfig overrides KATIE_TYPE
if(NOT KATIE_TYPE)
set(KATIE_TYPE SHARED)
katie_definition(-DQT_SHARED)
endif()
# https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
# https://github.com/Kitware/CMake/blob/master/Modules/CMakeDetermineSystem.cmake
if(NOT KATIE_PLATFORM)

2
scripts/genmap.py
View file

@ -8,7 +8,7 @@ components = {
'Gui': 'Q_GUI_EXPORT',
'DBus': 'Q_DBUS_EXPORT',
'Declarative': 'Q_DECLARATIVE_EXPORT',
'Designer': 'QDESIGNER_COMPONENTS_EXPORT|QDESIGNER_EXTENSION_EXPORT|QT_FORMEDITOR_EXPORT|QT_PROPERTYEDITOR_EXPORT|QT_SIGNALSLOTEDITOR_EXPORT|QT_OBJECTINSPECTOR_EXPORT|QT_WIDGETBOX_EXPORT|QT_BUDDYEDITOR_EXPORT|QT_TABORDEREDITOR_EXPORT|QT_TASKMENU_EXPORT',
'Designer': 'Q_DESIGNER_EXPORT|QDESIGNER_COMPONENTS_EXPORT|QT_FORMEDITOR_EXPORT|QT_PROPERTYEDITOR_EXPORT|QT_SIGNALSLOTEDITOR_EXPORT|QT_OBJECTINSPECTOR_EXPORT|QT_WIDGETBOX_EXPORT|QT_BUDDYEDITOR_EXPORT|QT_TABORDEREDITOR_EXPORT|QT_TASKMENU_EXPORT',
'Network': 'Q_NETWORK_EXPORT',
'Sql': 'Q_SQL_EXPORT',
'Svg': 'Q_SVG_EXPORT',

9
src/core/global/qglobal.cpp
View file

@ -827,15 +827,6 @@ const char *qVersion()
return QT_VERSION_STR;
}
bool qSharedBuild()
{
#ifdef QT_SHARED
return true;
#else
return false;
#endif
}
/*****************************************************************************
System detection routines
*****************************************************************************/

43
src/core/global/qglobal.h
View file

@ -381,33 +381,19 @@ typedef double qreal;
#define Q_DECL_HIDDEN __attribute__((visibility("hidden")))
#define Q_DECL_IMPORT
#if defined(QT_SHARED)
# define Q_CORE_EXPORT Q_DECL_EXPORT
# define Q_GUI_EXPORT Q_DECL_EXPORT
# define Q_SQL_EXPORT Q_DECL_EXPORT
# define Q_NETWORK_EXPORT Q_DECL_EXPORT
# define Q_SVG_EXPORT Q_DECL_EXPORT
# define Q_TEST_EXPORT Q_DECL_EXPORT
# define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT
# define Q_XML_EXPORT Q_DECL_EXPORT
# define Q_SCRIPT_EXPORT Q_DECL_EXPORT
# define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT
# define Q_DBUS_EXPORT Q_DECL_EXPORT
# define Q_UITOOLS_EXPORT Q_DECL_EXPORT
#else
# define Q_CORE_EXPORT
# define Q_GUI_EXPORT
# define Q_SQL_EXPORT
# define Q_NETWORK_EXPORT
# define Q_SVG_EXPORT
# define Q_TEST_EXPORT
# define Q_DECLARATIVE_EXPORT
# define Q_XML_EXPORT
# define Q_SCRIPT_EXPORT
# define Q_SCRIPTTOOLS_EXPORT
# define Q_DBUS_EXPORT
# define Q_UITOOLS_EXPORT
#endif
#define Q_CORE_EXPORT Q_DECL_EXPORT
#define Q_GUI_EXPORT Q_DECL_EXPORT
#define Q_SQL_EXPORT Q_DECL_EXPORT
#define Q_NETWORK_EXPORT Q_DECL_EXPORT
#define Q_SVG_EXPORT Q_DECL_EXPORT
#define Q_TEST_EXPORT Q_DECL_EXPORT
#define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT
#define Q_XML_EXPORT Q_DECL_EXPORT
#define Q_SCRIPT_EXPORT Q_DECL_EXPORT
#define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT
#define Q_DBUS_EXPORT Q_DECL_EXPORT
#define Q_UITOOLS_EXPORT Q_DECL_EXPORT
#define Q_DESIGNER_EXPORT Q_DECL_EXPORT
#define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline
#define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline
@ -417,7 +403,7 @@ typedef double qreal;
for Qt's internal unit tests. If you want slower loading times and more
symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
*/
#if defined(QT_BUILD_INTERNAL) && defined(QT_SHARED)
#if defined(QT_BUILD_INTERNAL)
# define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
#else
# define Q_AUTOTEST_EXPORT
@ -467,7 +453,6 @@ public:
};
Q_CORE_EXPORT const char *qVersion();
Q_CORE_EXPORT bool qSharedBuild();
/*
Avoid "unused parameter" warnings

8
src/core/plugin/qfactoryloader.cpp
View file

@ -184,7 +184,6 @@ void QFactoryLoader::updateDir(const QString &pluginDir)
void QFactoryLoader::update()
{
#ifdef QT_SHARED
Q_D(QFactoryLoader);
foreach (const QString &pluginDir, QCoreApplication::libraryPaths()) {
// Already loaded, skip it...
@ -193,13 +192,6 @@ void QFactoryLoader::update()
d->loadedPaths << pluginDir;
updateDir(pluginDir);
}
#else
Q_D(QFactoryLoader);
if (qt_debug_component()) {
qDebug() << "QFactoryLoader::QFactoryLoader() ignoring" << d->iid
<< "since plugins are disabled in static builds";
}
#endif
}
QFactoryLoader::~QFactoryLoader()

8
src/core/plugin/qpluginloader.cpp
View file

@ -260,7 +260,6 @@ bool QPluginLoader::isLoaded() const
*/
void QPluginLoader::setFileName(const QString &fileName)
{
#if defined(QT_SHARED)
QLibrary::LoadHints lh;
if (d) {
lh = d->loadHints;
@ -273,13 +272,6 @@ void QPluginLoader::setFileName(const QString &fileName)
d->loadHints = lh;
if (!d->isPlugin())
d->errorString = QLibrary::tr("The shared library was not found.");
#else
if (qt_debug_component()) {
qWarning("Cannot load %s into a statically linked Qt library.",
QFile::encodeName(fileName).data());
}
Q_UNUSED(fileName);
#endif
}
QString QPluginLoader::fileName() const

14
src/designer/CMakeLists.txt
View file

@ -37,7 +37,6 @@ set(DESIGNER_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/extension/default_extensionfactory.h
${CMAKE_CURRENT_SOURCE_DIR}/extension/extension.h
${CMAKE_CURRENT_SOURCE_DIR}/extension/qextensionmanager.h
${CMAKE_CURRENT_SOURCE_DIR}/extension/extension_global.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/abstractformeditor.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/abstractintrospection_p.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/abstractsettings_p.h
@ -70,8 +69,6 @@ set(DESIGNER_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/sdk/abstractdialoggui_p.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/script_p.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/abstractnewformwidget_p.h
${CMAKE_CURRENT_SOURCE_DIR}/sdk/sdk_global.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/shared_global_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/spacer_widget_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/layoutinfo_p.h
${CMAKE_CURRENT_SOURCE_DIR}/shared/layout_p.h
@ -280,17 +277,6 @@ set(DESIGNER_SOURCES
${CMAKE_SOURCE_DIR}/src/tools/rcc/rcc.cpp
)
if(KATIE_TYPE STREQUAL SHARED)
add_definitions(
-DQDESIGNER_SDK_LIBRARY
-DQDESIGNER_EXTENSION_LIBRARY
-DQDESIGNER_SHARED_LIBRARY
)
else()
add_definitions(-DQT_DESIGNER_STATIC)
endif()
add_subdirectory(components)
katie_generate_misc("${DESIGNER_HEADERS}" QtDesigner)

8
src/designer/data/generate_header.xsl
View file

@ -397,13 +397,7 @@
QT_BEGIN_NAMESPACE
#if defined(QT_DESIGNER_STATIC)
# define QUI_EXPORT
#elif defined(QT_UITOOLS_LIB)
# define QUI_EXPORT Q_DECL_EXPORT
#else
# define QUI_EXPORT Q_DECL_IMPORT
#endif
#define QUI_EXPORT Q_DECL_EXPORT
#ifdef QFORMINTERNAL_NAMESPACE
namespace QFormInternal

3
src/designer/extension/default_extensionfactory.h
View file

@ -34,7 +34,6 @@
#ifndef DEFAULT_EXTENSIONFACTORY_H
#define DEFAULT_EXTENSIONFACTORY_H
#include <QtDesigner/extension_global.h>
#include <QtDesigner/extension.h>
#include <QtCore/QMap>
@ -47,7 +46,7 @@ QT_BEGIN_NAMESPACE
class QExtensionManager;
class QDESIGNER_EXTENSION_EXPORT QExtensionFactory : public QObject, public QAbstractExtensionFactory
class Q_DESIGNER_EXPORT QExtensionFactory : public QObject, public QAbstractExtensionFactory
{
Q_OBJECT
Q_INTERFACES(QAbstractExtensionFactory)

11
src/designer/extension/extension_global.h
View file

@ -39,17 +39,6 @@
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define QDESIGNER_EXTENSION_EXTERN Q_DECL_EXPORT
#define QDESIGNER_EXTENSION_IMPORT Q_DECL_IMPORT
#ifdef QT_DESIGNER_STATIC
# define QDESIGNER_EXTENSION_EXPORT
#elif defined(QDESIGNER_EXTENSION_LIBRARY)
# define QDESIGNER_EXTENSION_EXPORT QDESIGNER_EXTENSION_EXTERN
#else
# define QDESIGNER_EXTENSION_EXPORT QDESIGNER_EXTENSION_IMPORT
#endif
QT_END_NAMESPACE
QT_END_HEADER

3
src/designer/extension/qextensionmanager.h
View file

@ -34,7 +34,6 @@
#ifndef QEXTENSIONMANAGER_H
#define QEXTENSIONMANAGER_H
#include <QtDesigner/extension_global.h>
#include <QtDesigner/extension.h>
#include <QtCore/QHash>
@ -42,7 +41,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDESIGNER_EXTENSION_EXPORT QExtensionManager: public QObject, public QAbstractExtensionManager
class Q_DESIGNER_EXPORT QExtensionManager: public QObject, public QAbstractExtensionManager
{
Q_OBJECT
Q_INTERFACES(QAbstractExtensionManager)

4
src/designer/sdk/abstractactioneditor.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTACTIONEDITOR_H
#define ABSTRACTACTIONEDITOR_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
@ -45,7 +43,7 @@ QT_BEGIN_NAMESPACE
class QDesignerFormEditorInterface;
class QDesignerFormWindowInterface;
class QDESIGNER_SDK_EXPORT QDesignerActionEditorInterface: public QWidget
class Q_DESIGNER_EXPORT QDesignerActionEditorInterface: public QWidget
{
Q_OBJECT
public:

4
src/designer/sdk/abstractbrushmanager.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTBRUSHMANAGER_H
#define ABSTRACTBRUSHMANAGER_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/qobject.h>
#include <QtCore/qmap.h>
#include <QtGui/qbrush.h>
@ -46,7 +44,7 @@ QT_BEGIN_NAMESPACE
class QObject;
class QDESIGNER_SDK_EXPORT QDesignerBrushManagerInterface : public QObject
class Q_DESIGNER_EXPORT QDesignerBrushManagerInterface : public QObject
{
Q_OBJECT
public:

3
src/designer/sdk/abstractdialoggui_p.h
View file

@ -45,7 +45,6 @@
#ifndef ABSTRACTDIALOGGUI_H
#define ABSTRACTDIALOGGUI_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QMessageBox>
#include <QtGui/QFileDialog>
@ -53,7 +52,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDESIGNER_SDK_EXPORT QDesignerDialogGuiInterface
class Q_DESIGNER_EXPORT QDesignerDialogGuiInterface
{
Q_DISABLE_COPY(QDesignerDialogGuiInterface)
public:

4
src/designer/sdk/abstractdnditem.h
View file

@ -34,7 +34,7 @@
#ifndef ABSTRACTDNDITEM_H
#define ABSTRACTDNDITEM_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
@ -44,7 +44,7 @@ class DomUI;
class QWidget;
class QPoint;
class QDESIGNER_SDK_EXPORT QDesignerDnDItemInterface
class Q_DESIGNER_EXPORT QDesignerDnDItemInterface
{
public:
enum DropType { MoveDrop, CopyDrop };

4
src/designer/sdk/abstractformeditor.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTFORMEDITOR_H
#define ABSTRACTFORMEDITOR_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
#include <QtCore/QPointer>
@ -69,7 +67,7 @@ class QExtensionManager;
class QDesignerFormEditorInterfacePrivate;
class QDESIGNER_SDK_EXPORT QDesignerFormEditorInterface : public QObject
class Q_DESIGNER_EXPORT QDesignerFormEditorInterface : public QObject
{
Q_OBJECT
public:

4
src/designer/sdk/abstractformeditorplugin.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTFORMEDITORPLUGIN_H
#define ABSTRACTFORMEDITORPLUGIN_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
QT_BEGIN_HEADER
@ -45,7 +43,7 @@ QT_BEGIN_NAMESPACE
class QDesignerFormEditorInterface;
class QAction;
class QDESIGNER_SDK_EXPORT QDesignerFormEditorPluginInterface
class Q_DESIGNER_EXPORT QDesignerFormEditorPluginInterface
{
public:
virtual ~QDesignerFormEditorPluginInterface() {}

4
src/designer/sdk/abstractformwindow.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTFORMWINDOW_H
#define ABSTRACTFORMWINDOW_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
@ -49,7 +47,7 @@ class DomUI;
class QUndoStack;
class QDir;
class QDESIGNER_SDK_EXPORT QDesignerFormWindowInterface: public QWidget
class Q_DESIGNER_EXPORT QDesignerFormWindowInterface: public QWidget
{
Q_OBJECT
public:

4
src/designer/sdk/abstractformwindowcursor.h
View file

@ -34,7 +34,7 @@
#ifndef ABSTRACTFORMWINDOWCURSOR_H
#define ABSTRACTFORMWINDOWCURSOR_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
@ -45,7 +45,7 @@ class QWidget;
class QVariant;
class QString;
class QDESIGNER_SDK_EXPORT QDesignerFormWindowCursorInterface
class Q_DESIGNER_EXPORT QDesignerFormWindowCursorInterface
{
public:
enum MoveOperation

3
src/designer/sdk/abstractformwindowmanager.h
View file

@ -34,7 +34,6 @@
#ifndef ABSTRACTFORMWINDOWMANAGER_H
#define ABSTRACTFORMWINDOWMANAGER_H
#include <QtDesigner/sdk_global.h>
#include <QtDesigner/abstractformwindow.h>
#include <QtCore/QObject>
@ -50,7 +49,7 @@ class DomUI;
class QWidget;
class QDesignerDnDItemInterface;
class QDESIGNER_SDK_EXPORT QDesignerFormWindowManagerInterface: public QObject
class Q_DESIGNER_EXPORT QDesignerFormWindowManagerInterface: public QObject
{
Q_OBJECT
public:

4
src/designer/sdk/abstractformwindowtool.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTFORMWINDOWTOOL_H
#define ABSTRACTFORMWINDOWTOOL_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
QT_BEGIN_HEADER
@ -48,7 +46,7 @@ class QWidget;
class QAction;
class DomUI;
class QDESIGNER_SDK_EXPORT QDesignerFormWindowToolInterface: public QObject
class Q_DESIGNER_EXPORT QDesignerFormWindowToolInterface: public QObject
{
Q_OBJECT
public:

4
src/designer/sdk/abstracticoncache.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTICONCACHE_H
#define ABSTRACTICONCACHE_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
QT_BEGIN_HEADER
@ -46,7 +44,7 @@ class QIcon;
class QPixmap;
class QString;
class QDESIGNER_SDK_EXPORT QDesignerIconCacheInterface : public QObject
class Q_DESIGNER_EXPORT QDesignerIconCacheInterface : public QObject
{
Q_OBJECT
public:

4
src/designer/sdk/abstractintegration.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTINTEGRATION_H
#define ABSTRACTINTEGRATION_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
#include <QtCore/QString>
@ -45,7 +43,7 @@ QT_BEGIN_NAMESPACE
class QDesignerFormEditorInterface;
class QDESIGNER_SDK_EXPORT QDesignerIntegrationInterface: public QObject
class Q_DESIGNER_EXPORT QDesignerIntegrationInterface: public QObject
{
Q_OBJECT
Q_PROPERTY(QString headerSuffix READ headerSuffix WRITE setHeaderSuffix)

12
src/designer/sdk/abstractintrospection_p.h
View file

@ -45,15 +45,13 @@
#ifndef ABSTRACTMETAOBJECT_H
#define ABSTRACTMETAOBJECT_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QVariant>
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDESIGNER_SDK_EXPORT QDesignerMetaEnumInterface
class Q_DESIGNER_EXPORT QDesignerMetaEnumInterface
{
public:
QDesignerMetaEnumInterface();
@ -71,7 +69,7 @@ public:
virtual QString valueToKeys(int value) const = 0;
};
class QDESIGNER_SDK_EXPORT QDesignerMetaPropertyInterface
class Q_DESIGNER_EXPORT QDesignerMetaPropertyInterface
{
public:
enum Kind { EnumKind, FlagKind, OtherKind };
@ -103,7 +101,7 @@ public:
Q_DECLARE_OPERATORS_FOR_FLAGS(QDesignerMetaPropertyInterface::AccessFlags)
Q_DECLARE_OPERATORS_FOR_FLAGS(QDesignerMetaPropertyInterface::Attributes)
class QDESIGNER_SDK_EXPORT QDesignerMetaMethodInterface
class Q_DESIGNER_EXPORT QDesignerMetaMethodInterface
{
public:
QDesignerMetaMethodInterface();
@ -122,7 +120,7 @@ public:
virtual QString typeName() const = 0;
};
class QDESIGNER_SDK_EXPORT QDesignerMetaObjectInterface {
class Q_DESIGNER_EXPORT QDesignerMetaObjectInterface {
public:
QDesignerMetaObjectInterface();
virtual ~QDesignerMetaObjectInterface();
@ -151,7 +149,7 @@ public:
};
// To be obtained from core
class QDESIGNER_SDK_EXPORT QDesignerIntrospectionInterface {
class Q_DESIGNER_EXPORT QDesignerIntrospectionInterface {
public:
QDesignerIntrospectionInterface();
virtual ~QDesignerIntrospectionInterface();

4
src/designer/sdk/abstractmetadatabase.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTMETADATABASE_H
#define ABSTRACTMETADATABASE_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtCore/QHash>
@ -65,7 +63,7 @@ public:
};
class QDESIGNER_SDK_EXPORT QDesignerMetaDataBaseInterface: public QObject
class Q_DESIGNER_EXPORT QDesignerMetaDataBaseInterface: public QObject
{
Q_OBJECT
public:

4
src/designer/sdk/abstractnewformwidget_p.h
View file

@ -45,8 +45,6 @@
#ifndef ABSTRACTNEWFORMWIDGET_H
#define ABSTRACTNEWFORMWIDGET_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
@ -55,7 +53,7 @@ QT_BEGIN_NAMESPACE
class QDesignerFormEditorInterface;
class QDESIGNER_SDK_EXPORT QDesignerNewFormWidgetInterface : public QWidget
class Q_DESIGNER_EXPORT QDesignerNewFormWidgetInterface : public QWidget
{
Q_DISABLE_COPY(QDesignerNewFormWidgetInterface)
Q_OBJECT

4
src/designer/sdk/abstractobjectinspector.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTOBJECTINSPECTOR_H
#define ABSTRACTOBJECTINSPECTOR_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
@ -45,7 +43,7 @@ QT_BEGIN_NAMESPACE
class QDesignerFormEditorInterface;
class QDesignerFormWindowInterface;
class QDESIGNER_SDK_EXPORT QDesignerObjectInspectorInterface: public QWidget
class Q_DESIGNER_EXPORT QDesignerObjectInspectorInterface: public QWidget
{
Q_OBJECT
public:

4
src/designer/sdk/abstractoptionspage_p.h
View file

@ -45,7 +45,7 @@
#ifndef ABSTRACTOPTIONSPAGE_P_H
#define ABSTRACTOPTIONSPAGE_P_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
class QString;
class QWidget;
class QDESIGNER_SDK_EXPORT QDesignerOptionsPageInterface
class Q_DESIGNER_EXPORT QDesignerOptionsPageInterface
{
public:
virtual ~QDesignerOptionsPageInterface() {}

4
src/designer/sdk/abstractpromotioninterface.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTPROMOTIONINTERFACE_H
#define ABSTRACTPROMOTIONINTERFACE_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QPair>
#include <QtCore/QList>
#include <QtCore/QSet>
@ -46,7 +44,7 @@ QT_BEGIN_NAMESPACE
class QDesignerWidgetDataBaseItemInterface;
class QDESIGNER_SDK_EXPORT QDesignerPromotionInterface
class Q_DESIGNER_EXPORT QDesignerPromotionInterface
{
public:
virtual ~QDesignerPromotionInterface();

4
src/designer/sdk/abstractpropertyeditor.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTPROPERTYEDITOR_H
#define ABSTRACTPROPERTYEDITOR_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
@ -46,7 +44,7 @@ class QDesignerFormEditorInterface;
class QString;
class QVariant;
class QDESIGNER_SDK_EXPORT QDesignerPropertyEditorInterface: public QWidget
class Q_DESIGNER_EXPORT QDesignerPropertyEditorInterface: public QWidget
{
Q_OBJECT
public:

4
src/designer/sdk/abstractresourcebrowser.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTRESOURCEBROWSER_H
#define ABSTRACTRESOURCEBROWSER_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
@ -44,7 +42,7 @@ QT_BEGIN_NAMESPACE
class QWidget;
class QDESIGNER_SDK_EXPORT QDesignerResourceBrowserInterface: public QWidget
class Q_DESIGNER_EXPORT QDesignerResourceBrowserInterface: public QWidget
{
Q_OBJECT
public:

4
src/designer/sdk/abstractsettings_p.h
View file

@ -45,8 +45,6 @@
#ifndef ABSTRACTSETTINGS_P_H
#define ABSTRACTSETTINGS_P_H
#include <QtDesigner/sdk_global.h>
#include <QVariant>
QT_BEGIN_HEADER
@ -58,7 +56,7 @@ class QString;
/*!
To be implemented by IDEs that want to control the way designer retrieves/stores its settings.
*/
class QDESIGNER_SDK_EXPORT QDesignerSettingsInterface
class Q_DESIGNER_EXPORT QDesignerSettingsInterface
{
public:
virtual ~QDesignerSettingsInterface() {}

4
src/designer/sdk/abstractwidgetbox.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTWIDGETBOX_H
#define ABSTRACTWIDGETBOX_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QMetaType>
#include <QtGui/QWidget>
#include <QtGui/QIcon>
@ -47,7 +45,7 @@ QT_BEGIN_NAMESPACE
class DomUI;
class QDesignerDnDItemInterface;
class QDESIGNER_SDK_EXPORT QDesignerWidgetBoxInterface : public QWidget
class Q_DESIGNER_EXPORT QDesignerWidgetBoxInterface : public QWidget
{
Q_OBJECT
public:

4
src/designer/sdk/abstractwidgetdatabase.h
View file

@ -34,8 +34,6 @@
#ifndef ABSTRACTWIDGETDATABASE_H
#define ABSTRACTWIDGETDATABASE_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
#include <QtCore/QList>
@ -93,7 +91,7 @@ public:
virtual QList<QVariant> defaultPropertyValues() const = 0;
};
class QDESIGNER_SDK_EXPORT QDesignerWidgetDataBaseInterface: public QObject
class Q_DESIGNER_EXPORT QDesignerWidgetDataBaseInterface: public QObject
{
Q_OBJECT
public:

3
src/designer/sdk/abstractwidgetfactory.h
View file

@ -34,7 +34,6 @@
#ifndef ABSTRACTWIDGETFACTORY_H
#define ABSTRACTWIDGETFACTORY_H
#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
QT_BEGIN_HEADER
@ -45,7 +44,7 @@ class QDesignerFormEditorInterface;
class QWidget;
class QLayout;
class QDESIGNER_SDK_EXPORT QDesignerWidgetFactoryInterface: public QObject
class Q_DESIGNER_EXPORT QDesignerWidgetFactoryInterface: public QObject
{
Q_OBJECT
public:

3
src/designer/sdk/extrainfo.h
View file

@ -34,7 +34,6 @@
#ifndef EXTRAINFO_H
#define EXTRAINFO_H
#include <QtDesigner/sdk_global.h>
#include <QtDesigner/extension.h>
QT_BEGIN_HEADER
@ -47,7 +46,7 @@ class QWidget;
class QDesignerFormEditorInterface;
class QDESIGNER_SDK_EXPORT QDesignerExtraInfoExtension
class Q_DESIGNER_EXPORT QDesignerExtraInfoExtension
{
public:
virtual ~QDesignerExtraInfoExtension() {}

3
src/designer/sdk/script_p.h
View file

@ -45,7 +45,6 @@
#ifndef SCRIPT_H
#define SCRIPT_H
#include <QtDesigner/sdk_global.h>
#include <QtDesigner/extension.h>
#include <QtCore/QVariant>
@ -55,7 +54,7 @@ QT_BEGIN_NAMESPACE
class QString;
class QDESIGNER_SDK_EXPORT QDesignerScriptExtension
class Q_DESIGNER_EXPORT QDesignerScriptExtension
{
public:
virtual ~QDesignerScriptExtension();

56
src/designer/sdk/sdk_global.h
View file

@ -1,56 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2016-2020 Ivailo Monev
**
** This file is part of the Katie Designer of the Katie 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.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company 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.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef SDK_GLOBAL_H
#define SDK_GLOBAL_H
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define QDESIGNER_SDK_EXTERN Q_DECL_EXPORT
#define QDESIGNER_SDK_IMPORT Q_DECL_IMPORT
#ifdef QT_DESIGNER_STATIC
# define QDESIGNER_SDK_EXPORT
#elif defined(QDESIGNER_SDK_LIBRARY)
# define QDESIGNER_SDK_EXPORT QDESIGNER_SDK_EXTERN
#else
# define QDESIGNER_SDK_EXPORT QDESIGNER_SDK_IMPORT
#endif
QT_END_NAMESPACE
QT_END_HEADER
#endif // SDK_GLOBAL_H

3
src/designer/shared/actioneditor_p.h
View file

@ -45,7 +45,6 @@
#ifndef ACTIONEDITOR_H
#define ACTIONEDITOR_H
#include "shared_global_p.h"
#include <QtDesigner/abstractactioneditor.h>
#include <QtCore/QPointer>
@ -68,7 +67,7 @@ namespace qdesigner_internal {
class ActionView;
class ResourceMimeData;
class QDESIGNER_SHARED_EXPORT ActionEditor: public QDesignerActionEditorInterface
class Q_DESIGNER_EXPORT ActionEditor: public QDesignerActionEditorInterface
{
Q_OBJECT
public:

5
src/designer/shared/actionrepository_p.h
View file

@ -45,7 +45,6 @@
#ifndef ACTIONREPOSITORY_H
#define ACTIONREPOSITORY_H
#include "shared_global_p.h"
#include <QtCore/QMimeData>
#include <QtGui/QStandardItemModel>
#include <QtGui/QTreeView>
@ -65,7 +64,7 @@ namespace qdesigner_internal {
class PropertySheetKeySequenceValue;
// Shared model of actions, to be used for several views (detailed/icon view).
class QDESIGNER_SHARED_EXPORT ActionModel: public QStandardItemModel
class Q_DESIGNER_EXPORT ActionModel: public QStandardItemModel
{
Q_OBJECT
public:
@ -233,7 +232,7 @@ private:
ActionListView *m_actionListView;
};
class QDESIGNER_SHARED_EXPORT ActionRepositoryMimeData: public QMimeData
class Q_DESIGNER_EXPORT ActionRepositoryMimeData: public QMimeData
{
Q_OBJECT
public:

3
src/designer/shared/codedialog_p.h
View file

@ -45,7 +45,6 @@
#ifndef CODEPREVIEWDIALOG_H
#define CODEPREVIEWDIALOG_H
#include "shared_global_p.h"
#include <QtGui/QDialog>
QT_BEGIN_NAMESPACE
@ -54,7 +53,7 @@ class QDesignerFormWindowInterface;
namespace qdesigner_internal {
// Dialog for viewing code.
class QDESIGNER_SHARED_EXPORT CodeDialog : public QDialog
class Q_DESIGNER_EXPORT CodeDialog : public QDialog
{
Q_OBJECT
explicit CodeDialog(QWidget *parent = Q_NULLPTR);

14
src/designer/shared/connectionedit_p.h
View file

@ -46,8 +46,6 @@
#ifndef CONNECTIONEDIT_H
#define CONNECTIONEDIT_H
#include "shared_global_p.h"
#include <QtCore/qmap.h>
#include <QtCore/QList>
#include <QtCore/QPointer>
@ -69,7 +67,7 @@ namespace qdesigner_internal {
class Connection;
class ConnectionEdit;
class QDESIGNER_SHARED_EXPORT CETypes
class Q_DESIGNER_EXPORT CETypes
{
public:
typedef QList<Connection*> ConnectionList;
@ -89,7 +87,7 @@ public:
enum LineDir { UpDir = 0, DownDir, RightDir, LeftDir };
};
class QDESIGNER_SHARED_EXPORT Connection : public CETypes
class Q_DESIGNER_EXPORT Connection : public CETypes
{
public:
explicit Connection(ConnectionEdit *edit);
@ -155,7 +153,7 @@ private:
QRect groundRect() const;
};
class QDESIGNER_SHARED_EXPORT ConnectionEdit : public QWidget, public CETypes
class Q_DESIGNER_EXPORT ConnectionEdit : public QWidget, public CETypes
{
Q_OBJECT
public:
@ -275,7 +273,7 @@ private:
friend class SetEndPointCommand;
};
class QDESIGNER_SHARED_EXPORT CECommand : public QUndoCommand, public CETypes
class Q_DESIGNER_EXPORT CECommand : public QUndoCommand, public CETypes
{
public:
explicit CECommand(ConnectionEdit *edit)
@ -289,7 +287,7 @@ private:
ConnectionEdit *m_edit;
};
class QDESIGNER_SHARED_EXPORT AddConnectionCommand : public CECommand
class Q_DESIGNER_EXPORT AddConnectionCommand : public CECommand
{
public:
AddConnectionCommand(ConnectionEdit *edit, Connection *con);
@ -299,7 +297,7 @@ private:
Connection *m_con;
};
class QDESIGNER_SHARED_EXPORT DeleteConnectionsCommand : public CECommand
class Q_DESIGNER_EXPORT DeleteConnectionsCommand : public CECommand
{
public:
DeleteConnectionsCommand(ConnectionEdit *edit, const ConnectionList &con_list);

3
src/designer/shared/csshighlighter_p.h
View file

@ -46,13 +46,12 @@
#define CSSHIGHLIGHTER_H
#include <QtGui/QSyntaxHighlighter>
#include "shared_global_p.h"
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT CssHighlighter : public QSyntaxHighlighter
class Q_DESIGNER_EXPORT CssHighlighter : public QSyntaxHighlighter
{
Q_OBJECT
public:

4
src/designer/shared/deviceprofile_p.h
View file

@ -45,8 +45,6 @@
#ifndef DEVICEPROFILE_H
#define DEVICEPROFILE_H
#include "shared_global_p.h"
#include <QtCore/QString>
#include <QtCore/qshareddata.h>
@ -65,7 +63,7 @@ class DeviceProfileData;
* style of the form. This class represents a device
* profile. */
class QDESIGNER_SHARED_EXPORT DeviceProfile {
class Q_DESIGNER_EXPORT DeviceProfile {
public:
DeviceProfile();

3
src/designer/shared/dialoggui_p.h
View file

@ -45,7 +45,6 @@
// We mean it.
//
#include "shared_global_p.h"
#include <abstractdialoggui_p.h>
QT_BEGIN_NAMESPACE
@ -54,7 +53,7 @@ class QFileIconProvider;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT DialogGui : public QDesignerDialogGuiInterface
class Q_DESIGNER_EXPORT DialogGui : public QDesignerDialogGuiInterface
{
public:
DialogGui();

6
src/designer/shared/filterwidget_p.h
View file

@ -45,8 +45,6 @@
#ifndef FILTERWIDGET_H
#define FILTERWIDGET_H
#include "shared_global_p.h"
#include <QtGui/QWidget>
#include <QtGui/QLineEdit>
#include <QtGui/QColor>
@ -67,7 +65,7 @@ namespace qdesigner_internal {
#define ICONBUTTON_SIZE 16
class QDESIGNER_SHARED_EXPORT HintLineEdit : public QLineEdit {
class Q_DESIGNER_EXPORT HintLineEdit : public QLineEdit {
Q_OBJECT
public:
explicit HintLineEdit(QWidget *parent = Q_NULLPTR);
@ -103,7 +101,7 @@ private:
// FilterWidget: For filtering item views, with reset button Uses HintLineEdit.
class QDESIGNER_SHARED_EXPORT FilterWidget : public QWidget
class Q_DESIGNER_EXPORT FilterWidget : public QWidget
{
Q_OBJECT
public:

3
src/designer/shared/formlayoutmenu_p.h
View file

@ -45,7 +45,6 @@
// We mean it.
//
#include "shared_global_p.h"
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtCore/QPointer>
@ -61,7 +60,7 @@ namespace qdesigner_internal {
// Task menu to be used for form layouts. Offers an options "Add row" which
// pops up a dialog in which the user can specify label name, text and buddy.
class QDESIGNER_SHARED_EXPORT FormLayoutMenu : public QObject
class Q_DESIGNER_EXPORT FormLayoutMenu : public QObject
{
Q_DISABLE_COPY(FormLayoutMenu)
Q_OBJECT

4
src/designer/shared/formwindowbase_p.h
View file

@ -45,8 +45,6 @@
#ifndef FORMWINDOWBASE_H
#define FORMWINDOWBASE_H
#include "shared_global_p.h"
#include <QtDesigner/abstractformwindow.h>
#include <QtCore/qvariant.h>
@ -69,7 +67,7 @@ class DesignerPixmapCache;
class DesignerIconCache;
class FormWindowBasePrivate;
class QDESIGNER_SHARED_EXPORT FormWindowBase: public QDesignerFormWindowInterface
class Q_DESIGNER_EXPORT FormWindowBase: public QDesignerFormWindowInterface
{
Q_OBJECT
public:

4
src/designer/shared/grid_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNER_GRID_H
#define QDESIGNER_GRID_H
#include "shared_global_p.h"
#include <QtCore/qvariant.h>
QT_BEGIN_NAMESPACE
@ -58,7 +56,7 @@ class QPainter;
namespace qdesigner_internal {
// Designer grid which is able to serialize to QVariantMap
class QDESIGNER_SHARED_EXPORT Grid
class Q_DESIGNER_EXPORT Grid
{
public:
Grid();

4
src/designer/shared/gridpanel_p.h
View file

@ -45,8 +45,6 @@
#ifndef GRIDPANEL_H
#define GRIDPANEL_H
#include "shared_global_p.h"
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
@ -56,7 +54,7 @@ namespace qdesigner_internal {
class Grid;
class Ui_GridPanel;
class QDESIGNER_SHARED_EXPORT GridPanel : public QWidget
class Q_DESIGNER_EXPORT GridPanel : public QWidget
{
Q_OBJECT
public:

4
src/designer/shared/iconloader.cpp
View file

@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
Q_DESIGNER_EXPORT QIcon createIconSet(const QString &name)
{
const QStringList candidates = QStringList()
<< (QLatin1String(":/trolltech/formeditor/images/") + name)
@ -56,7 +56,7 @@ QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
return QIcon();
}
QDESIGNER_SHARED_EXPORT QIcon emptyIcon()
Q_DESIGNER_EXPORT QIcon emptyIcon()
{
return QIcon(QLatin1String(":/trolltech/formeditor/images/emptyicon.png"));
}

6
src/designer/shared/iconloader_p.h
View file

@ -45,7 +45,7 @@
#ifndef ICONLOADER_H
#define ICONLOADER_H
#include "shared_global_p.h"
#include "qglobal.h"
QT_BEGIN_NAMESPACE
@ -54,8 +54,8 @@ class QIcon;
namespace qdesigner_internal {
QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name);
QDESIGNER_SHARED_EXPORT QIcon emptyIcon();
Q_DESIGNER_EXPORT QIcon createIconSet(const QString &name);
Q_DESIGNER_EXPORT QIcon emptyIcon();
} // namespace qdesigner_internal

8
src/designer/shared/iconselector_p.h
View file

@ -46,8 +46,6 @@
#ifndef ICONSELECTOR_H
#define ICONSELECTOR_H
#include "shared_global_p.h"
#include <QtGui/QWidget>
#include <QtGui/QDialog>
@ -68,7 +66,7 @@ class PropertySheetIconValue;
struct IconThemeEditorPrivate;
// Resource Dialog that embeds the language-dependent resource widget as returned by the language extension
class QDESIGNER_SHARED_EXPORT LanguageResourceDialog : public QDialog
class Q_DESIGNER_EXPORT LanguageResourceDialog : public QDialog
{
Q_OBJECT
@ -91,7 +89,7 @@ private:
};
class QDESIGNER_SHARED_EXPORT IconSelector: public QWidget
class Q_DESIGNER_EXPORT IconSelector: public QWidget
{
Q_OBJECT
public:
@ -130,7 +128,7 @@ private:
};
// IconThemeEditor: Let's the user input theme icon names and shows a preview label.
class QDESIGNER_SHARED_EXPORT IconThemeEditor : public QWidget
class Q_DESIGNER_EXPORT IconThemeEditor : public QWidget
{
Q_OBJECT
Q_PROPERTY(QString theme READ theme WRITE setTheme DESIGNABLE true)

4
src/designer/shared/invisible_widget_p.h
View file

@ -45,15 +45,13 @@
#ifndef INVISIBLE_WIDGET_H
#define INVISIBLE_WIDGET_H
#include "shared_global_p.h"
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT InvisibleWidget: public QWidget
class Q_DESIGNER_EXPORT InvisibleWidget: public QWidget
{
Q_OBJECT
public:

3
src/designer/shared/layout_p.h
View file

@ -45,7 +45,6 @@
#ifndef LAYOUT_H
#define LAYOUT_H
#include "shared_global_p.h"
#include "layoutinfo_p.h"
#include <QtCore/QPointer>
@ -62,7 +61,7 @@ QT_BEGIN_NAMESPACE
class QDesignerFormWindowInterface;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT Layout : public QObject
class Q_DESIGNER_EXPORT Layout : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(Layout)

4
src/designer/shared/layoutinfo.cpp
View file

@ -240,7 +240,7 @@ bool LayoutInfo::isEmptyItem(QLayoutItem *item)
return item->spacerItem() != 0;
}
QDESIGNER_SHARED_EXPORT void getFormLayoutItemPosition(const QFormLayout *formLayout, int index, int *rowPtr, int *columnPtr, int *rowspanPtr, int *colspanPtr)
Q_DESIGNER_EXPORT void getFormLayoutItemPosition(const QFormLayout *formLayout, int index, int *rowPtr, int *columnPtr, int *rowspanPtr, int *colspanPtr)
{
int row;
QFormLayout::ItemRole role;
@ -264,7 +264,7 @@ static inline QFormLayout::ItemRole formLayoutRole(int column, int colspan)
return column == 0 ? QFormLayout::LabelRole : QFormLayout::FieldRole;
}
QDESIGNER_SHARED_EXPORT void formLayoutAddWidget(QFormLayout *formLayout, QWidget *w, const QRect &r, bool insert)
Q_DESIGNER_EXPORT void formLayoutAddWidget(QFormLayout *formLayout, QWidget *w, const QRect &r, bool insert)
{
// Consistent API galore...
if (insert) {

8
src/designer/shared/layoutinfo_p.h
View file

@ -45,7 +45,7 @@
#ifndef LAYOUTINFO_H
#define LAYOUTINFO_H
#include "shared_global_p.h"
#include "qglobal.h"
QT_BEGIN_NAMESPACE
@ -59,7 +59,7 @@ class QString;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT LayoutInfo
class Q_DESIGNER_EXPORT LayoutInfo
{
public:
enum Type
@ -96,8 +96,8 @@ public:
static bool isEmptyItem(QLayoutItem *item);
};
QDESIGNER_SHARED_EXPORT void getFormLayoutItemPosition(const QFormLayout *formLayout, int index, int *rowPtr, int *columnPtr = 0, int *rowspanPtr = 0, int *colspanPtr = 0);
QDESIGNER_SHARED_EXPORT void formLayoutAddWidget(QFormLayout *formLayout, QWidget *w, const QRect &r, bool insert);
Q_DESIGNER_EXPORT void getFormLayoutItemPosition(const QFormLayout *formLayout, int index, int *rowPtr, int *columnPtr = 0, int *rowspanPtr = 0, int *colspanPtr = 0);
Q_DESIGNER_EXPORT void formLayoutAddWidget(QFormLayout *formLayout, QWidget *w, const QRect &r, bool insert);
} // namespace qdesigner_internal
QT_END_NAMESPACE

10
src/designer/shared/metadatabase.cpp
View file

@ -212,7 +212,7 @@ void MetaDataBase::slotDestroyed(QObject *object)
}
// promotion convenience
QDESIGNER_SHARED_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QWidget *widget,const QString &customClassName)
Q_DESIGNER_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QWidget *widget,const QString &customClassName)
{
MetaDataBase *db = qobject_cast<MetaDataBase *>(core->metaDataBase());
@ -236,7 +236,7 @@ QDESIGNER_SHARED_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QW
return true;
}
QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget)
Q_DESIGNER_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget)
{
MetaDataBase *db = qobject_cast<MetaDataBase *>(core->metaDataBase());
if (!db)
@ -248,7 +248,7 @@ QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWi
}
}
QDESIGNER_SHARED_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWidget* widget)
Q_DESIGNER_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWidget* widget)
{
const MetaDataBase *db = qobject_cast<const MetaDataBase *>(core->metaDataBase());
if (!db)
@ -259,7 +259,7 @@ QDESIGNER_SHARED_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWid
return !item->customClassName().isEmpty();
}
QDESIGNER_SHARED_EXPORT QString promotedCustomClassName(QDesignerFormEditorInterface *core, QWidget* widget)
Q_DESIGNER_EXPORT QString promotedCustomClassName(QDesignerFormEditorInterface *core, QWidget* widget)
{
const MetaDataBase *db = qobject_cast<const MetaDataBase *>(core->metaDataBase());
if (!db)
@ -270,7 +270,7 @@ QDESIGNER_SHARED_EXPORT QString promotedCustomClassName(QDesignerFormEditorInter
return item->customClassName();
}
QDESIGNER_SHARED_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* widget)
Q_DESIGNER_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* widget)
{
const QString customClassName = promotedCustomClassName(core,widget);
if (customClassName.isEmpty())

16
src/designer/shared/metadatabase_p.h
View file

@ -45,8 +45,6 @@
#ifndef METADATABASE_H
#define METADATABASE_H
#include "shared_global_p.h"
#include <QtDesigner/abstractmetadatabase.h>
#include <QtCore/QHash>
@ -57,7 +55,7 @@ QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT MetaDataBaseItem: public QDesignerMetaDataBaseItemInterface
class Q_DESIGNER_EXPORT MetaDataBaseItem: public QDesignerMetaDataBaseItemInterface
{
public:
explicit MetaDataBaseItem(QObject *object);
@ -95,7 +93,7 @@ private:
QStringList m_fakeSignals;
};
class QDESIGNER_SHARED_EXPORT MetaDataBase: public QDesignerMetaDataBaseInterface
class Q_DESIGNER_EXPORT MetaDataBase: public QDesignerMetaDataBaseInterface
{
Q_OBJECT
public:
@ -121,11 +119,11 @@ private:
};
// promotion convenience
QDESIGNER_SHARED_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QWidget *widget,const QString &customClassName);
QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget);
QDESIGNER_SHARED_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWidget* w);
QDESIGNER_SHARED_EXPORT QString promotedCustomClassName(QDesignerFormEditorInterface *core, QWidget* w);
QDESIGNER_SHARED_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* w);
Q_DESIGNER_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QWidget *widget,const QString &customClassName);
Q_DESIGNER_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget);
Q_DESIGNER_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWidget* w);
Q_DESIGNER_EXPORT QString promotedCustomClassName(QDesignerFormEditorInterface *core, QWidget* w);
Q_DESIGNER_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* w);
} // namespace qdesigner_internal

3
src/designer/shared/morphmenu_p.h
View file

@ -45,7 +45,6 @@
#ifndef MORPH_COMMAND_H
#define MORPH_COMMAND_H
#include "shared_global_p.h"
#include "qdesigner_formwindowcommand_p.h"
QT_BEGIN_NAMESPACE
@ -57,7 +56,7 @@ class QMenu;
namespace qdesigner_internal {
/* Conveniene morph menu that acts on a single widget. */
class QDESIGNER_SHARED_EXPORT MorphMenu : public QObject {
class Q_DESIGNER_EXPORT MorphMenu : public QObject {
Q_DISABLE_COPY(MorphMenu)
Q_OBJECT
public:

3
src/designer/shared/newformwidget_p.h
View file

@ -45,7 +45,6 @@
// We mean it.
//
#include "shared_global_p.h"
#include "deviceprofile_p.h"
#include <abstractnewformwidget_p.h>
@ -66,7 +65,7 @@ namespace qdesigner_internal {
class Ui_NewFormWidget;
class QDESIGNER_SHARED_EXPORT NewFormWidget : public QDesignerNewFormWidgetInterface
class Q_DESIGNER_EXPORT NewFormWidget : public QDesignerNewFormWidgetInterface
{
Q_OBJECT
Q_DISABLE_COPY(NewFormWidget)

4
src/designer/shared/orderdialog_p.h
View file

@ -45,8 +45,6 @@
#ifndef ORDERDIALOG_P_H
#define ORDERDIALOG_P_H
#include "shared_global_p.h"
#include <QtGui/QDialog>
#include <QtCore/QMap>
@ -58,7 +56,7 @@ namespace qdesigner_internal {
class Ui_OrderDialog;
class QDESIGNER_SHARED_EXPORT OrderDialog: public QDialog
class Q_DESIGNER_EXPORT OrderDialog: public QDialog
{
Q_OBJECT
public:

3
src/designer/shared/plaintexteditor_p.h
View file

@ -46,7 +46,6 @@
#define PLAINTEXTEDITOR_H
#include <QtGui/QDialog>
#include "shared_global_p.h"
QT_BEGIN_NAMESPACE
@ -55,7 +54,7 @@ class QDesignerFormEditorInterface;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT PlainTextEditorDialog : public QDialog
class Q_DESIGNER_EXPORT PlainTextEditorDialog : public QDialog
{
Q_OBJECT
public:

5
src/designer/shared/pluginmanager_p.h
View file

@ -45,7 +45,6 @@
#ifndef PLUGINMANAGER_H
#define PLUGINMANAGER_H
#include "shared_global_p.h"
#include "shared_enums_p.h"
#include <QtCore/qshareddata.h>
@ -62,7 +61,7 @@ class QDesignerPluginManagerPrivate;
class QDesignerCustomWidgetSharedData;
/* Information contained in the Dom XML of a custom widget. */
class QDESIGNER_SHARED_EXPORT QDesignerCustomWidgetData {
class Q_DESIGNER_EXPORT QDesignerCustomWidgetData {
public:
// StringPropertyType: validation mode and translatable flag.
typedef QPair<qdesigner_internal::TextPropertyValidationMode, bool> StringPropertyType;
@ -97,7 +96,7 @@ private:
QSharedDataPointer<QDesignerCustomWidgetSharedData> m_d;
};
class QDESIGNER_SHARED_EXPORT QDesignerPluginManager: public QObject
class Q_DESIGNER_EXPORT QDesignerPluginManager: public QObject
{
Q_OBJECT
public:

4
src/designer/shared/previewconfigurationwidget_p.h
View file

@ -45,8 +45,6 @@
#ifndef PREVIEWCONFIGURATIONWIDGET_H
#define PREVIEWCONFIGURATIONWIDGET_H
#include "shared_global_p.h"
#include <QtGui/QGroupBox>
#include <QtCore/qshareddata.h>
@ -59,7 +57,7 @@ namespace qdesigner_internal {
// ----------- PreviewConfigurationWidget: Widget to edit the preview configuration.
class QDESIGNER_SHARED_EXPORT PreviewConfigurationWidget : public QGroupBox
class Q_DESIGNER_EXPORT PreviewConfigurationWidget : public QGroupBox
{
Q_OBJECT
public:

6
src/designer/shared/previewmanager.cpp
View file

@ -237,17 +237,17 @@ void PreviewConfiguration::fromSettings(const QString &prefix, const QDesignerSe
}
QDESIGNER_SHARED_EXPORT bool operator<(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2)
Q_DESIGNER_EXPORT bool operator<(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2)
{
return compare(pc1, pc2) < 0;
}
QDESIGNER_SHARED_EXPORT bool operator==(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2)
Q_DESIGNER_EXPORT bool operator==(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2)
{
return compare(pc1, pc2) == 0;
}
QDESIGNER_SHARED_EXPORT bool operator!=(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2)
Q_DESIGNER_EXPORT bool operator!=(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2)
{
return compare(pc1, pc2) != 0;
}

12
src/designer/shared/previewmanager_p.h
View file

@ -45,8 +45,6 @@
#ifndef PREVIEWMANAGER_H
#define PREVIEWMANAGER_H
#include "shared_global_p.h"
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/qshareddata.h>
@ -68,7 +66,7 @@ namespace qdesigner_internal {
class PreviewConfigurationData;
class QDESIGNER_SHARED_EXPORT PreviewConfiguration {
class Q_DESIGNER_EXPORT PreviewConfiguration {
public:
PreviewConfiguration();
explicit PreviewConfiguration(const QString &style,
@ -93,16 +91,16 @@ private:
QSharedDataPointer<PreviewConfigurationData> m_d;
};
QDESIGNER_SHARED_EXPORT bool operator<(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2);
QDESIGNER_SHARED_EXPORT bool operator==(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2);
QDESIGNER_SHARED_EXPORT bool operator!=(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2);
Q_DESIGNER_EXPORT bool operator<(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2);
Q_DESIGNER_EXPORT bool operator==(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2);
Q_DESIGNER_EXPORT bool operator!=(const PreviewConfiguration &pc1, const PreviewConfiguration &pc2);
// ----------- Preview window manager.
// Maintains a list of preview widgets with their associated form windows and configuration.
class PreviewManagerPrivate;
class QDESIGNER_SHARED_EXPORT PreviewManager : public QObject
class Q_DESIGNER_EXPORT PreviewManager : public QObject
{
Q_OBJECT
public:

4
src/designer/shared/promotiontaskmenu_p.h
View file

@ -45,8 +45,6 @@
#ifndef PROMOTIONTASKMENU_H
#define PROMOTIONTASKMENU_H
#include "shared_global_p.h"
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QList>
@ -65,7 +63,7 @@ namespace qdesigner_internal {
// A helper class for creating promotion context menus and handling promotion actions.
class QDESIGNER_SHARED_EXPORT PromotionTaskMenu: public QObject
class Q_DESIGNER_EXPORT PromotionTaskMenu: public QObject
{
Q_OBJECT
public:

2
src/designer/shared/propertylineedit_p.h
View file

@ -45,8 +45,6 @@
#ifndef PROPERTYLINEEDIT_H
#define PROPERTYLINEEDIT_H
#include "shared_global_p.h"
#include <QtGui/QLineEdit>
QT_BEGIN_NAMESPACE

3
src/designer/shared/qdesigner_command2_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_COMMAND2_H
#define QDESIGNER_COMMAND2_H
#include "shared_global_p.h"
#include "qdesigner_formwindowcommand_p.h"
#include <QtGui/QWidget>
@ -63,7 +62,7 @@ class BreakLayoutCommand;
* LayoutCommand, parametrizing them not to actually delete/reparent
* QLayoutWidget's. */
class QDESIGNER_SHARED_EXPORT MorphLayoutCommand : public QDesignerFormWindowCommand {
class Q_DESIGNER_EXPORT MorphLayoutCommand : public QDesignerFormWindowCommand {
Q_DISABLE_COPY(MorphLayoutCommand)
public:
explicit MorphLayoutCommand(QDesignerFormWindowInterface *formWindow);

115
src/designer/shared/qdesigner_command_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_COMMAND_H
#define QDESIGNER_COMMAND_H
#include "shared_global_p.h"
#include "shared_enums_p.h"
#include "layoutinfo_p.h"
#include "qdesigner_utils_p.h"
@ -93,7 +92,7 @@ class PropertySheetIconValue;
class DesignerIconCache;
struct LayoutProperties;
class QDESIGNER_SHARED_EXPORT InsertWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT InsertWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -115,7 +114,7 @@ private:
bool m_widgetWasManaged;
};
class QDESIGNER_SHARED_EXPORT ChangeZOrderCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeZOrderCommand: public QDesignerFormWindowCommand
{
public:
@ -135,7 +134,7 @@ private:
QList<QWidget *> m_oldParentZOrder;
};
class QDESIGNER_SHARED_EXPORT RaiseWidgetCommand: public ChangeZOrderCommand
class Q_DESIGNER_EXPORT RaiseWidgetCommand: public ChangeZOrderCommand
{
public:
@ -148,7 +147,7 @@ protected:
virtual void reorder(QWidget *widget) const;
};
class QDESIGNER_SHARED_EXPORT LowerWidgetCommand: public ChangeZOrderCommand
class Q_DESIGNER_EXPORT LowerWidgetCommand: public ChangeZOrderCommand
{
public:
@ -161,7 +160,7 @@ protected:
virtual void reorder(QWidget *widget) const;
};
class QDESIGNER_SHARED_EXPORT AdjustWidgetSizeCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT AdjustWidgetSizeCommand: public QDesignerFormWindowCommand
{
public:
@ -182,7 +181,7 @@ private:
};
// Helper to correctly unmanage a widget and its children for delete operations
class QDESIGNER_SHARED_EXPORT ManageWidgetCommandHelper {
class Q_DESIGNER_EXPORT ManageWidgetCommandHelper {
public:
typedef QVector<QWidget*> WidgetVector;
@ -199,7 +198,7 @@ private:
WidgetVector m_managedChildren;
};
class QDESIGNER_SHARED_EXPORT DeleteWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT DeleteWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -230,7 +229,7 @@ private:
ManageWidgetCommandHelper m_manageHelper;
};
class QDESIGNER_SHARED_EXPORT ReparentWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ReparentWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -251,7 +250,7 @@ private:
QList<QWidget *> m_oldParentZOrder;
};
class QDESIGNER_SHARED_EXPORT ChangeFormLayoutItemRoleCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeFormLayoutItemRoleCommand : public QDesignerFormWindowCommand
{
public:
enum Operation { SpanningToLabel = 0x1, SpanningToField = 0x2, LabelToSpanning = 0x4, FieldToSpanning =0x8 };
@ -275,7 +274,7 @@ private:
Operation m_operation;
};
class QDESIGNER_SHARED_EXPORT ChangeLayoutItemGeometry: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeLayoutItemGeometry: public QDesignerFormWindowCommand
{
public:
@ -295,7 +294,7 @@ private:
QRect m_newInfo;
};
class QDESIGNER_SHARED_EXPORT TabOrderCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT TabOrderCommand: public QDesignerFormWindowCommand
{
public:
@ -318,7 +317,7 @@ private:
QList<QWidget*> m_newTabOrder;
};
class QDESIGNER_SHARED_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand
{
public:
typedef QList<QPointer<QWidget> > WidgetList;
@ -335,7 +334,7 @@ private:
QString m_customClassName;
};
class QDESIGNER_SHARED_EXPORT DemoteFromCustomWidgetCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT DemoteFromCustomWidgetCommand : public QDesignerFormWindowCommand
{
public:
typedef PromoteToCustomWidgetCommand::WidgetList WidgetList;
@ -350,7 +349,7 @@ private:
};
// Mixin class for storing the selection state
class QDESIGNER_SHARED_EXPORT CursorSelectionState {
class Q_DESIGNER_EXPORT CursorSelectionState {
Q_DISABLE_COPY(CursorSelectionState)
public:
CursorSelectionState();
@ -364,7 +363,7 @@ private:
QPointer<QWidget> m_current;
};
class QDESIGNER_SHARED_EXPORT LayoutCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT LayoutCommand: public QDesignerFormWindowCommand
{
public:
@ -390,7 +389,7 @@ private:
bool m_setup;
};
class QDESIGNER_SHARED_EXPORT BreakLayoutCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT BreakLayoutCommand: public QDesignerFormWindowCommand
{
public:
@ -420,7 +419,7 @@ private:
CursorSelectionState m_cursorSelectionState;
};
class QDESIGNER_SHARED_EXPORT SimplifyLayoutCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT SimplifyLayoutCommand: public QDesignerFormWindowCommand
{
public:
explicit SimplifyLayoutCommand(QDesignerFormWindowInterface *formWindow);
@ -441,7 +440,7 @@ private:
bool m_layoutSimplified;
};
class QDESIGNER_SHARED_EXPORT ToolBoxCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ToolBoxCommand: public QDesignerFormWindowCommand
{
public:
@ -461,7 +460,7 @@ protected:
QIcon m_itemIcon;
};
class QDESIGNER_SHARED_EXPORT MoveToolBoxPageCommand: public ToolBoxCommand
class Q_DESIGNER_EXPORT MoveToolBoxPageCommand: public ToolBoxCommand
{
public:
@ -478,7 +477,7 @@ private:
int m_oldIndex;
};
class QDESIGNER_SHARED_EXPORT DeleteToolBoxPageCommand: public ToolBoxCommand
class Q_DESIGNER_EXPORT DeleteToolBoxPageCommand: public ToolBoxCommand
{
public:
@ -491,7 +490,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT AddToolBoxPageCommand: public ToolBoxCommand
class Q_DESIGNER_EXPORT AddToolBoxPageCommand: public ToolBoxCommand
{
public:
@ -509,7 +508,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT TabWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT TabWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -529,7 +528,7 @@ protected:
QIcon m_itemIcon;
};
class QDESIGNER_SHARED_EXPORT DeleteTabPageCommand: public TabWidgetCommand
class Q_DESIGNER_EXPORT DeleteTabPageCommand: public TabWidgetCommand
{
public:
@ -542,7 +541,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT AddTabPageCommand: public TabWidgetCommand
class Q_DESIGNER_EXPORT AddTabPageCommand: public TabWidgetCommand
{
public:
@ -560,7 +559,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT MoveTabPageCommand: public TabWidgetCommand
class Q_DESIGNER_EXPORT MoveTabPageCommand: public TabWidgetCommand
{
public:
@ -582,7 +581,7 @@ private:
QIcon m_icon;
};
class QDESIGNER_SHARED_EXPORT StackedWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT StackedWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -600,7 +599,7 @@ protected:
int m_index;
};
class QDESIGNER_SHARED_EXPORT MoveStackedWidgetCommand: public StackedWidgetCommand
class Q_DESIGNER_EXPORT MoveStackedWidgetCommand: public StackedWidgetCommand
{
public:
@ -617,7 +616,7 @@ private:
int m_oldIndex;
};
class QDESIGNER_SHARED_EXPORT DeleteStackedWidgetPageCommand: public StackedWidgetCommand
class Q_DESIGNER_EXPORT DeleteStackedWidgetPageCommand: public StackedWidgetCommand
{
public:
@ -630,7 +629,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT AddStackedWidgetPageCommand: public StackedWidgetCommand
class Q_DESIGNER_EXPORT AddStackedWidgetPageCommand: public StackedWidgetCommand
{
public:
@ -648,7 +647,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT CreateMenuBarCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT CreateMenuBarCommand: public QDesignerFormWindowCommand
{
public:
@ -664,7 +663,7 @@ private:
QPointer<QMenuBar> m_menuBar;
};
class QDESIGNER_SHARED_EXPORT DeleteMenuBarCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT DeleteMenuBarCommand: public QDesignerFormWindowCommand
{
public:
@ -680,7 +679,7 @@ private:
QPointer<QMenuBar> m_menuBar;
};
class QDESIGNER_SHARED_EXPORT CreateStatusBarCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT CreateStatusBarCommand: public QDesignerFormWindowCommand
{
public:
@ -696,7 +695,7 @@ private:
QPointer<QStatusBar> m_statusBar;
};
class QDESIGNER_SHARED_EXPORT DeleteStatusBarCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT DeleteStatusBarCommand: public QDesignerFormWindowCommand
{
public:
@ -712,7 +711,7 @@ private:
QPointer<QStatusBar> m_statusBar;
};
class QDESIGNER_SHARED_EXPORT AddToolBarCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT AddToolBarCommand: public QDesignerFormWindowCommand
{
public:
@ -728,7 +727,7 @@ private:
QPointer<QToolBar> m_toolBar;
};
class QDESIGNER_SHARED_EXPORT DeleteToolBarCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT DeleteToolBarCommand: public QDesignerFormWindowCommand
{
public:
@ -744,7 +743,7 @@ private:
QPointer<QToolBar> m_toolBar;
};
class QDESIGNER_SHARED_EXPORT DockWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT DockWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -757,7 +756,7 @@ protected:
QPointer<QDockWidget> m_dockWidget;
};
class QDESIGNER_SHARED_EXPORT AddDockWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT AddDockWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -774,7 +773,7 @@ private:
QPointer<QDockWidget> m_dockWidget;
};
class QDESIGNER_SHARED_EXPORT ContainerWidgetCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ContainerWidgetCommand: public QDesignerFormWindowCommand
{
public:
@ -794,7 +793,7 @@ protected:
int m_index;
};
class QDESIGNER_SHARED_EXPORT DeleteContainerWidgetPageCommand: public ContainerWidgetCommand
class Q_DESIGNER_EXPORT DeleteContainerWidgetPageCommand: public ContainerWidgetCommand
{
public:
@ -807,7 +806,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT AddContainerWidgetPageCommand: public ContainerWidgetCommand
class Q_DESIGNER_EXPORT AddContainerWidgetPageCommand: public ContainerWidgetCommand
{
public:
@ -824,7 +823,7 @@ public:
virtual void undo();
};
class QDESIGNER_SHARED_EXPORT ChangeCurrentPageCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeCurrentPageCommand: public QDesignerFormWindowCommand
{
public:
@ -845,7 +844,7 @@ protected:
int m_newIndex;
};
struct QDESIGNER_SHARED_EXPORT ItemData {
struct Q_DESIGNER_EXPORT ItemData {
ItemData() {}
ItemData(const QListWidgetItem *item, bool editor);
@ -862,7 +861,7 @@ struct QDESIGNER_SHARED_EXPORT ItemData {
QHash<int, QVariant> m_properties;
};
struct QDESIGNER_SHARED_EXPORT ListContents {
struct Q_DESIGNER_EXPORT ListContents {
ListContents() {}
ListContents(const QTreeWidgetItem *item);
@ -881,7 +880,7 @@ struct QDESIGNER_SHARED_EXPORT ListContents {
// Data structure representing the contents of a QTableWidget with
// methods to retrieve and apply for ChangeTableContentsCommand
struct QDESIGNER_SHARED_EXPORT TableWidgetContents {
struct Q_DESIGNER_EXPORT TableWidgetContents {
typedef QPair<int, int> CellRowColumnAddress;
typedef QMap<CellRowColumnAddress, ItemData> TableItemMap;
@ -906,7 +905,7 @@ struct QDESIGNER_SHARED_EXPORT TableWidgetContents {
TableItemMap m_items;
};
class QDESIGNER_SHARED_EXPORT ChangeTableContentsCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeTableContentsCommand: public QDesignerFormWindowCommand
{
public:
explicit ChangeTableContentsCommand(QDesignerFormWindowInterface *formWindow);
@ -924,7 +923,7 @@ private:
// Data structure representing the contents of a QTreeWidget with
// methods to retrieve and apply for ChangeTreeContentsCommand
struct QDESIGNER_SHARED_EXPORT TreeWidgetContents {
struct Q_DESIGNER_EXPORT TreeWidgetContents {
struct ItemContents : public ListContents {
ItemContents() : m_itemFlags(-1) {}
@ -953,7 +952,7 @@ struct QDESIGNER_SHARED_EXPORT TreeWidgetContents {
QList<ItemContents> m_rootItems;
};
class QDESIGNER_SHARED_EXPORT ChangeTreeContentsCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeTreeContentsCommand: public QDesignerFormWindowCommand
{
public:
@ -973,7 +972,7 @@ private:
DesignerIconCache *m_iconCache;
};
class QDESIGNER_SHARED_EXPORT ChangeListContentsCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ChangeListContentsCommand: public QDesignerFormWindowCommand
{
public:
@ -991,7 +990,7 @@ private:
DesignerIconCache *m_iconCache;
};
class QDESIGNER_SHARED_EXPORT AddActionCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT AddActionCommand : public QDesignerFormWindowCommand
{
public:
@ -1006,7 +1005,7 @@ private:
// Note: This command must be executed within a macro since it
// makes the form emit objectRemoved() which might cause other components
// to add commands (for example, removal of signals and slots
class QDESIGNER_SHARED_EXPORT RemoveActionCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT RemoveActionCommand : public QDesignerFormWindowCommand
{
public:
@ -1029,7 +1028,7 @@ private:
ActionData m_actionData;
};
class QDESIGNER_SHARED_EXPORT ActionInsertionCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT ActionInsertionCommand : public QDesignerFormWindowCommand
{
protected:
@ -1049,7 +1048,7 @@ private:
bool m_update;
};
class QDESIGNER_SHARED_EXPORT InsertActionIntoCommand : public ActionInsertionCommand
class Q_DESIGNER_EXPORT InsertActionIntoCommand : public ActionInsertionCommand
{
public:
@ -1059,7 +1058,7 @@ public:
virtual void undo() { removeAction(); }
};
class QDESIGNER_SHARED_EXPORT RemoveActionFromCommand : public ActionInsertionCommand
class Q_DESIGNER_EXPORT RemoveActionFromCommand : public ActionInsertionCommand
{
public:
@ -1069,7 +1068,7 @@ public:
virtual void undo() { insertAction(); }
};
class QDESIGNER_SHARED_EXPORT MenuActionCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT MenuActionCommand : public QDesignerFormWindowCommand
{
public:
void init(QAction *action, QAction *actionBefore, QWidget *associatedWidget, QWidget *objectToSelect);
@ -1087,7 +1086,7 @@ private:
QWidget *m_objectToSelect;
};
class QDESIGNER_SHARED_EXPORT AddMenuActionCommand : public MenuActionCommand
class Q_DESIGNER_EXPORT AddMenuActionCommand : public MenuActionCommand
{
public:
@ -1097,7 +1096,7 @@ public:
virtual void undo() { removeMenu(); }
};
class QDESIGNER_SHARED_EXPORT RemoveMenuActionCommand : public MenuActionCommand
class Q_DESIGNER_EXPORT RemoveMenuActionCommand : public MenuActionCommand
{
public:
@ -1107,7 +1106,7 @@ public:
virtual void undo() { insertMenu(); }
};
class QDESIGNER_SHARED_EXPORT CreateSubmenuCommand : public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT CreateSubmenuCommand : public QDesignerFormWindowCommand
{
public:

5
src/designer/shared/qdesigner_dnditem_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_DNDITEM_H
#define QDESIGNER_DNDITEM_H
#include "shared_global_p.h"
#include <QtDesigner/abstractdnditem.h>
#include <QtCore/QPoint>
@ -60,7 +59,7 @@ class QDropEvent;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT QDesignerDnDItem: public QDesignerDnDItemInterface
class Q_DESIGNER_EXPORT QDesignerDnDItem: public QDesignerDnDItemInterface
{
public:
explicit QDesignerDnDItem(DropType type, QWidget *source = 0);
@ -92,7 +91,7 @@ private:
// Mime data for use with designer drag and drop operations.
class QDESIGNER_SHARED_EXPORT QDesignerMimeData : public QMimeData {
class Q_DESIGNER_EXPORT QDesignerMimeData : public QMimeData {
Q_OBJECT
public:

3
src/designer/shared/qdesigner_dockwidget_p.h
View file

@ -45,14 +45,13 @@
#ifndef QDESIGNER_DOCKWIDGET_H
#define QDESIGNER_DOCKWIDGET_H
#include "shared_global_p.h"
#include <QtGui/QDockWidget>
QT_BEGIN_NAMESPACE
class QDesignerFormWindowInterface;
class QDESIGNER_SHARED_EXPORT QDesignerDockWidget: public QDockWidget
class Q_DESIGNER_EXPORT QDesignerDockWidget: public QDockWidget
{
Q_OBJECT
Q_PROPERTY(Qt::DockWidgetArea dockWidgetArea READ dockWidgetArea WRITE setDockWidgetArea DESIGNABLE docked STORED false)

5
src/designer/shared/qdesigner_formbuilder_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_FORMBUILDER_H
#define QDESIGNER_FORMBUILDER_H
#include "shared_global_p.h"
#include "deviceprofile_p.h"
#include <QtUiTools/formscriptrunner_p.h>
@ -70,7 +69,7 @@ class DesignerIconCache;
/* Form builder used for previewing forms and widget box.
* It applies the system settings to its toplevel window. */
class QDESIGNER_SHARED_EXPORT QDesignerFormBuilder: public QFormBuilder
class Q_DESIGNER_EXPORT QDesignerFormBuilder: public QFormBuilder
{
public:
enum Mode {
@ -155,7 +154,7 @@ private:
// widgets in the template, it implements the handling of custom widgets
// (adding of them to the widget database).
class QDESIGNER_SHARED_EXPORT NewFormWidgetFormBuilder: public QDesignerFormBuilder {
class Q_DESIGNER_EXPORT NewFormWidgetFormBuilder: public QDesignerFormBuilder {
public:
NewFormWidgetFormBuilder(QDesignerFormEditorInterface *core,
Mode mode,

3
src/designer/shared/qdesigner_formeditorcommand_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_FORMEDITORCOMMAND_H
#define QDESIGNER_FORMEDITORCOMMAND_H
#include "shared_global_p.h"
#include <QtCore/QPointer>
#include <QtGui/qundostack.h>
@ -55,7 +54,7 @@ class QDesignerFormEditorInterface;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT QDesignerFormEditorCommand: public QUndoCommand
class Q_DESIGNER_EXPORT QDesignerFormEditorCommand: public QUndoCommand
{
public:

4
src/designer/shared/qdesigner_formwindowcommand_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNER_FORMWINDOWCOMMAND_H
#define QDESIGNER_FORMWINDOWCOMMAND_H
#include "shared_global_p.h"
#include <QtCore/QPointer>
#include <QtGui/qundostack.h>
@ -58,7 +56,7 @@ class QDesignerPropertySheetExtension;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT QDesignerFormWindowCommand: public QUndoCommand
class Q_DESIGNER_EXPORT QDesignerFormWindowCommand: public QUndoCommand
{
public:

3
src/designer/shared/qdesigner_formwindowmanager_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_FORMWINDOMANAGER_H
#define QDESIGNER_FORMWINDOMANAGER_H
#include "shared_global_p.h"
#include <QtDesigner/abstractformwindowmanager.h>
QT_BEGIN_NAMESPACE
@ -57,7 +56,7 @@ class PreviewManager;
//
// Convenience methods to manage form previews (ultimately forwarded to PreviewManager).
//
class QDESIGNER_SHARED_EXPORT QDesignerFormWindowManager
class Q_DESIGNER_EXPORT QDesignerFormWindowManager
: public QDesignerFormWindowManagerInterface
{
Q_OBJECT

3
src/designer/shared/qdesigner_integration_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_INTEGRATION_H
#define QDESIGNER_INTEGRATION_H
#include "shared_global_p.h"
#include <QtDesigner/abstractintegration.h>
#include <QtCore/QObject>
@ -64,7 +63,7 @@ namespace qdesigner_internal {
struct Selection;
class QDesignerIntegrationPrivate;
class QDESIGNER_SHARED_EXPORT QDesignerIntegration: public QDesignerIntegrationInterface
class Q_DESIGNER_EXPORT QDesignerIntegration: public QDesignerIntegrationInterface
{
Q_OBJECT
public:

3
src/designer/shared/qdesigner_introspection_p.h
View file

@ -45,7 +45,6 @@
#ifndef DESIGNERINTROSPECTION
#define DESIGNERINTROSPECTION
#include "shared_global_p.h"
#include <abstractintrospection_p.h>
#include <QtCore/QMap>
@ -56,7 +55,7 @@ class QWidget;
namespace qdesigner_internal {
// Qt C++ introspection with helpers to find core and meta object for an object
class QDESIGNER_SHARED_EXPORT QDesignerIntrospection : public QDesignerIntrospectionInterface {
class Q_DESIGNER_EXPORT QDesignerIntrospection : public QDesignerIntrospectionInterface {
public:
QDesignerIntrospection();
virtual ~QDesignerIntrospection();

6
src/designer/shared/qdesigner_membersheet_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNER_MEMBERSHEET_H
#define QDESIGNER_MEMBERSHEET_H
#include "shared_global_p.h"
#include <QtDesigner/membersheet.h>
#include <QtDesigner/default_extensionfactory.h>
#include <QtCore/QStringList>
@ -55,7 +53,7 @@ QT_BEGIN_NAMESPACE
class QDesignerMemberSheetPrivate;
class QDESIGNER_SHARED_EXPORT QDesignerMemberSheet: public QObject, public QDesignerMemberSheetExtension
class Q_DESIGNER_EXPORT QDesignerMemberSheet: public QObject, public QDesignerMemberSheetExtension
{
Q_OBJECT
Q_INTERFACES(QDesignerMemberSheetExtension)
@ -92,7 +90,7 @@ private:
QDesignerMemberSheetPrivate *d;
};
class QDESIGNER_SHARED_EXPORT QDesignerMemberSheetFactory: public QExtensionFactory
class Q_DESIGNER_EXPORT QDesignerMemberSheetFactory: public QExtensionFactory
{
Q_OBJECT
Q_INTERFACES(QAbstractExtensionFactory)

4
src/designer/shared/qdesigner_menu_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNER_MENU_H
#define QDESIGNER_MENU_H
#include "shared_global_p.h"
#include <QtGui/QAction>
#include <QtGui/QMenu>
#include <QtGui/QPixmap>
@ -69,7 +67,7 @@ namespace qdesigner_internal {
class ActionInsertionCommand;
}
class QDESIGNER_SHARED_EXPORT QDesignerMenu: public QMenu
class Q_DESIGNER_EXPORT QDesignerMenu: public QMenu
{
Q_OBJECT
public:

5
src/designer/shared/qdesigner_menubar_p.h
View file

@ -45,11 +45,8 @@
#ifndef QDESIGNER_MENUBAR_H
#define QDESIGNER_MENUBAR_H
#include "shared_global_p.h"
#include <QtGui/QAction>
#include <QtGui/QMenuBar>
#include <QtCore/QPointer>
#include <QtCore/QMimeData>
@ -74,7 +71,7 @@ public:
} // namespace qdesigner_internal
class QDESIGNER_SHARED_EXPORT QDesignerMenuBar: public QMenuBar
class Q_DESIGNER_EXPORT QDesignerMenuBar: public QMenuBar
{
Q_OBJECT
public:

5
src/designer/shared/qdesigner_objectinspector_p.h
View file

@ -45,7 +45,6 @@
#ifndef DESIGNEROBJECTINSPECTOR_H
#define DESIGNEROBJECTINSPECTOR_H
#include "shared_global_p.h"
#include <QtDesigner/abstractobjectinspector.h>
#include <QtCore/QList>
@ -55,7 +54,7 @@ class QDesignerDnDItemInterface;
namespace qdesigner_internal {
struct QDESIGNER_SHARED_EXPORT Selection {
struct Q_DESIGNER_EXPORT Selection {
bool empty() const;
void clear();
@ -73,7 +72,7 @@ struct QDESIGNER_SHARED_EXPORT Selection {
// Extends the QDesignerObjectInspectorInterface by functionality
// to access the selection
class QDESIGNER_SHARED_EXPORT QDesignerObjectInspector: public QDesignerObjectInspectorInterface
class Q_DESIGNER_EXPORT QDesignerObjectInspector: public QDesignerObjectInspectorInterface
{
Q_OBJECT
public:

4
src/designer/shared/qdesigner_promotion_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNERPROMOTION_H
#define QDESIGNERPROMOTION_H
#include "shared_global_p.h"
#include <QtDesigner/abstractpromotioninterface.h>
QT_BEGIN_NAMESPACE
@ -55,7 +53,7 @@ class QDesignerFormEditorInterface;
namespace qdesigner_internal {
class QDESIGNER_SHARED_EXPORT QDesignerPromotion : public QDesignerPromotionInterface
class Q_DESIGNER_EXPORT QDesignerPromotion : public QDesignerPromotionInterface
{
public:
explicit QDesignerPromotion(QDesignerFormEditorInterface *core);

12
src/designer/shared/qdesigner_propertycommand_p.h
View file

@ -74,7 +74,7 @@ enum SpecialProperty getSpecialProperty(const QString& propertyName);
// Can be used for Set commands (setValue(), restoreOldValue()) or
// Reset Commands restoreDefaultValue(), restoreOldValue()).
//
class QDESIGNER_SHARED_EXPORT PropertyHelper {
class Q_DESIGNER_EXPORT PropertyHelper {
Q_DISABLE_COPY(PropertyHelper)
public:
// A pair of Value and changed flag
@ -139,7 +139,7 @@ private:
// Base class for commands that can be applied to several widgets
class QDESIGNER_SHARED_EXPORT PropertyListCommand : public QDesignerFormWindowCommand {
class Q_DESIGNER_EXPORT PropertyListCommand : public QDesignerFormWindowCommand {
public:
typedef QList<QObject *> ObjectList;
@ -209,7 +209,7 @@ private:
PropertyHelperList m_propertyHelperList;
};
class QDESIGNER_SHARED_EXPORT SetPropertyCommand: public PropertyListCommand
class Q_DESIGNER_EXPORT SetPropertyCommand: public PropertyListCommand
{
public:
@ -243,7 +243,7 @@ private:
unsigned m_subPropertyMask;
};
class QDESIGNER_SHARED_EXPORT ResetPropertyCommand: public PropertyListCommand
class Q_DESIGNER_EXPORT ResetPropertyCommand: public PropertyListCommand
{
public:
@ -265,7 +265,7 @@ private:
};
class QDESIGNER_SHARED_EXPORT AddDynamicPropertyCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT AddDynamicPropertyCommand: public QDesignerFormWindowCommand
{
public:
@ -282,7 +282,7 @@ private:
QVariant m_value;
};
class QDESIGNER_SHARED_EXPORT RemoveDynamicPropertyCommand: public QDesignerFormWindowCommand
class Q_DESIGNER_EXPORT RemoveDynamicPropertyCommand: public QDesignerFormWindowCommand
{
public:

3
src/designer/shared/qdesigner_propertyeditor_p.h
View file

@ -46,7 +46,6 @@
#ifndef DESIGNERPROPERTYEDITOR_H
#define DESIGNERPROPERTYEDITOR_H
#include "shared_global_p.h"
#include "shared_enums_p.h"
#include <QtDesigner/abstractpropertyeditor.h>
@ -57,7 +56,7 @@ namespace qdesigner_internal {
// Extends the QDesignerPropertyEditorInterface by property comment handling and
// a signal for resetproperty.
class QDESIGNER_SHARED_EXPORT QDesignerPropertyEditor: public QDesignerPropertyEditorInterface
class Q_DESIGNER_EXPORT QDesignerPropertyEditor: public QDesignerPropertyEditorInterface
{
Q_OBJECT
public:

6
src/designer/shared/qdesigner_propertysheet_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_PROPERTYSHEET_H
#define QDESIGNER_PROPERTYSHEET_H
#include "shared_global_p.h"
#include "dynamicpropertysheet.h"
#include <QtDesigner/propertysheet.h>
#include <QtDesigner/default_extensionfactory.h>
@ -53,7 +52,6 @@
#include <QtCore/QVariant>
#include <QtCore/QPair>
#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
@ -69,7 +67,7 @@ namespace qdesigner_internal
class FormWindowBase;
}
class QDESIGNER_SHARED_EXPORT QDesignerPropertySheet: public QObject, public QDesignerPropertySheetExtension, public QDesignerDynamicPropertySheetExtension
class Q_DESIGNER_EXPORT QDesignerPropertySheet: public QObject, public QDesignerPropertySheetExtension, public QDesignerDynamicPropertySheetExtension
{
Q_OBJECT
Q_INTERFACES(QDesignerPropertySheetExtension QDesignerDynamicPropertySheetExtension)
@ -189,7 +187,7 @@ private:
* by multiple inheritance. The factory maintains ownership of
* the extension and returns it for both id's. */
class QDESIGNER_SHARED_EXPORT QDesignerAbstractPropertySheetFactory: public QExtensionFactory
class Q_DESIGNER_EXPORT QDesignerAbstractPropertySheetFactory: public QExtensionFactory
{
Q_OBJECT
Q_INTERFACES(QAbstractExtensionFactory)

3
src/designer/shared/qdesigner_qsettings_p.h
View file

@ -46,14 +46,13 @@
#define QDESIGNER_QSETTINGS_H
#include "abstractsettings_p.h"
#include "shared_global_p.h"
#include <QtCore/QSettings>
QT_BEGIN_NAMESPACE
// Implements QDesignerSettingsInterface by calls to QSettings
class QDESIGNER_SHARED_EXPORT QDesignerQSettings : public QDesignerSettingsInterface
class Q_DESIGNER_EXPORT QDesignerQSettings : public QDesignerSettingsInterface
{
public:
QDesignerQSettings();

7
src/designer/shared/qdesigner_stackedbox_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_STACKEDBOX_H
#define QDESIGNER_STACKEDBOX_H
#include "shared_global_p.h"
#include "qdesigner_propertysheet_p.h"
QT_BEGIN_NAMESPACE
@ -63,7 +62,7 @@ namespace qdesigner_internal {
// Event filter to be installed on a QStackedWidget in preview mode.
// Create two buttons to switch pages.
class QDESIGNER_SHARED_EXPORT QStackedWidgetPreviewEventFilter : public QObject
class Q_DESIGNER_EXPORT QStackedWidgetPreviewEventFilter : public QObject
{
Q_OBJECT
public:
@ -97,7 +96,7 @@ private:
// Event filter to be installed on a QStackedWidget in editing mode.
// In addition to the browse buttons, handles context menu and everything
class QDESIGNER_SHARED_EXPORT QStackedWidgetEventFilter : public QStackedWidgetPreviewEventFilter
class Q_DESIGNER_EXPORT QStackedWidgetEventFilter : public QStackedWidgetPreviewEventFilter
{
Q_OBJECT
public:
@ -132,7 +131,7 @@ private:
};
// PropertySheet to handle the "currentPageName" property
class QDESIGNER_SHARED_EXPORT QStackedWidgetPropertySheet : public QDesignerPropertySheet {
class Q_DESIGNER_EXPORT QStackedWidgetPropertySheet : public QDesignerPropertySheet {
public:
explicit QStackedWidgetPropertySheet(QStackedWidget *object, QObject *parent = Q_NULLPTR);

5
src/designer/shared/qdesigner_tabwidget_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_TABWIDGET_H
#define QDESIGNER_TABWIDGET_H
#include "shared_global_p.h"
#include "qdesigner_propertysheet_p.h"
#include "qdesigner_utils_p.h"
@ -64,7 +63,7 @@ namespace qdesigner_internal {
class PromotionTaskMenu;
}
class QDESIGNER_SHARED_EXPORT QTabWidgetEventFilter : public QObject
class Q_DESIGNER_EXPORT QTabWidgetEventFilter : public QObject
{
Q_OBJECT
public:
@ -109,7 +108,7 @@ private:
};
// PropertySheet to handle the page properties
class QDESIGNER_SHARED_EXPORT QTabWidgetPropertySheet : public QDesignerPropertySheet {
class Q_DESIGNER_EXPORT QTabWidgetPropertySheet : public QDesignerPropertySheet {
public:
explicit QTabWidgetPropertySheet(QTabWidget *object, QObject *parent = Q_NULLPTR);

3
src/designer/shared/qdesigner_taskmenu_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_TASKMENU_H
#define QDESIGNER_TASKMENU_H
#include "shared_global_p.h"
#include "extensionfactory_p.h"
#include <QtDesigner/taskmenu.h>
@ -64,7 +63,7 @@ class QSignalMapper;
namespace qdesigner_internal {
class QDesignerTaskMenuPrivate;
class QDESIGNER_SHARED_EXPORT QDesignerTaskMenu: public QObject, public QDesignerTaskMenuExtension
class Q_DESIGNER_EXPORT QDesignerTaskMenu: public QObject, public QDesignerTaskMenuExtension
{
Q_OBJECT
Q_INTERFACES(QDesignerTaskMenuExtension)

4
src/designer/shared/qdesigner_toolbar_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNER_TOOLBAR_H
#define QDESIGNER_TOOLBAR_H
#include "shared_global_p.h"
#include <QtGui/QAction>
#include <QtGui/QToolButton>
@ -68,7 +66,7 @@ class PromotionTaskMenu;
// Handles drag and drop to and from. Ensures that each
// child widget is WA_TransparentForMouseEvents to enable drag and drop.
class QDESIGNER_SHARED_EXPORT ToolBarEventFilter : public QObject {
class Q_DESIGNER_EXPORT ToolBarEventFilter : public QObject {
Q_OBJECT
public:

5
src/designer/shared/qdesigner_toolbox_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_TOOLBOX_H
#define QDESIGNER_TOOLBOX_H
#include "shared_global_p.h"
#include "qdesigner_propertysheet_p.h"
#include "qdesigner_utils_p.h"
#include <QtGui/QPalette>
@ -61,7 +60,7 @@ class QToolBox;
class QAction;
class QMenu;
class QDESIGNER_SHARED_EXPORT QToolBoxHelper : public QObject
class Q_DESIGNER_EXPORT QToolBoxHelper : public QObject
{
Q_OBJECT
@ -97,7 +96,7 @@ private:
};
// PropertySheet to handle the page properties
class QDESIGNER_SHARED_EXPORT QToolBoxWidgetPropertySheet : public QDesignerPropertySheet {
class Q_DESIGNER_EXPORT QToolBoxWidgetPropertySheet : public QDesignerPropertySheet {
public:
explicit QToolBoxWidgetPropertySheet(QToolBox *object, QObject *parent = Q_NULLPTR);

12
src/designer/shared/qdesigner_utils.cpp
View file

@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
namespace qdesigner_internal
{
QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
Q_DESIGNER_EXPORT void designerWarning(const QString &message)
{
qWarning("Designer: %s", qPrintable(message));
}
@ -714,7 +714,7 @@ namespace qdesigner_internal
return m_data->m_paths;
}
QDESIGNER_SHARED_EXPORT QDebug operator<<(QDebug d, const PropertySheetIconValue &p)
Q_DESIGNER_EXPORT QDebug operator<<(QDebug d, const PropertySheetIconValue &p)
{
typedef PropertySheetIconValue::ModeStateToPixmapMap::const_iterator ModeStateToPixmapMapConstIt;
@ -730,7 +730,7 @@ namespace qdesigner_internal
return d;
}
QDESIGNER_SHARED_EXPORT QDesignerFormWindowCommand *createTextPropertyCommand(const QString &propertyName, const QString &text, QObject *object, QDesignerFormWindowInterface *fw)
Q_DESIGNER_EXPORT QDesignerFormWindowCommand *createTextPropertyCommand(const QString &propertyName, const QString &text, QObject *object, QDesignerFormWindowInterface *fw)
{
if (text.isEmpty()) {
ResetPropertyCommand *cmd = new ResetPropertyCommand(fw);
@ -742,7 +742,7 @@ namespace qdesigner_internal
return cmd;
}
QDESIGNER_SHARED_EXPORT QAction *preferredEditAction(QDesignerFormEditorInterface *core, QWidget *managedWidget)
Q_DESIGNER_EXPORT QAction *preferredEditAction(QDesignerFormEditorInterface *core, QWidget *managedWidget)
{
QAction *action = 0;
if (const QDesignerTaskMenuExtension *taskMenu = qt_extension<QDesignerTaskMenuExtension*>(core->extensionManager(), managedWidget)) {
@ -767,7 +767,7 @@ namespace qdesigner_internal
return action;
}
QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, QByteArray& ba, QString &errorMessage)
Q_DESIGNER_EXPORT bool runUIC(const QString &fileName, QByteArray& ba, QString &errorMessage)
{
QStringList argv;
QString binary = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator() + QLatin1String("uic" KATIE_TOOLS_SUFFIX);
@ -790,7 +790,7 @@ namespace qdesigner_internal
return true;
}
QDESIGNER_SHARED_EXPORT QString qtify(const QString &name)
Q_DESIGNER_EXPORT QString qtify(const QString &name)
{
QString qname = name;

38
src/designer/shared/qdesigner_utils_p.h
View file

@ -45,8 +45,6 @@
#ifndef QDESIGNER_UTILS_H
#define QDESIGNER_UTILS_H
#include "shared_global_p.h"
#include <QtDesigner/abstractformwindow.h>
#include <QtCore/QVariant>
@ -66,9 +64,9 @@ class DesignerIconCache;
class FormWindowBase;
QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message);
Q_DESIGNER_EXPORT void designerWarning(const QString &message);
QDESIGNER_SHARED_EXPORT void reloadIconResources(DesignerIconCache *iconCache, QObject *object);
Q_DESIGNER_EXPORT void reloadIconResources(DesignerIconCache *iconCache, QObject *object);
/* Flag/Enumeration helpers for the property sheet: Enumeration or flag values are returned by the property sheet
* as a pair of meta type and integer value.
@ -162,7 +160,7 @@ void MetaEnum<IntType>::appendQualifiedName(const QString &key, QString &target)
// -------------- DesignerMetaEnum: Meta type for enumerations
class QDESIGNER_SHARED_EXPORT DesignerMetaEnum : public MetaEnum<int>
class Q_DESIGNER_EXPORT DesignerMetaEnum : public MetaEnum<int>
{
public:
DesignerMetaEnum(const QString &name, const QString &scope, const QString &separator);
@ -182,7 +180,7 @@ public:
// Note that while the handling of flags is done using unsigned integers, the actual values returned
// by the property system are integers.
class QDESIGNER_SHARED_EXPORT DesignerMetaFlags : public MetaEnum<uint>
class Q_DESIGNER_EXPORT DesignerMetaFlags : public MetaEnum<uint>
{
public:
DesignerMetaFlags(const QString &name, const QString &scope, const QString &separator);
@ -199,7 +197,7 @@ public:
// -------------- EnumValue: Returned by the property sheet for enumerations
struct QDESIGNER_SHARED_EXPORT PropertySheetEnumValue
struct Q_DESIGNER_EXPORT PropertySheetEnumValue
{
PropertySheetEnumValue(int v, const DesignerMetaEnum &me);
PropertySheetEnumValue();
@ -210,7 +208,7 @@ struct QDESIGNER_SHARED_EXPORT PropertySheetEnumValue
// -------------- FlagValue: Returned by the property sheet for flags
struct QDESIGNER_SHARED_EXPORT PropertySheetFlagValue
struct Q_DESIGNER_EXPORT PropertySheetFlagValue
{
PropertySheetFlagValue(int v, const DesignerMetaFlags &mf);
PropertySheetFlagValue();
@ -220,7 +218,7 @@ struct QDESIGNER_SHARED_EXPORT PropertySheetFlagValue
};
// -------------- PixmapValue: Returned by the property sheet for pixmaps
class QDESIGNER_SHARED_EXPORT PropertySheetPixmapValue
class Q_DESIGNER_EXPORT PropertySheetPixmapValue
{
public:
PropertySheetPixmapValue(const QString &path);
@ -249,7 +247,7 @@ private:
class PropertySheetIconValueData;
class QDESIGNER_SHARED_EXPORT PropertySheetIconValue
class Q_DESIGNER_EXPORT PropertySheetIconValue
{
public:
PropertySheetIconValue(const PropertySheetPixmapValue &pixmap);
@ -288,9 +286,9 @@ private:
QSharedDataPointer<PropertySheetIconValueData> m_data;
};
QDESIGNER_SHARED_EXPORT QDebug operator<<(QDebug, const PropertySheetIconValue &);
Q_DESIGNER_EXPORT QDebug operator<<(QDebug, const PropertySheetIconValue &);
class QDESIGNER_SHARED_EXPORT DesignerPixmapCache : public QObject
class Q_DESIGNER_EXPORT DesignerPixmapCache : public QObject
{
Q_OBJECT
public:
@ -304,7 +302,7 @@ private:
friend class FormWindowBase;
};
class QDESIGNER_SHARED_EXPORT DesignerIconCache : public QObject
class Q_DESIGNER_EXPORT DesignerIconCache : public QObject
{
Q_OBJECT
public:
@ -320,7 +318,7 @@ private:
};
// -------------- StringValue: Returned by the property sheet for strings
class QDESIGNER_SHARED_EXPORT PropertySheetStringValue
class Q_DESIGNER_EXPORT PropertySheetStringValue
{
public:
explicit PropertySheetStringValue(const QString &value = QString(),
@ -352,7 +350,7 @@ private:
// -------------- StringValue: Returned by the property sheet for strings
class QDESIGNER_SHARED_EXPORT PropertySheetKeySequenceValue
class Q_DESIGNER_EXPORT PropertySheetKeySequenceValue
{
public:
explicit PropertySheetKeySequenceValue(const QKeySequence &value = QKeySequence(),
@ -410,22 +408,22 @@ namespace qdesigner_internal {
// Create a command to change a text property (that is, create a reset property command if the text is empty)
QDESIGNER_SHARED_EXPORT QDesignerFormWindowCommand *createTextPropertyCommand(const QString &propertyName, const QString &text, QObject *object, QDesignerFormWindowInterface *fw);
Q_DESIGNER_EXPORT QDesignerFormWindowCommand *createTextPropertyCommand(const QString &propertyName, const QString &text, QObject *object, QDesignerFormWindowInterface *fw);
// Returns preferred task menu action for managed widget
QDESIGNER_SHARED_EXPORT QAction *preferredEditAction(QDesignerFormEditorInterface *core, QWidget *managedWidget);
Q_DESIGNER_EXPORT QAction *preferredEditAction(QDesignerFormEditorInterface *core, QWidget *managedWidget);
// Convenience to run UIC
QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, QByteArray& ba, QString &errorMessage);
Q_DESIGNER_EXPORT bool runUIC(const QString &fileName, QByteArray& ba, QString &errorMessage);
// Find a suitable variable name for a class.
QDESIGNER_SHARED_EXPORT QString qtify(const QString &name);
Q_DESIGNER_EXPORT QString qtify(const QString &name);
/* UpdateBlocker: Blocks the updates of the widget passed on while in scope.
* Does nothing if the incoming widget already has updatesEnabled==false
* which is important to avoid side-effects when putting it into QStackedLayout. */
class QDESIGNER_SHARED_EXPORT UpdateBlocker {
class Q_DESIGNER_EXPORT UpdateBlocker {
Q_DISABLE_COPY(UpdateBlocker)
public:

7
src/designer/shared/qdesigner_widget_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_WIDGET_H
#define QDESIGNER_WIDGET_H
#include "shared_global_p.h"
#include <QtGui/QDialog>
#include <QtGui/QLabel>
@ -57,7 +56,7 @@ namespace qdesigner_internal {
class FormWindowBase;
}
class QDESIGNER_SHARED_EXPORT QDesignerWidget : public QWidget
class Q_DESIGNER_EXPORT QDesignerWidget : public QWidget
{
Q_OBJECT
public:
@ -76,7 +75,7 @@ private:
qdesigner_internal::FormWindowBase* m_formWindow;
};
class QDESIGNER_SHARED_EXPORT QDesignerDialog : public QDialog
class Q_DESIGNER_EXPORT QDesignerDialog : public QDialog
{
Q_OBJECT
public:
@ -92,7 +91,7 @@ private:
qdesigner_internal::FormWindowBase* m_formWindow;
};
class QDESIGNER_SHARED_EXPORT Line : public QFrame
class Q_DESIGNER_EXPORT Line : public QFrame
{
Q_OBJECT
Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)

3
src/designer/shared/qdesigner_widgetbox_p.h
View file

@ -45,7 +45,6 @@
#ifndef QDESIGNER_WIDGETBOX_H
#define QDESIGNER_WIDGETBOX_H
#include "shared_global_p.h"
#include <QtDesigner/abstractwidgetbox.h>
QT_BEGIN_NAMESPACE
@ -56,7 +55,7 @@ namespace qdesigner_internal {
// A widget box with a load mode that allows for updating custom widgets.
class QDESIGNER_SHARED_EXPORT QDesignerWidgetBox : public QDesignerWidgetBoxInterface
class Q_DESIGNER_EXPORT QDesignerWidgetBox : public QDesignerWidgetBoxInterface
{
Q_OBJECT
public:

6
src/designer/shared/qdesigner_widgetitem_p.h
View file

@ -45,8 +45,6 @@
#ifndef DESIGNERWIDGETITEM_H
#define DESIGNERWIDGETITEM_H
#include "shared_global_p.h"
#include <QtGui/QLayoutItem>
#include <QtCore/QObject>
@ -71,7 +69,7 @@ namespace qdesigner_internal {
// and destroyed slots as Designer will for example re-create grid layouts to
// shrink them.
class QDESIGNER_SHARED_EXPORT QDesignerWidgetItem : public QObject, public QWidgetItemV2 {
class Q_DESIGNER_EXPORT QDesignerWidgetItem : public QObject, public QWidgetItemV2 {
Q_DISABLE_COPY(QDesignerWidgetItem)
Q_OBJECT
public:
@ -121,7 +119,7 @@ private:
// Helper class that ensures QDesignerWidgetItem is installed while an
// instance is in scope.
class QDESIGNER_SHARED_EXPORT QDesignerWidgetItemInstaller {
class Q_DESIGNER_EXPORT QDesignerWidgetItemInstaller {
Q_DISABLE_COPY(QDesignerWidgetItemInstaller)
public:

Some files were not shown because too many files have changed in this diff Show more