[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Plasma & Qt 5.7
From: Takahiro HASHIMOTO <kenya888 () gmail ! com>
Date: 2016-04-27 8:03:34
Message-ID: CAA6VfnXJqxo8kSuMo4oFwUeqwtja_7J1ePcKmDJ9QzOzJdOVFw () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
HI,
I also tried a few days ago. This is the just a quick response :)
It is due to this change. [1] I think.
Here is my ugly patch to rework libdbusmenu-qt.
I think that the better solution is refine QDBusMenuShortcut, not
inheriting QList<T>...
[1] https://codereview.qt-project.org/#/c/144823/
Regards.
-----
=== modified file 'src/dbusmenutypes_p.cpp'
--- src/dbusmenutypes_p.cpp 2011-02-23 13:23:56 +0000
+++ src/dbusmenutypes_p.cpp 2016-04-26 15:04:39 +0000
@@ -21,7 +21,6 @@
#include "dbusmenutypes_p.h"
// Local
-#include <dbusmenushortcut_p.h>
#include <debug_p.h>
// Qt
@@ -95,6 +94,17 @@
return argument;
}
+/// DBusMenuShortcut
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut
&obj)
+{
+ return argument << static_cast<const QList<QStringList>&>(obj);
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument,
DBusMenuShortcut &obj)
+{
+ return argument >> static_cast<QList<QStringList>&>(obj);
+}
+
void DBusMenuTypes_register()
{
static bool registered = false;
=== modified file 'src/dbusmenutypes_p.h'
--- src/dbusmenutypes_p.h 2011-02-23 13:23:56 +0000
+++ src/dbusmenutypes_p.h 2016-04-26 14:57:04 +0000
@@ -27,6 +27,7 @@
#include <QtCore/QVariant>
// Local
+#include <dbusmenushortcut_p.h>
#include <dbusmenu_export.h>
class QDBusArgument;
@@ -92,5 +93,12 @@
Q_DECLARE_METATYPE(DBusMenuLayoutItemList)
+/// DBusMenuShortcut
+/**
+ * DBusArgument operator for DBusMenuShortcut
+ */
+DBUSMENU_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const
DBusMenuShortcut &);
+DBUSMENU_EXPORT const QDBusArgument &operator>>(const QDBusArgument
&argument, DBusMenuShortcut &);
+
void DBusMenuTypes_register();
#endif /* DBUSMENUTYPES_P_H */
2016-04-27 16:52 GMT+09:00 Eike Hein <hein@kde.org>:
>
> Hi,
>
> I built Qt from the 5.7 branch yesterday and did a fresh kdesrc-build
> run against it.
>
> Notes:
>
> - The 5.7 branch build system seems kind of hosed right now, I had to
> kick off the build 5-6 times to get the full set of modules built -
> no build errors, it was just stopping early for some reason.
>
> - libdbusmenu-qt doesn't build: https://paste.kde.org/pmc7fjwog
> So I resorted to a binary build from my distro.
>
> - The rest builds fine.
>
> - plasmashell seems to run just fine (single-screen laptop).
>
>
> Cheers,
> Eike
> _______________________________________________
> Plasma-devel mailing list
> Plasma-devel@kde.org
> https://mail.kde.org/mailman/listinfo/plasma-devel
>
[Attachment #5 (text/html)]
<div dir="ltr">HI,<div><br></div><div>I also tried a few days ago. This is the just a \
quick response :)</div><div>It is due to this change. [1] I \
think.</div><div><br></div><div><div>Here is my ugly patch to rework \
libdbusmenu-qt.</div></div><div>I think that the better solution is refine \
QDBusMenuShortcut, not inheriting QList<T>...</div><div><br></div><div>[1] <a \
href="https://codereview.qt-project.org/#/c/144823/">https://codereview.qt-project.org \
/#/c/144823/</a></div><div><br></div><div>Regards.</div><div><br></div><div>-----</div><div><br></div><div><span \
style="font-family:monospace"><span style="color:rgb(0,0,0)">=== modified file \
'src/dbusmenutypes_p.cpp' </span><br>--- src/dbusmenutypes_p.cpp \
2011-02-23 13:23:56 +0000 <br>+++ src/dbusmenutypes_p.cpp 2016-04-26 15:04:39 \
+0000 <br>@@ -21,7 +21,6 @@
<br> #include "dbusmenutypes_p.h"
<br>
<br> // Local
<br>-#include <dbusmenushortcut_p.h>
<br> #include <debug_p.h>
<br>
<br> // Qt
<br>@@ -95,6 +94,17 @@
<br> return argument;
<br> }
<br>
<br>+/// DBusMenuShortcut
<br>+QDBusArgument &operator<<(QDBusArgument &argument, const \
DBusMenuShortcut &obj) <br>+{
<br>+ return argument << static_cast<const \
QList<QStringList>&>(obj); <br>+}
<br>+
<br>+const QDBusArgument &operator>>(const QDBusArgument &argument, \
DBusMenuShortcut &obj) <br>+{
<br>+ return argument >> \
static_cast<QList<QStringList>&>(obj); <br>+}
<br>+
<br> void DBusMenuTypes_register()
<br> {
<br> static bool registered = false;
<br>
<br>=== modified file 'src/dbusmenutypes_p.h'
<br>--- src/dbusmenutypes_p.h 2011-02-23 13:23:56 +0000
<br>+++ src/dbusmenutypes_p.h 2016-04-26 14:57:04 +0000
<br>@@ -27,6 +27,7 @@
<br> #include <QtCore/QVariant>
<br>
<br> // Local
<br>+#include <dbusmenushortcut_p.h>
<br> #include <dbusmenu_export.h>
<br>
<br> class QDBusArgument;
<br>@@ -92,5 +93,12 @@
<br>
<br> Q_DECLARE_METATYPE(DBusMenuLayoutItemList)
<br>
<br>+/// DBusMenuShortcut
<br>+/**
<br>+ * DBusArgument operator for DBusMenuShortcut
<br>+ */
<br>+DBUSMENU_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, \
const DBusMenuShortcut &); <br>+DBUSMENU_EXPORT const QDBusArgument \
&operator>>(const QDBusArgument &argument, DBusMenuShortcut &); \
<br>+ <br> void DBusMenuTypes_register();
<br> #endif /* DBUSMENUTYPES_P_H */<br>
<br></span></div><div><br></div><div><br></div></div><div \
class="gmail_extra"><br><div class="gmail_quote">2016-04-27 16:52 GMT+09:00 Eike Hein \
<span dir="ltr"><<a href="mailto:hein@kde.org" \
target="_blank">hein@kde.org</a>></span>:<br><blockquote class="gmail_quote" \
style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br> Hi,<br>
<br>
I built Qt from the 5.7 branch yesterday and did a fresh kdesrc-build<br>
run against it.<br>
<br>
Notes:<br>
<br>
- The 5.7 branch build system seems kind of hosed right now, I had to<br>
kick off the build 5-6 times to get the full set of modules built -<br>
no build errors, it was just stopping early for some reason.<br>
<br>
- libdbusmenu-qt doesn't build: <a href="https://paste.kde.org/pmc7fjwog" \
rel="noreferrer" target="_blank">https://paste.kde.org/pmc7fjwog</a><br> So I \
resorted to a binary build from my distro.<br> <br>
- The rest builds fine.<br>
<br>
- plasmashell seems to run just fine (single-screen laptop).<br>
<br>
<br>
Cheers,<br>
Eike<br>
_______________________________________________<br>
Plasma-devel mailing list<br>
<a href="mailto:Plasma-devel@kde.org" target="_blank">Plasma-devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/plasma-devel" rel="noreferrer" \
target="_blank">https://mail.kde.org/mailman/listinfo/plasma-devel</a><br> \
</blockquote></div><br></div>
["libdbusmenu-qt_qt57.patch" (text/x-patch)]
=== modified file 'src/dbusmenutypes_p.cpp'
--- src/dbusmenutypes_p.cpp 2011-02-23 13:23:56 +0000
+++ src/dbusmenutypes_p.cpp 2016-04-26 15:04:39 +0000
@@ -21,7 +21,6 @@
#include "dbusmenutypes_p.h"
// Local
-#include <dbusmenushortcut_p.h>
#include <debug_p.h>
// Qt
@@ -95,6 +94,17 @@
return argument;
}
+/// DBusMenuShortcut
+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &obj)
+{
+ return argument << static_cast<const QList<QStringList>&>(obj);
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &obj)
+{
+ return argument >> static_cast<QList<QStringList>&>(obj);
+}
+
void DBusMenuTypes_register()
{
static bool registered = false;
=== modified file 'src/dbusmenutypes_p.h'
--- src/dbusmenutypes_p.h 2011-02-23 13:23:56 +0000
+++ src/dbusmenutypes_p.h 2016-04-26 14:57:04 +0000
@@ -27,6 +27,7 @@
#include <QtCore/QVariant>
// Local
+#include <dbusmenushortcut_p.h>
#include <dbusmenu_export.h>
class QDBusArgument;
@@ -92,5 +93,12 @@
Q_DECLARE_METATYPE(DBusMenuLayoutItemList)
+/// DBusMenuShortcut
+/**
+ * DBusArgument operator for DBusMenuShortcut
+ */
+DBUSMENU_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &);
+DBUSMENU_EXPORT const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &);
+
void DBusMenuTypes_register();
#endif /* DBUSMENUTYPES_P_H */
[Attachment #7 (text/plain)]
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic