aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/qdbusmenumodel.h
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-11 10:54:49 +0200
committerOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-11 10:54:49 +0200
commit6504ccc25f02b73649c53e22194ebf2d2319e4e5 (patch)
tree58b25e63a33cc204a30bbc4987b2ea3610023c95 /libqmenumodel/src/qdbusmenumodel.h
parenta3c6400a93152d5cf4dc63f9c90955f6245ceacd (diff)
parent24faac7a03ce0769ed155bfc71be31f750c86dfb (diff)
downloadqmenumodel-6504ccc25f02b73649c53e22194ebf2d2319e4e5.tar.gz
qmenumodel-6504ccc25f02b73649c53e22194ebf2d2319e4e5.tar.bz2
qmenumodel-6504ccc25f02b73649c53e22194ebf2d2319e4e5.zip
Merge the latest changes from trunk.
Diffstat (limited to 'libqmenumodel/src/qdbusmenumodel.h')
-rw-r--r--libqmenumodel/src/qdbusmenumodel.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/libqmenumodel/src/qdbusmenumodel.h b/libqmenumodel/src/qdbusmenumodel.h
index 767451a..6943613 100644
--- a/libqmenumodel/src/qdbusmenumodel.h
+++ b/libqmenumodel/src/qdbusmenumodel.h
@@ -23,10 +23,6 @@
#include "qdbusobject.h"
#include "qmenumodel.h"
-extern "C" {
-#include <gio/gio.h>
-}
-
class QDBusMenuModel : public QMenuModel, public QDBusObject
{
Q_OBJECT