Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Post Qt5 retirement follow ups #5190

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Post Qt5 retirement follow ups #5190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
328598a
Post Qt5 retirement follow ups
nirvn Apr 17, 2024
5740074
Remove remaining traces
nirvn Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,9 @@ file(GLOB qfield_qmlfiles_editorwidgets
file(GLOB qfield_qmlfiles_theme
"${CMAKE_SOURCE_DIR}/src/qml/imports/Theme/*.qml")

list(
APPEND
qfield_qmlfiles
${qfield_qmlfiles_geometryeditors}
${qfield_qmlfiles_editorwidgets}
${qfield_qmlfiles_theme}
${qfield_qmlfiles_theme_extra}
${qfield_qmlfiles_qfieldcontrols})
list(APPEND qfield_qmlfiles ${qfield_qmlfiles_geometryeditors}
${qfield_qmlfiles_editorwidgets} ${qfield_qmlfiles_theme}
${qfield_qmlfiles_theme_extra})

set_property(TARGET qfield_qml PROPERTY QML_FILES ${qfield_qmlfiles})

Expand Down
0 ...qml/imports/QFieldControls/CodeReader.qml → src/qml/CodeReader.qml
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/qml/FeatureForm.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import QtWebView 1.14
import org.qgis 1.0
import org.qfield 1.0
import Theme 1.0
import QFieldControls 1.0

Page {
id: form
Expand Down
1 change: 0 additions & 1 deletion src/qml/FeatureListForm.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import QtQuick.Controls.Material.impl 2.14
import org.qgis 1.0
import org.qfield 1.0
import Theme 1.0
import QFieldControls 1.0

Rectangle {
id: featureForm
Expand Down
0 ...ts/QFieldControls/QFieldAudioRecorder.qml → src/qml/QFieldAudioRecorder.qml
View file
Open in desktop
File renamed without changes.
0 ...l/imports/QFieldControls/QFieldCamera.qml → src/qml/QFieldCamera.qml
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions src/qml/TemporalProperties.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import QtQuick.Layouts 1.14
import org.qgis 1.0
import org.qfield 1.0
import Theme 1.0
import QFieldControls 1.0

Popup {
id: popup
Expand Down Expand Up @@ -155,7 +154,7 @@ Popup {
}
}

CalendarPanel {
QfCalendarPanel {
id: calendarPanel

property string temporalField: ''
Expand Down
3 changes: 1 addition & 2 deletions src/qml/editorwidgets/DateTime.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import QtQuick.Layouts 1.14

import org.qfield 1.0
import Theme 1.0
import QFieldControls 1.0

import "."
import ".."
Expand Down Expand Up @@ -230,7 +229,7 @@ EditorWidgetBase {
font: label.font
}

CalendarPanel {
QfCalendarPanel {
id: calendarPanel
isDateTime: !main.fieldIsDate
onDateTimePicked: {
Expand Down
1 change: 0 additions & 1 deletion src/qml/editorwidgets/ExternalResource.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import QtMultimedia
import org.qgis 1.0
import org.qfield 1.0
import Theme 1.0
import QFieldControls 1.0

import "."
import ".."
Expand Down
8 changes: 0 additions & 8 deletions src/qml/imports/QFieldControls/qmldir
View file
Open in desktop

This file was deleted.

0 .../imports/QFieldControls/CalendarPanel.qml → src/qml/imports/Theme/QfCalendarPanel.qml
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions src/qml/imports/Theme/qmldir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ QfTextField 1.0 QfTextField.qml
QfCollapsibleMessage 1.0 QfCollapsibleMessage.qml
QfDropShadow 1.0 QfDropShadow.qml
QfOpacityMask 1.0 QfOpacityMask.qml
QfCalendarPanel 1.0 QfCalendarPanel.qml
1 change: 0 additions & 1 deletion src/qml/qgismobileapp.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import org.qgis 1.0
import org.qfield 1.0

import Theme 1.0
import QFieldControls 1.0

ApplicationWindow {
id: mainWindow
Expand Down
11 changes: 5 additions & 6 deletions src/qml/qml.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<file>BookmarkRenderer.qml</file>
<file>BrowserPanel.qml</file>
<file>BusyOverlay.qml</file>
<file>CodeReader.qml</file>
<file>ConfirmationToolbar.qml</file>
<file>CoordinateLocator.qml</file>
<file>DashBoard.qml</file>
Expand All @@ -28,6 +29,8 @@
<file>PositioningSettings.qml</file>
<file>PositioningInformationView.qml</file>
<file>PositioningPreciseView.qml</file>
<file>QFieldAudioRecorder.qml</file>
<file>QFieldCamera.qml</file>
<file>QFieldSettings.qml</file>
<file>ScaleBar.qml</file>
<file>SensorInformationView.qml</file>
Expand Down Expand Up @@ -81,12 +84,9 @@
<file>imports/Theme/QfSwitch.qml</file>
<file>imports/Theme/QfTextField.qml</file>
<file>imports/Theme/QfCollapsibleMessage.qml</file>
<file>imports/Theme/QfSlider.qml</file>
<file>imports/Theme/QfCalendarPanel.qml</file>
<file>imports/Theme/qmldir</file>
<file>imports/QFieldControls/qmldir</file>
<file>imports/QFieldControls/CodeReader.qml</file>
<file>imports/QFieldControls/CalendarPanel.qml</file>
<file>imports/QFieldControls/QFieldAudioRecorder.qml</file>
<file>imports/QFieldControls/QFieldCamera.qml</file>
<file>PageHeader.qml</file>
<file>TrackerSettings.qml</file>
<file>TrackingSession.qml</file>
Expand All @@ -101,6 +101,5 @@
<file>QFieldCloudPackageLayersFeedback.qml</file>
<file>QFieldLocalDataPickerScreen.qml</file>
<file>QFieldSketcher.qml</file>
<file>imports/Theme/QfSlider.qml</file>
</qresource>
</RCC>
4 changes: 0 additions & 4 deletions src/qml/qmlqt6.qrc
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions test/qml/tst_editorwidgets.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,28 @@ import QtTest 1.0

import org.qfield 1.0

import QFieldControls 1.0
import Theme 1.0

import "../../src/qml/editorwidgets" as EditorWidgets

TestCase {
name: "EditorWidgets"

TextEdit {
EditorWidgets.TextEdit {
id: textEdit
property var value: 'one'
property var config: undefined
property bool isEnabled: true
}

Range {
EditorWidgets.Range {
id: range
property var value: 1
property var config: undefined
property bool isEnabled: true
}

DateTime {
EditorWidgets.DateTime {
id: dateTime

property var value: '2022-01-01'
Expand Down
2 changes: 0 additions & 2 deletions test/qml/tst_positioning.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import QtTest 1.0

import org.qfield 1.0

import QFieldControls 1.0

TestCase {
name: "Positioning"

Expand Down
Loading