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")
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()
-# 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)
'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',
return QT_VERSION_STR;
}
-bool qSharedBuild()
-{
-#ifdef QT_SHARED
- return true;
-#else
- return false;
-#endif
-}
-
/*****************************************************************************
System detection routines
*****************************************************************************/
#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
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
};
Q_CORE_EXPORT const char *qVersion();
-Q_CORE_EXPORT bool qSharedBuild();
/*
Avoid "unused parameter" warnings
void QFactoryLoader::update()
{
-#ifdef QT_SHARED
Q_D(QFactoryLoader);
foreach (const QString &pluginDir, QCoreApplication::libraryPaths()) {
// Already loaded, skip it...
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()
*/
void QPluginLoader::setFileName(const QString &fileName)
{
-#if defined(QT_SHARED)
QLibrary::LoadHints lh;
if (d) {
lh = d->loadHints;
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
${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
${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
${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)
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
#ifndef DEFAULT_EXTENSIONFACTORY_H
#define DEFAULT_EXTENSIONFACTORY_H
-#include <QtDesigner/extension_global.h>
#include <QtDesigner/extension.h>
#include <QtCore/QMap>
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)
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
#ifndef QEXTENSIONMANAGER_H
#define QEXTENSIONMANAGER_H
-#include <QtDesigner/extension_global.h>
#include <QtDesigner/extension.h>
#include <QtCore/QHash>
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)
#ifndef ABSTRACTACTIONEDITOR_H
#define ABSTRACTACTIONEDITOR_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtGui/QWidget>
QT_BEGIN_HEADER
class QDesignerFormEditorInterface;
class QDesignerFormWindowInterface;
-class QDESIGNER_SDK_EXPORT QDesignerActionEditorInterface: public QWidget
+class Q_DESIGNER_EXPORT QDesignerActionEditorInterface: public QWidget
{
Q_OBJECT
public:
#ifndef ABSTRACTBRUSHMANAGER_H
#define ABSTRACTBRUSHMANAGER_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/qobject.h>
#include <QtCore/qmap.h>
#include <QtGui/qbrush.h>
class QObject;
-class QDESIGNER_SDK_EXPORT QDesignerBrushManagerInterface : public QObject
+class Q_DESIGNER_EXPORT QDesignerBrushManagerInterface : public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTDIALOGGUI_H
#define ABSTRACTDIALOGGUI_H
-#include <QtDesigner/sdk_global.h>
#include <QtGui/QMessageBox>
#include <QtGui/QFileDialog>
QT_BEGIN_NAMESPACE
-class QDESIGNER_SDK_EXPORT QDesignerDialogGuiInterface
+class Q_DESIGNER_EXPORT QDesignerDialogGuiInterface
{
Q_DISABLE_COPY(QDesignerDialogGuiInterface)
public:
#ifndef ABSTRACTDNDITEM_H
#define ABSTRACTDNDITEM_H
-#include <QtDesigner/sdk_global.h>
+#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
class QWidget;
class QPoint;
-class QDESIGNER_SDK_EXPORT QDesignerDnDItemInterface
+class Q_DESIGNER_EXPORT QDesignerDnDItemInterface
{
public:
enum DropType { MoveDrop, CopyDrop };
#ifndef ABSTRACTFORMEDITOR_H
#define ABSTRACTFORMEDITOR_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
#include <QtCore/QPointer>
class QDesignerFormEditorInterfacePrivate;
-class QDESIGNER_SDK_EXPORT QDesignerFormEditorInterface : public QObject
+class Q_DESIGNER_EXPORT QDesignerFormEditorInterface : public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTFORMEDITORPLUGIN_H
#define ABSTRACTFORMEDITORPLUGIN_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
QT_BEGIN_HEADER
class QDesignerFormEditorInterface;
class QAction;
-class QDESIGNER_SDK_EXPORT QDesignerFormEditorPluginInterface
+class Q_DESIGNER_EXPORT QDesignerFormEditorPluginInterface
{
public:
virtual ~QDesignerFormEditorPluginInterface() {}
#ifndef ABSTRACTFORMWINDOW_H
#define ABSTRACTFORMWINDOW_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtGui/QWidget>
QT_BEGIN_HEADER
class QUndoStack;
class QDir;
-class QDESIGNER_SDK_EXPORT QDesignerFormWindowInterface: public QWidget
+class Q_DESIGNER_EXPORT QDesignerFormWindowInterface: public QWidget
{
Q_OBJECT
public:
#ifndef ABSTRACTFORMWINDOWCURSOR_H
#define ABSTRACTFORMWINDOWCURSOR_H
-#include <QtDesigner/sdk_global.h>
+#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
class QVariant;
class QString;
-class QDESIGNER_SDK_EXPORT QDesignerFormWindowCursorInterface
+class Q_DESIGNER_EXPORT QDesignerFormWindowCursorInterface
{
public:
enum MoveOperation
#ifndef ABSTRACTFORMWINDOWMANAGER_H
#define ABSTRACTFORMWINDOWMANAGER_H
-#include <QtDesigner/sdk_global.h>
#include <QtDesigner/abstractformwindow.h>
#include <QtCore/QObject>
class QWidget;
class QDesignerDnDItemInterface;
-class QDESIGNER_SDK_EXPORT QDesignerFormWindowManagerInterface: public QObject
+class Q_DESIGNER_EXPORT QDesignerFormWindowManagerInterface: public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTFORMWINDOWTOOL_H
#define ABSTRACTFORMWINDOWTOOL_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
QT_BEGIN_HEADER
class QAction;
class DomUI;
-class QDESIGNER_SDK_EXPORT QDesignerFormWindowToolInterface: public QObject
+class Q_DESIGNER_EXPORT QDesignerFormWindowToolInterface: public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTICONCACHE_H
#define ABSTRACTICONCACHE_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
QT_BEGIN_HEADER
class QPixmap;
class QString;
-class QDESIGNER_SDK_EXPORT QDesignerIconCacheInterface : public QObject
+class Q_DESIGNER_EXPORT QDesignerIconCacheInterface : public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTINTEGRATION_H
#define ABSTRACTINTEGRATION_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
#include <QtCore/QString>
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)
#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();
virtual QString valueToKeys(int value) const = 0;
};
-class QDESIGNER_SDK_EXPORT QDesignerMetaPropertyInterface
+class Q_DESIGNER_EXPORT QDesignerMetaPropertyInterface
{
public:
enum Kind { EnumKind, FlagKind, OtherKind };
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();
virtual QString typeName() const = 0;
};
-class QDESIGNER_SDK_EXPORT QDesignerMetaObjectInterface {
+class Q_DESIGNER_EXPORT QDesignerMetaObjectInterface {
public:
QDesignerMetaObjectInterface();
virtual ~QDesignerMetaObjectInterface();
};
// To be obtained from core
-class QDESIGNER_SDK_EXPORT QDesignerIntrospectionInterface {
+class Q_DESIGNER_EXPORT QDesignerIntrospectionInterface {
public:
QDesignerIntrospectionInterface();
virtual ~QDesignerIntrospectionInterface();
#ifndef ABSTRACTMETADATABASE_H
#define ABSTRACTMETADATABASE_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtCore/QHash>
};
-class QDESIGNER_SDK_EXPORT QDesignerMetaDataBaseInterface: public QObject
+class Q_DESIGNER_EXPORT QDesignerMetaDataBaseInterface: public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTNEWFORMWIDGET_H
#define ABSTRACTNEWFORMWIDGET_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtGui/QWidget>
QT_BEGIN_HEADER
class QDesignerFormEditorInterface;
-class QDESIGNER_SDK_EXPORT QDesignerNewFormWidgetInterface : public QWidget
+class Q_DESIGNER_EXPORT QDesignerNewFormWidgetInterface : public QWidget
{
Q_DISABLE_COPY(QDesignerNewFormWidgetInterface)
Q_OBJECT
#ifndef ABSTRACTOBJECTINSPECTOR_H
#define ABSTRACTOBJECTINSPECTOR_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtGui/QWidget>
QT_BEGIN_HEADER
class QDesignerFormEditorInterface;
class QDesignerFormWindowInterface;
-class QDESIGNER_SDK_EXPORT QDesignerObjectInspectorInterface: public QWidget
+class Q_DESIGNER_EXPORT QDesignerObjectInspectorInterface: public QWidget
{
Q_OBJECT
public:
#ifndef ABSTRACTOPTIONSPAGE_P_H
#define ABSTRACTOPTIONSPAGE_P_H
-#include <QtDesigner/sdk_global.h>
+#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
class QString;
class QWidget;
-class QDESIGNER_SDK_EXPORT QDesignerOptionsPageInterface
+class Q_DESIGNER_EXPORT QDesignerOptionsPageInterface
{
public:
virtual ~QDesignerOptionsPageInterface() {}
#ifndef ABSTRACTPROMOTIONINTERFACE_H
#define ABSTRACTPROMOTIONINTERFACE_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QPair>
#include <QtCore/QList>
#include <QtCore/QSet>
class QDesignerWidgetDataBaseItemInterface;
-class QDESIGNER_SDK_EXPORT QDesignerPromotionInterface
+class Q_DESIGNER_EXPORT QDesignerPromotionInterface
{
public:
virtual ~QDesignerPromotionInterface();
#ifndef ABSTRACTPROPERTYEDITOR_H
#define ABSTRACTPROPERTYEDITOR_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtGui/QWidget>
QT_BEGIN_HEADER
class QString;
class QVariant;
-class QDESIGNER_SDK_EXPORT QDesignerPropertyEditorInterface: public QWidget
+class Q_DESIGNER_EXPORT QDesignerPropertyEditorInterface: public QWidget
{
Q_OBJECT
public:
#ifndef ABSTRACTRESOURCEBROWSER_H
#define ABSTRACTRESOURCEBROWSER_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtGui/QWidget>
QT_BEGIN_HEADER
class QWidget;
-class QDESIGNER_SDK_EXPORT QDesignerResourceBrowserInterface: public QWidget
+class Q_DESIGNER_EXPORT QDesignerResourceBrowserInterface: public QWidget
{
Q_OBJECT
public:
#ifndef ABSTRACTSETTINGS_P_H
#define ABSTRACTSETTINGS_P_H
-#include <QtDesigner/sdk_global.h>
-
#include <QVariant>
QT_BEGIN_HEADER
/*!
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() {}
#ifndef ABSTRACTWIDGETBOX_H
#define ABSTRACTWIDGETBOX_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QMetaType>
#include <QtGui/QWidget>
#include <QtGui/QIcon>
class DomUI;
class QDesignerDnDItemInterface;
-class QDESIGNER_SDK_EXPORT QDesignerWidgetBoxInterface : public QWidget
+class Q_DESIGNER_EXPORT QDesignerWidgetBoxInterface : public QWidget
{
Q_OBJECT
public:
#ifndef ABSTRACTWIDGETDATABASE_H
#define ABSTRACTWIDGETDATABASE_H
-#include <QtDesigner/sdk_global.h>
-
#include <QtCore/QObject>
#include <QtCore/QList>
virtual QList<QVariant> defaultPropertyValues() const = 0;
};
-class QDESIGNER_SDK_EXPORT QDesignerWidgetDataBaseInterface: public QObject
+class Q_DESIGNER_EXPORT QDesignerWidgetDataBaseInterface: public QObject
{
Q_OBJECT
public:
#ifndef ABSTRACTWIDGETFACTORY_H
#define ABSTRACTWIDGETFACTORY_H
-#include <QtDesigner/sdk_global.h>
#include <QtCore/QObject>
QT_BEGIN_HEADER
class QWidget;
class QLayout;
-class QDESIGNER_SDK_EXPORT QDesignerWidgetFactoryInterface: public QObject
+class Q_DESIGNER_EXPORT QDesignerWidgetFactoryInterface: public QObject
{
Q_OBJECT
public:
#ifndef EXTRAINFO_H
#define EXTRAINFO_H
-#include <QtDesigner/sdk_global.h>
#include <QtDesigner/extension.h>
QT_BEGIN_HEADER
class QDesignerFormEditorInterface;
-class QDESIGNER_SDK_EXPORT QDesignerExtraInfoExtension
+class Q_DESIGNER_EXPORT QDesignerExtraInfoExtension
{
public:
virtual ~QDesignerExtraInfoExtension() {}
#ifndef SCRIPT_H
#define SCRIPT_H
-#include <QtDesigner/sdk_global.h>
#include <QtDesigner/extension.h>
#include <QtCore/QVariant>
class QString;
-class QDESIGNER_SDK_EXPORT QDesignerScriptExtension
+class Q_DESIGNER_EXPORT QDesignerScriptExtension
{
public:
virtual ~QDesignerScriptExtension();
+++ /dev/null
-/****************************************************************************
-**
-** 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
#ifndef ACTIONEDITOR_H
#define ACTIONEDITOR_H
-#include "shared_global_p.h"
#include <QtDesigner/abstractactioneditor.h>
#include <QtCore/QPointer>
class ActionView;
class ResourceMimeData;
-class QDESIGNER_SHARED_EXPORT ActionEditor: public QDesignerActionEditorInterface
+class Q_DESIGNER_EXPORT ActionEditor: public QDesignerActionEditorInterface
{
Q_OBJECT
public:
#ifndef ACTIONREPOSITORY_H
#define ACTIONREPOSITORY_H
-#include "shared_global_p.h"
#include <QtCore/QMimeData>
#include <QtGui/QStandardItemModel>
#include <QtGui/QTreeView>
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:
ActionListView *m_actionListView;
};
-class QDESIGNER_SHARED_EXPORT ActionRepositoryMimeData: public QMimeData
+class Q_DESIGNER_EXPORT ActionRepositoryMimeData: public QMimeData
{
Q_OBJECT
public:
#ifndef CODEPREVIEWDIALOG_H
#define CODEPREVIEWDIALOG_H
-#include "shared_global_p.h"
#include <QtGui/QDialog>
QT_BEGIN_NAMESPACE
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);
#ifndef CONNECTIONEDIT_H
#define CONNECTIONEDIT_H
-#include "shared_global_p.h"
-
#include <QtCore/qmap.h>
#include <QtCore/QList>
#include <QtCore/QPointer>
class Connection;
class ConnectionEdit;
-class QDESIGNER_SHARED_EXPORT CETypes
+class Q_DESIGNER_EXPORT CETypes
{
public:
typedef QList<Connection*> ConnectionList;
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);
QRect groundRect() const;
};
-class QDESIGNER_SHARED_EXPORT ConnectionEdit : public QWidget, public CETypes
+class Q_DESIGNER_EXPORT ConnectionEdit : public QWidget, public CETypes
{
Q_OBJECT
public:
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)
ConnectionEdit *m_edit;
};
-class QDESIGNER_SHARED_EXPORT AddConnectionCommand : public CECommand
+class Q_DESIGNER_EXPORT AddConnectionCommand : public CECommand
{
public:
AddConnectionCommand(ConnectionEdit *edit, Connection *con);
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);
#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:
#ifndef DEVICEPROFILE_H
#define DEVICEPROFILE_H
-#include "shared_global_p.h"
-
#include <QtCore/QString>
#include <QtCore/qshareddata.h>
* style of the form. This class represents a device
* profile. */
-class QDESIGNER_SHARED_EXPORT DeviceProfile {
+class Q_DESIGNER_EXPORT DeviceProfile {
public:
DeviceProfile();
// We mean it.
//
-#include "shared_global_p.h"
#include <abstractdialoggui_p.h>
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT DialogGui : public QDesignerDialogGuiInterface
+class Q_DESIGNER_EXPORT DialogGui : public QDesignerDialogGuiInterface
{
public:
DialogGui();
#ifndef FILTERWIDGET_H
#define FILTERWIDGET_H
-#include "shared_global_p.h"
-
#include <QtGui/QWidget>
#include <QtGui/QLineEdit>
#include <QtGui/QColor>
#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);
// 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:
// We mean it.
//
-#include "shared_global_p.h"
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtCore/QPointer>
// 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
#ifndef FORMWINDOWBASE_H
#define FORMWINDOWBASE_H
-#include "shared_global_p.h"
-
#include <QtDesigner/abstractformwindow.h>
#include <QtCore/qvariant.h>
class DesignerIconCache;
class FormWindowBasePrivate;
-class QDESIGNER_SHARED_EXPORT FormWindowBase: public QDesignerFormWindowInterface
+class Q_DESIGNER_EXPORT FormWindowBase: public QDesignerFormWindowInterface
{
Q_OBJECT
public:
#ifndef QDESIGNER_GRID_H
#define QDESIGNER_GRID_H
-#include "shared_global_p.h"
-
#include <QtCore/qvariant.h>
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
// Designer grid which is able to serialize to QVariantMap
-class QDESIGNER_SHARED_EXPORT Grid
+class Q_DESIGNER_EXPORT Grid
{
public:
Grid();
#ifndef GRIDPANEL_H
#define GRIDPANEL_H
-#include "shared_global_p.h"
-
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class Grid;
class Ui_GridPanel;
-class QDESIGNER_SHARED_EXPORT GridPanel : public QWidget
+class Q_DESIGNER_EXPORT GridPanel : public QWidget
{
Q_OBJECT
public:
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)
return QIcon();
}
-QDESIGNER_SHARED_EXPORT QIcon emptyIcon()
+Q_DESIGNER_EXPORT QIcon emptyIcon()
{
return QIcon(QLatin1String(":/trolltech/formeditor/images/emptyicon.png"));
}
#ifndef ICONLOADER_H
#define ICONLOADER_H
-#include "shared_global_p.h"
+#include "qglobal.h"
QT_BEGIN_NAMESPACE
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
#ifndef ICONSELECTOR_H
#define ICONSELECTOR_H
-#include "shared_global_p.h"
-
#include <QtGui/QWidget>
#include <QtGui/QDialog>
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
};
-class QDESIGNER_SHARED_EXPORT IconSelector: public QWidget
+class Q_DESIGNER_EXPORT IconSelector: public QWidget
{
Q_OBJECT
public:
};
// 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)
#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:
#ifndef LAYOUT_H
#define LAYOUT_H
-#include "shared_global_p.h"
#include "layoutinfo_p.h"
#include <QtCore/QPointer>
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)
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;
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) {
#ifndef LAYOUTINFO_H
#define LAYOUTINFO_H
-#include "shared_global_p.h"
+#include "qglobal.h"
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT LayoutInfo
+class Q_DESIGNER_EXPORT LayoutInfo
{
public:
enum Type
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
}
// 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());
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)
}
}
-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)
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)
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())
#ifndef METADATABASE_H
#define METADATABASE_H
-#include "shared_global_p.h"
-
#include <QtDesigner/abstractmetadatabase.h>
#include <QtCore/QHash>
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT MetaDataBaseItem: public QDesignerMetaDataBaseItemInterface
+class Q_DESIGNER_EXPORT MetaDataBaseItem: public QDesignerMetaDataBaseItemInterface
{
public:
explicit MetaDataBaseItem(QObject *object);
QStringList m_fakeSignals;
};
-class QDESIGNER_SHARED_EXPORT MetaDataBase: public QDesignerMetaDataBaseInterface
+class Q_DESIGNER_EXPORT MetaDataBase: public QDesignerMetaDataBaseInterface
{
Q_OBJECT
public:
};
// 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
#ifndef MORPH_COMMAND_H
#define MORPH_COMMAND_H
-#include "shared_global_p.h"
#include "qdesigner_formwindowcommand_p.h"
QT_BEGIN_NAMESPACE
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:
// We mean it.
//
-#include "shared_global_p.h"
#include "deviceprofile_p.h"
#include <abstractnewformwidget_p.h>
class Ui_NewFormWidget;
-class QDESIGNER_SHARED_EXPORT NewFormWidget : public QDesignerNewFormWidgetInterface
+class Q_DESIGNER_EXPORT NewFormWidget : public QDesignerNewFormWidgetInterface
{
Q_OBJECT
Q_DISABLE_COPY(NewFormWidget)
#ifndef ORDERDIALOG_P_H
#define ORDERDIALOG_P_H
-#include "shared_global_p.h"
-
#include <QtGui/QDialog>
#include <QtCore/QMap>
class Ui_OrderDialog;
-class QDESIGNER_SHARED_EXPORT OrderDialog: public QDialog
+class Q_DESIGNER_EXPORT OrderDialog: public QDialog
{
Q_OBJECT
public:
#define PLAINTEXTEDITOR_H
#include <QtGui/QDialog>
-#include "shared_global_p.h"
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT PlainTextEditorDialog : public QDialog
+class Q_DESIGNER_EXPORT PlainTextEditorDialog : public QDialog
{
Q_OBJECT
public:
#ifndef PLUGINMANAGER_H
#define PLUGINMANAGER_H
-#include "shared_global_p.h"
#include "shared_enums_p.h"
#include <QtCore/qshareddata.h>
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;
QSharedDataPointer<QDesignerCustomWidgetSharedData> m_d;
};
-class QDESIGNER_SHARED_EXPORT QDesignerPluginManager: public QObject
+class Q_DESIGNER_EXPORT QDesignerPluginManager: public QObject
{
Q_OBJECT
public:
#ifndef PREVIEWCONFIGURATIONWIDGET_H
#define PREVIEWCONFIGURATIONWIDGET_H
-#include "shared_global_p.h"
-
#include <QtGui/QGroupBox>
#include <QtCore/qshareddata.h>
// ----------- PreviewConfigurationWidget: Widget to edit the preview configuration.
-class QDESIGNER_SHARED_EXPORT PreviewConfigurationWidget : public QGroupBox
+class Q_DESIGNER_EXPORT PreviewConfigurationWidget : public QGroupBox
{
Q_OBJECT
public:
}
-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;
}
#ifndef PREVIEWMANAGER_H
#define PREVIEWMANAGER_H
-#include "shared_global_p.h"
-
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/qshareddata.h>
class PreviewConfigurationData;
-class QDESIGNER_SHARED_EXPORT PreviewConfiguration {
+class Q_DESIGNER_EXPORT PreviewConfiguration {
public:
PreviewConfiguration();
explicit PreviewConfiguration(const QString &style,
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:
#ifndef PROMOTIONTASKMENU_H
#define PROMOTIONTASKMENU_H
-#include "shared_global_p.h"
-
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QList>
// 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:
#ifndef PROPERTYLINEEDIT_H
#define PROPERTYLINEEDIT_H
-#include "shared_global_p.h"
-
#include <QtGui/QLineEdit>
QT_BEGIN_NAMESPACE
#ifndef QDESIGNER_COMMAND2_H
#define QDESIGNER_COMMAND2_H
-#include "shared_global_p.h"
#include "qdesigner_formwindowcommand_p.h"
#include <QtGui/QWidget>
* 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);
#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"
class DesignerIconCache;
struct LayoutProperties;
-class QDESIGNER_SHARED_EXPORT InsertWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT InsertWidgetCommand: public QDesignerFormWindowCommand
{
public:
bool m_widgetWasManaged;
};
-class QDESIGNER_SHARED_EXPORT ChangeZOrderCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ChangeZOrderCommand: public QDesignerFormWindowCommand
{
public:
QList<QWidget *> m_oldParentZOrder;
};
-class QDESIGNER_SHARED_EXPORT RaiseWidgetCommand: public ChangeZOrderCommand
+class Q_DESIGNER_EXPORT RaiseWidgetCommand: public ChangeZOrderCommand
{
public:
virtual void reorder(QWidget *widget) const;
};
-class QDESIGNER_SHARED_EXPORT LowerWidgetCommand: public ChangeZOrderCommand
+class Q_DESIGNER_EXPORT LowerWidgetCommand: public ChangeZOrderCommand
{
public:
virtual void reorder(QWidget *widget) const;
};
-class QDESIGNER_SHARED_EXPORT AdjustWidgetSizeCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT AdjustWidgetSizeCommand: public QDesignerFormWindowCommand
{
public:
};
// 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;
WidgetVector m_managedChildren;
};
-class QDESIGNER_SHARED_EXPORT DeleteWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT DeleteWidgetCommand: public QDesignerFormWindowCommand
{
public:
ManageWidgetCommandHelper m_manageHelper;
};
-class QDESIGNER_SHARED_EXPORT ReparentWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ReparentWidgetCommand: public QDesignerFormWindowCommand
{
public:
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 };
Operation m_operation;
};
-class QDESIGNER_SHARED_EXPORT ChangeLayoutItemGeometry: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ChangeLayoutItemGeometry: public QDesignerFormWindowCommand
{
public:
QRect m_newInfo;
};
-class QDESIGNER_SHARED_EXPORT TabOrderCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT TabOrderCommand: public QDesignerFormWindowCommand
{
public:
QList<QWidget*> m_newTabOrder;
};
-class QDESIGNER_SHARED_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand
{
public:
typedef QList<QPointer<QWidget> > WidgetList;
QString m_customClassName;
};
-class QDESIGNER_SHARED_EXPORT DemoteFromCustomWidgetCommand : public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT DemoteFromCustomWidgetCommand : public QDesignerFormWindowCommand
{
public:
typedef PromoteToCustomWidgetCommand::WidgetList WidgetList;
};
// Mixin class for storing the selection state
-class QDESIGNER_SHARED_EXPORT CursorSelectionState {
+class Q_DESIGNER_EXPORT CursorSelectionState {
Q_DISABLE_COPY(CursorSelectionState)
public:
CursorSelectionState();
QPointer<QWidget> m_current;
};
-class QDESIGNER_SHARED_EXPORT LayoutCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT LayoutCommand: public QDesignerFormWindowCommand
{
public:
bool m_setup;
};
-class QDESIGNER_SHARED_EXPORT BreakLayoutCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT BreakLayoutCommand: public QDesignerFormWindowCommand
{
public:
CursorSelectionState m_cursorSelectionState;
};
-class QDESIGNER_SHARED_EXPORT SimplifyLayoutCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT SimplifyLayoutCommand: public QDesignerFormWindowCommand
{
public:
explicit SimplifyLayoutCommand(QDesignerFormWindowInterface *formWindow);
bool m_layoutSimplified;
};
-class QDESIGNER_SHARED_EXPORT ToolBoxCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ToolBoxCommand: public QDesignerFormWindowCommand
{
public:
QIcon m_itemIcon;
};
-class QDESIGNER_SHARED_EXPORT MoveToolBoxPageCommand: public ToolBoxCommand
+class Q_DESIGNER_EXPORT MoveToolBoxPageCommand: public ToolBoxCommand
{
public:
int m_oldIndex;
};
-class QDESIGNER_SHARED_EXPORT DeleteToolBoxPageCommand: public ToolBoxCommand
+class Q_DESIGNER_EXPORT DeleteToolBoxPageCommand: public ToolBoxCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT AddToolBoxPageCommand: public ToolBoxCommand
+class Q_DESIGNER_EXPORT AddToolBoxPageCommand: public ToolBoxCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT TabWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT TabWidgetCommand: public QDesignerFormWindowCommand
{
public:
QIcon m_itemIcon;
};
-class QDESIGNER_SHARED_EXPORT DeleteTabPageCommand: public TabWidgetCommand
+class Q_DESIGNER_EXPORT DeleteTabPageCommand: public TabWidgetCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT AddTabPageCommand: public TabWidgetCommand
+class Q_DESIGNER_EXPORT AddTabPageCommand: public TabWidgetCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT MoveTabPageCommand: public TabWidgetCommand
+class Q_DESIGNER_EXPORT MoveTabPageCommand: public TabWidgetCommand
{
public:
QIcon m_icon;
};
-class QDESIGNER_SHARED_EXPORT StackedWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT StackedWidgetCommand: public QDesignerFormWindowCommand
{
public:
int m_index;
};
-class QDESIGNER_SHARED_EXPORT MoveStackedWidgetCommand: public StackedWidgetCommand
+class Q_DESIGNER_EXPORT MoveStackedWidgetCommand: public StackedWidgetCommand
{
public:
int m_oldIndex;
};
-class QDESIGNER_SHARED_EXPORT DeleteStackedWidgetPageCommand: public StackedWidgetCommand
+class Q_DESIGNER_EXPORT DeleteStackedWidgetPageCommand: public StackedWidgetCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT AddStackedWidgetPageCommand: public StackedWidgetCommand
+class Q_DESIGNER_EXPORT AddStackedWidgetPageCommand: public StackedWidgetCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT CreateMenuBarCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT CreateMenuBarCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QMenuBar> m_menuBar;
};
-class QDESIGNER_SHARED_EXPORT DeleteMenuBarCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT DeleteMenuBarCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QMenuBar> m_menuBar;
};
-class QDESIGNER_SHARED_EXPORT CreateStatusBarCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT CreateStatusBarCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QStatusBar> m_statusBar;
};
-class QDESIGNER_SHARED_EXPORT DeleteStatusBarCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT DeleteStatusBarCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QStatusBar> m_statusBar;
};
-class QDESIGNER_SHARED_EXPORT AddToolBarCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT AddToolBarCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QToolBar> m_toolBar;
};
-class QDESIGNER_SHARED_EXPORT DeleteToolBarCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT DeleteToolBarCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QToolBar> m_toolBar;
};
-class QDESIGNER_SHARED_EXPORT DockWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT DockWidgetCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QDockWidget> m_dockWidget;
};
-class QDESIGNER_SHARED_EXPORT AddDockWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT AddDockWidgetCommand: public QDesignerFormWindowCommand
{
public:
QPointer<QDockWidget> m_dockWidget;
};
-class QDESIGNER_SHARED_EXPORT ContainerWidgetCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ContainerWidgetCommand: public QDesignerFormWindowCommand
{
public:
int m_index;
};
-class QDESIGNER_SHARED_EXPORT DeleteContainerWidgetPageCommand: public ContainerWidgetCommand
+class Q_DESIGNER_EXPORT DeleteContainerWidgetPageCommand: public ContainerWidgetCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT AddContainerWidgetPageCommand: public ContainerWidgetCommand
+class Q_DESIGNER_EXPORT AddContainerWidgetPageCommand: public ContainerWidgetCommand
{
public:
virtual void undo();
};
-class QDESIGNER_SHARED_EXPORT ChangeCurrentPageCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ChangeCurrentPageCommand: public QDesignerFormWindowCommand
{
public:
int m_newIndex;
};
-struct QDESIGNER_SHARED_EXPORT ItemData {
+struct Q_DESIGNER_EXPORT ItemData {
ItemData() {}
ItemData(const QListWidgetItem *item, bool editor);
QHash<int, QVariant> m_properties;
};
-struct QDESIGNER_SHARED_EXPORT ListContents {
+struct Q_DESIGNER_EXPORT ListContents {
ListContents() {}
ListContents(const QTreeWidgetItem *item);
// 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;
TableItemMap m_items;
};
-class QDESIGNER_SHARED_EXPORT ChangeTableContentsCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ChangeTableContentsCommand: public QDesignerFormWindowCommand
{
public:
explicit ChangeTableContentsCommand(QDesignerFormWindowInterface *formWindow);
// 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) {}
QList<ItemContents> m_rootItems;
};
-class QDESIGNER_SHARED_EXPORT ChangeTreeContentsCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ChangeTreeContentsCommand: public QDesignerFormWindowCommand
{
public:
DesignerIconCache *m_iconCache;
};
-class QDESIGNER_SHARED_EXPORT ChangeListContentsCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ChangeListContentsCommand: public QDesignerFormWindowCommand
{
public:
DesignerIconCache *m_iconCache;
};
-class QDESIGNER_SHARED_EXPORT AddActionCommand : public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT AddActionCommand : public QDesignerFormWindowCommand
{
public:
// 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:
ActionData m_actionData;
};
-class QDESIGNER_SHARED_EXPORT ActionInsertionCommand : public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ActionInsertionCommand : public QDesignerFormWindowCommand
{
protected:
bool m_update;
};
-class QDESIGNER_SHARED_EXPORT InsertActionIntoCommand : public ActionInsertionCommand
+class Q_DESIGNER_EXPORT InsertActionIntoCommand : public ActionInsertionCommand
{
public:
virtual void undo() { removeAction(); }
};
-class QDESIGNER_SHARED_EXPORT RemoveActionFromCommand : public ActionInsertionCommand
+class Q_DESIGNER_EXPORT RemoveActionFromCommand : public ActionInsertionCommand
{
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);
QWidget *m_objectToSelect;
};
-class QDESIGNER_SHARED_EXPORT AddMenuActionCommand : public MenuActionCommand
+class Q_DESIGNER_EXPORT AddMenuActionCommand : public MenuActionCommand
{
public:
virtual void undo() { removeMenu(); }
};
-class QDESIGNER_SHARED_EXPORT RemoveMenuActionCommand : public MenuActionCommand
+class Q_DESIGNER_EXPORT RemoveMenuActionCommand : public MenuActionCommand
{
public:
virtual void undo() { insertMenu(); }
};
-class QDESIGNER_SHARED_EXPORT CreateSubmenuCommand : public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT CreateSubmenuCommand : public QDesignerFormWindowCommand
{
public:
#ifndef QDESIGNER_DNDITEM_H
#define QDESIGNER_DNDITEM_H
-#include "shared_global_p.h"
#include <QtDesigner/abstractdnditem.h>
#include <QtCore/QPoint>
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);
// 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:
#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)
#ifndef QDESIGNER_FORMBUILDER_H
#define QDESIGNER_FORMBUILDER_H
-#include "shared_global_p.h"
#include "deviceprofile_p.h"
#include <QtUiTools/formscriptrunner_p.h>
/* 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 {
// 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,
#ifndef QDESIGNER_FORMEDITORCOMMAND_H
#define QDESIGNER_FORMEDITORCOMMAND_H
-#include "shared_global_p.h"
#include <QtCore/QPointer>
#include <QtGui/qundostack.h>
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT QDesignerFormEditorCommand: public QUndoCommand
+class Q_DESIGNER_EXPORT QDesignerFormEditorCommand: public QUndoCommand
{
public:
#ifndef QDESIGNER_FORMWINDOWCOMMAND_H
#define QDESIGNER_FORMWINDOWCOMMAND_H
-#include "shared_global_p.h"
-
#include <QtCore/QPointer>
#include <QtGui/qundostack.h>
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT QDesignerFormWindowCommand: public QUndoCommand
+class Q_DESIGNER_EXPORT QDesignerFormWindowCommand: public QUndoCommand
{
public:
#ifndef QDESIGNER_FORMWINDOMANAGER_H
#define QDESIGNER_FORMWINDOMANAGER_H
-#include "shared_global_p.h"
#include <QtDesigner/abstractformwindowmanager.h>
QT_BEGIN_NAMESPACE
//
// Convenience methods to manage form previews (ultimately forwarded to PreviewManager).
//
-class QDESIGNER_SHARED_EXPORT QDesignerFormWindowManager
+class Q_DESIGNER_EXPORT QDesignerFormWindowManager
: public QDesignerFormWindowManagerInterface
{
Q_OBJECT
#ifndef QDESIGNER_INTEGRATION_H
#define QDESIGNER_INTEGRATION_H
-#include "shared_global_p.h"
#include <QtDesigner/abstractintegration.h>
#include <QtCore/QObject>
struct Selection;
class QDesignerIntegrationPrivate;
-class QDESIGNER_SHARED_EXPORT QDesignerIntegration: public QDesignerIntegrationInterface
+class Q_DESIGNER_EXPORT QDesignerIntegration: public QDesignerIntegrationInterface
{
Q_OBJECT
public:
#ifndef DESIGNERINTROSPECTION
#define DESIGNERINTROSPECTION
-#include "shared_global_p.h"
#include <abstractintrospection_p.h>
#include <QtCore/QMap>
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();
#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>
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)
QDesignerMemberSheetPrivate *d;
};
-class QDESIGNER_SHARED_EXPORT QDesignerMemberSheetFactory: public QExtensionFactory
+class Q_DESIGNER_EXPORT QDesignerMemberSheetFactory: public QExtensionFactory
{
Q_OBJECT
Q_INTERFACES(QAbstractExtensionFactory)
#ifndef QDESIGNER_MENU_H
#define QDESIGNER_MENU_H
-#include "shared_global_p.h"
-
#include <QtGui/QAction>
#include <QtGui/QMenu>
#include <QtGui/QPixmap>
class ActionInsertionCommand;
}
-class QDESIGNER_SHARED_EXPORT QDesignerMenu: public QMenu
+class Q_DESIGNER_EXPORT QDesignerMenu: public QMenu
{
Q_OBJECT
public:
#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>
} // namespace qdesigner_internal
-class QDESIGNER_SHARED_EXPORT QDesignerMenuBar: public QMenuBar
+class Q_DESIGNER_EXPORT QDesignerMenuBar: public QMenuBar
{
Q_OBJECT
public:
#ifndef DESIGNEROBJECTINSPECTOR_H
#define DESIGNEROBJECTINSPECTOR_H
-#include "shared_global_p.h"
#include <QtDesigner/abstractobjectinspector.h>
#include <QtCore/QList>
namespace qdesigner_internal {
-struct QDESIGNER_SHARED_EXPORT Selection {
+struct Q_DESIGNER_EXPORT Selection {
bool empty() const;
void clear();
// 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:
#ifndef QDESIGNERPROMOTION_H
#define QDESIGNERPROMOTION_H
-#include "shared_global_p.h"
-
#include <QtDesigner/abstractpromotioninterface.h>
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
- class QDESIGNER_SHARED_EXPORT QDesignerPromotion : public QDesignerPromotionInterface
+ class Q_DESIGNER_EXPORT QDesignerPromotion : public QDesignerPromotionInterface
{
public:
explicit QDesignerPromotion(QDesignerFormEditorInterface *core);
// 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
// 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;
PropertyHelperList m_propertyHelperList;
};
-class QDESIGNER_SHARED_EXPORT SetPropertyCommand: public PropertyListCommand
+class Q_DESIGNER_EXPORT SetPropertyCommand: public PropertyListCommand
{
public:
unsigned m_subPropertyMask;
};
-class QDESIGNER_SHARED_EXPORT ResetPropertyCommand: public PropertyListCommand
+class Q_DESIGNER_EXPORT ResetPropertyCommand: public PropertyListCommand
{
public:
};
-class QDESIGNER_SHARED_EXPORT AddDynamicPropertyCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT AddDynamicPropertyCommand: public QDesignerFormWindowCommand
{
public:
QVariant m_value;
};
-class QDESIGNER_SHARED_EXPORT RemoveDynamicPropertyCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT RemoveDynamicPropertyCommand: public QDesignerFormWindowCommand
{
public:
#ifndef DESIGNERPROPERTYEDITOR_H
#define DESIGNERPROPERTYEDITOR_H
-#include "shared_global_p.h"
#include "shared_enums_p.h"
#include <QtDesigner/abstractpropertyeditor.h>
// 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:
#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>
#include <QtCore/QVariant>
#include <QtCore/QPair>
-
#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
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)
* 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)
#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();
#ifndef QDESIGNER_STACKEDBOX_H
#define QDESIGNER_STACKEDBOX_H
-#include "shared_global_p.h"
#include "qdesigner_propertysheet_p.h"
QT_BEGIN_NAMESPACE
// 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:
// 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:
};
// 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);
#ifndef QDESIGNER_TABWIDGET_H
#define QDESIGNER_TABWIDGET_H
-#include "shared_global_p.h"
#include "qdesigner_propertysheet_p.h"
#include "qdesigner_utils_p.h"
class PromotionTaskMenu;
}
-class QDESIGNER_SHARED_EXPORT QTabWidgetEventFilter : public QObject
+class Q_DESIGNER_EXPORT QTabWidgetEventFilter : public QObject
{
Q_OBJECT
public:
};
// 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);
#ifndef QDESIGNER_TASKMENU_H
#define QDESIGNER_TASKMENU_H
-#include "shared_global_p.h"
#include "extensionfactory_p.h"
#include <QtDesigner/taskmenu.h>
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)
#ifndef QDESIGNER_TOOLBAR_H
#define QDESIGNER_TOOLBAR_H
-#include "shared_global_p.h"
-
#include <QtGui/QAction>
#include <QtGui/QToolButton>
// 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:
#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>
class QAction;
class QMenu;
-class QDESIGNER_SHARED_EXPORT QToolBoxHelper : public QObject
+class Q_DESIGNER_EXPORT QToolBoxHelper : public QObject
{
Q_OBJECT
};
// 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);
namespace qdesigner_internal
{
- QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
+ Q_DESIGNER_EXPORT void designerWarning(const QString &message)
{
qWarning("Designer: %s", qPrintable(message));
}
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;
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);
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)) {
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);
return true;
}
- QDESIGNER_SHARED_EXPORT QString qtify(const QString &name)
+ Q_DESIGNER_EXPORT QString qtify(const QString &name)
{
QString qname = name;
#ifndef QDESIGNER_UTILS_H
#define QDESIGNER_UTILS_H
-#include "shared_global_p.h"
-
#include <QtDesigner/abstractformwindow.h>
#include <QtCore/QVariant>
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.
// -------------- 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);
// 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);
// -------------- 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();
// -------------- 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();
};
// -------------- PixmapValue: Returned by the property sheet for pixmaps
-class QDESIGNER_SHARED_EXPORT PropertySheetPixmapValue
+class Q_DESIGNER_EXPORT PropertySheetPixmapValue
{
public:
PropertySheetPixmapValue(const QString &path);
class PropertySheetIconValueData;
-class QDESIGNER_SHARED_EXPORT PropertySheetIconValue
+class Q_DESIGNER_EXPORT PropertySheetIconValue
{
public:
PropertySheetIconValue(const PropertySheetPixmapValue &pixmap);
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:
friend class FormWindowBase;
};
-class QDESIGNER_SHARED_EXPORT DesignerIconCache : public QObject
+class Q_DESIGNER_EXPORT DesignerIconCache : public QObject
{
Q_OBJECT
public:
};
// -------------- 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(),
// -------------- 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(),
// 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:
#ifndef QDESIGNER_WIDGET_H
#define QDESIGNER_WIDGET_H
-#include "shared_global_p.h"
#include <QtGui/QDialog>
#include <QtGui/QLabel>
class FormWindowBase;
}
-class QDESIGNER_SHARED_EXPORT QDesignerWidget : public QWidget
+class Q_DESIGNER_EXPORT QDesignerWidget : public QWidget
{
Q_OBJECT
public:
qdesigner_internal::FormWindowBase* m_formWindow;
};
-class QDESIGNER_SHARED_EXPORT QDesignerDialog : public QDialog
+class Q_DESIGNER_EXPORT QDesignerDialog : public QDialog
{
Q_OBJECT
public:
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)
#ifndef QDESIGNER_WIDGETBOX_H
#define QDESIGNER_WIDGETBOX_H
-#include "shared_global_p.h"
#include <QtDesigner/abstractwidgetbox.h>
QT_BEGIN_NAMESPACE
// 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:
#ifndef DESIGNERWIDGETITEM_H
#define DESIGNERWIDGETITEM_H
-#include "shared_global_p.h"
-
#include <QtGui/QLayoutItem>
#include <QtCore/QObject>
// 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:
// 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:
#ifndef QLAYOUT_WIDGET_H
#define QLAYOUT_WIDGET_H
-#include "shared_global_p.h"
-
#include <QtDesigner/layoutdecoration.h>
#include <QtCore/QPointer>
// ---- LayoutProperties: Helper struct that stores all layout-relevant properties
// with functions to retrieve and apply to property sheets. Can be used to store the state
// for undo commands and while rebuilding layouts.
-struct QDESIGNER_SHARED_EXPORT LayoutProperties
+struct Q_DESIGNER_EXPORT LayoutProperties
{
LayoutProperties();
void clear();
};
// Base class for layout decoration extensions.
-class QDESIGNER_SHARED_EXPORT QLayoutSupport: public QObject, public QDesignerLayoutDecorationExtension
+class Q_DESIGNER_EXPORT QLayoutSupport: public QObject, public QDesignerLayoutDecorationExtension
{
Q_OBJECT
Q_INTERFACES(QDesignerLayoutDecorationExtension)
} // namespace qdesigner_internal
// Red layout widget.
-class QDESIGNER_SHARED_EXPORT QLayoutWidget: public QWidget
+class Q_DESIGNER_EXPORT QLayoutWidget: public QWidget
{
Q_OBJECT
public:
#ifndef QSIMPLERESOURCE_H
#define QSIMPLERESOURCE_H
-#include "shared_global_p.h"
#include "abstractformbuilder.h"
#include <QtCore/QStringList>
class WidgetDataBaseItem;
-class QDESIGNER_SHARED_EXPORT QSimpleResource : public QAbstractFormBuilder
+class Q_DESIGNER_EXPORT QSimpleResource : public QAbstractFormBuilder
{
public:
explicit QSimpleResource(QDesignerFormEditorInterface *core);
// Contents of clipboard for formbuilder copy and paste operations
// (Actions and widgets)
-struct QDESIGNER_SHARED_EXPORT FormBuilderClipboard {
+struct Q_DESIGNER_EXPORT FormBuilderClipboard {
typedef QList<QAction*> ActionList;
FormBuilderClipboard() {}
// Base class for a form builder used in the editor that
// provides copy and paste.(move into base interface)
-class QDESIGNER_SHARED_EXPORT QEditorFormBuilder : public QSimpleResource
+class Q_DESIGNER_EXPORT QEditorFormBuilder : public QSimpleResource
{
public:
explicit QEditorFormBuilder(QDesignerFormEditorInterface *core) : QSimpleResource(core) {}
#ifndef QTRESOURCEMODEL_H
#define QTRESOURCEMODEL_H
-#include "shared_global_p.h"
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtCore/QScopedPointer>
class QtResourceModel;
-class QDESIGNER_SHARED_EXPORT QtResourceSet // one instance per one form
+class Q_DESIGNER_EXPORT QtResourceSet // one instance per one form
{
public:
QStringList activeQrcPaths() const;
Q_DISABLE_COPY(QtResourceSet)
};
-class QDESIGNER_SHARED_EXPORT QtResourceModel : public QObject // one instance per whole designer
+class Q_DESIGNER_EXPORT QtResourceModel : public QObject // one instance per whole designer
{
Q_OBJECT
public:
#ifndef QTRESOURCEVIEW_H
#define QTRESOURCEVIEW_H
-#include "shared_global_p.h"
#include <QtGui/QWidget>
#include <QtGui/QDialog>
class QDesignerFormEditorInterface;
class QMimeData;
-class QDESIGNER_SHARED_EXPORT QtResourceView : public QWidget
+class Q_DESIGNER_EXPORT QtResourceView : public QWidget
{
Q_OBJECT
public:
Q_PRIVATE_SLOT(d_func(), void slotFilterChanged(const QString &pattern))
};
-class QDESIGNER_SHARED_EXPORT QtResourceViewDialog : public QDialog
+class Q_DESIGNER_EXPORT QtResourceViewDialog : public QDialog
{
Q_OBJECT
public:
#include <QtGui/QTextEdit>
#include <QtGui/QDialog>
-#include "shared_global_p.h"
QT_BEGIN_NAMESPACE
class RichTextEditor;
-class QDESIGNER_SHARED_EXPORT RichTextEditorDialog : public QDialog
+class Q_DESIGNER_EXPORT RichTextEditorDialog : public QDialog
{
Q_OBJECT
public:
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT ScriptCommand: public QDesignerFormWindowCommand
+class Q_DESIGNER_EXPORT ScriptCommand: public QDesignerFormWindowCommand
{
ScriptCommand(const ScriptCommand &);
ScriptCommand& operator=(const ScriptCommand &);
#ifndef SCRIPTDIALOG_H
#define SCRIPTDIALOG_H
-#include "shared_global_p.h"
-
#include <QtGui/QDialog>
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
// Dialog for showing script errors
- class QDESIGNER_SHARED_EXPORT ScriptDialog : public QDialog {
+ class Q_DESIGNER_EXPORT ScriptDialog : public QDialog {
Q_OBJECT
public:
#ifndef SCRIPTERRORDIALOG_H
#define SCRIPTERRORDIALOG_H
-#include "shared_global_p.h"
#include "formscriptrunner_p.h"
#include <QtGui/QDialog>
namespace qdesigner_internal {
// Dialog for showing script errors
- class QDESIGNER_SHARED_EXPORT ScriptErrorDialog : public QDialog {
+ class Q_DESIGNER_EXPORT ScriptErrorDialog : public QDialog {
Q_OBJECT
public:
#ifndef SHAREDENUMS_H
#define SHAREDENUMS_H
-#include "shared_global_p.h"
+#include "qglobal.h"
QT_BEGIN_NAMESPACE
+++ /dev/null
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Katie API. It exists for the convenience
-// of Katie Designer. This header
-// file may change from version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef SHARED_GLOBAL_H
-#define SHARED_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#ifdef QT_DESIGNER_STATIC
-#define QDESIGNER_SHARED_EXTERN
-#define QDESIGNER_SHARED_IMPORT
-#else
-#define QDESIGNER_SHARED_EXTERN Q_DECL_EXPORT
-#define QDESIGNER_SHARED_IMPORT Q_DECL_IMPORT
-#endif
-
-#ifdef QDESIGNER_SHARED_LIBRARY
-# define QDESIGNER_SHARED_EXPORT QDESIGNER_SHARED_EXTERN
-#else
-# define QDESIGNER_SHARED_EXPORT QDESIGNER_SHARED_IMPORT
-#endif
-
-#endif // SHARED_GLOBAL_H
#ifndef SHARED_SETTINGS_H
#define SHARED_SETTINGS_H
-#include "shared_global_p.h"
#include "deviceprofile_p.h"
-#include <QtCore/qglobal.h>
#include <QtCore/QList>
QT_BEGIN_NAMESPACE
*/
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT QDesignerSharedSettings {
+class Q_DESIGNER_EXPORT QDesignerSharedSettings {
public:
typedef QList<DeviceProfile> DeviceProfileList;
#ifndef SHEET_DELEGATE_H
#define SHEET_DELEGATE_H
-#include "shared_global_p.h"
-
#include <QtGui/QItemDelegate>
#include <QtGui/QTreeView>
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT SheetDelegate: public QItemDelegate
+class Q_DESIGNER_EXPORT SheetDelegate: public QItemDelegate
{
Q_OBJECT
public:
#ifndef _SIGNALSLOTDIALOG_H
#define _SIGNALSLOTDIALOG_H
-#include "shared_global_p.h"
#include <QtCore/QStringList>
#include <QtGui/QDialog>
#include <QtGui/QStandardItemModel>
// Arguably, we could require the MainContainer to be promoted for that, too,
// but that would require entering a header.
-class QDESIGNER_SHARED_EXPORT SignalSlotDialog : public QDialog {
+class Q_DESIGNER_EXPORT SignalSlotDialog : public QDialog {
Q_OBJECT
public:
#ifndef SPACER_WIDGET_H
#define SPACER_WIDGET_H
-#include "shared_global_p.h"
-
#include <QtGui/QWidget>
#include <QtGui/QSizePolicy>
class QDesignerFormWindowInterface;
-class QDESIGNER_SHARED_EXPORT Spacer: public QWidget
+class Q_DESIGNER_EXPORT Spacer: public QWidget
{
Q_OBJECT
#include <QtGui/QTextEdit>
#include <QtGui/QDialog>
#include <QtGui/QLabel>
-#include "shared_global_p.h"
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT StyleSheetEditor : public QTextEdit
+class Q_DESIGNER_EXPORT StyleSheetEditor : public QTextEdit
{
Q_OBJECT
public:
};
// Edit a style sheet.
-class QDESIGNER_SHARED_EXPORT StyleSheetEditorDialog : public QDialog
+class Q_DESIGNER_EXPORT StyleSheetEditorDialog : public QDialog
{
Q_OBJECT
public:
// Edit the style sheet property of the designer selection.
// Provides an "Apply" button.
-class QDESIGNER_SHARED_EXPORT StyleSheetPropertyEditorDialog : public StyleSheetEditorDialog
+class Q_DESIGNER_EXPORT StyleSheetPropertyEditorDialog : public StyleSheetEditorDialog
{
Q_OBJECT
public:
#ifndef TEXTPROPERTYEDITOR_H
#define TEXTPROPERTYEDITOR_H
-#include "shared_global_p.h"
#include "shared_enums_p.h"
#include <QtGui/QWidget>
// Inline-Editor for text properties. Does escaping of newline characters
// to '\n' and back and provides validation modes. The interface
// corresponds to that of QLineEdit.
- class QDESIGNER_SHARED_EXPORT TextPropertyEditor : public QWidget
+ class Q_DESIGNER_EXPORT TextPropertyEditor : public QWidget
{
TextPropertyEditor(const TextPropertyEditor &);
TextPropertyEditor& operator=(const TextPropertyEditor &);
}
// ---- free functions
-QDESIGNER_SHARED_EXPORT IncludeSpecification includeSpecification(QString includeFile)
+Q_DESIGNER_EXPORT IncludeSpecification includeSpecification(QString includeFile)
{
const bool global = !includeFile.isEmpty() &&
includeFile[0] == QLatin1Char('<') &&
return IncludeSpecification(includeFile, global ? IncludeGlobal : IncludeLocal);
}
-QDESIGNER_SHARED_EXPORT QString buildIncludeFile(QString includeFile, IncludeType includeType) {
+Q_DESIGNER_EXPORT QString buildIncludeFile(QString includeFile, IncludeType includeType) {
if (includeType == IncludeGlobal && !includeFile.isEmpty()) {
includeFile.append(QLatin1Char('>'));
includeFile.insert(0, QLatin1Char('<'));
Depending on whether an entry exists, the existing or a newly created entry is
returned. A return value of 0 indicates that the base class could not be found. */
-QDESIGNER_SHARED_EXPORT QDesignerWidgetDataBaseItemInterface *
+Q_DESIGNER_EXPORT QDesignerWidgetDataBaseItemInterface *
appendDerived(QDesignerWidgetDataBaseInterface *db,
const QString &className, const QString &group,
const QString &baseClassName,
/* Return a list of database items to which a class can be promoted to. */
-QDESIGNER_SHARED_EXPORT WidgetDataBaseItemList
+Q_DESIGNER_EXPORT WidgetDataBaseItemList
promotionCandidates(const QDesignerWidgetDataBaseInterface *db,
const QString &baseClassName)
{
#ifndef WIDGETDATABASE_H
#define WIDGETDATABASE_H
-#include "shared_global_p.h"
-
#include <QtDesigner/abstractwidgetdatabase.h>
#include <QtGui/QIcon>
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT WidgetDataBaseItem: public QDesignerWidgetDataBaseItemInterface
+class Q_DESIGNER_EXPORT WidgetDataBaseItem: public QDesignerWidgetDataBaseItemInterface
{
public:
explicit WidgetDataBaseItem(const QString &name = QString(),
typedef QPair<QString, IncludeType> IncludeSpecification;
-QDESIGNER_SHARED_EXPORT IncludeSpecification includeSpecification(QString includeFile);
-QDESIGNER_SHARED_EXPORT QString buildIncludeFile(QString includeFile, IncludeType includeType);
+Q_DESIGNER_EXPORT IncludeSpecification includeSpecification(QString includeFile);
+Q_DESIGNER_EXPORT QString buildIncludeFile(QString includeFile, IncludeType includeType);
-class QDESIGNER_SHARED_EXPORT WidgetDataBase: public QDesignerWidgetDataBaseInterface
+class Q_DESIGNER_EXPORT WidgetDataBase: public QDesignerWidgetDataBaseInterface
{
Q_OBJECT
public:
QDesignerFormEditorInterface *m_core;
};
-QDESIGNER_SHARED_EXPORT QDesignerWidgetDataBaseItemInterface
+Q_DESIGNER_EXPORT QDesignerWidgetDataBaseItemInterface
*appendDerived(QDesignerWidgetDataBaseInterface *db,
const QString &className,
const QString &group,
typedef QList<QDesignerWidgetDataBaseItemInterface*> WidgetDataBaseItemList;
-QDESIGNER_SHARED_EXPORT WidgetDataBaseItemList
+Q_DESIGNER_EXPORT WidgetDataBaseItemList
promotionCandidates(const QDesignerWidgetDataBaseInterface *db,
const QString &baseClassName);
} // namespace qdesigner_internal
#ifndef WIDGETFACTORY_H
#define WIDGETFACTORY_H
-#include "shared_global_p.h"
#include "pluginmanager_p.h"
#include <QtDesigner/abstractwidgetfactory.h>
namespace qdesigner_internal {
-class QDESIGNER_SHARED_EXPORT WidgetFactory: public QDesignerWidgetFactoryInterface
+class Q_DESIGNER_EXPORT WidgetFactory: public QDesignerWidgetFactoryInterface
{
Q_OBJECT
public:
#ifndef ZOOMWIDGET_H
#define ZOOMWIDGET_H
-#include "shared_global_p.h"
-
#include <QtGui/QGraphicsView>
#include <QtGui/QGraphicsProxyWidget>
#include <QtCore/QList>
// A checkable zoom menu action group. Operates in percent.
-class QDESIGNER_SHARED_EXPORT ZoomMenu : public QObject {
+class Q_DESIGNER_EXPORT ZoomMenu : public QObject {
Q_OBJECT
Q_DISABLE_COPY(ZoomMenu)
/* Zoom view: A QGraphicsView with a zoom menu */
-class QDESIGNER_SHARED_EXPORT ZoomView : public QGraphicsView
+class Q_DESIGNER_EXPORT ZoomView : public QGraphicsView
{
Q_PROPERTY(int zoom READ zoom WRITE setZoom DESIGNABLE true SCRIPTABLE true)
Q_PROPERTY(bool zoomContextMenuEnabled READ isZoomContextMenuEnabled WRITE setZoomContextMenuEnabled DESIGNABLE true SCRIPTABLE true)
/* The proxy widget used in ZoomWidget. It refuses to move away from 0,0,
* This behaviour is required for Windows only. */
-class QDESIGNER_SHARED_EXPORT ZoomProxyWidget : public QGraphicsProxyWidget {
+class Q_DESIGNER_EXPORT ZoomProxyWidget : public QGraphicsProxyWidget {
Q_DISABLE_COPY(ZoomProxyWidget)
public:
explicit ZoomProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
* Pass the scaled change on to the embedded widget.
* Provides helper functions for a zoom context menu on the widget. */
-class QDESIGNER_SHARED_EXPORT ZoomWidget : public ZoomView
+class Q_DESIGNER_EXPORT ZoomWidget : public ZoomView
{
Q_PROPERTY(bool widgetZoomContextMenuEnabled READ isWidgetZoomContextMenuEnabled WRITE setWidgetZoomContextMenuEnabled DESIGNABLE true SCRIPTABLE true)
Q_PROPERTY(bool itemAcceptDrops READ itemAcceptDrops WRITE setItemAcceptDrops DESIGNABLE true SCRIPTABLE true)
add_library(qdeclarativeviewplugin MODULE ${qdeclarativeviewplugin_SOURCES})
target_link_libraries(qdeclarativeviewplugin KtCore KtDeclarative KtDesigner)
set_target_properties(qdeclarativeviewplugin PROPERTIES OUTPUT_NAME qdeclarativeview)
-target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRARY)
install(
TARGETS qdeclarativeviewplugin
${CMAKE_CURRENT_SOURCE_DIR}/designer.qrc
)
-if(NOT KATIE_TYPE STREQUAL SHARED)
- add_definitions(-DQT_DESIGNER_STATIC)
-endif()
-
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/designer.desktop.cmake
${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
{ QLatin1String("QDeclarativePropertyValueSource"), QLatin1String("QtDeclarative/qdeclarativepropertyvaluesource.h") },
{ QLatin1String("QDeclarativeScriptString"), QLatin1String("QtDeclarative/qdeclarativescriptstring.h") },
{ QLatin1String("QDeclarativeView"), QLatin1String("QtDeclarative/qdeclarativeview.h") },
+ { QLatin1String("QDesignerActionEditorInterface"), QLatin1String("QtDesigner/abstractactioneditor.h") },
+ { QLatin1String("QDesignerBrushManagerInterface"), QLatin1String("QtDesigner/abstractbrushmanager.h") },
{ QLatin1String("QDesignerComponents"), QLatin1String("QtDesigner/qdesigner_components.h") },
+ { QLatin1String("QDesignerDnDItemInterface"), QLatin1String("QtDesigner/abstractdnditem.h") },
+ { QLatin1String("QDesignerExtraInfoExtension"), QLatin1String("QtDesigner/extrainfo.h") },
+ { QLatin1String("QDesignerFormEditorInterface"), QLatin1String("QtDesigner/abstractformeditor.h") },
+ { QLatin1String("QDesignerFormEditorPluginInterface"), QLatin1String("QtDesigner/abstractformeditorplugin.h") },
+ { QLatin1String("QDesignerFormWindowCursorInterface"), QLatin1String("QtDesigner/abstractformwindowcursor.h") },
+ { QLatin1String("QDesignerFormWindowInterface"), QLatin1String("QtDesigner/abstractformwindow.h") },
+ { QLatin1String("QDesignerFormWindowManagerInterface"), QLatin1String("QtDesigner/abstractformwindowmanager.h") },
+ { QLatin1String("QDesignerFormWindowToolInterface"), QLatin1String("QtDesigner/abstractformwindowtool.h") },
+ { QLatin1String("QDesignerIconCacheInterface"), QLatin1String("QtDesigner/abstracticoncache.h") },
+ { QLatin1String("QDesignerIntegrationInterface"), QLatin1String("QtDesigner/abstractintegration.h") },
+ { QLatin1String("QDesignerMetaDataBaseInterface"), QLatin1String("QtDesigner/abstractmetadatabase.h") },
+ { QLatin1String("QDesignerObjectInspectorInterface"), QLatin1String("QtDesigner/abstractobjectinspector.h") },
+ { QLatin1String("QDesignerPromotionInterface"), QLatin1String("QtDesigner/abstractpromotioninterface.h") },
+ { QLatin1String("QDesignerPropertyEditorInterface"), QLatin1String("QtDesigner/abstractpropertyeditor.h") },
{ QLatin1String("QDesignerResource"), QLatin1String("QtDesigner/qdesigner_resource.h") },
+ { QLatin1String("QDesignerResourceBrowserInterface"), QLatin1String("QtDesigner/abstractresourcebrowser.h") },
+ { QLatin1String("QDesignerWidgetBoxInterface"), QLatin1String("QtDesigner/abstractwidgetbox.h") },
+ { QLatin1String("QDesignerWidgetDataBaseInterface"), QLatin1String("QtDesigner/abstractwidgetdatabase.h") },
+ { QLatin1String("QDesignerWidgetFactoryInterface"), QLatin1String("QtDesigner/abstractwidgetfactory.h") },
{ QLatin1String("QDesktopServices"), QLatin1String("QtGui/qdesktopservices.h") },
{ QLatin1String("QDesktopWidget"), QLatin1String("QtGui/qdesktopwidget.h") },
{ QLatin1String("QDial"), QLatin1String("QtGui/qdial.h") },
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
OSDN Git Service
