From 9900faefa06380271a6331c1bab29903cacc2051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Tue, 11 Jun 2013 02:10:06 +0200 Subject: [PATCH] Disable all TextAreas Initializing a TextArea crashes the shell, there's a Qt bug https://bugreports.qt-project.org/browse/QTBUG-30925 filed about this. Since we now can't even build against an old-enough Qt, which doesn't suffer from this crasher, disable the textareas in our code until it's fixed. --- .../contents/ui/ButtonsPage.qml | 8 ++-- .../contents/ui/DialogContent.qml | 10 ++-- .../contents/ui/EditorPage.qml | 46 +++++++++---------- .../contents/ui/testshaderapplet.qml | 8 ++-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml b/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml index 353c8589f..8d36b5ae7 100644 --- a/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml +++ b/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml @@ -67,10 +67,10 @@ PlasmaComponents.Page { clearButtonShown: true } } - PlasmaComponents.TextArea { - width: parent.width - height: _h*2 - } +// PlasmaComponents.TextArea { +// width: parent.width +// height: _h*2 +// } } } diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/DialogContent.qml b/src/shell/applets/testcomponentsapplet/contents/ui/DialogContent.qml index 9fed86d33..e99ca467f 100644 --- a/src/shell/applets/testcomponentsapplet/contents/ui/DialogContent.qml +++ b/src/shell/applets/testcomponentsapplet/contents/ui/DialogContent.qml @@ -48,11 +48,11 @@ Item { id: localeItem anchors { left: parent.left; right: parent.right; top: tx.bottom; } } - PlasmaComponents.TextArea { - anchors { left: parent.left; right: parent.right; top: localeItem.bottom; } - width: parent.width - height: 80 - } +// PlasmaComponents.TextArea { +// anchors { left: parent.left; right: parent.right; top: localeItem.bottom; } +// width: parent.width +// height: 80 +// } PlasmaComponents.Button { id: thanks anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: 24; } diff --git a/src/shell/applets/testshaderapplet/contents/ui/EditorPage.qml b/src/shell/applets/testshaderapplet/contents/ui/EditorPage.qml index f6cd29165..6a5603e97 100644 --- a/src/shell/applets/testshaderapplet/contents/ui/EditorPage.qml +++ b/src/shell/applets/testshaderapplet/contents/ui/EditorPage.qml @@ -99,30 +99,30 @@ PlasmaComponents.Page { } } - PlasmaComponents.TextArea { - id: editor - anchors { - top: heading.bottom; - topMargin: _s - left: parent.left - right: parent.right - bottom: applyButton.top - bottomMargin: _s - - } -// text: { "void main(void) {\ -// gl_FragColor = vec4(1.0, 0.0, 0.0, 0.3);\ -// }" +// PlasmaComponents.TextArea { +// id: editor +// anchors { +// top: heading.bottom; +// topMargin: _s +// left: parent.left +// right: parent.right +// bottom: applyButton.top +// bottomMargin: _s +// // } - text:" - void main(void) { - gl_FragColor = vec4(0.2, 0.8, 0.6, 0.3); - } - " - -// width: parent.width -// parent.height-height: _h*2 - } +// // text: { "void main(void) {\ +// // gl_FragColor = vec4(1.0, 0.0, 0.0, 0.3);\ +// // }" +// // } +// text:" +// void main(void) { +// gl_FragColor = vec4(0.2, 0.8, 0.6, 0.3); +// } +// " +// +// // width: parent.width +// // parent.height-height: _h*2 +// } PlasmaComponents.Button { id: applyButton diff --git a/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml b/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml index 9ab272f07..4648e0a39 100644 --- a/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml +++ b/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml @@ -50,7 +50,7 @@ Item { PlasmaComponents.TabButton { tab: wobbleExample; text: tab.pageName; } PlasmaComponents.TabButton { tab: shadowExample; text: tab.pageName; } PlasmaComponents.TabButton { tab: simpleExample; text: tab.pageName; } - PlasmaComponents.TabButton { tab: vertexPage; iconSource: vertexPage.icon; } + //PlasmaComponents.TabButton { tab: vertexPage; iconSource: vertexPage.icon; } } PlasmaComponents.TabGroup { @@ -77,9 +77,9 @@ Item { SimpleExample { id: simpleExample } - EditorPage { - id: vertexPage - } +// EditorPage { +// id: vertexPage +// } } }