diff options
Diffstat (limited to 'examples/sql/sqlwidgetmapper')
-rw-r--r-- | examples/sql/sqlwidgetmapper/CMakeLists.txt | 36 | ||||
-rw-r--r-- | examples/sql/sqlwidgetmapper/window.cpp | 15 | ||||
-rw-r--r-- | examples/sql/sqlwidgetmapper/window.h | 22 |
3 files changed, 42 insertions, 31 deletions
diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt index 5eff5f475b..91ce3cf339 100644 --- a/examples/sql/sqlwidgetmapper/CMakeLists.txt +++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt @@ -1,16 +1,13 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(sqlwidgetmapper LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sql/sqlwidgetmapper") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Sql Widgets) +qt_standard_project_setup() + qt_add_executable(sqlwidgetmapper main.cpp window.cpp window.h @@ -21,15 +18,22 @@ set_target_properties(sqlwidgetmapper PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(sqlwidgetmapper PUBLIC - Qt::Core - Qt::Gui - Qt::Sql - Qt::Widgets +target_link_libraries(sqlwidgetmapper PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Sql + Qt6::Widgets ) install(TARGETS sqlwidgetmapper - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET sqlwidgetmapper + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/sql/sqlwidgetmapper/window.cpp b/examples/sql/sqlwidgetmapper/window.cpp index fee3bc78dd..cd44174f84 100644 --- a/examples/sql/sqlwidgetmapper/window.cpp +++ b/examples/sql/sqlwidgetmapper/window.cpp @@ -1,11 +1,20 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include <QtWidgets> -#include <QtSql> - #include "window.h" +#include <QComboBox> +#include <QDataWidgetMapper> +#include <QGridLayout> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> +#include <QSqlQuery> +#include <QSqlRelationalDelegate> +#include <QSqlTableModel> +#include <QTextEdit> + //! [Set up widgets] Window::Window(QWidget *parent) : QWidget(parent) diff --git a/examples/sql/sqlwidgetmapper/window.h b/examples/sql/sqlwidgetmapper/window.h index c3b01155af..9af9628b90 100644 --- a/examples/sql/sqlwidgetmapper/window.h +++ b/examples/sql/sqlwidgetmapper/window.h @@ -6,18 +6,16 @@ #include <QWidget> -QT_BEGIN_NAMESPACE -class QComboBox; -class QDataWidgetMapper; -class QItemSelectionModel; -class QLabel; -class QLineEdit; -class QPushButton; -class QSqlRelationalTableModel; -class QStandardItemModel; -class QStringListModel; -class QTextEdit; -QT_END_NAMESPACE +QT_FORWARD_DECLARE_CLASS(QComboBox) +QT_FORWARD_DECLARE_CLASS(QDataWidgetMapper) +QT_FORWARD_DECLARE_CLASS(QItemSelectionModel) +QT_FORWARD_DECLARE_CLASS(QLabel) +QT_FORWARD_DECLARE_CLASS(QLineEdit) +QT_FORWARD_DECLARE_CLASS(QPushButton) +QT_FORWARD_DECLARE_CLASS(QSqlRelationalTableModel) +QT_FORWARD_DECLARE_CLASS(QStandardItemModel) +QT_FORWARD_DECLARE_CLASS(QStringListModel) +QT_FORWARD_DECLARE_CLASS(QTextEdit) //! [Window definition] class Window : public QWidget |