From cfe69e690213bbb010d6e255e627956885ead72c Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Thu, 12 Mar 2015 19:08:11 +0100
Subject: AndroidManifestWidget: Fix resizing behavior

This time for real. Change layout from
QScrollArea
 -> QStackedWidget
    -> GeneralPage
    -> EditorPage

to
QStackedWidget
  -> QScrollArea
     -> GeneralPage
  -> EditorPage

Change-Id: Id0d4baca297a5b4d58292fa72faa62b66c91a2dd
Task-number: QTCREATORBUG-14127
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
---
 src/plugins/android/androidmanifesteditorwidget.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/plugins/android/androidmanifesteditorwidget.h')

diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 2d0ebdf1ac..80fa29c669 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -35,7 +35,6 @@
 
 #include <QAbstractListModel>
 #include <QStackedWidget>
-#include <QScrollArea>
 #include <QTimer>
 
 QT_BEGIN_NAMESPACE
@@ -86,7 +85,7 @@ public:
     explicit AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent);
 };
 
-class AndroidManifestEditorWidget : public QScrollArea
+class AndroidManifestEditorWidget : public QStackedWidget
 {
     Q_OBJECT
 public:
@@ -196,7 +195,6 @@ private:
 
     QTimer m_timerParseCheck;
     TextEditor::TextEditorWidget *m_textEditorWidget;
-    QStackedWidget *m_stackedWidget;
     AndroidManifestEditor *m_editor;
 };
 } // namespace Internal
-- 
cgit v1.2.1