haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

MonkeyStudio: fix build with Qt 5.11

Browse Source 
* fixes #3065.
This commit is contained in:
Sergei Reznikov
2018-09-25 13:41:10 +03:00
parent 09cf4418bd
commit d0ec7a8cae
2 changed files with 19 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
View File

@@ -29,7 +29,7 @@ languages."
HOMEPAGE="https://monkeystudio.pasnox.com/"
COPYRIGHT="2005-2016 Azevedo Filipe & The Monkey Studio Team"
LICENSE="GNU GPL v2"
REVISION="9"
REVISION="10"
srcGitRev="01256a61395ae92e25d65c97b23a76212d8754a5"
SOURCE_URI="https://github.com/pasnox/monkeystudio2/archive/$srcGitRev.zip"
CHECKSUM_SHA256="ebb9cecef699c097dd12e567e8fca1d037a1fd020263fa5d5bf44b92343b5323"

219
dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset
View File

@@ -1,4 +1,4 @@
From a0b256852c224ade58c16f95290afdea22d0d685 Mon Sep 17 00:00:00 2001
From 6135e21baff428fcc70bcace1a1884913abf9aaf Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 3 Dec 2014 20:58:56 -0500
Subject: Don't pass -rdynamic on Haiku.
@@ -19,10 +19,10 @@ index a5f6cfc..bd7910f 100644
LIBS *= -Wl,--whole-archive # import all symbols as the not used ones too
unix:LIBS *= -rdynamic
--
2.15.0
2.19.0
From f2c98d65bb8acd9aba57cc417737845bc63da2da Mon Sep 17 00:00:00 2001
From 41e0737628e79cadbee4ba1195e1a223bbeacde8 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 18 Dec 2017 11:41:28 +0300
Subject: Link against qscintilla2_qt5
@@ -42,203 +42,20 @@ index 51a052b..d2e8ddc 100644
# MacExtras is Qt 5.2 & up
greaterThan(QT_MINOR_VERSION, 1) {
--
2.15.0
2.19.0
From 2afe656377b12a5e8657f9412aec221465f32628 Mon Sep 17 00:00:00 2001
From 8f3681fecda808d2c5536e3a345bdee6a023b05a Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 18 Dec 2017 15:11:48 +0300
Subject: Add support for Qt 5.9
Date: Tue, 25 Sep 2018 13:22:50 +0300
Subject: Add support for Qt 5.11
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 <QtDesigner/sdk_global.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QStringList>
+#include <QtCore/QFlags>
+
+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 &parameterNames);
+ 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 &parameterNames);
+ 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<QDesignerIntegrationInterfacePrivate> 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<qdesigner_internal::QDesignerIntegrationPrivate> 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
diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.11/pluginmanager_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/pluginmanager_p.h
new file mode 100644
index 0000000..35a2bf1
--- /dev/null
+++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/pluginmanager_p.h
+++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/pluginmanager_p.h
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
@@ -389,11 +206,11 @@ index 0000000..35a2bf1
+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
diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.11/previewmanager_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/previewmanager_p.h
new file mode 100644
index 0000000..08d67e3
index 0000000..271df5d
--- /dev/null
+++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.9/previewmanager_p.h
+++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/previewmanager_p.h
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
@@ -529,7 +346,7 @@ index 0000000..08d67e3
+ 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;
+ bool eventFilter(QObject *watched, QEvent *event) override;
+
+public slots:
+ void closeAllPreviews();
@@ -566,11 +383,11 @@ index 0000000..08d67e3
+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
diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.11/shared_enums_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/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
+++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/shared_enums_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
@@ -659,11 +476,11 @@ index 0000000..d9c3dc0
+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
diff --git a/plugins/child/QtDesigner/src/3rdparty/designer/5.11/shared_global_p.h b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/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
+++ b/plugins/child/QtDesigner/src/3rdparty/designer/5.11/shared_global_p.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
@@ -729,5 +546,5 @@ index 0000000..3609e5b
+
+#endif // SHARED_GLOBAL_H
--
2.15.0
2.19.0