diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-03-12 19:08:11 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-03-13 10:42:11 +0000 |
| commit | cfe69e690213bbb010d6e255e627956885ead72c (patch) | |
| tree | 018d698fde97eb09149dd72d4fd6b3f0bb0f75e5 /src/plugins/android/androidmanifesteditorwidget.h | |
| parent | c9dc686a040d8ae7d54bccb7712362dc6ff45414 (diff) | |
| download | qt-creator-cfe69e690213bbb010d6e255e627956885ead72c.tar.gz | |
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>
Diffstat (limited to 'src/plugins/android/androidmanifesteditorwidget.h')
| -rw-r--r-- | src/plugins/android/androidmanifesteditorwidget.h | 4 |
1 files changed, 1 insertions, 3 deletions
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 |