1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 20 Jun 2011 21:42:41 +0200
Subject: [PATCH] add qws support
based on a patch from OpenEmbedded:
http://cgit.openembedded.net/cgit.cgi/openembedded/tree/recipes/pyside/python-pyside-embedded/support-qws.patch
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
CMakeLists.txt | 4 ++++
PySide/QtCore/typesystem_core_qws.xml | 26 ++++++++++++++++++++++++++
PySide/QtGui/typesystem_gui_common.xml | 2 ++
PySide/QtGui/typesystem_gui_qws.xml | 26 ++++++++++++++++++++++++++
4 files changed, 58 insertions(+)
create mode 100644 PySide/QtCore/typesystem_core_qws.xml
create mode 100644 PySide/QtGui/typesystem_gui_qws.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e0e3d07e2e3..0e7d85025376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,7 @@ set(ENABLE_X11 "0")
set(ENABLE_MAC "0")
set(ENABLE_WIN "0")
set(ENABLE_SIMULATOR "0")
+set(ENABLE_QWS "0")
if(Q_WS_X11)
set(ENABLE_X11 "1")
if(Q_WS_MAEMO_5)
@@ -104,6 +105,9 @@ elseif(Q_WS_WIN)
elseif(Q_WS_SIMULATOR)
set(ENABLE_SIMULATOR "1")
set(AUTO_OS "simulator")
+elseif(Q_WS_QWS)
+ set(ENABLE_QWS "1")
+ set(AUTO_OS "qws")
else()
message(FATAL_ERROR "OS not supported")
endif()
diff --git a/PySide/QtCore/typesystem_core_qws.xml b/PySide/QtCore/typesystem_core_qws.xml
new file mode 100644
index 000000000000..eba223c73097
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_qws.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ This file is part of PySide project.
+ Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: PySide team <contact@pyside.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+<typesystem package="PySide.QtCore">
+ <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
+ <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
+ <include file-name="QTextDocument" location="global"/>
+ </primitive-type>
+</typesystem>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 711d7cc3a352..e7d00eac6df8 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -5635,6 +5635,8 @@
<modify-function signature="QApplication(int&,char**,bool,int)" remove="all"/>
<modify-function signature="QApplication(int&,char**,QApplication::Type,int)" remove="all"/>
<!-- ### -->
+ <!-- QWS: FIXME: really fix this -->
+ <modify-function signature="setArgs(int,char**)" remove="all"/>
<!-- ownership control transfer to qApp -->
<modify-function signature="setStyle(QStyle*)">
diff --git a/PySide/QtGui/typesystem_gui_qws.xml b/PySide/QtGui/typesystem_gui_qws.xml
new file mode 100644
index 000000000000..d4a4793ad496
--- /dev/null
+++ b/PySide/QtGui/typesystem_gui_qws.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ This file is part of PySide project.
+ Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ Contact: PySide team <contact@pyside.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+<typesystem package="PySide.QtGui">
+ <value-type name="QCursor">
+ <!-- Does not exist on QWS -->
+ <modify-function signature="QCursor(Qt::HANDLE)" remove="all"/>
+ </value-type>
+</typesystem>
|
