diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-07-13 15:53:49 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-07-13 15:59:57 (GMT) |
| commit | b7598e32617ea8608d7c82800e1706d9180ddbd9 (patch) | |
| tree | 8c59823fb866447c9037c36b9320d3c4e7599483 /examples/activeqt | |
| parent | 754d9c2f1d0dce16017b99f766c1fa3e47b0afde (diff) | |
| download | Qt-b7598e32617ea8608d7c82800e1706d9180ddbd9.zip Qt-b7598e32617ea8608d7c82800e1706d9180ddbd9.tar.gz Qt-b7598e32617ea8608d7c82800e1706d9180ddbd9.tar.bz2 | |
make examples/activeqt/webbrowser work on Windows CE
This example only worked on desktop Windows and Windows mobile.
Windows CE uses the same GUID for the Internet Explorer ActiveX control
like desktop Windows.
Task-number: 255111
Reviewed-by: thartman
Diffstat (limited to 'examples/activeqt')
| -rw-r--r-- | examples/activeqt/webbrowser/main.cpp | 4 | ||||
| -rw-r--r-- | examples/activeqt/webbrowser/mainwindow_windowsmobile.ui (renamed from examples/activeqt/webbrowser/wincemainwindow.ui) | 0 | ||||
| -rw-r--r-- | examples/activeqt/webbrowser/webbrowser.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp index ab14c0b..e83ef56 100644 --- a/examples/activeqt/webbrowser/main.cpp +++ b/examples/activeqt/webbrowser/main.cpp @@ -46,8 +46,8 @@ #include <QMainWindow> #include <QAbstractEventDispatcher> -#if defined(Q_OS_WINCE) -#include "ui_wincemainwindow.h" +#if defined(Q_WS_WINCE_WM) +#include "ui_mainwindow_windowsmobile.h" #include <windows.h> #else #include "ui_mainwindow.h" diff --git a/examples/activeqt/webbrowser/wincemainwindow.ui b/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui index 98a9ddb..98a9ddb 100644 --- a/examples/activeqt/webbrowser/wincemainwindow.ui +++ b/examples/activeqt/webbrowser/mainwindow_windowsmobile.ui diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 992d871..32eac71 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -7,7 +7,7 @@ QTDIR_build:REQUIRES = shared HEADERS = webaxwidget.h SOURCES = main.cpp FORMS = mainwindow.ui -wince*: FORMS = wincemainwindow.ui +wincewm*: FORMS = mainwindow_windowsmobile.ui # install |