6 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/image0.png b/tests/auto/declarative/visual/qfxtext/elide/data/opengl/image0.png
deleted file mode 100644
index 7d45407..0000000
--- a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/image0.png
+++ /dev/null
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/manifest.xml b/tests/auto/declarative/visual/qfxtext/elide/data/opengl/manifest.xml
deleted file mode 100644
index b784f42..0000000
--- a/tests/auto/declarative/visual/qfxtext/elide/data/opengl/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLog>
-    <TestFullFrame time="30" frameId="0"/>
-</TestLog>
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/raster/image0.png b/tests/auto/declarative/visual/qfxtext/elide/data/raster/image0.png
new file mode 100644
index 0000000..05dc9ab
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/elide/data/raster/image0.png
diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
new file mode 100644
index 0000000..6d900f5
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/elide/data/raster/manifest.qml
@@ -0,0 +1,6 @@
+TestLog {
+    TestFullFrame {
+        time: 0
+        frameId: 0
+        }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/elide/test b/tests/auto/declarative/visual/qfxtext/elide/test
index d35cbc9..bde7c7c 100644
--- a/tests/auto/declarative/visual/qfxtext/elide/test
+++ b/tests/auto/declarative/visual/qfxtext/elide/test
@@ -1 +1 @@
-elide.xml
+elide.qml
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 0417539..2ef5616 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -266,8 +266,10 @@ void QmlViewer::createMenu(QMenuBar *menu, QMenu *flatmenu)
     connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
     fileMenu->addSeparator();
     fileMenu->addAction(quitAction);
-    if (menu)
+    if (menu) {
         menu->setFixedHeight(menu->sizeHint().height());
+        menu->setMinimumWidth(10);
+    }
 }
 
 void QmlViewer::setScaleSkin()