diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 97b22bd9426cc0ae7ba3d988ff9a2109144bdfc9..43ccbebf7c53222df400f160f87f8d0ad3831491 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -6,10 +6,8 @@ SUBDIRS += comapp \
simple \
wrapper
-contains(QT_CONFIG, shared):SUBDIRS += webbrowser
contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
qtHaveModule(quickcontrols2):SUBDIRS += simpleqml
-# For now only the contain examples with mingw, for the others you need
-# an IDL compiler
-mingw:SUBDIRS = webbrowser
+# For now the examples need an IDL compiler
+mingw:SUBDIRS = ""
diff --git a/examples/activeqt/webbrowser/doc/images/activeqt-webbrowser-example.png b/examples/activeqt/webbrowser/doc/images/activeqt-webbrowser-example.png
deleted file mode 100644
index 0bb451abc353aa7a3bef871434bbd47c1eab9bdf..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/doc/images/activeqt-webbrowser-example.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/doc/src/webbrowser.qdoc b/examples/activeqt/webbrowser/doc/src/webbrowser.qdoc
deleted file mode 100644
index b8215bd24647e28fc3b0bfc5931ea4d694f51a7f..0000000000000000000000000000000000000000
--- a/examples/activeqt/webbrowser/doc/src/webbrowser.qdoc
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \example activeqt/webbrowser
- \title Web Browser Example (ActiveQt)
-
- \brief The Web Browser example uses the Microsoft Web Browser
- ActiveX control to implement a fully functional Web Browser
- application. The user interface has been developed using the Qt
- Designer integration of the QAxWidget class.
-
- \image activeqt-webbrowser-example.png
-
- The code demonstrates how the Qt application can communicate
- with the embedded ActiveX controls using signals, slots and the
- dynamicCall() function.
-
- \snippet activeqt/webbrowser/main.cpp 0
-
- The \c MainWindow class declares a \c QMainWindow based user interface,
- using the \c Ui::MainWindow class generated by Qt Designer. A number
- of slots are implemented to handle events from the various user
- interface elements, including the \c WebBrowser object, which is a
- QAxWidget hosting the Microsoft Web Browser control.
-
- \snippet activeqt/webbrowser/main.cpp 1
-
- The constructor initializes the user interface, installs a
- progress bar on the status bar, and loads the bookmarks.
-
- \snippet activeqt/webbrowser/main.cpp 2
- Different slots handle the signals emitted by the WebBrowser object.
-
- Connections that don't require any coding, i.e. connecting the \c back
- action to the \c GoBack() slot, have already been made in Qt Designer.
-
- \snippet activeqt/webbrowser/main.cpp 3
- \snippet activeqt/webbrowser/main.cpp 4
-
- The rest of the implementation is not related to ActiveQt - the actions
- are handled by different slots, and the entry point function starts the
- application using standard Qt APIs.
-
- To build the example you must first build the QAxContainer
- library. Then run your make tool in \c
- examples/activeqt/webbrowser and run the resulting \c
- webbrowser.exe.
-*/
diff --git a/examples/activeqt/webbrowser/images/back.png b/examples/activeqt/webbrowser/images/back.png
deleted file mode 100644
index ca100f63d6818247052e575d857d36f772c1382c..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/back.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/images/forward.png b/examples/activeqt/webbrowser/images/forward.png
deleted file mode 100644
index 833cbfa6ff05ca8338bcc21c9807c8715167ee9f..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/forward.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/images/go.png b/examples/activeqt/webbrowser/images/go.png
deleted file mode 100644
index 8aaf835906790e4e981c1f64e60138e60a81735f..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/go.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/images/home.png b/examples/activeqt/webbrowser/images/home.png
deleted file mode 100644
index 51dc56d0a726a497db2c14dae203372798189dd9..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/home.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/images/refresh.png b/examples/activeqt/webbrowser/images/refresh.png
deleted file mode 100644
index cd24b5f6f61545205d67cfcc18c48e1538b395e9..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/refresh.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/images/search.png b/examples/activeqt/webbrowser/images/search.png
deleted file mode 100644
index 4f1e1caba1e2fee63e45f810316b8f91a2c40855..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/search.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/images/stop.png b/examples/activeqt/webbrowser/images/stop.png
deleted file mode 100644
index ded466c38410433fc4e0f1bd8db84c381896df5c..0000000000000000000000000000000000000000
Binary files a/examples/activeqt/webbrowser/images/stop.png and /dev/null differ
diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp
deleted file mode 100644
index 869ddfccb5d81dc1c6b47759a3d161f7ead7bfd4..0000000000000000000000000000000000000000
--- a/examples/activeqt/webbrowser/main.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QMessageBox>
-#include <QProgressBar>
-#include <QLineEdit>
-#include <QLabel>
-#include <QStatusBar>
-#include <QMainWindow>
-#include <QDesktopWidget>
-#include <QAbstractEventDispatcher>
-#include <QSignalMapper>
-#include <QVariant>
-#include <QSettings>
-
-#include "ui_mainwindow.h"
-
-static const char qtUrl[] = "qt.io";
-static const char iWebBrowser2DocumentationUrl[] = "http://msdn.microsoft.com/en-us/library/aa752127%28v=vs.85%29.aspx";
-static const char versionKey[] = "Version";
-static const char geometryKey[] = "Geometry";
-
-struct Location {
- Location(const QString &t = QString(), const QString &a = QString()) : title(t), address(a) {}
-
- QString title;
- QString address;
-};
-
-Q_DECLARE_METATYPE(Location)
-
-static QList<Location> defaultBookmarks()
-{
- QList<Location> result;
- result.append(Location(QStringLiteral("Qt"), QLatin1String(qtUrl)));
- result.append(Location(QStringLiteral("Digia"), QStringLiteral("http://qt.digia.com/")));
- result.append(Location(QStringLiteral("IWebBrowser2 MSDN Documentation"), QLatin1String(iWebBrowser2DocumentationUrl)));
- return result;
-}
-
-static bool containsAddress(const QList<Location> &locations, const QString &address)
-{
- for (const Location &location : locations) {
- if (location.address == address)
- return true;
- }
- return false;
-}
-
-static inline Location locationFromAction(const QAction *action)
-{
- return action->data().value<Location>();
-}
-
-static QList<Location> readBookMarks(QSettings &settings)
-{
- QList<Location> result;
- if (const int count = settings.beginReadArray(QStringLiteral("Bookmarks"))) {
- const QString titleKey = QStringLiteral("title");
- const QString addressKey = QStringLiteral("address");
- for (int i = 0; i < count; ++i) {
- settings.setArrayIndex(i);
- result.append(Location(settings.value(titleKey).toString(),
- settings.value(addressKey).toString()));
- }
- }
- settings.endArray();
- return result;
-}
-
-static void saveBookMarks(const QList<Location> &bookmarks, QSettings &settings)
-{
- const int count = bookmarks.size();
- settings.beginWriteArray(QStringLiteral("Bookmarks"));
- const QString titleKey = QStringLiteral("title");
- const QString addressKey = QStringLiteral("address");
- for (int i = 0; i < count; ++i) {
- settings.setArrayIndex(i);
- settings.setValue(titleKey, bookmarks.at(i).title);
- settings.setValue(addressKey, bookmarks.at(i).address);
- }
- settings.endArray();
-}
-
-//! [0]
-class MainWindow : public QMainWindow, public Ui::MainWindow
-{
- Q_OBJECT
-public:
- MainWindow();
- ~MainWindow();
-
-public slots:
- void navigate(const QString &address);
- void on_WebBrowser_TitleChange(const QString &title);
- void on_WebBrowser_ProgressChange(int a, int b);
- void on_WebBrowser_CommandStateChange(int cmd, bool on);
- void on_WebBrowser_BeforeNavigate();
- void on_WebBrowser_NavigateComplete(const QString &address);
-
- void on_actionGo_triggered();
- void on_actionNewWindow_triggered();
- void on_actionAddBookmark_triggered();
- void on_actionAbout_triggered();
- void on_actionAboutQt_triggered();
- void on_actionFileClose_triggered();
-
-private:
- inline const QString address() const
- { return addressEdit->text().trimmed(); }
- QList<Location> bookmarks() const;
- QAction *addLocation(const Location &location, QMenu *menu);
- inline void addBookmark(const Location &location)
- { bookmarkActions << addLocation(location, BookmarksMenu); }
-
- QProgressBar *pb;
- QLineEdit *addressEdit;
- QList<QAction *> bookmarkActions;
- QList<QAction *> historyActions;
- QSignalMapper locationActionMapper;
-};
-//! [0] //! [1]
-
-MainWindow::MainWindow()
-{
- setupUi(this);
-
- addressEdit = new QLineEdit;
- tbAddress->insertWidget(actionGo, new QLabel(tr("Address")));
- tbAddress->insertWidget(actionGo, addressEdit);
-
- connect(addressEdit, SIGNAL(returnPressed()), actionGo, SLOT(trigger()));
- connect(actionBack, SIGNAL(triggered()), WebBrowser, SLOT(GoBack()));
- connect(actionForward, SIGNAL(triggered()), WebBrowser, SLOT(GoForward()));
- connect(actionStop, SIGNAL(triggered()), WebBrowser, SLOT(Stop()));
- connect(actionRefresh, SIGNAL(triggered()), WebBrowser, SLOT(Refresh()));
- connect(actionHome, SIGNAL(triggered()), WebBrowser, SLOT(GoHome()));
- connect(actionSearch, SIGNAL(triggered()), WebBrowser, SLOT(GoSearch()));
-
- pb = new QProgressBar(statusBar());
- pb->setTextVisible(false);
- pb->hide();
- statusBar()->addPermanentWidget(pb);
-
- connect(&locationActionMapper, SIGNAL(mapped(QString)), this, SLOT(navigate(QString)));
-
- QSettings settings(QSettings::IniFormat, QSettings::UserScope,
- QCoreApplication::organizationName(), QCoreApplication::applicationName());
- const QByteArray restoredGeometry = settings.value(QLatin1String(geometryKey)).toByteArray();
- if (restoredGeometry.isEmpty() || !restoreGeometry(restoredGeometry)) {
- const QRect availableGeometry = QApplication::desktop()->availableGeometry(this);
- const QSize size = (availableGeometry.size() * 4) / 5;
- resize(size);
- move(availableGeometry.center() - QPoint(size.width(), size.height()) / 2);
- }
- const QString restoredVersion = settings.value(QLatin1String(versionKey)).toString();
- QList<Location> bookmarks = readBookMarks(settings);
- if (bookmarks.isEmpty() || restoredVersion.isEmpty())
- bookmarks = defaultBookmarks();
- for (const Location &bookmark : qAsConst(bookmarks))
- addBookmark(bookmark);
-}
-
-//! [1]
-
-MainWindow::~MainWindow()
-{
- QSettings settings(QSettings::IniFormat, QSettings::UserScope,
- QCoreApplication::organizationName(), QCoreApplication::applicationName());
- saveBookMarks(bookmarks(), settings);
- settings.setValue(QLatin1String(versionKey), QLatin1String(QT_VERSION_STR));
- settings.setValue(QLatin1String(geometryKey), saveGeometry());
-}
-
-QAction *MainWindow::addLocation(const Location &location, QMenu *menu)
-{
- QAction *action = menu->addAction(location.title);
- action->setData(QVariant::fromValue(location));
- locationActionMapper.setMapping(action, location.address);
- connect(action, SIGNAL(triggered()), &locationActionMapper, SLOT(map()));
- return action;
-}
-
-QList<Location> MainWindow::bookmarks() const
-{
- QList<Location> result;
- for (const QAction *action : qAsConst(bookmarkActions))
- result.append(locationFromAction(action));
- return result;
-}
-
-void MainWindow::on_actionAddBookmark_triggered()
-{
- if (!historyActions.isEmpty()) {
- const Location location = locationFromAction(historyActions.last());
- if (!containsAddress(bookmarks(), location.address))
- addBookmark(location);
- }
-}
-
-//! [2]
-void MainWindow::on_WebBrowser_TitleChange(const QString &title)
-{
- // This is called multiple times after NavigateComplete().
- // Add new URLs to history here.
- setWindowTitle("Qt WebBrowser - " + title);
- const QString currentAddress = address();
- const QString historyAddress = historyActions.isEmpty() ?
- QString() : locationFromAction(historyActions.last()).address;
- if (currentAddress.isEmpty() || currentAddress == "about:blank" || currentAddress == historyAddress)
- return;
- historyActions << addLocation(Location(title, currentAddress), HistoryMenu);
- if (historyActions.size() > 10)
- delete historyActions.takeFirst();
-}
-
-void MainWindow::on_WebBrowser_ProgressChange(int a, int b)
-{
- if (a <= 0 || b <= 0) {
- pb->hide();
- return;
- }
- pb->show();
- pb->setRange(0, b);
- pb->setValue(a);
-}
-
-void MainWindow::on_WebBrowser_CommandStateChange(int cmd, bool on)
-{
- switch (cmd) {
- case 1:
- actionForward->setEnabled(on);
- break;
- case 2:
- actionBack->setEnabled(on);
- break;
- }
-}
-
-void MainWindow::on_WebBrowser_BeforeNavigate()
-{
- actionStop->setEnabled(true);
-}
-
-void MainWindow::on_WebBrowser_NavigateComplete(const QString &url)
-{
- actionStop->setEnabled(false);
- const bool blocked = addressEdit->blockSignals(true);
- addressEdit->setText(url);
- addressEdit->blockSignals(blocked);
-}
-
-//! [3]
-void MainWindow::on_actionGo_triggered()
-{
- navigate(address());
-}
-
-//! [2]
-
-void MainWindow::navigate(const QString &url)
-{
- WebBrowser->dynamicCall("Navigate(const QString&)", url);
-}
-
-void MainWindow::on_actionNewWindow_triggered()
-{
- MainWindow *window = new MainWindow;
- window->show();
- if (addressEdit->text().isEmpty())
- return;
- window->addressEdit->setText(addressEdit->text());
- window->actionStop->setEnabled(true);
- window->on_actionGo_triggered();
-}
-
-void MainWindow::on_actionAbout_triggered()
-{
- QMessageBox::about(this, tr("About WebBrowser"),
- tr("This Example has been created using the ActiveQt integration into Qt Designer.\n"
- "It demonstrates the use of QAxWidget to embed the Internet Explorer ActiveX\n"
- "control into a Qt application."));
-}
-
-void MainWindow::on_actionAboutQt_triggered()
-{
- QMessageBox::aboutQt(this, tr("About Qt"));
-}
-
-void MainWindow::on_actionFileClose_triggered()
-{
- close();
-}
-
-#include "main.moc"
-
-//! [3] //! [4]
-int main(int argc, char ** argv)
-{
- QApplication a(argc, argv);
- QCoreApplication::setApplicationVersion(QT_VERSION_STR);
- QCoreApplication::setApplicationName("Active Qt Web Browser");
- QCoreApplication::setOrganizationName("QtProject");
- MainWindow w;
- const QStringList arguments = QCoreApplication::arguments();
- const QString url = arguments.size() > 1 ?
- arguments.at(1) : QString::fromLatin1(qtUrl);
- w.navigate(url);
- w.show();
- return a.exec();
-}
-//! [4]
diff --git a/examples/activeqt/webbrowser/mainwindow.ui b/examples/activeqt/webbrowser/mainwindow.ui
deleted file mode 100644
index 4f5877d186a2206b1db6fa22d9ab6388221ed2bf..0000000000000000000000000000000000000000
--- a/examples/activeqt/webbrowser/mainwindow.ui
+++ /dev/null
@@ -1,290 +0,0 @@
-<ui version="4.0" stdsetdef="1" >
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
- <property name="objectName" >
- <string notr="true" >MainWindow</string>
- </property>
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>812</width>
- <height>605</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Qt WebBrowser</string>
- </property>
- <widget class="QWidget" name="centralWidget">
- <layout class="QHBoxLayout" >
- <property name="objectName" >
- <string notr="true" >unnamed</string>
- </property>
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QFrame" name="Frame3" >
- <property name="objectName" >
- <string notr="true" >Frame3</string>
- </property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
- </property>
- <layout class="QVBoxLayout" >
- <property name="objectName" >
- <string notr="true" >unnamed</string>
- </property>
- <property name="margin" >
- <number>1</number>
- </property>
- <property name="spacing" >
- <number>0</number>
- </property>
- <item>
- <widget class="WebAxWidget" name="WebBrowser" >
- <property name="objectName" >
- <string notr="true" >WebBrowser</string>
- </property>
- <property name="focusPolicy" >
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="control" >
- <string>{8856F961-340A-11D0-A96B-00C04FD705A2}</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QToolBar" name="tbNavigate" >
- <property name="objectName" >
- <string notr="true" >tbNavigate</string>
- </property>
- <property name="windowTitle" >
- <string>Navigation</string>
- </property>
- <addaction name="actionBack" />
- <addaction name="actionForward" />
- <addaction name="actionStop" />
- <addaction name="actionRefresh" />
- <addaction name="actionHome" />
- <addaction name="separator" />
- <addaction name="actionSearch" />
- </widget>
- <widget class="QToolBar" name="tbAddress" >
- <property name="objectName" >
- <string notr="true" >tbAddress</string>
- </property>
- <property name="windowTitle" >
- <string>Address</string>
- </property>
- <addaction name="actionGo" />
- </widget>
- <widget class="QMenuBar" name="menubar" >
- <property name="objectName" >
- <string notr="true" >menubar</string>
- </property>
- <widget class="QMenu" name="PopupMenu" >
- <property name="objectName" >
- <string notr="true" >PopupMenu</string>
- </property>
- <property name="title" >
- <string>&File</string>
- </property>
- <widget class="QMenu" name="FileNewGroup_2" >
- <property name="objectName" >
- <string notr="true" >FileNewGroup_2</string>
- </property>
- <property name="title" >
- <string>New</string>
- </property>
- <addaction name="actionNewWindow" />
- </widget>
- <addaction name="FileNewGroup" />
- <addaction name="FileNewGroup_2" />
- <addaction name="separator" />
- <addaction name="actionFileClose" />
- </widget>
- <widget class="QMenu" name="BookmarksMenu" >
- <property name="objectName" >
- <string notr="true" >BookmarksMenu</string>
- </property>
- <property name="title" >
- <string>&Bookmarks</string>
- </property>
- <addaction name="actionAddBookmark" />
- <addaction name="separator" />
- </widget>
- <widget class="QMenu" name="HistoryMenu" >
- <property name="objectName" >
- <string notr="true" >HistoryMenu</string>
- </property>
- <property name="title" >
- <string>Hi&story</string>
- </property>
- </widget>
- <widget class="QMenu" name="unnamed" >
- <property name="objectName" >
- <string notr="true" >unnamed</string>
- </property>
- <property name="title" >
- <string>&Help</string>
- </property>
- <addaction name="actionAbout" />
- <addaction name="actionAboutQt" />
- </widget>
- <addaction name="PopupMenu" />
- <addaction name="BookmarksMenu" />
- <addaction name="HistoryMenu" />
- <addaction name="unnamed" />
- </widget>
- <action name="actionGo" >
- <property name="objectName" >
- <string>actionGo</string>
- </property>
- <property name="icon" >
- <iconset>:/images/go.png</iconset>
- </property>
- <property name="iconText" >
- <string>Go</string>
- </property>
- </action>
- <action name="actionBack" >
- <property name="objectName" >
- <string>actionBack</string>
- </property>
- <property name="icon" >
- <iconset>:/images/back.png</iconset>
- </property>
- <property name="iconText" >
- <string>Back</string>
- </property>
- <property name="shortcut" >
- <string>Backspace</string>
- </property>
- </action>
- <action name="actionForward" >
- <property name="objectName" >
- <string>actionForward</string>
- </property>
- <property name="icon" >
- <iconset>:/images/forward.png</iconset>
- </property>
- <property name="iconText" >
- <string>Forward</string>
- </property>
- </action>
- <action name="actionStop" >
- <property name="objectName" >
- <string>actionStop</string>
- </property>
- <property name="icon" >
- <iconset>:/images/stop.png</iconset>
- </property>
- <property name="iconText" >
- <string>Stop</string>
- </property>
- </action>
- <action name="actionRefresh" >
- <property name="objectName" >
- <string>actionRefresh</string>
- </property>
- <property name="icon" >
- <iconset>:/images/refresh.png</iconset>
- </property>
- <property name="iconText" >
- <string>Refresh</string>
- </property>
- </action>
- <action name="actionHome" >
- <property name="objectName" >
- <string>actionHome</string>
- </property>
- <property name="icon" >
- <iconset>:/images/home.png</iconset>
- </property>
- <property name="iconText" >
- <string>Home</string>
- </property>
- </action>
- <action name="actionFileClose" >
- <property name="objectName" >
- <string>actionFileClose</string>
- </property>
- <property name="iconText" >
- <string>Close</string>
- </property>
- <property name="text" >
- <string>C&lose</string>
- </property>
- </action>
- <action name="actionSearch" >
- <property name="objectName" >
- <string>actionSearch</string>
- </property>
- <property name="icon" >
- <iconset>:/images/search.png</iconset>
- </property>
- <property name="iconText" >
- <string>Search</string>
- </property>
- </action>
- <action name="actionAbout" >
- <property name="objectName" >
- <string>actionAbout</string>
- </property>
- <property name="iconText" >
- <string>About</string>
- </property>
- </action>
- <action name="actionAddBookmark" >
- <property name="objectName" >
- <string>actionAddBookmark</string>
- </property>
- <property name="text" >
- <string>Add Bookmark</string>
- </property>
- </action>
- <action name="actionAboutQt" >
- <property name="objectName" >
- <string>actionAboutQt</string>
- </property>
- <property name="iconText" >
- <string>About Qt</string>
- </property>
- </action>
- <actiongroup name="FileNewGroup" >
- <action name="actionNewWindow" >
- <property name="objectName" >
- <string>actionNewWindow</string>
- </property>
- <property name="iconText" >
- <string>Window</string>
- </property>
- <property name="shortcut" >
- <string>Ctrl+N</string>
- </property>
- </action>
- <property name="objectName" >
- <string>FileNewGroup</string>
- </property>
- </actiongroup>
- </widget>
- <customwidgets>
- <customwidget>
- <class>WebAxWidget</class>
- <extends>QAxWidget</extends>
- <header>webaxwidget.h</header>
- </customwidget>
- </customwidgets>
- <layoutdefault spacing="6" margin="11" />
-</ui>
diff --git a/examples/activeqt/webbrowser/webaxwidget.h b/examples/activeqt/webbrowser/webaxwidget.h
deleted file mode 100644
index ffd90f8f3f0de2d1d024f05e0a16c7844bd37a62..0000000000000000000000000000000000000000
--- a/examples/activeqt/webbrowser/webaxwidget.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of The Qt Company Ltd nor the names of its
-** contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef WEBAXWIDGET_H
-#define WEBAXWIDGET_H
-
-#include <ActiveQt/QAxWidget>
-#include "windows.h"
-
-class WebAxWidget : public QAxWidget
-{
-public:
-
- WebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0)
- : QAxWidget(parent, f)
- {
- }
-protected:
- bool translateKeyEvent(int message, int keycode) const override
- {
- if (message >= WM_KEYFIRST && message <= WM_KEYLAST)
- return true;
- else
- return QAxWidget::translateKeyEvent(message, keycode);
- }
-
-};
-
-#endif // WEBAXWIDGET_H
diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro
deleted file mode 100644
index 76a791c982189b55e7fc8425753e5c9b4b3e2069..0000000000000000000000000000000000000000
--- a/examples/activeqt/webbrowser/webbrowser.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-
-QT += widgets axcontainer
-
-HEADERS = webaxwidget.h
-SOURCES = main.cpp
-FORMS = mainwindow.ui
-RESOURCES += webbrowser.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/webbrowser
-INSTALLS += target
diff --git a/examples/activeqt/webbrowser/webbrowser.qrc b/examples/activeqt/webbrowser/webbrowser.qrc
deleted file mode 100644
index 4f463e2bd332d53f6f86f8d8c9b1a470a1d7c8c8..0000000000000000000000000000000000000000
--- a/examples/activeqt/webbrowser/webbrowser.qrc
+++ /dev/null
@@ -1,11 +0,0 @@
-<RCC>
-<qresource>
- <file>images/back.png</file>
- <file>images/forward.png</file>
- <file>images/go.png</file>
- <file>images/home.png</file>
- <file>images/refresh.png</file>
- <file>images/search.png</file>
- <file>images/stop.png</file>
-</qresource>
-</RCC>
diff --git a/src/activeqt/doc/src/activeqt-index.qdoc b/src/activeqt/doc/src/activeqt-index.qdoc
index 2fba3eadf8a51d304ddc65cf98742f4778d46a8b..75f51f8ff439e868acaa39c481b9370ceca16318 100644
--- a/src/activeqt/doc/src/activeqt-index.qdoc
+++ b/src/activeqt/doc/src/activeqt-index.qdoc
@@ -109,6 +109,5 @@
\li \l{Menus Example (ActiveQt)}
\li \l{Wrapper Example (ActiveQt)}
\li \l{Simple Example (ActiveQt)}
- \li \l{Web Browser Example (ActiveQt)}
\endlist
*/
diff --git a/src/activeqt/doc/src/qtaxcontainer.qdoc b/src/activeqt/doc/src/qtaxcontainer.qdoc
index 7d79372f36d668897de3b858a24f483940886ac4..264c0b26da272e87956ca11fdd2fc24c2e8abb8d 100644
--- a/src/activeqt/doc/src/qtaxcontainer.qdoc
+++ b/src/activeqt/doc/src/qtaxcontainer.qdoc
@@ -199,8 +199,6 @@
object and its subobjects; note that not all of the COM object's APIs
might be available.
- See the \l{activeqt/webbrowser}{Webbrowser} example for more information.
-
\section2 Calling Function Through a Script Engine
A Qt application can host any ActiveScript engine installed on the system.