I have made the following changes intended for : CE:Apps / mobilebrowser Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/3287 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3287: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-11-29T09:31:24 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: home:vesku:branches:CE:Apps / mobilebrowser -> CE:Apps / mobilebrowser changes files: -------------- --- mobilebrowser.changes +++ mobilebrowser.changes @@ -0,0 +1,5 @@ +* Mon Oct 28 2011 Vesa-Matti Hartikainen <[email protected]> - 1.0.0.1 +- Fix for NEMO#6 https sites do not work in the browser +-- added dependency to ca-certificates +- Renamed Fix_GITHUB#18_Browser_orientation.patch + old: ---- Fix_GITHUB#18_Browser_orientation.patch Makefile new: ---- Fix_GITHUB_18_Browser_orientation.patch spec files: ----------- --- mobilebrowser.spec +++ mobilebrowser.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.23 # # >> macros # << macros @@ -16,7 +16,8 @@ Source1: mobilebrowser.desktop Source100: mobilebrowser.yaml Patch0: 0001-fixed-install-path-for-meego.patch -Patch1: Fix_GITHUB#18_Browser_orientation.patch +Patch1: Fix_GITHUB_18_Browser_orientation.patch +Requires: ca-certificates BuildRequires: pkgconfig(QtCore) >= 4.6.0 BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtWebKit) @@ -35,7 +36,7 @@ # 0001-fixed-install-path-for-meego.patch %patch0 -p1 -# Fix_GITHUB#18_Browser_orientation.patch +# Fix_GITHUB_18_Browser_orientation.patch %patch1 -p1 # >> setup # << setup other changes: -------------- ++++++ Fix_GITHUB_18_Browser_orientation.patch (new) --- Fix_GITHUB_18_Browser_orientation.patch +++ Fix_GITHUB_18_Browser_orientation.patch @@ -0,0 +1,132 @@ +diff --git a/src/OrientationFollower.cpp b/src/OrientationFollower.cpp +index 0204615..8080c19 100644 +--- a/src/OrientationFollower.cpp ++++ b/src/OrientationFollower.cpp +@@ -1,7 +1,7 @@ + #include "OrientationFollower.h" +-#include "qorientationsensor.h" + #include <QApplication> + #include <QInputContext> ++#include <contextproperty.h> + + OrientationFollower::OrientationFollower(QObject *parent) : + QObject(parent), m_state("Landscape") +@@ -9,14 +9,14 @@ OrientationFollower::OrientationFollower(QObject *parent) : + + // We do not follow orientation on Maemo5 as platform does the orientation change + #if !defined(Q_WS_MAEMO_5) +- m_sensor = new QtMobility::QOrientationSensor(this); +- connect(m_sensor, SIGNAL(readingChanged()), SLOT(onReadingChanged())); +- m_sensor->start(); ++ topEdge = new ContextProperty("Screen.TopEdge"); ++ QObject::connect(topEdge, SIGNAL(valueChanged()), ++ this, SLOT(onReadingChanged())); + #endif + } + + OrientationFollower::~OrientationFollower() { +- delete m_sensor; ++ delete topEdge; + } + + void OrientationFollower::update() { +@@ -32,42 +32,19 @@ enum OrientationAngle { Angle0=0, Angle90=90, Angle180=180, Angle270=270 }; + + void OrientationFollower::onReadingChanged() + { +- QtMobility::QOrientationReading* reading = m_sensor->reading(); +- M::OrientationAngle mtfOrient = M::Angle0; +- +- switch(reading->orientation()) +- { +- case QtMobility::QOrientationReading::TopUp: ++ if(topEdge->value()== "left") { + m_state = "Portrait"; +- mtfOrient=M::Angle270; + + emit orientationChanged(); +- break; +- case QtMobility::QOrientationReading::TopDown: +- m_state = "PortaitInverted"; +- mtfOrient=M::Angle90; ++ } else if(topEdge->value()== "right") { ++ m_state = "PortraitInverted"; + + emit orientationChanged(); +- break; +- case QtMobility::QOrientationReading::LeftUp: ++ } else if(topEdge->value()== "bottom") { + m_state = "LandscapeInverted"; + emit orientationChanged(); +- mtfOrient=M::Angle180; +- +- break; +- case QtMobility::QOrientationReading::RightUp: ++ } else if(topEdge->value()== "top") { + m_state = "Landscape"; + emit orientationChanged(); +- mtfOrient=M::Angle0; +- +- default: +- break; + } +- +- // We then update to VKB what is the current orientation +- QInputContext* context = qApp->inputContext(); +- QMetaObject::invokeMethod(context, +- "notifyOrientationChanged", +- Q_ARG(M::OrientationAngle, mtfOrient)); +- + } +diff --git a/src/OrientationFollower.h b/src/OrientationFollower.h +index f683ce9..c99eb14 100644 +--- a/src/OrientationFollower.h ++++ b/src/OrientationFollower.h +@@ -2,7 +2,8 @@ + #define ORIENTATIONFOLLOWER_H + + #include <QString> +-#include "qorientationsensor.h" ++#include <contextproperty.h> ++ + + class OrientationFollower : public QObject + { +@@ -23,7 +24,7 @@ private slots: + + private: + QString m_state; +- QtMobility::QOrientationSensor* m_sensor; ++ ContextProperty *topEdge; + + }; + +diff --git a/src/src.pro b/src/src.pro +index c380eb7..42fbcde 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -33,6 +33,7 @@ HEADERS += buildconfig.h \ + Logbook.h \ + LogbookLinkItems.h \ + FaviconImageProvider.h ++INCLUDEPATH+="/usr/include/contextsubscriber" + + # Used to see the QML files in the Project view of "Qt Creator" + OTHER_FILES += qmls/BrowserView.qml \ +@@ -80,12 +81,9 @@ include(maemo5/maemo5.pri) + + # TODO + # This should be made an optional feature +-# but for now this changes the build to require qt mobility for orientation tracking + SOURCES+=OrientationFollower.cpp + HEADERS+=OrientationFollower.h +-CONFIG+= mobility +-MOBILITY+=sensors +- ++LIBS+=-lcontextsubscriber + + debug { + message(Building in DEBUG mode) +-- +1.7.0.4 + ++++++ mobilebrowser.yaml --- mobilebrowser.yaml +++ mobilebrowser.yaml @@ -11,7 +11,7 @@ Patches: - 0001-fixed-install-path-for-meego.patch - - Fix_GITHUB#18_Browser_orientation.patch + - Fix_GITHUB_18_Browser_orientation.patch Description: Mobile Web Browser PkgConfigBR: - QtCore >= 4.6.0 @@ -19,8 +19,8 @@ - QtWebKit - QtOpenGL - contextsubscriber-1.0 >= 0.5.25 - - +Requires: + - ca-certificates Configure: none Builder: qmake Files: ++++++ deleted files: --- Fix_GITHUB#18_Browser_orientation.patch --- Makefile
