summaryrefslogtreecommitdiffstats
path: root/wayland/democompositor/apps/appentry.h
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2017-08-13 09:41:50 +0200
committerHolger Freyther <holger+qt@freyther.de>2017-09-12 06:16:50 +0000
commitb18b35e2d2db771c754eee9fec7faada2b8fd303 (patch)
treebebbfb9406d24c71654ee87bd7c978bd98bf38ee /wayland/democompositor/apps/appentry.h
parente1c257c3330057d7df70d3a1e92361afcdd06579 (diff)
democompositor: Give up on having AppEntry with only const members
When building gadgets that include instances of AppEntry that will expose these member variables a Q_PROPERTY we will end trying to do a std::move (even if the AppEntry is not movable). Remove the const from the member variables, leave the CONSTANT in the property to not generate a write function and let's keep the discipline to not assign to an existing AppEntry. Change-Id: I742a9d091e7e6eac6cc3cb84a48b7b8812a24247 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'wayland/democompositor/apps/appentry.h')
-rw-r--r--wayland/democompositor/apps/appentry.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/wayland/democompositor/apps/appentry.h b/wayland/democompositor/apps/appentry.h
index cb7a727..317b748 100644
--- a/wayland/democompositor/apps/appentry.h
+++ b/wayland/democompositor/apps/appentry.h
@@ -64,11 +64,12 @@ class AppEntry {
Q_PROPERTY(QString executableName MEMBER executableName CONSTANT)
Q_PROPERTY(QString executablePath MEMBER executablePath CONSTANT)
public:
- const QString iconName;
- const QString appName;
- const QString executableName;
- const QString executablePath;
- const QString sourceFileName;
+
+ QString iconName;
+ QString appName;
+ QString executableName;
+ QString executablePath;
+ QString sourceFileName;
static AppEntry empty();
};