Index: drydemo.pro
===================================================================
diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -r581c95962cdb9ce7728e8def1e51556548d02244
--- drydemo.pro (.../drydemo.pro) (revision 80b8371f1a93481e05302cef6e474db802fda153)
+++ drydemo.pro (.../drydemo.pro) (revision 581c95962cdb9ce7728e8def1e51556548d02244)
@@ -240,7 +240,7 @@
sources/utility/qrcodegen.cpp
RESOURCES += \
- drydemo.qrc
+ #drydemo.qrc
DEFINES += \
VER_MAJOR="\\\"${majorVersion}\\\"" \
Index: drydemo.qrc
===================================================================
diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -r581c95962cdb9ce7728e8def1e51556548d02244
--- drydemo.qrc (.../drydemo.qrc) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2)
+++ drydemo.qrc (.../drydemo.qrc) (revision 581c95962cdb9ce7728e8def1e51556548d02244)
@@ -72,62 +72,34 @@
resources/images/DenaliDevice.png
- sources/gui/qml/components/MainMenu.qml
sources/gui/qml/components/TouchRect.qml
sources/gui/qml/components/TitleText.qml
- sources/gui/qml/components/ImageLogoD.qml
sources/gui/qml/components/ScreenItem.qml
sources/gui/qml/components/StackItem.qml
- sources/gui/qml/components/ModalDialog.qml
- sources/gui/qml/components/BackButton.qml
sources/gui/qml/components/USBButton.qml
- sources/gui/qml/components/ExportButton.qml
sources/gui/qml/components/TouchArea.qml
sources/gui/qml/components/TextRect.qml
- sources/gui/qml/components/Background.qml
- sources/gui/qml/components/Line.qml
- sources/gui/qml/components/PlaceHolderText.qml
sources/gui/qml/components/ProgressBar.qml
sources/gui/qml/components/RangeMarker.qml
sources/gui/qml/components/ProgressRect.qml
sources/gui/qml/components/RangeRect.qml
sources/gui/qml/components/RangeBar.qml
- sources/gui/qml/components/Circle.qml
sources/gui/qml/components/StepBullet.qml
sources/gui/qml/components/StepIndicator.qml
sources/gui/qml/components/TimeText.qml
sources/gui/qml/components/ProgressCircle.qml
sources/gui/qml/components/Slider.qml
sources/gui/qml/components/SliderCreateTreatment.qml
- sources/gui/qml/components/ConfirmTreatmentTable.qml
- sources/gui/qml/components/ConfirmTreatmentSubTable.qml
- sources/gui/qml/components/GridSelection.qml
sources/gui/qml/components/ProgressBarEx.qml
- sources/gui/qml/components/CloseButton.qml
- sources/gui/qml/components/ConfirmButton.qml
sources/gui/qml/components/TickMarks.qml
- sources/gui/qml/components/NotificationBar.qml
- sources/gui/qml/components/NotificationBarSmall.qml
sources/gui/qml/components/UltrafiltrationButton.qml
- sources/gui/qml/components/ImageWave.qml
- sources/gui/qml/components/ImageClock.qml
- sources/gui/qml/components/ImageLogoDDarkTransparent.qml
- sources/gui/qml/components/ConfirmTreatmentTableEntry.qml
- sources/gui/qml/components/DebugDataColumn.qml
sources/gui/qml/components/RangeSlider.qml
- sources/gui/qml/components/MuteButton.qml
sources/gui/qml/components/UpDownButton.qml
- sources/gui/qml/components/ImageText.qml
sources/gui/qml/components/WaitDone.qml
sources/gui/qml/components/TimeCircle.qml
- sources/gui/qml/components/Footer.qml
sources/gui/qml/components/TextEntry.qml
sources/gui/qml/components/ScrollBar.qml
- sources/gui/qml/compounds/Fader.qml
- sources/gui/qml/components/FooterStatic.qml
sources/gui/qml/components/TimeEntry.qml
- sources/gui/qml/components/Label.qml
- sources/gui/qml/components/EntryDialog.qml
sources/gui/qml/components/SliderArrows.qml
sources/gui/qml/components/QRCode.qml
@@ -139,15 +111,7 @@
sources/gui/qml/compounds/TouchGrid.qml
sources/gui/qml/compounds/BPHREntry.qml
-
- qtquickcontrols2.conf
- sources/gui/qml/main.qml
- sources/gui/qml/AlarmItem.qml
- sources/gui/qml/PowerItem.qml
- sources/gui/qml/KeyboardItem.qml
- sources/gui/qml/SDCProgressItem.qml
- sources/gui/qml/USBProgressItem.qml
-
+
sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg
sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/check.svg
Index: main.cpp
===================================================================
diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -r581c95962cdb9ce7728e8def1e51556548d02244
--- main.cpp (.../main.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153)
+++ main.cpp (.../main.cpp) (revision 581c95962cdb9ce7728e8def1e51556548d02244)
@@ -37,7 +37,6 @@
#include
#include
-// FW
#include "Compatible.h"
// Project
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/AlarmItem.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/KeyboardItem.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/PowerItem.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/SDCProgressItem.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/USBProgressItem.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/BackButton.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/Background.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/Circle.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/CloseButton.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmButton.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmTreatmentSubTable.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmTreatmentTable.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmTreatmentTableEntry.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/DebugDataColumn.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/EntryDialog.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ExportButton.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/Footer.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/FooterStatic.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/GridSelection.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ImageClock.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ImageLogoD.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ImageLogoDDarkTransparent.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ImageText.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ImageWave.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/Label.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/Line.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/MainMenu.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/ModalDialog.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/MuteButton.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/NotificationBar.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/NotificationBarSmall.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/components/PlaceHolderText.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/compounds/Fader.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 581c95962cdb9ce7728e8def1e51556548d02244 refers to a dead (removed) revision in file `sources/gui/qml/main.qml'.
Fisheye: No comparison available. Pass `N' to diff?