[libcamera-devel,v4,4/6] qcam: Add the version string to the title

Message ID 20190704145942.17879-5-kieran.bingham@ideasonboard.com
State Accepted
Headers show
Series
  • Automatic Version Generation ++
Related show

Commit Message

Kieran Bingham July 4, 2019, 2:59 p.m. UTC
Provide the version string reported by the libcamera library on the qcam
test utility.

This helps confirm the exact version of the library that is being used
while testing.

The version string is stored in the MainWindow so that it can be reused
without reconstructing.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/qcam/main_window.cpp | 4 ++++
 src/qcam/main_window.h   | 1 +
 2 files changed, 5 insertions(+)

Patch

diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
index 0f737d852960..d61369109d66 100644
--- a/src/qcam/main_window.cpp
+++ b/src/qcam/main_window.cpp
@@ -14,6 +14,7 @@ 
 #include <QTimer>
 
 #include <libcamera/camera_manager.h>
+#include <libcamera/version.h>
 
 #include "main_window.h"
 #include "viewfinder.h"
@@ -25,6 +26,9 @@  MainWindow::MainWindow(const OptionsParser::Options &options)
 {
 	int ret;
 
+	title_ = "QCam " + QString::fromStdString(libcamera::version);
+	setWindowTitle(title_);
+
 	viewfinder_ = new ViewFinder(this);
 	setCentralWidget(viewfinder_);
 	viewfinder_->setFixedSize(500, 500);
diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h
index 345bdaaed354..46a494a9d783 100644
--- a/src/qcam/main_window.h
+++ b/src/qcam/main_window.h
@@ -42,6 +42,7 @@  private:
 			     const std::map<Stream *, Buffer *> &buffers);
 	int display(Buffer *buffer);
 
+	QString title_;
 	const OptionsParser::Options &options_;
 
 	std::shared_ptr<Camera> camera_;