File 0002-Update-plugins.qmltypes.patch of Package python3-pyotherside
From 80b1107b23e3d6129cab9cd5378fd1ebdf67c843 Mon Sep 17 00:00:00 2001
From: Martin Kampas <martin.kampas@jolla.com>
Date: Fri, 22 Jun 2018 09:42:35 +0200
Subject: [PATCH 1/3] Remove unneeded _PRO_FILE_PWD_ use
---
src/src.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/src.pro b/src/src.pro
index 3ce2cb2..3eaa0a2 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,7 +13,7 @@ QT += qml quick svg
target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
INSTALLS += target
-qmldir.files += $$_PRO_FILE_PWD_/qmldir $$_PRO_FILE_PWD_/pyotherside.qmltypes
+qmldir.files += qmldir pyotherside.qmltypes
qmldir.path += $$target.path
INSTALLS += qmldir
From 71caa2f83764204bf74bed80d2ccabeedcddd7f0 Mon Sep 17 00:00:00 2001
From: Martin Kampas <martin.kampas@jolla.com>
Date: Fri, 22 Jun 2018 03:36:05 -0400
Subject: [PATCH 2/3] Add qmltypes make target
---
src/src.pro | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/src.pro b/src/src.pro
index 3eaa0a2..ad3cdfc 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -17,6 +17,9 @@ qmldir.files += qmldir pyotherside.qmltypes
qmldir.path += $$target.path
INSTALLS += qmldir
+qmltypes.commands = qmlplugindump -nonrelocatable io.thp.pyotherside 1.5 > $$PWD/pyotherside.qmltypes
+QMAKE_EXTRA_TARGETS += qmltypes
+
DEPENDPATH += .
INCLUDEPATH += .
From 9f7db20aff6e39d42cd0d63d17648037e019f4e7 Mon Sep 17 00:00:00 2001
From: Martin Kampas <martin.kampas@jolla.com>
Date: Fri, 22 Jun 2018 03:37:51 -0400
Subject: [PATCH 3/3] Update plugins.qmltypes
Using QML2_IMPORT_PATH instead of command line argument to avoid
recording local path in the plugins.qmlypes file.
---
README | 4 +-
src/pyotherside.qmltypes | 200 ++++++++++++++++++++++++++++++++++++---
2 files changed, 191 insertions(+), 13 deletions(-)
diff --git a/README b/README
index 9f910f7..49b1b33 100644
--- a/README
+++ b/README
@@ -29,8 +29,8 @@ To manually update the qmltypes file on x64 Linux (TODO: make this automated):
qmake
make
make INSTALL_ROOT=$(pwd)/tmp/
- qmlplugindump io.thp.pyotherside 1.0 tmp/usr/lib/x86_64-linux-gnu/qt5/qml \
- >src/pyotherside.qmltypes
+ QML2_IMPORT_PATH=$(pwd)/tmp/usr/lib/x86_64-linux-gnu/qt5/qml \
+ make -C src qmltypes
To run the included unit tests after building, use:
diff --git a/src/pyotherside.qmltypes b/src/pyotherside.qmltypes
index e7e48ec..7ed48fa 100644
--- a/src/pyotherside.qmltypes
+++ b/src/pyotherside.qmltypes
@@ -1,17 +1,18 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump io.thp.pyotherside 1.0 tmp/usr/lib/x86_64-linux-gnu/qt5/qml'
+// 'qmlplugindump -nonrelocatable io.thp.pyotherside 1.5'
Module {
+ dependencies: []
Component {
name: "PyFbo"
defaultProperty: "data"
prototype: "QQuickFramebufferObject"
- exports: ["PyFBO 1.5"]
+ exports: ["io.thp.pyotherside/PyFBO 1.5"]
exportMetaObjectRevisions: [0]
Property { name: "renderer"; type: "QVariant" }
}
@@ -19,7 +20,7 @@ Module {
name: "PyGLArea"
defaultProperty: "data"
prototype: "QQuickItem"
- exports: ["PyGLArea 1.5"]
+ exports: ["io.thp.pyotherside/PyGLArea 1.5"]
exportMetaObjectRevisions: [0]
Property { name: "renderer"; type: "QVariant" }
Property { name: "before"; type: "bool" }
@@ -40,7 +41,7 @@ Module {
Signal {
name: "process"
Parameter { name: "func"; type: "QVariant" }
- Parameter { name: "args"; type: "QVariant" }
+ Parameter { name: "unboxed_args"; type: "QVariant" }
Parameter { name: "callback"; type: "QJSValue"; isPointer: true }
}
Signal {
@@ -48,6 +49,12 @@ Module {
Parameter { name: "name"; type: "string" }
Parameter { name: "callback"; type: "QJSValue"; isPointer: true }
}
+ Signal {
+ name: "import_names"
+ Parameter { name: "name"; type: "string" }
+ Parameter { name: "args"; type: "QVariant" }
+ Parameter { name: "callback"; type: "QJSValue"; isPointer: true }
+ }
Method {
name: "addImportPath"
Parameter { name: "path"; type: "string" }
@@ -62,6 +69,18 @@ Module {
type: "QVariant"
Parameter { name: "expr"; type: "string" }
}
+ Method {
+ name: "importNames"
+ Parameter { name: "name"; type: "string" }
+ Parameter { name: "args"; type: "QVariant" }
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
+ Method {
+ name: "importNames_sync"
+ type: "bool"
+ Parameter { name: "name"; type: "string" }
+ Parameter { name: "args"; type: "QVariant" }
+ }
Method {
name: "importModule"
Parameter { name: "name"; type: "string" }
@@ -91,7 +110,7 @@ Module {
name: "call_sync"
type: "QVariant"
Parameter { name: "func"; type: "QVariant" }
- Parameter { name: "args"; type: "QVariant" }
+ Parameter { name: "boxed_args"; type: "QVariant" }
}
Method {
name: "call_sync"
@@ -110,31 +129,31 @@ Module {
Component {
name: "QPython10"
prototype: "QPython"
- exports: ["Python 1.0"]
+ exports: ["io.thp.pyotherside/Python 1.0"]
exportMetaObjectRevisions: [0]
}
Component {
name: "QPython12"
prototype: "QPython"
- exports: ["Python 1.2"]
+ exports: ["io.thp.pyotherside/Python 1.2"]
exportMetaObjectRevisions: [0]
}
Component {
name: "QPython13"
prototype: "QPython"
- exports: ["Python 1.3"]
+ exports: ["io.thp.pyotherside/Python 1.3"]
exportMetaObjectRevisions: [0]
}
Component {
name: "QPython14"
prototype: "QPython"
- exports: ["Python 1.4"]
+ exports: ["io.thp.pyotherside/Python 1.4"]
exportMetaObjectRevisions: [0]
}
Component {
name: "QPython15"
prototype: "QPython"
- exports: ["Python 1.5"]
+ exports: ["io.thp.pyotherside/Python 1.5"]
exportMetaObjectRevisions: [0]
}
Component {
@@ -142,9 +161,168 @@ Module {
defaultProperty: "data"
prototype: "QQuickItem"
Property { name: "textureFollowsItemSize"; type: "bool" }
+ Property { name: "mirrorVertically"; type: "bool" }
Signal {
name: "textureFollowsItemSizeChanged"
Parameter { type: "bool" }
}
+ Signal {
+ name: "mirrorVerticallyChanged"
+ Parameter { type: "bool" }
+ }
+ }
+ Component {
+ name: "QQuickItem"
+ defaultProperty: "data"
+ prototype: "QObject"
+ Enum {
+ name: "TransformOrigin"
+ values: {
+ "TopLeft": 0,
+ "Top": 1,
+ "TopRight": 2,
+ "Left": 3,
+ "Center": 4,
+ "Right": 5,
+ "BottomLeft": 6,
+ "Bottom": 7,
+ "BottomRight": 8
+ }
+ }
+ Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "x"; type: "float" }
+ Property { name: "y"; type: "float" }
+ Property { name: "z"; type: "float" }
+ Property { name: "width"; type: "float" }
+ Property { name: "height"; type: "float" }
+ Property { name: "opacity"; type: "float" }
+ Property { name: "enabled"; type: "bool" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
+ Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
+ Property { name: "state"; type: "string" }
+ Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+ Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
+ Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baselineOffset"; type: "float" }
+ Property { name: "clip"; type: "bool" }
+ Property { name: "focus"; type: "bool" }
+ Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+ Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
+ Property { name: "rotation"; type: "float" }
+ Property { name: "scale"; type: "float" }
+ Property { name: "transformOrigin"; type: "TransformOrigin" }
+ Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+ Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
+ Property { name: "smooth"; type: "bool" }
+ Property { name: "antialiasing"; type: "bool" }
+ Property { name: "implicitWidth"; type: "float" }
+ Property { name: "implicitHeight"; type: "float" }
+ Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
+ Signal {
+ name: "childrenRectChanged"
+ Parameter { type: "QRectF" }
+ }
+ Signal {
+ name: "baselineOffsetChanged"
+ Parameter { type: "float" }
+ }
+ Signal {
+ name: "stateChanged"
+ Parameter { type: "string" }
+ }
+ Signal {
+ name: "focusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusOnTabChanged"
+ revision: 1
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "parentChanged"
+ Parameter { type: "QQuickItem"; isPointer: true }
+ }
+ Signal {
+ name: "transformOriginChanged"
+ Parameter { type: "TransformOrigin" }
+ }
+ Signal {
+ name: "smoothChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "antialiasingChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "clipChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "windowChanged"
+ revision: 1
+ Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+ }
+ Method { name: "update" }
+ Method {
+ name: "grabToImage"
+ revision: 2
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "targetSize"; type: "QSize" }
+ }
+ Method {
+ name: "grabToImage"
+ revision: 2
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
+ Method {
+ name: "contains"
+ type: "bool"
+ Parameter { name: "point"; type: "QPointF" }
+ }
+ Method {
+ name: "mapFromItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "mapToItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method { name: "forceActiveFocus" }
+ Method {
+ name: "forceActiveFocus"
+ Parameter { name: "reason"; type: "Qt::FocusReason" }
+ }
+ Method {
+ name: "nextItemInFocusChain"
+ revision: 1
+ type: "QQuickItem*"
+ Parameter { name: "forward"; type: "bool" }
+ }
+ Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
+ Method {
+ name: "childAt"
+ type: "QQuickItem*"
+ Parameter { name: "x"; type: "float" }
+ Parameter { name: "y"; type: "float" }
+ }
}
}
