From f96299ea942ac91976f576bc2e1b2db76ba4c72e Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 15 Oct 2013 19:54:15 -0700
Subject: [PATCH] Dependencies are too aggressive for version.h

Apparently qmake can't tell that #include "version.h" and #include
"libdivecomputer/version.h" are not the same thing. Instead of spending
another bunch of hours on fixing the buildsystem I decided to just cleanup
the spots where we actually use the version file and rename it to
ssrf-version.h.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .gitignore                 | 2 +-
 main.cpp                   | 1 -
 qt-gui.cpp                 | 1 -
 qt-ui/about.cpp            | 2 +-
 subsurface-gen-version.pri | 4 ++--
 subsurfacestartup.c        | 1 +
 subsurfacestartup.h        | 1 -
 7 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9031a06f6..ac16b6d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ translations/*.qm
 *.dmg
 *.patch
 *.xml
-version.h
+ssrf-version.h
 !dives/*.xml
 *~
 po/*.mo
diff --git a/main.cpp b/main.cpp
index 0d53a5acf..72a6cc585 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,7 +6,6 @@
 #include <time.h>
 
 #include "qt-gui.h"
-#include "version.h"
 #include "subsurfacestartup.h"
 #include "qt-ui/mainwindow.h"
 #include "qt-ui/diveplanner.h"
diff --git a/qt-gui.cpp b/qt-gui.cpp
index 8d678909e..0fd162d3d 100644
--- a/qt-gui.cpp
+++ b/qt-gui.cpp
@@ -15,7 +15,6 @@
 #include "uemis.h"
 #include "device.h"
 #include "webservice.h"
-#include "version.h"
 #include "libdivecomputer.h"
 #include "qt-ui/mainwindow.h"
 #include "helpers.h"
diff --git a/qt-ui/about.cpp b/qt-ui/about.cpp
index 835c22c94..e2d815325 100644
--- a/qt-ui/about.cpp
+++ b/qt-ui/about.cpp
@@ -1,5 +1,5 @@
 #include "about.h"
-#include "version.h"
+#include "ssrf-version.h"
 #include <QDebug>
 #include <QDialogButtonBox>
 #include <QNetworkReply>
diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri
index 135774541..5d6170f1b 100644
--- a/subsurface-gen-version.pri
+++ b/subsurface-gen-version.pri
@@ -1,5 +1,5 @@
-# Generate the version.h file
-VERSION_FILE = version.h
+# Generate the ssrf-version.h file
+VERSION_FILE = ssrf-version.h
 macx: VER_OS = darwin
 unix: !macx: VER_OS = linux
 win32: VER_OS = win
diff --git a/subsurfacestartup.c b/subsurfacestartup.c
index 9a03be6d7..ff0e8405b 100644
--- a/subsurfacestartup.c
+++ b/subsurfacestartup.c
@@ -1,4 +1,5 @@
 #include "subsurfacestartup.h"
+#include "ssrf-version.h"
 #include <stdbool.h>
 #include <string.h>
 #include "gettext.h"
diff --git a/subsurfacestartup.h b/subsurfacestartup.h
index 8a2420345..c979dc71e 100644
--- a/subsurfacestartup.h
+++ b/subsurfacestartup.h
@@ -4,7 +4,6 @@
 #include "dive.h"
 #include "divelist.h"
 #include "libdivecomputer.h"
-#include "version.h"
 #include <stdbool.h>
 
 #ifdef __cplusplus