Merge pull request ethereum#201 from yann300/version1

version 1.0
microfins · Feb 8, 2016 · 115fc43 · 115fc43
2 parents eff94e1 + c55430b
commit 115fc43
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.1.0")
+set(PROJECT_VERSION "1.0.0")
 project(mix VERSION ${PROJECT_VERSION})
 
 # Let's find our dependencies

diff --git a/src/MixApplication.cpp b/src/MixApplication.cpp
@@ -27,6 +27,7 @@
 #include <QFont>
 #include <QtWebEngine/QtWebEngine>
 #include <libsolidity/interface/Version.h>
+#include <mix/BuildInfo.h>
 #include "CodeModel.h"
 #include "ClientModel.h"
 #include "FileIo.h"
@@ -39,6 +40,8 @@
 
 using namespace dev::mix;
 
+char const* dev::mix::VersionNumber = ETH_PROJECT_VERSION;
+
 ApplicationService::ApplicationService()
 {
 	QtWebEngine::initialize();
@@ -74,7 +77,7 @@ void MixApplication::initialize()
 	setOrganizationName(tr("Ethereum"));
 	setOrganizationDomain(tr("ethereum.org"));
 	setApplicationName(tr("Mix"));
-	setApplicationVersion("0.1");
+	setApplicationVersion(dev::mix::VersionNumber);
 
 	qmlRegisterType<CodeModel>("org.ethereum.qml.CodeModel", 1, 0, "CodeModel");
 	qmlRegisterType<ClientModel>("org.ethereum.qml.ClientModel", 1, 0, "ClientModel");

diff --git a/src/MixApplication.h b/src/MixApplication.h
@@ -33,6 +33,8 @@ namespace dev
 namespace mix
 {
 
+extern char const* VersionNumber;
+
 class ApplicationService: public QObject
 {
 	Q_OBJECT