diff --git a/src/provider/core/provider.h b/src/provider/core/provider.h
--- a/src/provider/core/provider.h
+++ b/src/provider/core/provider.h
@@ -108,7 +108,11 @@
         DetailedSystemInformation = 0x30, ///< Transmit detailed system information.
         DetailedUsageStatistics = 0x40, ///< Transmit detailed usage statistics.
     };
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    Q_ENUM(StatisticsCollectionMode)
+#else
     Q_ENUMS(StatisticsCollectionMode)
+#endif
 
     /*! Create a new feedback provider.
      *  @param parent The parent object.
diff --git a/src/provider/core/surveyinfo.h b/src/provider/core/surveyinfo.h
--- a/src/provider/core/surveyinfo.h
+++ b/src/provider/core/surveyinfo.h
@@ -21,6 +21,12 @@
 #include "userfeedbackcore_export.h"
 
 #include <QSharedDataPointer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <qobjectdefs.h>
+#include <QUrl>
+#include <QUuid>
+#endif
+
 
 QT_BEGIN_NAMESPACE
 class QJsonObject;
@@ -37,6 +43,13 @@
  */
 class USERFEEDBACKCORE_EXPORT SurveyInfo
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    Q_GADGET
+    Q_PROPERTY(bool isValid READ isValid)
+    Q_PROPERTY(QUrl url READ url)
+    Q_PROPERTY(QString target READ target)
+    Q_PROPERTY(QUuid uuid READ uuid)
+#endif
 public:
     /*! Create an empty, invalid survey request. */
     SurveyInfo();
diff --git a/src/provider/core/surveyinfo.cpp b/src/provider/core/surveyinfo.cpp
--- a/src/provider/core/surveyinfo.cpp
+++ b/src/provider/core/surveyinfo.cpp
@@ -99,3 +99,7 @@
 #endif
     return s;
 }
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include "surveyinfo.moc"
+#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@
     target_link_libraries(notificationpopuptest UserFeedbackWidgets)
 
     add_executable(orwell orwell.cpp)
-    target_link_libraries(orwell UserFeedbackWidgets ${QT_QTGUI_LIBRARIES})
+    target_link_libraries(orwell UserFeedbackWidgets)
 else()
     # stand-alone build for testing includes and cmake config
     message(STATUS "building test application stand-alone")