diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe index be1db2f3b..dc73ccf9e 100644 --- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe +++ b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe @@ -1,6 +1,6 @@ -SUMMARY="A cross platform IDE written in C++/Qt 4" -DESCRIPTION="MonkeyStudio's primary goal was to be a Qt 4 only IDE, but it \ -evolved to be a way to support any kind of project. It supports Qt 4 \ +SUMMARY="A cross platform IDE written in C++/Qt" +DESCRIPTION="MonkeyStudio's primary goal was to be a Qt only IDE, but it \ +evolved to be a way to support any kind of project. It supports Qt \ project management and embeds Designer and Assistant to form a complete, \ fast and powerful Qt-based IDE. It's based upon a flexible plugin system \ that allows extending it in a near-infinite manner. @@ -29,7 +29,7 @@ languages." HOMEPAGE="http://www.monkeystudio.org" COPYRIGHT="2005-2016 Azevedo Filipe & The Monkey Studio Team" LICENSE="GNU GPL v2" -REVISION="5" +REVISION="6" COMMIT="01256a61395ae92e25d65c97b23a76212d8754a5" SOURCE_URI="https://github.com/pasnox/monkeystudio2/archive/$COMMIT.zip" CHECKSUM_SHA256="ebb9cecef699c097dd12e567e8fca1d037a1fd020263fa5d5bf44b92343b5323" @@ -37,7 +37,7 @@ SOURCE_DIR="monkeystudio2-$COMMIT" PATCHES="monkeystudio-$portVersion.patchset" ADDITIONAL_FILES="monkeystudio.rdef.in" -ARCHITECTURES="!x86_gcc2 x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" diff --git a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset index eec308b2a..9b0764215 100644 --- a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset +++ b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset @@ -1,7 +1,7 @@ -From cc357095af73c88c2cc267bc355ad59476afde50 Mon Sep 17 00:00:00 2001 +From a0b256852c224ade58c16f95290afdea22d0d685 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 3 Dec 2014 20:58:56 -0500 -Subject: [PATCH] Don't pass -rdynamic on Haiku. +Subject: Don't pass -rdynamic on Haiku. Our GCC4 doesn't support this and throws an error. @@ -22,7 +22,7 @@ index a5f6cfc..bd7910f 100644 2.15.0 -From 7dcb03005f3a06eae7cf25bf2e6a24a87fe8ae55 Mon Sep 17 00:00:00 2001 +From f2c98d65bb8acd9aba57cc417737845bc63da2da Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 18 Dec 2017 11:41:28 +0300 Subject: Link against qscintilla2_qt5 @@ -44,3 +44,690 @@ index 51a052b..d2e8ddc 100644 -- 2.15.0 + +From 2afe656377b12a5e8657f9412aec221465f32628 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Mon, 18 Dec 2017 15:11:48 +0300 +Subject: Add support for Qt 5.9 + + +diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.9/abstractintegration.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/abstractintegration.h +new file mode 100644 +index 0000000..4d0ffb9 +--- /dev/null ++++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/abstractintegration.h +@@ -0,0 +1,177 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the Qt Designer of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef ABSTRACTINTEGRATION_H ++#define ABSTRACTINTEGRATION_H ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++class QDesignerFormWindowInterface; ++class QDesignerFormEditorInterface; ++class QDesignerIntegrationInterfacePrivate; ++class QDesignerResourceBrowserInterface; ++class QVariant; ++class QWidget; ++ ++namespace qdesigner_internal { ++class QDesignerIntegrationPrivate; ++} ++ ++class QDESIGNER_SDK_EXPORT QDesignerIntegrationInterface: public QObject ++{ ++ Q_OBJECT ++ Q_PROPERTY(QString headerSuffix READ headerSuffix WRITE setHeaderSuffix) ++ Q_PROPERTY(bool headerLowercase READ isHeaderLowercase WRITE setHeaderLowercase) ++ ++public: ++ enum ResourceFileWatcherBehaviour ++ { ++ NoResourceFileWatcher, ++ ReloadResourceFileSilently, ++ PromptToReloadResourceFile // Default ++ }; ++ ++ enum FeatureFlag ++ { ++ ResourceEditorFeature = 0x1, ++ SlotNavigationFeature = 0x2, ++ DefaultWidgetActionFeature = 0x4, ++ DefaultFeature = ResourceEditorFeature | DefaultWidgetActionFeature ++ }; ++ Q_DECLARE_FLAGS(Feature, FeatureFlag) ++ ++ explicit QDesignerIntegrationInterface(QDesignerFormEditorInterface *core, QObject *parent = Q_NULLPTR); ++ virtual ~QDesignerIntegrationInterface(); ++ ++ QDesignerFormEditorInterface *core() const; ++ ++ virtual QWidget *containerWindow(QWidget *widget) const = 0; ++ ++ // Create a resource browser specific to integration. Language integration takes precedence ++ virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = Q_NULLPTR) = 0; ++ virtual QString headerSuffix() const = 0; ++ virtual void setHeaderSuffix(const QString &headerSuffix) = 0; ++ ++ virtual bool isHeaderLowercase() const = 0; ++ virtual void setHeaderLowercase(bool headerLowerCase) = 0; ++ ++ virtual Feature features() const = 0; ++ bool hasFeature(Feature f) const; ++ ++ virtual ResourceFileWatcherBehaviour resourceFileWatcherBehaviour() const = 0; ++ virtual void setResourceFileWatcherBehaviour(ResourceFileWatcherBehaviour behaviour) = 0; ++ ++ virtual QString contextHelpId() const = 0; ++ ++ void emitObjectNameChanged(QDesignerFormWindowInterface *formWindow, QObject *object, ++ const QString &newName, const QString &oldName); ++ void emitNavigateToSlot(const QString &objectName, const QString &signalSignature, const QStringList ¶meterNames); ++ void emitNavigateToSlot(const QString &slotSignature); ++ void emitHelpRequested(const QString &manual, const QString &document); ++ ++Q_SIGNALS: ++ void propertyChanged(QDesignerFormWindowInterface *formWindow, const QString &name, const QVariant &value); ++ void objectNameChanged(QDesignerFormWindowInterface *formWindow, QObject *object, const QString &newName, const QString &oldName); ++ void helpRequested(const QString &manual, const QString &document); ++ ++ void navigateToSlot(const QString &objectName, const QString &signalSignature, const QStringList ¶meterNames); ++ void navigateToSlot(const QString &slotSignature); ++ ++public Q_SLOTS: ++ virtual void setFeatures(Feature f) = 0; ++ virtual void updateProperty(const QString &name, const QVariant &value, bool enableSubPropertyHandling) = 0; ++ virtual void updateProperty(const QString &name, const QVariant &value) = 0; ++ // Additional signals of designer property editor ++ virtual void resetProperty(const QString &name) = 0; ++ virtual void addDynamicProperty(const QString &name, const QVariant &value) = 0; ++ virtual void removeDynamicProperty(const QString &name) = 0; ++ ++ virtual void updateActiveFormWindow(QDesignerFormWindowInterface *formWindow) = 0; ++ virtual void setupFormWindow(QDesignerFormWindowInterface *formWindow) = 0; ++ virtual void updateSelection() = 0; ++ virtual void updateCustomWidgetPlugins() = 0; ++ ++private: ++ QScopedPointer d; ++}; ++ ++class QDESIGNER_SDK_EXPORT QDesignerIntegration: public QDesignerIntegrationInterface ++{ ++ Q_OBJECT ++public: ++ explicit QDesignerIntegration(QDesignerFormEditorInterface *core, QObject *parent = Q_NULLPTR); ++ virtual ~QDesignerIntegration(); ++ ++ QString headerSuffix() const; ++ void setHeaderSuffix(const QString &headerSuffix); ++ ++ bool isHeaderLowercase() const; ++ void setHeaderLowercase(bool headerLowerCase); ++ ++ Feature features() const; ++ virtual void setFeatures(Feature f); ++ ++ ResourceFileWatcherBehaviour resourceFileWatcherBehaviour() const; ++ void setResourceFileWatcherBehaviour(ResourceFileWatcherBehaviour behaviour); ++ ++ virtual QWidget *containerWindow(QWidget *widget) const; ++ ++ // Load plugins into widget database and factory. ++ static void initializePlugins(QDesignerFormEditorInterface *formEditor); ++ ++ // Create a resource browser specific to integration. Language integration takes precedence ++ virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = Q_NULLPTR); ++ ++ virtual QString contextHelpId() const; ++ ++ virtual void updateProperty(const QString &name, const QVariant &value, bool enableSubPropertyHandling); ++ virtual void updateProperty(const QString &name, const QVariant &value); ++ // Additional signals of designer property editor ++ virtual void resetProperty(const QString &name); ++ virtual void addDynamicProperty(const QString &name, const QVariant &value); ++ virtual void removeDynamicProperty(const QString &name); ++ ++ virtual void updateActiveFormWindow(QDesignerFormWindowInterface *formWindow); ++ virtual void setupFormWindow(QDesignerFormWindowInterface *formWindow); ++ virtual void updateSelection(); ++ virtual void updateCustomWidgetPlugins(); ++ ++private: ++ QScopedPointer d; ++}; ++ ++QT_END_NAMESPACE ++ ++#endif // ABSTRACTINTEGRATION_H +diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.9/pluginmanager_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/pluginmanager_p.h +new file mode 100644 +index 0000000..35a2bf1 +--- /dev/null ++++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/pluginmanager_p.h +@@ -0,0 +1,149 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the Qt Designer of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists for the convenience ++// of Qt Designer. This header ++// file may change from version to version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#ifndef PLUGINMANAGER_H ++#define PLUGINMANAGER_H ++ ++#include "shared_global_p.h" ++#include "shared_enums_p.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++class QDesignerFormEditorInterface; ++class QDesignerCustomWidgetInterface; ++class QDesignerPluginManagerPrivate; ++ ++class QDesignerCustomWidgetSharedData; ++ ++/* Information contained in the Dom XML of a custom widget. */ ++class QDESIGNER_SHARED_EXPORT QDesignerCustomWidgetData { ++public: ++ // StringPropertyType: validation mode and translatable flag. ++ typedef QPair StringPropertyType; ++ ++ explicit QDesignerCustomWidgetData(const QString &pluginPath = QString()); ++ ++ enum ParseResult { ParseOk, ParseWarning, ParseError }; ++ ParseResult parseXml(const QString &xml, const QString &name, QString *errorMessage); ++ ++ QDesignerCustomWidgetData(const QDesignerCustomWidgetData&); ++ QDesignerCustomWidgetData& operator=(const QDesignerCustomWidgetData&); ++ ~QDesignerCustomWidgetData(); ++ ++ bool isNull() const; ++ ++ QString pluginPath() const; ++ ++ // Data as parsed from the widget's domXML(). ++ QString xmlClassName() const; ++ // Optional. The language the plugin is supposed to be used with. ++ QString xmlLanguage() const; ++ // Optional. method used to add pages to a container with a container extension ++ QString xmlAddPageMethod() const; ++ // Optional. Base class ++ QString xmlExtends() const; ++ // Optional. The name to be used in the widget box. ++ QString xmlDisplayName() const; ++ // Type of a string property ++ bool xmlStringPropertyType(const QString &name, StringPropertyType *type) const; ++ // Custom tool tip of property ++ QString propertyToolTip(const QString &name) const; ++ ++private: ++ QSharedDataPointer m_d; ++}; ++ ++class QDESIGNER_SHARED_EXPORT QDesignerPluginManager: public QObject ++{ ++ Q_OBJECT ++public: ++ typedef QList CustomWidgetList; ++ ++ explicit QDesignerPluginManager(QDesignerFormEditorInterface *core); ++ virtual ~QDesignerPluginManager(); ++ ++ QDesignerFormEditorInterface *core() const; ++ ++ QObject *instance(const QString &plugin) const; ++ ++ QStringList registeredPlugins() const; ++ ++ QStringList findPlugins(const QString &path); ++ ++ QStringList pluginPaths() const; ++ void setPluginPaths(const QStringList &plugin_paths); ++ ++ QStringList disabledPlugins() const; ++ void setDisabledPlugins(const QStringList &disabled_plugins); ++ ++ QStringList failedPlugins() const; ++ QString failureReason(const QString &pluginName) const; ++ ++ QObjectList instances() const; ++ ++ CustomWidgetList registeredCustomWidgets() const; ++ QDesignerCustomWidgetData customWidgetData(QDesignerCustomWidgetInterface *w) const; ++ QDesignerCustomWidgetData customWidgetData(const QString &className) const; ++ ++ bool registerNewPlugins(); ++ ++public slots: ++ bool syncSettings(); ++ void ensureInitialized(); ++ ++private: ++ void updateRegisteredPlugins(); ++ void registerPath(const QString &path); ++ void registerPlugin(const QString &plugin); ++ ++private: ++ static QStringList defaultPluginPaths(); ++ ++ QDesignerPluginManagerPrivate *m_d; ++}; ++ ++QT_END_NAMESPACE ++ ++#endif // PLUGINMANAGER_H +diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.9/previewmanager_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/previewmanager_p.h +new file mode 100644 +index 0000000..08d67e3 +--- /dev/null ++++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/previewmanager_p.h +@@ -0,0 +1,171 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the Qt Designer of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists for the convenience ++// of Qt Designer. This header ++// file may change from version to version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#ifndef PREVIEWMANAGER_H ++#define PREVIEWMANAGER_H ++ ++#include "shared_global_p.h" ++ ++#include ++#include ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++class QDesignerFormWindowInterface; ++class QWidget; ++class QPixmap; ++class QAction; ++class QActionGroup; ++class QMenu; ++class QWidget; ++class QDesignerSettingsInterface; ++ ++namespace qdesigner_internal { ++ ++// ----------- PreviewConfiguration ++ ++class PreviewConfigurationData; ++ ++class QDESIGNER_SHARED_EXPORT PreviewConfiguration { ++public: ++ PreviewConfiguration(); ++ explicit PreviewConfiguration(const QString &style, ++ const QString &applicationStyleSheet = QString(), ++ const QString &deviceSkin = QString()); ++ ++ PreviewConfiguration(const PreviewConfiguration&); ++ PreviewConfiguration& operator=(const PreviewConfiguration&); ++ ~PreviewConfiguration(); ++ ++ QString style() const; ++ void setStyle(const QString &); ++ ++ // Style sheet to prepend (to simulate the effect od QApplication::setSyleSheet()). ++ QString applicationStyleSheet() const; ++ void setApplicationStyleSheet(const QString &); ++ ++ QString deviceSkin() const; ++ void setDeviceSkin(const QString &); ++ ++ void clear(); ++ void toSettings(const QString &prefix, QDesignerSettingsInterface *settings) const; ++ void fromSettings(const QString &prefix, const QDesignerSettingsInterface *settings); ++ ++private: ++ QSharedDataPointer 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); ++ ++// ----------- 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 ++{ ++ Q_OBJECT ++public: ++ ++ enum PreviewMode { ++ // Modal preview. Do not use on Macs as dialogs would have no close button ++ ApplicationModalPreview, ++ // Non modal previewing of one form in different configurations (closes if form window changes) ++ SingleFormNonModalPreview, ++ // Non modal previewing of several forms in different configurations ++ MultipleFormNonModalPreview }; ++ ++ explicit PreviewManager(PreviewMode mode, QObject *parent); ++ virtual ~PreviewManager(); ++ ++ // Show preview. Raise existing preview window if there is one with a matching ++ // configuration, else create a new preview. ++ QWidget *showPreview(const QDesignerFormWindowInterface *, const PreviewConfiguration &pc, int deviceProfileIndex /*=-1*/, QString *errorMessage); ++ // Convenience that creates a preview using a configuration taken from the settings. ++ QWidget *showPreview(const QDesignerFormWindowInterface *, const QString &style, int deviceProfileIndex /*=-1*/, QString *errorMessage); ++ QWidget *showPreview(const QDesignerFormWindowInterface *, const QString &style, QString *errorMessage); ++ ++ int previewCount() const; ++ ++ // Create a pixmap for printing. ++ QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const PreviewConfiguration &pc, int deviceProfileIndex /*=-1*/, QString *errorMessage); ++ // Convenience that creates a pixmap using a configuration taken from the settings. ++ QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const QString &style, int deviceProfileIndex /*=-1*/, QString *errorMessage); ++ QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const QString &style, QString *errorMessage); ++ ++ bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; ++ ++public slots: ++ void closeAllPreviews(); ++ ++signals: ++ void firstPreviewOpened(); ++ void lastPreviewClosed(); ++ ++private slots: ++ void slotZoomChanged(int); ++ ++private: ++ ++ virtual Qt::WindowFlags previewWindowFlags(const QWidget *widget) const; ++ virtual QWidget *createDeviceSkinContainer(const QDesignerFormWindowInterface *) const; ++ ++ QWidget *raise(const QDesignerFormWindowInterface *, const PreviewConfiguration &pc); ++ QWidget *createPreview(const QDesignerFormWindowInterface *, ++ const PreviewConfiguration &pc, ++ int deviceProfileIndex /* = -1 */, ++ QString *errorMessage, ++ /*Disabled by default, <0 */ ++ int initialZoom = -1); ++ ++ void updatePreviewClosed(QWidget *w); ++ ++ PreviewManagerPrivate *d; ++ ++ PreviewManager(const PreviewManager &other); ++ PreviewManager &operator =(const PreviewManager &other); ++}; ++} ++ ++QT_END_NAMESPACE ++ ++#endif // PREVIEWMANAGER_H +diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.9/shared_enums_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/shared_enums_p.h +new file mode 100644 +index 0000000..d9c3dc0 +--- /dev/null ++++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/shared_enums_p.h +@@ -0,0 +1,87 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the Qt Designer of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists for the convenience ++// of Qt Designer. This header ++// file may change from version to version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#ifndef SHAREDENUMS_H ++#define SHAREDENUMS_H ++ ++#include "shared_global_p.h" ++ ++QT_BEGIN_NAMESPACE ++ ++namespace qdesigner_internal { ++ ++ // Validation mode of text property line edits ++ enum TextPropertyValidationMode { ++ // Allow for multiline editing using literal "\n". ++ ValidationMultiLine, ++ // Allow for HTML rich text including multiline editing using literal "\n". ++ ValidationRichText, ++ // Validate a stylesheet ++ ValidationStyleSheet, ++ // Single line mode, suppresses newlines ++ ValidationSingleLine, ++ // Allow only for identifier characters ++ ValidationObjectName, ++ // Allow only for identifier characters and colons ++ ValidationObjectNameScope, ++ // URL ++ ValidationURL ++ }; ++ ++ // Container types ++ enum ContainerType { ++ // A container with pages, at least one of which one must always be present (for example, QTabWidget) ++ PageContainer, ++ // Mdi type container. All pages may be deleted, no concept of page order ++ MdiContainer, ++ // Wizard container ++ WizardContainer ++ }; ++ ++ enum AuxiliaryItemDataRoles { ++ // item->flags while being edited ++ ItemFlagsShadowRole = 0x13370551 ++ }; ++ ++ enum ObjectNamingMode { CamelCase, Underscore }; ++} ++ ++QT_END_NAMESPACE ++ ++#endif // SHAREDENUMS_H +diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.9/shared_global_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/shared_global_p.h +new file mode 100644 +index 0000000..3609e5b +--- /dev/null ++++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/shared_global_p.h +@@ -0,0 +1,63 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the Qt Designer of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists for the convenience ++// of Qt 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 ++ ++#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 ++ ++#ifndef QT_NO_SHARED_EXPORT ++# ifdef QDESIGNER_SHARED_LIBRARY ++# define QDESIGNER_SHARED_EXPORT QDESIGNER_SHARED_EXTERN ++# else ++# define QDESIGNER_SHARED_EXPORT QDESIGNER_SHARED_IMPORT ++# endif ++#else ++# define QDESIGNER_SHARED_EXPORT ++#endif ++ ++#endif // SHARED_GLOBAL_H +-- +2.15.0 +