From 7e042a0bd336ca0b3187e4c77245fe9cc5b8ba05 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Sun, 15 Sep 2013 22:06:11 +0200
Subject: [PATCH] [OP-835] Qt 5.1.0 - migrated GCS libs/extensionsystem

---
 .../src/libs/extensionsystem/extensionsystem.pro       |  2 ++
 .../src/libs/extensionsystem/plugindetailsview.h       |  2 +-
 .../src/libs/extensionsystem/pluginerrorview.h         |  2 +-
 .../src/libs/extensionsystem/pluginmanager.cpp         |  4 ++--
 .../src/libs/extensionsystem/pluginview.cpp            | 10 +++++-----
 .../openpilotgcs/src/libs/extensionsystem/pluginview.h |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pro b/ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pro
index b27eb6272..c40987f6d 100644
--- a/ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pro
+++ b/ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pro
@@ -8,6 +8,8 @@ unix:!macx:!freebsd*:LIBS += -ldl
 
 DEFINES += GCS_TEST_DIR=\\\"$$GCS_SOURCE_TREE\\\"
 
+QT += widgets
+
 HEADERS += pluginerrorview.h \
     plugindetailsview.h \
     iplugin.h \
diff --git a/ground/openpilotgcs/src/libs/extensionsystem/plugindetailsview.h b/ground/openpilotgcs/src/libs/extensionsystem/plugindetailsview.h
index 1d6161b2c..2f43b5fc4 100644
--- a/ground/openpilotgcs/src/libs/extensionsystem/plugindetailsview.h
+++ b/ground/openpilotgcs/src/libs/extensionsystem/plugindetailsview.h
@@ -31,7 +31,7 @@
 
 #include "extensionsystem_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace ExtensionSystem {
 class PluginSpec;
diff --git a/ground/openpilotgcs/src/libs/extensionsystem/pluginerrorview.h b/ground/openpilotgcs/src/libs/extensionsystem/pluginerrorview.h
index b33aaabf6..6169c48d0 100644
--- a/ground/openpilotgcs/src/libs/extensionsystem/pluginerrorview.h
+++ b/ground/openpilotgcs/src/libs/extensionsystem/pluginerrorview.h
@@ -31,7 +31,7 @@
 
 #include "extensionsystem_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace ExtensionSystem {
 class PluginSpec;
diff --git a/ground/openpilotgcs/src/libs/extensionsystem/pluginmanager.cpp b/ground/openpilotgcs/src/libs/extensionsystem/pluginmanager.cpp
index 8ff664205..c41a6a5ff 100644
--- a/ground/openpilotgcs/src/libs/extensionsystem/pluginmanager.cpp
+++ b/ground/openpilotgcs/src/libs/extensionsystem/pluginmanager.cpp
@@ -433,8 +433,8 @@ void PluginManager::startTests()
         methods.append("arg0");
         // We only want slots starting with "test"
         for (int i = mo->methodOffset(); i < mo->methodCount(); ++i) {
-            if (QByteArray(mo->method(i).signature()).startsWith("test")) {
-                QString method = QString::fromLatin1(mo->method(i).signature());
+            if (QByteArray(mo->method(i).methodSignature()).startsWith("test")) {
+                QString method = QString::fromLatin1(mo->method(i).methodSignature());
                 methods.append(method.left(method.size() - 2));
             }
         }
diff --git a/ground/openpilotgcs/src/libs/extensionsystem/pluginview.cpp b/ground/openpilotgcs/src/libs/extensionsystem/pluginview.cpp
index 6d5daffc2..0ee7b7734 100644
--- a/ground/openpilotgcs/src/libs/extensionsystem/pluginview.cpp
+++ b/ground/openpilotgcs/src/libs/extensionsystem/pluginview.cpp
@@ -33,8 +33,8 @@
 #include "ui_pluginview.h"
 
 #include <QtCore/QDir>
-#include <QtGui/QHeaderView>
-#include <QtGui/QTreeWidgetItem>
+#include <QHeaderView>
+#include <QTreeWidgetItem>
 #include <QtDebug>
 
 /*!
@@ -76,9 +76,9 @@ PluginView::PluginView(PluginManager *manager, QWidget *parent)
 {
     m_ui->setupUi(this);
     QHeaderView *header = m_ui->pluginWidget->header();
-    header->setResizeMode(0, QHeaderView::ResizeToContents);
-    header->setResizeMode(1, QHeaderView::ResizeToContents);
-    header->setResizeMode(2, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+    header->setSectionResizeMode(2, QHeaderView::ResizeToContents);
     m_ui->pluginWidget->sortItems(1, Qt::AscendingOrder);
     p->manager = manager;
     connect(p->manager, SIGNAL(pluginsChanged()), this, SLOT(updateList()));
diff --git a/ground/openpilotgcs/src/libs/extensionsystem/pluginview.h b/ground/openpilotgcs/src/libs/extensionsystem/pluginview.h
index f1d49eb6f..c90d22ea0 100644
--- a/ground/openpilotgcs/src/libs/extensionsystem/pluginview.h
+++ b/ground/openpilotgcs/src/libs/extensionsystem/pluginview.h
@@ -31,7 +31,7 @@
 
 #include "extensionsystem_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;