diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-05-29 05:44:54 +0100 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-05-29 05:44:54 +0100 |
| commit | 3ab7ec581fb0d491a9c78013c5932630a4617d47 (patch) | |
| tree | 0ece7552ab2861a5e07b59d0cb6e00707cf065dc /plugins/Themes/Oxygen | |
| parent | 316a0f5ee6cb7a2ba545e595b6958f3cbebf6d48 (diff) | |
| parent | 594fcba67600704bee9115c86e18927b2237b304 (diff) | |
record new upstream branch and merge it
Diffstat (limited to 'plugins/Themes/Oxygen')
| -rw-r--r-- | plugins/Themes/Oxygen/ThemesFactory.h | 4 | ||||
| -rw-r--r-- | plugins/Themes/Oxygen/Variable.h | 2 | ||||
| -rw-r--r-- | plugins/Themes/Oxygen/informations.xml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/plugins/Themes/Oxygen/ThemesFactory.h b/plugins/Themes/Oxygen/ThemesFactory.h index f5e304f..3eb76f6 100644 --- a/plugins/Themes/Oxygen/ThemesFactory.h +++ b/plugins/Themes/Oxygen/ThemesFactory.h @@ -3,8 +3,8 @@ \author alpha_one_x86 \licence GPL3, see the file COPYING */ -#ifndef FACTORY_H -#define FACTORY_H +#ifndef FACTORYTHEMEOXYGEN_H +#define FACTORYTHEMEOXYGEN_H #include <QObject> #include <QWidget> diff --git a/plugins/Themes/Oxygen/Variable.h b/plugins/Themes/Oxygen/Variable.h index 8b6119b..b55c203 100644 --- a/plugins/Themes/Oxygen/Variable.h +++ b/plugins/Themes/Oxygen/Variable.h @@ -8,7 +8,9 @@ //Un-comment this next line to put ultracopier plugin in debug mode
+#ifndef ULTRACOPIER_NODEBUG
#define ULTRACOPIER_PLUGIN_DEBUG
+#endif
#define ULTRACOPIER_VERSION_ULTIMATE
diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml index 7f66317..a05c01a 100644 --- a/plugins/Themes/Oxygen/informations.xml +++ b/plugins/Themes/Oxygen/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Oxygen style for Ultracopier]]></description> <description xml:lang="fr"><![CDATA[Style oxygen pour Ultracopier]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.6</version> + <version>1.4.0.8</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Oxygen</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> |