Generate a config.h file for versioning

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index e63c87d75194599a9d1c7a89529f733b6745c896..661c84a6d23c0ea40d128a52fe8584608f624fd7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -26,14 +26,17 @@ extern "C" {
 
 #include <QtGui/QApplication>
 #include <QDebug>
-#include "mainwindow.h"
+
+#include "pv/mainwindow.h"
+
+#include "config.h"
 
 int main(int argc, char *argv[])
 {
        QApplication a(argc, argv);
 
        /* Set some application metadata. */
-       QApplication::setApplicationVersion(APP_VERSION);
+       QApplication::setApplicationVersion(PV_VERSION_STRING);
        QApplication::setApplicationName("PulseView");
        QApplication::setOrganizationDomain("http://www.sigrok.org");
 
@@ -63,7 +66,7 @@ int main(int argc, char *argv[])
        }
 
        /* Initialise the main window */
-       MainWindow w;
+       pv::MainWindow w;
        w.show();
 
        /* Run the application */