Merge branch '4.6'

6 files changed, 7 insertions, 6 deletions

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 648a5d5..87cf82e 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -351,7 +351,8 @@ void QSymbianControl::HandleLongTapEventL( const TPoint& aPenEventLocation, cons
     bool res = sendMouseEvent(alienWidget, &mEvent);
 
 #if !defined(QT_NO_CONTEXTMENU)
-    QContextMenuEvent e2(QContextMenuEvent::Mouse, widgetPos, globalPos, mEvent.modifiers());
+    QContextMenuEvent contextMenuEvent(QContextMenuEvent::Mouse, widgetPos, globalPos, mEvent.modifiers());
+    qt_sendSpontaneousEvent(alienWidget, &contextMenuEvent);
 #endif     
     
     m_previousEventLongTap = true;
diff --git a/src/gui/styles/images/defaults60theme.blob b/src/gui/styles/images/defaults60theme.blob
new file mode 100644
index 0000000..f3a5952
--- /dev/null
+++ b/src/gui/styles/images/defaults60theme.blob
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 12d4948..3230c17 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2732,6 +2732,8 @@ bool QS60Style::event(QEvent *e)
     default:
         break;
     }
+#else
+    Q_UNUSED(e)
 #endif
     return false;
 }
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 350ef51..2d185bd 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -366,8 +366,7 @@ QFont QS60StylePrivate::s60Font_specific(QS60StyleEnums::FontCategories fontCate
 QS60Style::QS60Style()
     : QCommonStyle(*new QS60StylePrivate)
 {
-    // Assume, that the resource system has a ':/s60Stylethemes/Default.blob'
-    const QString defaultBlob = QString::fromLatin1(":/s60Stylethemes/Default.blob");
+    const QString defaultBlob = QString::fromLatin1(":/trolltech/styles/s60style/images/defaults60theme.blob");
     if (QFile::exists(defaultBlob))
         loadS60ThemeFromBlob(defaultBlob);
 }
diff --git a/src/gui/styles/qstyle_s60_simulated.qrc b/src/gui/styles/qstyle_s60_simulated.qrc
index 72aab9e..969732e 100644
--- a/src/gui/styles/qstyle_s60_simulated.qrc
+++ b/src/gui/styles/qstyle_s60_simulated.qrc
@@ -1,6 +1,6 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
     <qresource prefix="/trolltech/styles/s60style">
-        <file>images/s60themes.dat</file>
+        <file>images/defaults60theme.blob</file>
     </qresource>
 </RCC>
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index 70ac6cb..767ade0 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -168,11 +168,10 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) {
 	SOURCES += styles/qs60style.cpp
 	symbian {
 		SOURCES += styles/qs60style_s60.cpp
-		# TODO: fix the following LIBS hack. Line 1 is for armv5, 2 for winscw
-		LIBS += aknicon aknskins aknskinsrv fontutils
 		LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
 	} else {
 		SOURCES += styles/qs60style_simulated.cpp
+		RESOURCES += styles/qstyle_s60_simulated.qrc
 	}
 } else {
 	DEFINES += QT_NO_STYLE_S60