Add Qt Simulator support
Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org> Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
This commit is contained in:
parent
e5e44b6465
commit
6914f21603
4 changed files with 52 additions and 0 deletions
|
|
@ -75,6 +75,7 @@ endif()
|
||||||
set(ENABLE_X11 "0")
|
set(ENABLE_X11 "0")
|
||||||
set(ENABLE_MAC "0")
|
set(ENABLE_MAC "0")
|
||||||
set(ENABLE_WIN "0")
|
set(ENABLE_WIN "0")
|
||||||
|
set(ENABLE_SIMULATOR "0")
|
||||||
if(Q_WS_X11)
|
if(Q_WS_X11)
|
||||||
set(ENABLE_X11 "1")
|
set(ENABLE_X11 "1")
|
||||||
if(Q_WS_MAEMO_5)
|
if(Q_WS_MAEMO_5)
|
||||||
|
|
@ -88,6 +89,9 @@ elseif(Q_WS_MAC)
|
||||||
elseif(Q_WS_WIN)
|
elseif(Q_WS_WIN)
|
||||||
set(ENABLE_WIN "1")
|
set(ENABLE_WIN "1")
|
||||||
set(AUTO_OS "win")
|
set(AUTO_OS "win")
|
||||||
|
elseif(Q_WS_SIMULATOR)
|
||||||
|
set(ENABLE_SIMULATOR "1")
|
||||||
|
set(AUTO_OS "simulator")
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "OS not supported")
|
message(FATAL_ERROR "OS not supported")
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
35
PySide/QtGui/typesystem_gui_simulator.xml
Normal file
35
PySide/QtGui/typesystem_gui_simulator.xml
Normal file
|
|
@ -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>
|
||||||
11
PySide/QtWebKit/typesystem_webkit_simulator.xml
Normal file
11
PySide/QtWebKit/typesystem_webkit_simulator.xml
Normal file
|
|
@ -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>
|
||||||
|
|
@ -338,6 +338,8 @@ QT_END_HEADER
|
||||||
#define Q_WS_MAC
|
#define Q_WS_MAC
|
||||||
#elif @ENABLE_WIN@
|
#elif @ENABLE_WIN@
|
||||||
#define Q_WS_WIN
|
#define Q_WS_WIN
|
||||||
|
#elif @ENABLE_SIMULATOR@
|
||||||
|
#define Q_WS_SIMULATOR
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// There are symbols in Qt that exist in Debug but
|
// There are symbols in Qt that exist in Debug but
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue