summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <elvis.angelaccio@kde.org>2016-09-09 15:21:01 (GMT)
committerElvis Angelaccio <elvis.angelaccio@kde.org>2016-09-09 15:21:01 (GMT)
commited4ba1488ad03960f84348b28fe450208a3118bb (patch)
tree487fe2f7680f8cb9d545fc218fb0257dee2f632c
parent4d0eaefcf59f7b191bf4a1f740817a8bee3c4395 (diff)
Port to Q_ENUM
clazy warns about the deprecated Q_ENUMS. This bumps Qt minimum version to 5.5
-rw-r--r--CMakeLists.txt2
-rw-r--r--kerfuffle/archive_kerfuffle.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64773f2..bc2b07b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
project(ark)
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-set(QT_MIN_VERSION 5.4.0)
+set(QT_MIN_VERSION 5.5.0)
set(KF5_MIN_VERSION 5.16.0)
# KDE Application Version, managed by release script
diff --git a/kerfuffle/archive_kerfuffle.h b/kerfuffle/archive_kerfuffle.h
index e64dc14..e715ced 100644
--- a/kerfuffle/archive_kerfuffle.h
+++ b/kerfuffle/archive_kerfuffle.h
@@ -73,7 +73,6 @@ typedef QHash<QString, QVariant> ExtractionOptions;
class KERFUFFLE_EXPORT Archive : public QObject
{
Q_OBJECT
- Q_ENUMS(EncryptionType)
/**
* Complete base name, without the "tar" extension (if any).
@@ -102,6 +101,7 @@ public:
Encrypted,
HeaderEncrypted
};
+ Q_ENUM(EncryptionType)
class Entry;
@@ -223,6 +223,4 @@ private:
} // namespace Kerfuffle
-Q_DECLARE_METATYPE(Kerfuffle::Archive::EncryptionType)
-
#endif // ARCHIVE_H