Merge branch 'tmp' into dev

CuteVersioning.pri

@@ -1,20 +1,42 @@
 win32 {
-    SYSTEM_QMAKE_BIN = $$system(where qmake)
+    GIT_BIN = $$system(where git)
 }
 unix|max {
-    SYSTEM_QMAKE_BIN = $$system(which qmake)
+    GIT_BIN = $$system(which git)
 }
-isEmpty(SYSTEM_QMAKE_BIN) {
-    SYSTEM_QMAKE_BIN = $$[QT_INSTALL_BINS]/qmake
-}
-!isEmpty(SYSTEM_QMAKE_BIN) {
-    system(cd $$PWD/generator && $$SYSTEM_QMAKE_BIN && make && ./generator $$GIT_DIR)
-} else {
-    warning(Cannot update version files: qmake not found in PATH nor bins.)
+
+GIT_LATEST_TAG = "git-not-found"
+GIT_DESCRIPTION = "git-not-found"
+GIT_DIRTY = true
+
+!isEmpty(GIT_BIN) {
+    GIT_LATEST_TAG = $$system(git --git-dir $$GIT_DIR describe --always --tags --abbrev=0)
+    GIT_DESCRIPTION = $$system(git --git-dir $$GIT_DIR describe --always --tags --long)
+    GIT_DIRTY = true
+    system(git --git-dir $$GIT_DIR diff-index --quiet HEAD --) {
+        GIT_DIRTY=false
+    }
 }
 
+HEADER_OUTPUT = \
+"$${LITERAL_HASH}include <QString>"\
+"$${LITERAL_HASH}include <QVersionNumber>"\
+""\
+"namespace CuteVersioning {"\
+"const QString latestTag = \"$${GIT_LATEST_TAG}\";"\
+"const QString identifier = \"$${GIT_DESCRIPTION}\";"\
+"const bool dirty = $${GIT_DIRTY};"\
+"const QVersionNumber versionNumber = QVersionNumber::fromString(latestTag);"\
+"}"\
+
+write_file($$PWD/CuteVersioning/version.h, HEADER_OUTPUT)
+
 qmakeforce.target = dummy
-qmakeforce.commands = touch $$PWD/CuteVersioning.pri # hack to force qmake to run every time
+unix {
+    qmakeforce.commands = touch $$PWD/CuteVersioning.pri # hack to force qmake to run every time
+} win32 {
+    qmakeforce.commands = type NUL >> $$PWD/CuteVersioning.pri
+}
 qmakeforce.depends = FORCE
 POST_TARGETDEPS += $$qmakeforce.target
 QMAKE_EXTRA_TARGETS += qmakeforce
@@ -29,9 +51,8 @@ HEADERS += \
     $$PWD/src/quickversion.h \
     $$PWD/CuteVersioning/cuteversioning.h
 
-RESOURCES +=
-
 SOURCES += \
     $$PWD/src/quickversion.cpp
 
 INCLUDEPATH += $$PWD
+

src/init.h

@@ -1,9 +1,10 @@
 #ifndef INIT_H
 #define INIT_H
 
-#include <QQmlEngine>
 #include "./quickversion.h"
 
+#include <QtQml>
+
 namespace CuteVersioning {
 
 void init() {

src/quickversion.cpp

@@ -25,22 +25,23 @@ QObject *QuickVersion::qmlInstance(QQmlEngine *engine, QJSEngine *scriptEngine)
 
 int QuickVersion::majorVersion() const
 {
-    return CuteVersioning::majorVersion;
+    return CuteVersioning::versionNumber.majorVersion();
 }
 
 int QuickVersion::minorVersion() const
 {
-    return CuteVersioning::minorVersion;
+    return CuteVersioning::versionNumber.minorVersion();
 }
 
 int QuickVersion::microVersion() const
 {
-    return CuteVersioning::microVersion;
+    return CuteVersioning::versionNumber.microVersion();
 }
 
 QString QuickVersion::suffix() const
 {
-    return CuteVersioning::suffix;
+//    return CuteVersioning::versionNumber.suffix();
+    return QString();
 }
 
 QString QuickVersion::latestTag() const