diff options
Diffstat (limited to 'examples/sql/tablemodel')
-rw-r--r-- | examples/sql/tablemodel/CMakeLists.txt | 21 | ||||
-rw-r--r-- | examples/sql/tablemodel/tablemodel.cpp | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt index 7b65d81029..28919bb69a 100644 --- a/examples/sql/tablemodel/CMakeLists.txt +++ b/examples/sql/tablemodel/CMakeLists.txt @@ -1,15 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(tablemodel LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sql/tablemodel") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Sql Widgets) qt_standard_project_setup() @@ -32,7 +26,14 @@ target_link_libraries(tablemodel PRIVATE ) install(TARGETS tablemodel - 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 tablemodel + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/sql/tablemodel/tablemodel.cpp b/examples/sql/tablemodel/tablemodel.cpp index ae0aa17719..04c114dc63 100644 --- a/examples/sql/tablemodel/tablemodel.cpp +++ b/examples/sql/tablemodel/tablemodel.cpp @@ -6,8 +6,6 @@ #include <QSqlTableModel> #include <QTableView> -#include <stdlib.h> - void initializeModel(QSqlTableModel *model) { model->setTable("person"); |