Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Remove code changes that were NOT intended as part of the fix
  Wordwrap QInputDialog label in Symbian
  Use qtmain.lib to provide entry point for all Symbian applications

6 files changed, 10 insertions, 38 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index decec14..6d1f708 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -79,7 +79,6 @@ QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32
 QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
 QMAKE_LIBS_THREAD       = -llibpthread
 QMAKE_LIBS_COMPAT       = 
-QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon -leikcoctl
 
 exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
@@ -127,6 +126,8 @@ QT_ARCH               = symbian
 
 load(qt_config)
 
+QMAKE_LIBS_QT_ENTRY     = -lqtmain$${QT_LIBINFIX}.lib
+
 # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
 QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
 QT_IMPORTS_BASE_DIR = /resource/qt/imports
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 0564e9b..348c366 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -3,9 +3,6 @@ load(default_post)
 contains(TEMPLATE, ".*app") {
     contains(CONFIG, stdbinary) {
         QMAKE_LIBS +=
-    } else:contains(QT, gui):contains(CONFIG,qt) {
-        S60MAIN_LIBS = -leuser
-        QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
     } else {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     }
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 1a51cb2..20bc3a3 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -187,26 +187,16 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
     linux-armcc: {
         QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
-        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
-            QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib
-            QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
-        } else {
-            QMAKE_LIBS -= -llibcrt0.lib
-            QMAKE_LIBS += -llibcrt0.lib
-        }
+        QMAKE_LIBS -= $$QMAKE_LIBS_QT_ENTRY
+        QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     } else :linux-gcce {
         # notice that we can't merge these as ordering of arguments is important.
         QMAKE_LIBS += \
             -l:eexe.lib \
             -l:usrt2_2.lib
-        contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
-            QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib
-            QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib
-        } else {
-            QMAKE_LIBS -= -l:libcrt0.lib
-            QMAKE_LIBS -= -l:libcrt0_gcce.lib
-            QMAKE_LIBS += -l:libcrt0_gcce.lib
-        }
+        modified_entry = $$replace(QMAKE_LIBS_QT_ENTRY, "^-l", "-l:")
+        QMAKE_LIBS -= $$modified_entry
+        QMAKE_LIBS += $$modified_entry
         QMAKE_LIBS += \
             -l:dfpaeabi.dso \
             -l:drtaeabi.dso \
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index abaaa49..ce27bd3 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -561,6 +561,9 @@ void QInputDialog::setLabelText(const QString &text)
     } else {
         d->label->setText(text);
     }
+#ifdef Q_OS_SYMBIAN
+    d->label->setWordWrap(true);
+#endif
 }
 
 QString QInputDialog::labelText() const
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 53ca28c..f3fb2f5 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -112,8 +112,6 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** End of generated data ***
 };
 
-QSet<const QWidget *> *QS60StylePrivate::m_autoFillDisabledWidgets = 0;
-
 const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
 
 // theme background texture
@@ -154,8 +152,6 @@ const double KTabFontMul = 0.72;
 
 QS60StylePrivate::~QS60StylePrivate()
 {
-    delete m_autoFillDisabledWidgets;
-    m_autoFillDisabledWidgets = 0;
     clearCaches(); //deletes also background image
     deleteThemePalette();
 #ifdef Q_WS_S60
@@ -3188,13 +3184,6 @@ void QS60Style::polish(QWidget *widget)
     }
     d->setThemePalette(widget);
     d->setFont(widget);
-    
-    if (widget->autoFillBackground()) {
-        if (!d->m_autoFillDisabledWidgets)
-            d->m_autoFillDisabledWidgets = new QSet<const QWidget *>;
-        widget->setAutoFillBackground(false);
-        d->m_autoFillDisabledWidgets->insert(widget);
-    }
 }
 
 /*!
@@ -3229,13 +3218,6 @@ void QS60Style::unpolish(QWidget *widget)
 
     if (widget)
         widget->setPalette(QPalette());
-    
-    if (d->m_autoFillDisabledWidgets &&
-	    !d->m_autoFillDisabledWidgets->isEmpty() &&
-		d->m_autoFillDisabledWidgets->contains(widget)) {
-        widget->setAutoFillBackground(true);
-        d->m_autoFillDisabledWidgets->remove(widget);
-    }
 
 #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR)
     if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) {
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 3d66c40..b46f75e 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -625,7 +625,6 @@ private:
     static qint64 m_webPaletteKey;
 
     static QPointer<QWidget> m_pressedWidget;
-    static QSet<const QWidget *> *m_autoFillDisabledWidgets;
 
 #ifdef Q_WS_S60
     //list of progress bars having animation running