Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

10 files changed, 43 insertions, 22 deletions

diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
index 7b7c448..72c6e88 100644
--- a/demos/browser/browser.pro
+++ b/demos/browser/browser.pro
@@ -3,7 +3,7 @@ TARGET = browser
 QT += webkit network
 
 CONFIG += qt warn_on
-contains(QT_BUILD_PARTS, tools): CONFIG += uitools
+contains(QT_BUILD_PARTS, tools):!symbian: CONFIG += uitools
 else: DEFINES += QT_NO_UITOOLS
 
 FORMS += \
@@ -92,4 +92,4 @@ INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
 
-symbian:TARGET.UID3 = 0xA000CF70
\ No newline at end of file
+symbian:TARGET.UID3 = 0xA000CF70
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index f1dcaef..37b8ddc 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -575,7 +575,7 @@ QUrl BrowserMainWindow::guessUrlFromString(const QString &string)
         int dotIndex = urlStr.indexOf(QLatin1Char('.'));
         if (dotIndex != -1) {
             QString prefix = urlStr.left(dotIndex).toLower();
-            QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : "http";
+            QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : QByteArray("http");
             QUrl url =
                 QUrl::fromEncoded(schema + "://" + urlStr.toUtf8(), QUrl::TolerantMode);
             if (url.isValid())
diff --git a/demos/browser/searchlineedit.cpp b/demos/browser/searchlineedit.cpp
index 8f668e0..aa00475 100644
--- a/demos/browser/searchlineedit.cpp
+++ b/demos/browser/searchlineedit.cpp
@@ -50,7 +50,9 @@
 ClearButton::ClearButton(QWidget *parent)
   : QAbstractButton(parent)
 {
+#ifndef QT_NO_CURSOR
     setCursor(Qt::ArrowCursor);
+#endif // QT_NO_CURSOR
     setToolTip(tr("Clear"));
     setVisible(false);
     setFocusPolicy(Qt::NoFocus);
@@ -103,7 +105,9 @@ SearchButton::SearchButton(QWidget *parent)
     m_menu(0)
 {
     setObjectName(QLatin1String("SearchButton"));
+#ifndef QT_NO_CURSOR
     setCursor(Qt::ArrowCursor);
+#endif //QT_NO_CURSOR
     setFocusPolicy(Qt::NoFocus);
 }
 
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
index 6c4d857..63505f9 100644
--- a/demos/browser/webview.cpp
+++ b/demos/browser/webview.cpp
@@ -54,7 +54,9 @@
 
 #include <QtWebKit/QWebHitTestResult>
 
+#ifndef QT_NO_UITOOLS
 #include <QtUiTools/QUiLoader>
+#endif  //QT_NO_UITOOLS
 
 #include <QtCore/QDebug>
 #include <QtCore/QBuffer>
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
index afc0cc2..e496241 100644
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ b/examples/webkit/fancybrowser/fancybrowser.pro
@@ -1,4 +1,4 @@
-QT      +=  webkit
+QT      +=  webkit network
 HEADERS =   mainwindow.h
 SOURCES =   main.cpp \
             mainwindow.cpp
@@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/fancybrowser
 INSTALLS += target sources
 
-symbian:TARGET.UID3 = 0xA000CF6C
\ No newline at end of file
+symbian:TARGET.UID3 = 0xA000CF6C
diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkit/formextractor/formextractor.pro
index ecb264c..33e2267 100644
--- a/examples/webkit/formextractor/formextractor.pro
+++ b/examples/webkit/formextractor/formextractor.pro
@@ -1,4 +1,4 @@
-QT          +=  webkit
+QT          +=  webkit network
 TARGET       =  formExtractor
 TEMPLATE     =  app
 SOURCES     +=  main.cpp \
@@ -17,4 +17,4 @@ INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
 
-symbian:TARGET.UID3 = 0xA000CF6D
\ No newline at end of file
+symbian:TARGET.UID3 = 0xA000CF6D
diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro
index bc2aad3..8e4f9a6 100644
--- a/examples/webkit/googlechat/googlechat.pro
+++ b/examples/webkit/googlechat/googlechat.pro
@@ -1,4 +1,4 @@
-QT      +=  webkit
+QT      +=  webkit network
 HEADERS =   googlechat.h
 SOURCES =   main.cpp \
             googlechat.cpp
@@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlechat
 INSTALLS += target sources
 
-symbian:TARGET.UID3 = 0xA000CF6E
\ No newline at end of file
+symbian:TARGET.UID3 = 0xA000CF6E
diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
index ce7906b..cc7fb73 100644
--- a/examples/webkit/previewer/previewer.pro
+++ b/examples/webkit/previewer/previewer.pro
@@ -1,4 +1,4 @@
-QT      +=  webkit
+QT      +=  webkit network
 HEADERS =   previewer.h \
             mainwindow.h
 SOURCES =   main.cpp \
@@ -14,4 +14,4 @@ INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
 
-symbian:TARGET.UID3 = 0xA000CF6F
\ No newline at end of file
+symbian:TARGET.UID3 = 0xA000CF6F
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index d2bd679..b80adc2 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -478,7 +478,9 @@ void QS60StylePrivate::setThemePalette(QApplication *app) const
     Q_UNUSED(app)
     QPalette widgetPalette = QPalette(Qt::white);
     setThemePalette(&widgetPalette);
-    QApplication::setPalette(widgetPalette);
+    QApplication::setPalette(widgetPalette); //calling QApplication::setPalette clears palette hash
+    setThemePaletteHash(&widgetPalette);
+    storeThemePalette(&widgetPalette);
 }
 
 void QS60StylePrivate::setThemePalette(QStyleOption *option) const
@@ -664,7 +666,7 @@ void QS60StylePrivate::setThemePalette(QWidget *widget) const
 {
     if(!widget)
         return;
-    QPalette widgetPalette = widget->palette();
+    QPalette widgetPalette = QApplication::palette(widget);
 
     //header view and its viewport need to be set 100% transparent button color, since drawing code will
     //draw transparent theme graphics to table column and row headers.
@@ -716,9 +718,6 @@ void QS60StylePrivate::setThemePalette(QPalette *palette) const
     palette->setColor(QPalette::Midlight, palette->color(QPalette::Button).lighter(125));
     palette->setColor(QPalette::Mid, palette->color(QPalette::Button).darker(150));
     palette->setColor(QPalette::Shadow, Qt::black);
-
-    setThemePaletteHash(palette);
-    storeThemePalette(palette);
 }
 
 void QS60StylePrivate::deleteThemePalette()
@@ -791,6 +790,18 @@ void QS60StylePrivate::setThemePaletteHash(QPalette *palette) const
     QApplication::setPalette(widgetPalette, "QLineEdit");
     widgetPalette = *palette;
 
+    widgetPalette.setColor(QPalette::All, QPalette::Text,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 34, 0));
+    widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
+    QApplication::setPalette(widgetPalette, "QTextEdit");
+    widgetPalette = *palette;
+    
+    widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+        s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
+    QApplication::setPalette(widgetPalette, "QComboBox");
+    widgetPalette = *palette;
+    
     widgetPalette.setColor(QPalette::WindowText, mainAreaTextColor);
     widgetPalette.setColor(QPalette::Button, QApplication::palette().color(QPalette::Button));
     widgetPalette.setColor(QPalette::Dark, mainAreaTextColor.darker());
