summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2023-11-13 12:50:10 +0100
committerKai Köhne <kai.koehne@qt.io>2023-11-14 10:00:20 +0100
commit9bd95bcb0189670a3e7673bdd05b8a90987c56bc (patch)
treec9fb039cadd6d9fa66d8c8bd0c9b98481356628d
parentd440c037f50682fece994988e57ce20cceabd7ad (diff)
Remove the SimpleQML example
It's undocumented, and it uses outdated QML idioms such as setting a context property when it could use a singleton. Also, the extra QMainWindow + Controller class seems unnecessary; a QQuickWidget subclass that provides the "Controller" functionality would work as well. As it is, the "Controller" API isn't accessible for COM clients. Change-Id: I42d8e00fb13311e8b5df74f69f9bb76053346229 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
-rw-r--r--examples/activeqt/CMakeLists.txt3
-rw-r--r--examples/activeqt/activeqt.pro2
-rw-r--r--examples/activeqt/simpleqml/CMakeLists.txt46
-rw-r--r--examples/activeqt/simpleqml/main.cpp79
-rw-r--r--examples/activeqt/simpleqml/main.qml31
-rw-r--r--examples/activeqt/simpleqml/simpleqml.def6
-rw-r--r--examples/activeqt/simpleqml/simpleqml.icobin766 -> 0 bytes
-rw-r--r--examples/activeqt/simpleqml/simpleqml.pro15
-rw-r--r--examples/activeqt/simpleqml/simpleqml.qrc5
-rw-r--r--examples/activeqt/simpleqml/simpleqml.rc2
10 files changed, 0 insertions, 189 deletions
diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt
index 5604df2..c95e04e 100644
--- a/examples/activeqt/CMakeLists.txt
+++ b/examples/activeqt/CMakeLists.txt
@@ -5,7 +5,4 @@ if(MSVC)
qt_internal_add_example(comapp)
qt_internal_add_example(simple)
qt_internal_add_example(wrapper)
- if(TARGET Qt::QuickControls2)
- qt_internal_add_example(simpleqml)
- endif()
endif()
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index ee5a663..3628f1c 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -2,5 +2,3 @@ TEMPLATE = subdirs
SUBDIRS += comapp \
simple \
wrapper
-
-qtHaveModule(quickcontrols2):SUBDIRS += simpleqml
diff --git a/examples/activeqt/simpleqml/CMakeLists.txt b/examples/activeqt/simpleqml/CMakeLists.txt
deleted file mode 100644
index 0d243b0..0000000
--- a/examples/activeqt/simpleqml/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-cmake_minimum_required(VERSION 3.16)
-project(simpleqmlax LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/simpleqml")
-
-find_package(Qt6 REQUIRED COMPONENTS AxServer Core Gui Quick QuickWidgets Widgets)
-qt6_add_axserver_library(simpleqmlax
- main.cpp
- simpleqml.def
- simpleqml.rc
-)
-
-target_link_libraries(simpleqmlax PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Quick
- Qt::QuickWidgets
- Qt::Widgets
-)
-
-# Resources:
-set(simpleqml_resource_files
- "main.qml"
-)
-
-qt6_add_resources(simpleqmlax "simpleqml"
- PREFIX
- "/"
- FILES
- ${simpleqml_resource_files}
-)
-
-install(TARGETS simpleqmlax
- RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
- BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
- LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/examples/activeqt/simpleqml/main.cpp b/examples/activeqt/simpleqml/main.cpp
deleted file mode 100644
index 67c4c5f..0000000
--- a/examples/activeqt/simpleqml/main.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-#include <QAxBindable>
-#include <QAxFactory>
-#include <QMainWindow>
-#include <QQuickWidget>
-#include <QQmlContext>
-
-class Controller : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
- Q_PROPERTY(QColor color READ color NOTIFY valueChanged)
-public:
- explicit Controller(QWidget *parent = nullptr) :
- QObject(parent)
- { }
-
- qreal value() const { return m_value; }
-
- void setValue(qreal value)
- {
- m_value = qBound(qreal(0.0), value, qreal(1.0));
- valueChanged();
- }
-
- QColor color() const
- {
- QColor start = Qt::yellow;
- QColor end = Qt::magenta;
-
- // Linear interpolation between two colors in HSV space
- return QColor::fromHsvF(
- start.hueF() * (1.0f - m_value) + end.hueF() * m_value,
- start.saturationF() * (1.0f - m_value) + end.saturationF() * m_value,
- start.valueF() * (1.0f - m_value) + end.valueF() * m_value,
- start.alphaF() * (1.0f - m_value) + end.alphaF() * m_value
- );
- }
-
-signals:
- void valueChanged();
-
-private:
- qreal m_value = 0;
-};
-
-class QSimpleQmlAx : public QMainWindow
-{
- Q_OBJECT
- Q_CLASSINFO("ClassID", "{50477337-58FE-4898-8FFC-6F6199CEAE08}")
- Q_CLASSINFO("InterfaceID", "{A5EC7D99-CEC9-4BD1-8336-ED15A579B185}")
- Q_CLASSINFO("EventsID", "{5BBFBCFD-20FD-48A3-96C7-1F6649CD1F52}")
-public:
- explicit QSimpleQmlAx(QWidget *parent = nullptr) :
- QMainWindow(parent)
- {
- auto ui = new QQuickWidget(this);
-
- // Register our type to qml
- qmlRegisterType<Controller>("app", 1, 0, "Controller");
-
- // Initialize view
- ui->rootContext()->setContextProperty(QStringLiteral("context"), QVariant::fromValue(new Controller(this)));
- ui->setMinimumSize(200, 200);
- ui->setResizeMode(QQuickWidget::SizeRootObjectToView);
- ui->setSource(QUrl(QStringLiteral("qrc:/main.qml")));
- setCentralWidget(ui);
- }
-};
-
-#include "main.moc"
-
-QAXFACTORY_BEGIN(
- "{E544E321-EF8B-4CD4-91F6-DB55A59DBADB}", // type library ID
- "{E37E3131-DEA2-44EB-97A2-01CDD09A5A4D}") // application ID
- QAXCLASS(QSimpleQmlAx)
-QAXFACTORY_END()
diff --git a/examples/activeqt/simpleqml/main.qml b/examples/activeqt/simpleqml/main.qml
deleted file mode 100644
index 92a23c8..0000000
--- a/examples/activeqt/simpleqml/main.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-import QtQuick 2.5
-import QtQuick.Controls 2.0
-
-import app 1.0
-
-Rectangle {
- // Properties from context
- property Controller controller: context
-
- color: controller.color
-
- Label {
- id: idText
- text: "Color slider"
- anchors.top: parent.top
- anchors.left: parent.left
- color: "black"
- font.pixelSize: 12
- }
-
- Slider {
- value: controller.value
- onVisualPositionChanged: controller.value = visualPosition
-
- anchors.top: idText.bottom
- anchors.left: parent.left
- }
-}
diff --git a/examples/activeqt/simpleqml/simpleqml.def b/examples/activeqt/simpleqml/simpleqml.def
deleted file mode 100644
index bc82a03..0000000
--- a/examples/activeqt/simpleqml/simpleqml.def
+++ /dev/null
@@ -1,6 +0,0 @@
-EXPORTS
- DllCanUnloadNow PRIVATE
- DllGetClassObject PRIVATE
- DllRegisterServer PRIVATE
- DllUnregisterServer PRIVATE
- DumpIDL PRIVATE
diff --git a/examples/activeqt/simpleqml/simpleqml.ico b/examples/activeqt/simpleqml/simpleqml.ico
deleted file mode 100644
index c80d36a..0000000
--- a/examples/activeqt/simpleqml/simpleqml.ico
+++ /dev/null
Binary files differ
diff --git a/examples/activeqt/simpleqml/simpleqml.pro b/examples/activeqt/simpleqml/simpleqml.pro
deleted file mode 100644
index 9043e9d..0000000
--- a/examples/activeqt/simpleqml/simpleqml.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-include(../shared.pri)
-
-TEMPLATE = lib
-TARGET = simpleqmlax
-
-QT += widgets axserver quick quickwidgets
-
-SOURCES = main.cpp
-RC_FILE = simpleqml.rc
-DEF_FILE = simpleqml.def
-RESOURCES = simpleqml.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simpleqml
-INSTALLS += target
diff --git a/examples/activeqt/simpleqml/simpleqml.qrc b/examples/activeqt/simpleqml/simpleqml.qrc
deleted file mode 100644
index 5f6483a..0000000
--- a/examples/activeqt/simpleqml/simpleqml.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>main.qml</file>
- </qresource>
-</RCC>
diff --git a/examples/activeqt/simpleqml/simpleqml.rc b/examples/activeqt/simpleqml/simpleqml.rc
deleted file mode 100644
index d2978ce..0000000
--- a/examples/activeqt/simpleqml/simpleqml.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-1 TYPELIB "simpleqml.rc"
-1 ICON "simpleqml.ico"