summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--PySide/QtGui/typesystem_gui_simulator.xml35
-rw-r--r--PySide/QtWebKit/typesystem_webkit_simulator.xml11
-rw-r--r--PySide/global.h.in2
4 files changed, 52 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 244e5586..c62fdf9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,7 @@ endif()
set(ENABLE_X11 "0")
set(ENABLE_MAC "0")
set(ENABLE_WIN "0")
+set(ENABLE_SIMULATOR "0")
if(Q_WS_X11)
set(ENABLE_X11 "1")
if(Q_WS_MAEMO_5)
@@ -88,6 +89,9 @@ elseif(Q_WS_MAC)
elseif(Q_WS_WIN)
set(ENABLE_WIN "1")
set(AUTO_OS "win")
+elseif(Q_WS_SIMULATOR)
+ set(ENABLE_SIMULATOR "1")
+ set(AUTO_OS "simulator")
else()
message(FATAL_ERROR "OS not supported")
endif()
diff --git a/PySide/QtGui/typesystem_gui_simulator.xml b/PySide/QtGui/typesystem_gui_simulator.xml
new file mode 100644
index 00000000..18873497
--- /dev/null
+++ b/PySide/QtGui/typesystem_gui_simulator.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<typesystem package="PySide.QtGui">
+ <!-- These classes are not present in Qt Simulator build, even though
+ QT_NO_PRINTER is *not* set -->
+ <rejection class="QAbstractPageSetupDialog"/>
+ <rejection class="QAbstractPrintDialog"/>
+ <rejection class="QPageSetupDialog"/>
+ <rejection class="QPrintDialog"/>
+ <rejection class="QPrintPreviewDialog"/>
+ <rejection class="QPrintPreviewWidget"/>
+ <rejection class="QPrintEngine"/>
+ <rejection class="QPrinterInfo"/>
+ <rejection class="QPrinter"/>
+
+ <object-type name="QPlainTextEdit">
+ <modify-function signature="print(QPrinter*)const" remove="all"/>
+ </object-type>
+ <object-type name="QTextDocument">
+ <modify-function signature="print(QPrinter*)const" remove="all"/>
+ </object-type>
+ <object-type name="QTextEdit">
+ <modify-function signature="print(QPrinter*)const" remove="all"/>
+ </object-type>
+
+ <!-- Qt::HANDLE is typedef to "void *", which gives compilation errors on
+ conversion templates -->
+ <value-type name="QCursor">
+ <modify-function signature="QCursor(Qt::HANDLE)" remove="all"/>
+ </value-type>
+ <value-type name="QFont">
+ <modify-function signature="handle()const" remove="all"/>
+ </value-type>
+
+ <load-typesystem name="typesystem_gui.xml" generate="yes"/>
+</typesystem>
diff --git a/PySide/QtWebKit/typesystem_webkit_simulator.xml b/PySide/QtWebKit/typesystem_webkit_simulator.xml
new file mode 100644
index 00000000..f2a40f28
--- /dev/null
+++ b/PySide/QtWebKit/typesystem_webkit_simulator.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<typesystem package="PySide.QtWebKit">
+ <object-type name="QWebFrame">
+ <modify-function signature="print(QPrinter*)const" remove="all"/>
+ </object-type>
+ <object-type name="QWebView">
+ <modify-function signature="print(QPrinter*)const" remove="all"/>
+ </object-type>
+
+ <load-typesystem name="typesystem_webkit.xml" generate="yes"/>
+</typesystem>
diff --git a/PySide/global.h.in b/PySide/global.h.in
index cf21bd6c..ef854247 100644
--- a/PySide/global.h.in
+++ b/PySide/global.h.in
@@ -338,6 +338,8 @@ QT_END_HEADER
#define Q_WS_MAC
#elif @ENABLE_WIN@
#define Q_WS_WIN
+#elif @ENABLE_SIMULATOR@
+ #define Q_WS_SIMULATOR
#endif
// There are symbols in Qt that exist in Debug but