diff options
author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-04-25 17:36:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-25 17:36:22 +0300 |
commit | 3916a6a92e4930a9d47608912fb3bc25f78b316e (patch) | |
tree | 5febecec4d80b24a6e8566ddbc32fd6596a5e94f | |
parent | 9a25508643eb920c999bc882905433d4afb5f282 (diff) |
Fix legacy branding builds (#9602)
-rw-r--r-- | src/common/syncjournaldb.cpp | 1 | ||||
-rw-r--r-- | src/common/utility.cpp | 2 | ||||
-rw-r--r-- | src/common/vfs.cpp | 2 | ||||
-rw-r--r-- | src/libsync/version.h | 17 |
4 files changed, 19 insertions, 3 deletions
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index 9444bc180..bb2d676a1 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -32,7 +32,6 @@ #include "common/syncjournaldb.h" #include "common/version.h" #include "filesystembase.h" -#include "version.h" #include "common/c_jhash.h" diff --git a/src/common/utility.cpp b/src/common/utility.cpp index d9dc7514e..c0f97ca5d 100644 --- a/src/common/utility.cpp +++ b/src/common/utility.cpp @@ -21,7 +21,7 @@ #include "common/asserts.h" #include "common/filesystembase.h" #include "common/utility.h" -#include "version.h" +#include "common/version.h" // Note: This file must compile without QtGui #include <QCollator> diff --git a/src/common/vfs.cpp b/src/common/vfs.cpp index f3c67920f..88f770e91 100644 --- a/src/common/vfs.cpp +++ b/src/common/vfs.cpp @@ -17,8 +17,8 @@ */ #include "vfs.h" +#include "common/version.h" #include "plugin.h" -#include "version.h" #include "syncjournaldb.h" #include "common/filesystembase.h" diff --git a/src/libsync/version.h b/src/libsync/version.h new file mode 100644 index 000000000..4ec22aacb --- /dev/null +++ b/src/libsync/version.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) by Hannah von Reth <hannah.vonreth@owncloud.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ +#pragma once +#pragma message("Warning: Legacy version.h was included, this is only meant as a workaround for the legacy branding mechanism. Please directly include 'common/version.h'") + +#include "common/version.h" |