From cd62f76fc208c06026bf8b88eb23c37a3ddefc85 Mon Sep 17 00:00:00 2001 From: Anton Thomasson Date: Sat, 1 Jan 2022 19:26:40 +0100 Subject: [PATCH] Remove autogeneration of version header ...just use a direct define. --- .gitignore | 4 ---- harbour-seaprint.pro | 8 +------- src/convertworker.cpp | 1 - src/curlworker.cpp | 1 - src/harbour-seaprint.cpp | 1 - src/ippdiscovery.cpp | 1 - src/ippprinter.cpp | 1 - 7 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index a3258b1..5291a38 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,3 @@ target_wrapper.* # QtCreator CMake CMakeLists.txt.user* - -# Automatically generated - -seaprint_version.h diff --git a/harbour-seaprint.pro b/harbour-seaprint.pro index e24ddc8..c71c33b 100644 --- a/harbour-seaprint.pro +++ b/harbour-seaprint.pro @@ -31,13 +31,7 @@ PKGCONFIG += mlite5 libcurl poppler glib-2.0 cairo LIBS += -lcurl -lglib-2.0 -lgobject-2.0 -ldl DEFINES += MADNESS=1 DEFINES += PDF_CREATOR='\\"SeaPrint\ $$VERSION\\"' - -# Write version file -VERSION_H = \ -"$${LITERAL_HASH}ifndef SEAPRINT_VERSION" \ -"$${LITERAL_HASH} define SEAPRINT_VERSION \"$$VERSION\"" \ -"$${LITERAL_HASH}endif" -write_file($$$$OUT_PWD/seaprint_version.h, VERSION_H) +DEFINES += SEAPRINT_VERSION='\\"$$VERSION\\"' SOURCES += src/harbour-seaprint.cpp \ src/convertchecker.cpp \ diff --git a/src/convertworker.cpp b/src/convertworker.cpp index 6d09f41..48fae90 100644 --- a/src/convertworker.cpp +++ b/src/convertworker.cpp @@ -3,7 +3,6 @@ #include "papersizes.h" #include "convertchecker.h" #include "mimer.h" -#include "seaprint_version.h" #include #include #include diff --git a/src/curlworker.cpp b/src/curlworker.cpp index 8e753de..b887568 100644 --- a/src/curlworker.cpp +++ b/src/curlworker.cpp @@ -1,7 +1,6 @@ #include "curlworker.h" #include "curlrequester.h" #include "settings.h" -#include static size_t trampoline(char* dest, size_t size, size_t nmemb, void* userp) { diff --git a/src/harbour-seaprint.cpp b/src/harbour-seaprint.cpp index 7a489e4..e04373f 100644 --- a/src/harbour-seaprint.cpp +++ b/src/harbour-seaprint.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #include #include diff --git a/src/ippdiscovery.cpp b/src/ippdiscovery.cpp index 30fa0a6..fdbbb41 100644 --- a/src/ippdiscovery.cpp +++ b/src/ippdiscovery.cpp @@ -1,7 +1,6 @@ #include "ippdiscovery.h" #include "ippprinter.h" #include "settings.h" -#include #define A 1 #define PTR 12 diff --git a/src/ippprinter.cpp b/src/ippprinter.cpp index 60c96ab..16843a4 100644 --- a/src/ippprinter.cpp +++ b/src/ippprinter.cpp @@ -1,5 +1,4 @@ #include "ippprinter.h" -#include #include "mimer.h" #include "papersizes.h" #include "overrider.h"