diff options
| author | Erik Prabowo Kamal <erik@darapsa.org> | 2025-12-10 16:58:20 +0800 |
|---|---|---|
| committer | Erik Prabowo Kamal <erik@darapsa.org> | 2025-12-10 16:58:20 +0800 |
| commit | 2f18a0f6663141b567a75faa7e3e52b5dfa4f002 (patch) | |
| tree | 6a76349959b60718a44975f079829d3083f8ac42 | |
| parent | c92b6dc8585c5e76624389ae59274df1fe6fff85 (diff) | |
Update the project & remaining QML files to Qt6
27 files changed, 87 insertions, 90 deletions
@@ -3,3 +3,4 @@ *.user .DS_Store build +translations.db* diff --git a/Button/Btn.ui.qml b/Button/Btn.ui.qml index e672537..a7c2d2c 100644 --- a/Button/Btn.ui.qml +++ b/Button/Btn.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Button { property color bsBtnColor: Eduport.bsBtnColor diff --git a/Button/Light.ui.qml b/Button/Light.ui.qml index 38bbe14..fde47c8 100644 --- a/Button/Light.ui.qml +++ b/Button/Light.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { bsBtnColor: Eduport.bsGray900 diff --git a/Button/NavLink.ui.qml b/Button/NavLink.ui.qml index dac7d30..0e8a1e0 100644 --- a/Button/NavLink.ui.qml +++ b/Button/NavLink.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { id: button diff --git a/Button/NavLink/TabsLine.ui.qml b/Button/NavLink/TabsLine.ui.qml index 527f9f2..9c6d1b8 100644 --- a/Button/NavLink/TabsLine.ui.qml +++ b/Button/NavLink/TabsLine.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport import ".." NavLink { diff --git a/Button/Outline/Primary.ui.qml b/Button/Outline/Primary.ui.qml index 7755890..49509de 100644 --- a/Button/Outline/Primary.ui.qml +++ b/Button/Outline/Primary.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport import ".." Btn { diff --git a/Button/Primary.ui.qml b/Button/Primary.ui.qml index 1e1aae6..aee9660 100644 --- a/Button/Primary.ui.qml +++ b/Button/Primary.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { bsBtnColor: Eduport.bsBtnPrimaryColor diff --git a/Button/Success.ui.qml b/Button/Success.ui.qml index 9a1286d..778792d 100644 --- a/Button/Success.ui.qml +++ b/Button/Success.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Btn { bsBtnColor: Eduport.bsBtnSuccessColor diff --git a/Course/Detail/Classic/Content/Main/TabContents/Curriculum/CourseLecture.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Curriculum/CourseLecture.ui.qml index 8dfbff3..0afa4c4 100644 --- a/Course/Detail/Classic/Content/Main/TabContents/Curriculum/CourseLecture.ui.qml +++ b/Course/Detail/Classic/Content/Main/TabContents/Curriculum/CourseLecture.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Rectangle { width: coursecontent.width diff --git a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml index 42e2d97..b534c04 100644 --- a/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml +++ b/Course/Detail/Classic/Content/Main/TabContents/Instructor.ui.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap import "Instructor" ColumnLayout { diff --git a/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml b/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml index 22a102a..8d4dcc6 100644 --- a/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml +++ b/Course/Detail/Classic/Content/Main/TabContents/Reviews/LeaveReview.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Column { spacing: 16 diff --git a/Course/Grid/Minimal.ui.qml b/Course/Grid/Minimal.ui.qml index bb85b1a..f33f324 100644 --- a/Course/Grid/Minimal.ui.qml +++ b/Course/Grid/Minimal.ui.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Eduport import "Minimal" import "../../Home/Default" diff --git a/Course/Grid/Minimal/FilterBar.ui.qml b/Course/Grid/Minimal/FilterBar.ui.qml index b4c268d..e3c86f2 100644 --- a/Course/Grid/Minimal/FilterBar.ui.qml +++ b/Course/Grid/Minimal/FilterBar.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts Rectangle { id: bgLightBorder diff --git a/Eduport.qmlproject b/Eduport.qmlproject index 5cd6352..c0a86e0 100644 --- a/Eduport.qmlproject +++ b/Eduport.qmlproject @@ -1,4 +1,4 @@ -import QmlProject 1.1 +import QmlProject Project { mainUiFile: "Home/Default.ui.qml" @@ -26,13 +26,9 @@ Project { Environment { QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" - QMLSCENE_CORE_PROFILE: "true" } + qt6Project: true + importPaths: [ "imports" ] - qdsVersion: "3.9" - quickVersion: "2.15" - multilanguageSupport: true - supportedLanguages: ["en", "id"] - primaryLanguage: "en" } diff --git a/Home/Default/Counter.ui.qml b/Home/Default/Counter.ui.qml index 16873e2..42bc8d5 100644 --- a/Home/Default/Counter.ui.qml +++ b/Home/Default/Counter.ui.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Bootstrap 5.3 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap +import Eduport Item { Rectangle { diff --git a/Label/Display6.ui.qml b/Label/Display6.ui.qml index b82734b..838dc5a 100644 --- a/Label/Display6.ui.qml +++ b/Label/Display6.ui.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls import ".." H6 { diff --git a/Label/FwLight.ui.qml b/Label/FwLight.ui.qml index f012fe5..7cfd0c3 100644 --- a/Label/FwLight.ui.qml +++ b/Label/FwLight.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport H6 { font { diff --git a/Label/H6.ui.qml b/Label/H6.ui.qml index b9b16a0..c4a43e4 100644 --- a/Label/H6.ui.qml +++ b/Label/H6.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport Label { font { diff --git a/Shop/Checkout.ui.qml b/Shop/Checkout.ui.qml index bafebfe..1cbbca6 100644 --- a/Shop/Checkout.ui.qml +++ b/Shop/Checkout.ui.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Bootstrap 5.3 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap +import Eduport import "../Button" as Btn import "Checkout" import "Checkout/RightSidebar" diff --git a/Shop/Checkout/PersonalInfo.ui.qml b/Shop/Checkout/PersonalInfo.ui.qml index 534120e..9dd7c57 100644 --- a/Shop/Checkout/PersonalInfo.ui.qml +++ b/Shop/Checkout/PersonalInfo.ui.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Bootstrap 5.3 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap +import Eduport import "../../TextField" import "PersonalInfo/PaymentMethod" diff --git a/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml b/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml index a776ee0..581cf80 100644 --- a/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml +++ b/Shop/Checkout/PersonalInfo/PaymentMethod/NetBanking.ui.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Eduport ColumnLayout { property alias banks: banks diff --git a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml index 7913ea1..3861533 100644 --- a/Shop/Checkout/RightSidebar/OrderSummary.ui.qml +++ b/Shop/Checkout/RightSidebar/OrderSummary.ui.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Bootstrap 5.3 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Bootstrap +import Eduport import "../../../TextField" import "../../../Button" import "../.." diff --git a/Shop/cart/Alert.ui.qml b/Shop/cart/Alert.ui.qml index f7fb4e4..e662a00 100644 --- a/Shop/cart/Alert.ui.qml +++ b/Shop/cart/Alert.ui.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Eduport import "../../TextField" as TxtFld import "../../Label" as Lbl import "../../Button" as Btn diff --git a/Student/Dashboard.ui.qml b/Student/Dashboard.ui.qml index c89e7ad..7817f2b 100644 --- a/Student/Dashboard.ui.qml +++ b/Student/Dashboard.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import "Dashboard" Flickable { diff --git a/TextField/Input.ui.qml b/TextField/Input.ui.qml index 9e0a821..37aea16 100644 --- a/TextField/Input.ui.qml +++ b/TextField/Input.ui.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Eduport 1.4 +import QtQuick +import QtQuick.Controls +import Eduport TextField { font { diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml index f5035e8..c21d647 100644 --- a/imports/Bootstrap/Bootstrap.qml +++ b/imports/Bootstrap/Bootstrap.qml @@ -1,5 +1,5 @@ pragma Singleton -import QtQuick 2.15 +import QtQuick QtObject { enum Mode { diff --git a/imports/Eduport/Eduport.qml b/imports/Eduport/Eduport.qml index 6bbddd0..d8a3354 100644 --- a/imports/Eduport/Eduport.qml +++ b/imports/Eduport/Eduport.qml @@ -1,6 +1,6 @@ pragma Singleton -import QtQuick 2.15 -import Bootstrap 5.3 +import QtQuick +import Bootstrap QtObject { property int mode: Bootstrap.mode |