Skip to content

Commit 42cfc80

Browse files
committed
Squashed all commits into one.
1 parent 1bc7093 commit 42cfc80

File tree

142 files changed

+1614
-675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+1614
-675
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
*.user
1+
*.user
2+
build
3+
Build

AUTHORS.txt renamed to AUTHORS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ AUTHORS
22

33
Marek M. Cel
44
5-
SVG graphics
5+
SVG graphics.
66

77
Dave Culp
88
99
PFD ILD identification and distance indicators.
1010

1111
Berk Bavas
1212
13-
QML Port of Marek M. Cel's work https://github.com/marek-cel/QFlightinstruments
13+
Porting Marek M. Cel's work https://github.com/marek-cel/QFlightinstruments to QML.

BasicSix/AirspeedIndicator.qml

Lines changed: 0 additions & 43 deletions
This file was deleted.

CustomComboBox.qml

Lines changed: 0 additions & 26 deletions
This file was deleted.

ExampleBasicSix.qml

Lines changed: 0 additions & 87 deletions
This file was deleted.

ExampleMiscellaneousGauges.qml

Lines changed: 0 additions & 34 deletions
This file was deleted.

Misc/GaugeMask.qml

Lines changed: 0 additions & 31 deletions
This file was deleted.

QmlFlightInstruments.pro

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,12 @@
11
QT += quick qml
22

3-
# You can make your code fail to compile if it uses deprecated APIs.
4-
# In order to do so, uncomment the following line.
5-
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
6-
73
SOURCES += \
8-
Animation.cpp \
9-
PrimaryFlightData.cpp \
10-
main.cpp
11-
12-
RESOURCES += qml.qrc
13-
14-
# Additional import path used to resolve QML modules in Qt Creator's code model
15-
QML_IMPORT_PATH =
16-
17-
# Additional import path used to resolve QML modules just for Qt Quick Designer
18-
QML_DESIGNER_IMPORT_PATH =
4+
src/Animation.cpp \
5+
src/PrimaryFlightData.cpp \
6+
src/Main.cpp
197

20-
# Default rules for deployment.
21-
qnx: target.path = /tmp/$${TARGET}/bin
22-
else: unix:!android: target.path = /opt/$${TARGET}/bin
23-
!isEmpty(target.path): INSTALLS += target
8+
RESOURCES += QmlFlightInstruments.qrc
249

2510
HEADERS += \
26-
Animation.h \
27-
PrimaryFlightData.h
11+
src/Animation.h \
12+
src/PrimaryFlightData.h

0 commit comments

Comments
 (0)