Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 4 insertions, 1 deletions

diff --git a/src/GLView.h b/src/GLView.h
index c31e7af..5552e4b 100644
--- a/src/GLView.h
+++ b/src/GLView.h
@@ -32,7 +32,8 @@ public:
 	void setShowCrosshairs(bool enabled) { this->showcrosshairs = enabled; }
 	bool orthoMode() const { return this->orthomode; }
 	void setOrthoMode(bool enabled) { this->orthomode = enabled; }
-	
+	const QString &getRendererInfo() const { return this->rendererInfo; }
+
 public:
 	QLabel *statusLabel;
 	double object_rot_x;
@@ -52,6 +53,8 @@ private:
 	void init();
 	Renderer *renderer;
 
+	QString rendererInfo;
+
 	bool showfaces;
 	bool showedges;
 	bool showaxes;