Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 files changed, 10 insertions, 4 deletions

diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
index 5ef3ce6..b27b5c1 100644
--- a/demos/browser/browserapplication.cpp
+++ b/demos/browser/browserapplication.cpp
@@ -205,6 +205,7 @@ void BrowserApplication::postLaunch()
     if (directory.isEmpty())
         directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
     QWebSettings::setIconDatabasePath(directory);
+    QWebSettings::setOfflineStoragePath(directory);
 
     setWindowIcon(QIcon(QLatin1String(":browser.svg")));
 
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 4f6fed1..0f74295 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -98,7 +98,6 @@ Item {
         id: Proxy
         anchors.left: Container.left
         anchors.fill: Container
-        focusable: true
         targets: [(ReturnKey), (Editor)]
     }
     KeyActions {
diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml
index 9ae87bd..fd3ca88 100644
--- a/demos/declarative/samegame/SameGame.qml
+++ b/demos/declarative/samegame/SameGame.qml
@@ -3,7 +3,7 @@ import "content"
 Rect {
     width: 460
     height: 700
-    color: "white"
+    color: activePalette.window
     Script { source: "content/samegame.js" }
     Rect{
         property int score: 0
diff --git a/demos/declarative/samegame/content/pics/blueStar.png b/demos/declarative/samegame/content/pics/blueStar.png
index 822dc53..ff9588f 100644
--- a/demos/declarative/samegame/content/pics/blueStar.png
+++ b/demos/declarative/samegame/content/pics/blueStar.png
diff --git a/demos/declarative/samegame/content/pics/greenStar.png b/demos/declarative/samegame/content/pics/greenStar.png
index 1abbcf0..cd06854 100644
--- a/demos/declarative/samegame/content/pics/greenStar.png
+++ b/demos/declarative/samegame/content/pics/greenStar.png
diff --git a/demos/declarative/samegame/content/pics/redStar.png b/demos/declarative/samegame/content/pics/redStar.png
index b18834f..0a4dffe 100644
--- a/demos/declarative/samegame/content/pics/redStar.png
+++ b/demos/declarative/samegame/content/pics/redStar.png
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 4c6a177..d5416c6 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -120,7 +120,6 @@ Item {
                             id: proxy
                             anchors.left: UrlBox.left
                             anchors.fill: UrlBox
-                            focusable: true
                             targets: [keyActions,EditUrl]
                         }
                         KeyActions {
@@ -191,7 +190,6 @@ Item {
                 url: WebBrowser.url
                 smooth: !Flick.moving
                 fillColor: "white"
-                focusable: true
                 focus: true
 
                 idealWidth: Flick.width
diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
index 17516b4..5eee855 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
@@ -336,6 +336,8 @@ void TextEdit::setupTextActions()
     comboStyle->addItem("Ordered List (Decimal)");
     comboStyle->addItem("Ordered List (Alpha lower)");
     comboStyle->addItem("Ordered List (Alpha upper)");
+    comboStyle->addItem("Ordered List (Roman lower)");
+    comboStyle->addItem("Ordered List (Roman upper)");
     connect(comboStyle, SIGNAL(activated(int)),
             this, SLOT(textStyle(int)));
 
@@ -573,6 +575,12 @@ void TextEdit::textStyle(int styleIndex)
             case 6:
                 style = QTextListFormat::ListUpperAlpha;
                 break;
+            case 7:
+                style = QTextListFormat::ListLowerRoman;
+                break;
+            case 8:
+                style = QTextListFormat::ListUpperRoman;
+                break;
         }
 
         cursor.beginEditBlock();