Commit 89585013 authored by Tapani Mattila's avatar Tapani Mattila
Browse files

Updates based on first review.

parent 1971943d
......@@ -3,11 +3,9 @@ cmake_minimum_required(VERSION 3.18)
project(CoffeeMachine LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
find_package(Qt6 COMPONENTS Widgets Gui Qml Quick)
find_package(Qt6 COMPONENTS Gui Qml Quick)
add_executable(CoffeeMachine main.cpp)
......@@ -16,7 +14,6 @@ add_subdirectory(imports/CoffeeMachineImport)
target_link_libraries(CoffeeMachine PRIVATE
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Quick
Qt${QT_VERSION_MAJOR}::Qml
......
......@@ -35,22 +35,22 @@
import QmlProject
Project {
mainFile: "./CoffeeMachineQml/CoffeeMachine.qml"
mainFile: "CoffeeMachineQml/CoffeeMachine.qml"
/* Include .qml, .js, and image files from a directory and subdirectories */
QmlFiles {
directory: "./CoffeeMachineQml"
directory: "CoffeeMachineQml"
}
QmlFiles {
directory: "./imports/CoffeeMachineImport"
directory: "imports/CoffeeMachineImport"
}
JavaScriptFiles {
directory: "./CoffeeMachineQml"
directory: "CoffeeMachineQml"
}
ImageFiles {
directory: "./CoffeeMachineQml/images"
directory: "CoffeeMachineQml/images"
}
Files {
......@@ -60,15 +60,15 @@ Project {
Files {
filter: "qmldir"
directory: "./CoffeeMachineQml"
directory: "CoffeeMachineQml"
}
Files {
filter: "qmldir"
directory: "./imports/CoffeeMachineImport"
directory: "imports/CoffeeMachineImport"
}
Environment {
QT_QUICK_CONTROLS_CONF: "./CoffeeMachineQml/qtquickcontrols2.conf"
QT_QUICK_CONTROLS_CONF: "CoffeeMachineQml/qtquickcontrols2.conf"
QT_AUTO_SCREEN_SCALE_FACTOR: "1"
}
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
qt6_add_qml_module(CoffeeMachineQml
SHARED
URI "CoffeeMachineQml"
CLASS_NAME "CoffeeMachineQml"
VERSION 1.0
QML_FILES
ApplicationFlowForm.ui.qml
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Design Studio.
......
......@@ -4,9 +4,7 @@ set_source_files_properties(Constants.qml
)
qt6_add_qml_module(CoffeeMachineImport
SHARED
URI "CoffeeMachineImport"
CLASS_NAME "CoffeeMachineImport"
VERSION 1.0
QML_FILES
Constants.qml
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment