Merge branch '1.8-stable'

licq-im · Oct 31, 2013 · 65026d6 · 65026d6
2 parents b865be2 + f288367
commit 65026d6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/qt4-gui/src/helpers/usercodec.h b/qt4-gui/src/helpers/usercodec.h
@@ -20,13 +20,14 @@
 #ifndef USERCODEC_H
 #define USERCODEC_H
 
+#include <QObject>
 #include <QString>
 
 namespace LicqQtGui
 {
 class UserCodec
 {
-  Q_OBJECT
+  Q_GADGET
 
 public:
   struct encoding_t