Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/ui/qt/capture_info_dialog.cpp b/ui/qt/capture_info_dialog.cpp
index 5a29652c..e171ba3d 100644
--- a/ui/qt/capture_info_dialog.cpp
+++ b/ui/qt/capture_info_dialog.cpp
@@ -19,7 +19,7 @@
 #include "ui/capture.h"
 
 #include "capture_info_dialog.h"
-#include "ui_capture_info_dialog.h"
+#include <ui_capture_info_dialog.h>
 
 #include "main_application.h"
 
@@ -146,7 +146,7 @@ void CaptureInfoModel::updateInfo()
     if (!cap_info_) return;
 
     GHashTableIter iter;
-    gpointer key, value;
+    void *key, *value;
 
     samples_++;
     other_points_.append(cap_info_->counts->other - last_other_);