diff options
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/platformsupport.pro | 7 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri (renamed from src/platformsupport/dbusmenu/dbusmenu.pri) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp (renamed from src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h (renamed from src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp (renamed from src/platformsupport/dbusmenu/qdbusmenubar.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h (renamed from src/platformsupport/dbusmenu/qdbusmenubar_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp (renamed from src/platformsupport/dbusmenu/qdbusmenuconnection.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h (renamed from src/platformsupport/dbusmenu/qdbusmenuconnection_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp (renamed from src/platformsupport/dbusmenu/qdbusmenuregistrarproxy.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h (renamed from src/platformsupport/dbusmenu/qdbusmenuregistrarproxy_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp (renamed from src/platformsupport/dbusmenu/qdbusmenutypes.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h (renamed from src/platformsupport/dbusmenu/qdbusmenutypes_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp (renamed from src/platformsupport/dbusmenu/qdbusplatformmenu.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h (renamed from src/platformsupport/dbusmenu/qdbusplatformmenu_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/dbustray.pri (renamed from src/platformsupport/dbustray/dbustray.pri) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp (renamed from src/platformsupport/dbustray/qdbustrayicon.cpp) | 2 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h (renamed from src/platformsupport/dbustray/qdbustrayicon_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp (renamed from src/platformsupport/dbustray/qdbustraytypes.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h (renamed from src/platformsupport/dbustray/qdbustraytypes_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp (renamed from src/platformsupport/dbustray/qstatusnotifieritemadaptor.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h (renamed from src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp (renamed from src/platformsupport/dbustray/qxdgnotificationproxy.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h (renamed from src/platformsupport/dbustray/qxdgnotificationproxy_p.h) | 0 | ||||
-rw-r--r-- | src/platformsupport/themes/genericunix/genericunix.pri | 5 |
24 files changed, 6 insertions, 8 deletions
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 19efa60f48..f9b57acaa8 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -22,13 +22,6 @@ include(linuxaccessibility/linuxaccessibility.pri) include(clipboard/clipboard.pri) include(platformcompositor/platformcompositor.pri) -# dbus convenience for unix except darwin: the platform -# plugins for these platforms do not use dbus and we -# don't want to create a false dependency. -unix:!darwin:qtConfig(dbus) { - include(dbusmenu/dbusmenu.pri) - include(dbustray/dbustray.pri) -} darwin: include(graphics/graphics.pri) load(qt_module) diff --git a/src/platformsupport/dbusmenu/dbusmenu.pri b/src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri index 662ebfdae6..662ebfdae6 100644 --- a/src/platformsupport/dbusmenu/dbusmenu.pri +++ b/src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp index 354b9c3a2e..354b9c3a2e 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h index 6612f019a7..6612f019a7 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h diff --git a/src/platformsupport/dbusmenu/qdbusmenubar.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp index 76d658f51a..76d658f51a 100644 --- a/src/platformsupport/dbusmenu/qdbusmenubar.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp diff --git a/src/platformsupport/dbusmenu/qdbusmenubar_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h index 8266a395f5..8266a395f5 100644 --- a/src/platformsupport/dbusmenu/qdbusmenubar_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h diff --git a/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp index 361146dc23..361146dc23 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp diff --git a/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h index 84eb2a6f3a..84eb2a6f3a 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h diff --git a/src/platformsupport/dbusmenu/qdbusmenuregistrarproxy.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp index c59b5a675e..c59b5a675e 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuregistrarproxy.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp diff --git a/src/platformsupport/dbusmenu/qdbusmenuregistrarproxy_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h index c92de0a140..c92de0a140 100644 --- a/src/platformsupport/dbusmenu/qdbusmenuregistrarproxy_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp index 82a13d2fa0..82a13d2fa0 100644 --- a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h index fd6727d3be..fd6727d3be 100644 --- a/src/platformsupport/dbusmenu/qdbusmenutypes_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp index 15440a03cd..15440a03cd 100644 --- a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h index 38c27e8051..38c27e8051 100644 --- a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h diff --git a/src/platformsupport/dbustray/dbustray.pri b/src/platformsupport/themes/genericunix/dbustray/dbustray.pri index f703e24ba9..f703e24ba9 100644 --- a/src/platformsupport/dbustray/dbustray.pri +++ b/src/platformsupport/themes/genericunix/dbustray/dbustray.pri diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp index 36939b467e..95e9651e9a 100644 --- a/src/platformsupport/dbustray/qdbustrayicon.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp @@ -44,7 +44,7 @@ #include "qdbusmenuconnection_p.h" #include "qstatusnotifieritemadaptor_p.h" #include "qdbusmenuadaptor_p.h" -#include "dbusmenu/qdbusplatformmenu_p.h" +#include "qdbusplatformmenu_p.h" #include "qxdgnotificationproxy_p.h" #include <qpa/qplatformmenu.h> diff --git a/src/platformsupport/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h index a383ef86fc..a383ef86fc 100644 --- a/src/platformsupport/dbustray/qdbustrayicon_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h diff --git a/src/platformsupport/dbustray/qdbustraytypes.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp index fc0fa00655..fc0fa00655 100644 --- a/src/platformsupport/dbustray/qdbustraytypes.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp diff --git a/src/platformsupport/dbustray/qdbustraytypes_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h index 1bdc855c3c..1bdc855c3c 100644 --- a/src/platformsupport/dbustray/qdbustraytypes_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h diff --git a/src/platformsupport/dbustray/qstatusnotifieritemadaptor.cpp b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp index d3c5454f01..d3c5454f01 100644 --- a/src/platformsupport/dbustray/qstatusnotifieritemadaptor.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp diff --git a/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h index 776e1b23ef..776e1b23ef 100644 --- a/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h diff --git a/src/platformsupport/dbustray/qxdgnotificationproxy.cpp b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp index ef2aa799c8..ef2aa799c8 100644 --- a/src/platformsupport/dbustray/qxdgnotificationproxy.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp diff --git a/src/platformsupport/dbustray/qxdgnotificationproxy_p.h b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h index 03899723ab..03899723ab 100644 --- a/src/platformsupport/dbustray/qxdgnotificationproxy_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h diff --git a/src/platformsupport/themes/genericunix/genericunix.pri b/src/platformsupport/themes/genericunix/genericunix.pri index eed48257d0..27019b4aa2 100644 --- a/src/platformsupport/themes/genericunix/genericunix.pri +++ b/src/platformsupport/themes/genericunix/genericunix.pri @@ -1,2 +1,7 @@ HEADERS += $$PWD/qgenericunixthemes_p.h SOURCES += $$PWD/qgenericunixthemes.cpp + +qtConfig(dbus) { + include(dbusmenu/dbusmenu.pri) + include(dbustray/dbustray.pri) +} |