@@ -1662,7 +1673,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
     case CE_MenuItem:
         if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
             QStyleOptionMenuItem optionMenuItem = *menuItem;
-            
+
             bool drawSubMenuIndicator = false;
             switch(menuItem->menuItemType) {
                 case QStyleOptionMenuItem::Scroller:
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 1f02efa..6688fe7 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -318,16 +318,16 @@ const partMapEntry QS60StyleModeSpecifics::m_partMap[] = {
     /* SP_QsnFrButtonSideLInactive */    {KAknsIIDQsnFrButtonTbSideL,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b7},
     /* SP_QsnFrButtonSideRInactive */    {KAknsIIDQsnFrButtonTbSideR,           ENoDraw,     ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b8},
     /* SP_QsnFrButtonCenterInactive */   {KAknsIIDQsnFrButtonTbCenter,          EDrawIcon,   ES60_3_1 | ES60_3_2, EAknsMajorSkin, 0x21b9},  
-    
-    /*SP_QsnFrNotepadCornerTl */         {KAknsIIDQsnFrNotepadCornerTl,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrNotepadCornerTr */        {KAknsIIDQsnFrNotepadCornerTr,         ENoDraw,     ES60_AllReleases,    -1,-1},
+
+    /* SP_QsnFrNotepadCornerTl */        {KAknsIIDQsnFrNotepadContCornerTl,     ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadCornerTr */        {KAknsIIDQsnFrNotepadContCornerTr,     ENoDraw,     ES60_AllReleases,    -1,-1},
     /* SP_QsnFrNotepadCornerBl */        {KAknsIIDQsnFrNotepadCornerBl,         ENoDraw,     ES60_AllReleases,    -1,-1},
     /* SP_QsnFrNotepadCornerBr */        {KAknsIIDQsnFrNotepadCornerBr,         ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrNotepadSideT */           {KAknsIIDQsnFrNotepadSideT,            ENoDraw,     ES60_AllReleases,    -1,-1},
+    /* SP_QsnFrNotepadSideT */           {KAknsIIDQsnFrNotepadContSideT,        ENoDraw,     ES60_AllReleases,    -1,-1},
     /* SP_QsnFrNotepadSideB */           {KAknsIIDQsnFrNotepadSideB,            ENoDraw,     ES60_AllReleases,    -1,-1},
     /* SP_QsnFrNotepadSideL */           {KAknsIIDQsnFrNotepadSideL,            ENoDraw,     ES60_AllReleases,    -1,-1},
     /* SP_QsnFrNotepadSideR */           {KAknsIIDQsnFrNotepadSideR,            ENoDraw,     ES60_AllReleases,    -1,-1},
-    /* SP_QsnFrNotepadCenter */          {KAknsIIDQsnFrNotepadCenter,           EDrawIcon,   ES60_AllReleases,    -1,-1}
+    /* SP_QsnFrNotepadCenter */          {KAknsIIDQsnFrNotepadCenter,           EDrawIcon,   ES60_AllReleases,    -1,-1},
 
 };
 
@@ -828,6 +828,10 @@ void QS60StyleModeSpecifics::frameIdAndCenterId(QS60StylePrivate::SkinFrameEleme
             centerId.Set(KAknsIIDNone);
             frameId.Set(KAknsIIDQsnFrSetOpt);
             break;
+        case QS60StylePrivate::SF_Editor:
+            centerId.Set(KAknsIIDQsnFrNotepadCenter);
+            frameId.Set(KAknsIIDQsnFrNotepadCont);
+            break;
         default:
             // center should be correct here
             frameId.iMinor = centerId.iMinor - 9;