new approach to build date/time, sorry for the mess

cpvrlab · Sep 21, 2015 · 523793c · 523793c
1 parent 508c97e
commit 523793c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/ImagePlay/ImagePlay.pro b/ImagePlay/ImagePlay.pro
@@ -24,27 +24,13 @@ QMAKE_TARGET_PRODUCT = "ImagePlay"
 QMAKE_TARGET_DESCRIPTION = ""
 QMAKE_TARGET_COPYRIGHT = ""
 
-# this is hell, different locals and operating systems handle
-# date and time differently
-#win32 {
-#    BUILD_DATE = $$system("date /T")
-#    BUILD_TIME = $$system("time /T")
-#} else {
-#    BUILD_DATE = $$system("date")
-#    BUILD_TIME = $$system("time")
-#}
-
-BUILD_DATE = "18.09.2015"
-
 DEFINES += \
 APP_VERSION=\"\\\"$$VERSION\\\"\" \
 APP_COMPANY=\"\\\"$$QMAKE_TARGET_COMPANY\\\"\" \
 APP_PRODUCT=\"\\\"$$QMAKE_TARGET_PRODUCT\\\"\" \
 APP_DESCRIPTION=\"\\\"$$QMAKE_TARGET_DESCRIPTION\\\"\" \
 APP_COPYRIGHT=\"\\\"$$QMAKE_TARGET_COPYRIGHT\\\"\" \
 APP_NAME=\\\"$$TARGET\\\" \
-#IMAGEPLAY_BUILDDATE=\"\\\"$$BUILD_DATE\\\"\" \
-#IMAGEPLAY_VERSION=\\\"$$VERSION\\\"
 
 message($$DEFINES)
 

diff --git a/ImagePlay/include/MainWindow.h b/ImagePlay/include/MainWindow.h
@@ -62,15 +62,15 @@ class IPProcessGridScene;
 // constants
 
 #ifndef IMAGEPLAY_VERSION
-#define IMAGEPLAY_VERSION "6.0.0"
+#define IMAGEPLAY_VERSION "6.0.0-rc.0"
 #endif
 
 #ifndef IMAGEPLAY_BUILDDATE
-#define IMAGEPLAY_BUILDDATE "UNKNOWN"
+#define IMAGEPLAY_BUILDDATE __DATE__
 #endif
 
 #ifndef IMAGEPLAY_BUILDTIME
-#define IMAGEPLAY_BUILDTIME ""
+#define IMAGEPLAY_BUILDTIME __TIME__
 #endif
 
 #define MAX_RECENT_PROJECTS 10

diff --git a/ImagePlay/src/AboutWindow.cpp b/ImagePlay/src/AboutWindow.cpp
@@ -28,9 +28,9 @@ AboutWindow::AboutWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    QString version("<b>Version: </b> %1, <b>Build Date: </b> %2");
+    QString version("<b>Version: </b> %1, <b>Build Date: </b> %2 %3");
 
-    ui->labelVersion->setText(version.arg(IMAGEPLAY_VERSION).arg(IMAGEPLAY_BUILDDATE));
+    ui->labelVersion->setText(version.arg(IMAGEPLAY_VERSION).arg(IMAGEPLAY_BUILDDATE).arg(IMAGEPLAY_BUILDTIME));
 }
 
 AboutWindow::~AboutWindow()