diff options
| author |   Raquel Medina <raquel.medina@konsulko.com> | 2020-05-05 13:28:03 +0200 |
|---|---|---|
| committer | raquel medina <raquel.medina@konsulko.com> | 2020-05-05 12:53:15 +0000 |
| commit | 3bd1bb068819f29b480812bc7db61a87006103e1 (patch) | |
| tree | ca2669292352f5f1c93a099fbc95e267fb6bfb23 | |
| parent | be7f78b632635c51089dc60f5bf178cc5db60350 (diff) | |
fix compilation for new Qt version 5.14.1
std::hash specializations for some Qt types
are in Qt 5.14, so we dont need the custom
specialization for QString in utils.h.
Note that if this code was to be merged to
previous agl versions with pre 5.14 Qt
version, the custom specialization for
std::hash<QString> would be needed.
Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I81240f4e804ff6c1046a50c486f39eec74edc057
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | messageenginefactory.cpp | 1 | ||||
| -rw-r--r-- | utils.h | 16 |
3 files changed, 1 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 696b8bd..4a37ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ set (SUBDIRS voice-capabilities weather) -add_headers(message.h messagefactory.h messageengine.h messageenginefactory.h responsemessage.h callmessage.h eventmessage.h utils.h) +add_headers(message.h messagefactory.h messageengine.h messageenginefactory.h responsemessage.h callmessage.h eventmessage.h) add_sources(message.cpp messagefactory.cpp messageengine.cpp messageenginefactory.cpp responsemessage.cpp callmessage.cpp eventmessage.cpp) foreach(subdir ${SUBDIRS}) diff --git a/messageenginefactory.cpp b/messageenginefactory.cpp index 7a052ce..db5c70b 100644 --- a/messageenginefactory.cpp +++ b/messageenginefactory.cpp @@ -21,7 +21,6 @@ #include <QUrl> #include "messageenginefactory.h" #include "messageengine.h" -#include "utils.h" std::shared_ptr<MessageEngine> MessageEngineFactory::getMessageEngine(const QUrl& url) { diff --git a/utils.h b/utils.h deleted file mode 100644 index d0203f9..0000000 --- a/utils.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef UTILS_H -#define UTILS_H - -#include <functional> -#include <QHash> -#include <QString> - -namespace std { - template<> struct hash<QString> { - std::size_t operator()(const QString& s) const noexcept { - return (size_t) qHash(s); - } - }; -} - -#endif |