Now qs60style does not send extra resize event in orientation change.

QSymbianControl::HandleResourceChange contained global event handling.
So Qt handled same issues unnecessarily (for each shown top level
widget). Now this global event handling is encapsulated to
s60ResourceChange (new method) called by s60main. In addition,
qs60style generated unnecessary resize events. If widget was
fullscreen or maximized, then this caused incorrect resize events
(old size delivered). With these changes, qs60style just informs
widgets of style change (similarly as in qstylesheetstyle).

Task-number: 251085
Reviewed-by: Jason Barron <jason.barron@nokia.com>

Conflicts:

	src/gui/kernel/qapplication.h
	src/gui/styles/qs60style.cpp

3 files changed, 173 insertions, 1 deletions

diff --git a/tests/auto/symbian/orientationchange/orientationchange.pro b/tests/auto/symbian/orientationchange/orientationchange.pro
new file mode 100644
index 0000000000..d240fa1a48
--- /dev/null
+++ b/tests/auto/symbian/orientationchange/orientationchange.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+HEADERS += 
+SOURCES += tst_orientationchange.cpp
+
+symbian {   
+    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+}
diff --git a/tests/auto/symbian/orientationchange/tst_orientationchange.cpp b/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
new file mode 100644
index 0000000000..9d57ae1c96
--- /dev/null
+++ b/tests/auto/symbian/orientationchange/tst_orientationchange.cpp
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#ifdef Q_OS_SYMBIAN
+
+#include <eikenv.h>
+#include <aknappui.h>
+
+class tst_orientationchange : public QObject
+{
+    Q_OBJECT
+public:
+    tst_orientationchange(){};
+    ~tst_orientationchange(){};
+
+private slots:
+    void resizeEventOnOrientationChange();
+};
+
+class TestWidget : public QWidget
+{
+public:
+    TestWidget(QWidget *parent = 0);
+    
+    void reset();
+public:
+    void resizeEvent(QResizeEvent *event);
+    
+public:
+    QSize resizeEventSize;
+    int resizeEventCount;
+};
+
+TestWidget::TestWidget(QWidget *parent)
+: QWidget(parent)
+{
+    reset();
+}
+
+void TestWidget::reset()
+{
+    resizeEventSize = QSize();
+    resizeEventCount = 0;
+}
+
+void TestWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    
+    // Size delivered in first resize event is stored.
+    if (!resizeEventCount) 
+        resizeEventSize = event->size();
+
+    resizeEventCount++;    
+}
+
+void tst_orientationchange::resizeEventOnOrientationChange()
+{
+    // This will test that when orientation 'changes', then
+    // at most one resize event is generated.
+    
+    TestWidget *normalWidget = new TestWidget();
+    TestWidget *fullScreenWidget = new TestWidget();
+    TestWidget *maximizedWidget = new TestWidget();
+    
+    fullScreenWidget->showFullScreen();
+    maximizedWidget->showMaximized();
+    normalWidget->show();
+    
+    QCoreApplication::sendPostedEvents();
+    QCoreApplication::sendPostedEvents();
+    
+    QCOMPARE(fullScreenWidget->resizeEventCount, 1);
+    QCOMPARE(fullScreenWidget->size(), fullScreenWidget->resizeEventSize);
+    QCOMPARE(maximizedWidget->resizeEventCount, 1);
+    QCOMPARE(maximizedWidget->size(), maximizedWidget->resizeEventSize);
+    QCOMPARE(normalWidget->resizeEventCount, 1);
+    QCOMPARE(normalWidget->size(), normalWidget->resizeEventSize);
+    
+    fullScreenWidget->reset();
+    maximizedWidget->reset();
+    normalWidget->reset();
+    
+    // Assumes that Qt application is AVKON application.
+    CAknAppUi *appUi = static_cast<CAknAppUi*>(CEikonEnv::Static()->EikAppUi());
+    
+    // Determine 'opposite' orientation to the current orientation.
+    
+    CAknAppUi::TAppUiOrientation orientation = CAknAppUi::EAppUiOrientationLandscape;
+    if (fullScreenWidget->size().width() > fullScreenWidget->size().height()) {
+        orientation = CAknAppUi::EAppUiOrientationPortrait;
+    }
+    
+    TRAPD(err, appUi->SetOrientationL(orientation));
+
+    QCoreApplication::sendPostedEvents();
+    QCoreApplication::sendPostedEvents();
+
+    // setOrientationL is not guaranteed to change orientation 
+    // (if emulator configured to support just portrait or landscape, then 
+    //  setOrientationL call shouldn't do anything).
+    // So let's ensure that we do not get resize event twice.
+
+    QVERIFY(fullScreenWidget->resizeEventCount <= 1);
+    if (fullScreenWidget->resizeEventCount) {
+        QCOMPARE(fullScreenWidget->size(), fullScreenWidget->resizeEventSize);
+    }
+    QVERIFY(maximizedWidget->resizeEventCount <= 1);
+    if (fullScreenWidget->resizeEventCount) {
+        QCOMPARE(maximizedWidget->size(), maximizedWidget->resizeEventSize);
+    }
+    QCOMPARE(normalWidget->resizeEventCount, 0);
+    
+    TRAP(err, appUi->SetOrientationL(CAknAppUi::EAppUiOrientationUnspecified));
+    
+    delete normalWidget;
+    delete fullScreenWidget;
+    delete maximizedWidget;
+}
+
+QTEST_MAIN(tst_orientationchange)
+#include "tst_orientationchange.moc"
+#else
+QTEST_NOOP_MAIN
+#endif
diff --git a/tests/auto/symbian/qsymbiantests.pro b/tests/auto/symbian/qsymbiantests.pro
index 151d7ec0d6..648335ee81 100644
--- a/tests/auto/symbian/qsymbiantests.pro
+++ b/tests/auto/symbian/qsymbiantests.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = qmainexceptions
\ No newline at end of file
+SUBDIRS = qmainexceptions orientationchange
\ No newline at end of file