Merge pull request #5366 from AndKe/RX100

Camera: Added Sony RX100
8 years ago · 044e3f72ec
1 changed files with 11 additions and 0 deletions
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@ -410,6 +410,17 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
				@@ -410,6 +410,17 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
                                      false,
                                      this);
        _cameraList.append(QVariant::fromValue(metaData));
+
+        metaData = new CameraMetaData(tr("Sony RX100 II 28mm"),
+                                      13.2,
+                                      8.8,
+                                      5472,
+                                      3648,
+                                      10.4,
+                                      true,
+                                      false,
+                                      this);
+        _cameraList.append(QVariant::fromValue(metaData));
    }

    return _cameraList;