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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
  Fix compilation with symbian-armcc
  Updated Russian translation
  Ukrainian translation updated
  Fix wrong merge of 3aa39b0164ce4bb9e
  Symbol table is very limited in numeric input mode
  Fix build of Qt/DirectFB without graphics view support.
  Add new QSysInfo::symbianVersion() enums
  QDesktopServices::openUrl() doesn't handle URL encodings correctly
  Build fix for transition effect support on S60 5.0.
  Make EGL surface transparency working on Symbian.
  QmlDebug: Fix license headers in new ost plugin
  Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
  Resolve unqualified attached properties correctly
  Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
  QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
  QDeclarativeDebug: Don't crash when connection is closed
  Splitview flag should also be updated to inputcontext
  QGraphicsView with vertical scrollbar flickers when splitview opens
  Splitview: opening a context menu should not re-position of focusItem
  Trigger fullscreen transition effects properly on app exit.
  ...

1 files changed, 191 insertions, 0 deletions

diff --git a/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h b/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h
new file mode 100644
index 0000000..48ff7bf
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h
@@ -0,0 +1,191 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef USBHOSTCOMM_H
+#define USBHOSTCOMM_H
+
+// Based on the official usbostrouter header, modified to remove dependancy on
+// the client DLL
+
+#include <e32base.h>
+
+typedef int TOstProtIds;
+
+class RUsbOstComm : public RSessionBase
+{
+public:
+    RUsbOstComm();
+    TInt Connect();
+    TInt Disconnect();
+    TInt Open();
+    TInt Close();
+    TInt RegisterProtocolID(TOstProtIds aId, TBool aNeedHeader);
+    void ReadMessage(TRequestStatus& aStatus, TDes8& aDes);
+    TInt ReadCancel();
+    void WriteMessage(TRequestStatus& aStatus, const TDesC8& aDes, TBool aHasHeader=EFalse);
+    TVersion Version() const;
+
+private:
+    enum TUsbOstCmdCode
+    {
+        EUsbOstCmdCodeFirst,
+        EUsbOstCmdConnect,
+        EUsbOstCmdDisconnect,
+        EUsbOstCmdCodeGetAcmConfig,
+        EUsbOstCmdCodeSetAcmConfig,
+        EUsbOstCmdCodeOpen,
+        EUsbOstCmdCodeClose,
+        EUsbOstCmdCodeRegisterId,
+        EUsbOstCmdCodeRegisterIds,
+        EUsbOstCmdCodeUnRegisterId,
+        EUsbOstCmdCodeUnRegisterIds,
+        EUsbOstCmdCodeReadMsg,
+        EUsbOstCmdCodeReadCancel,
+        EUsbOstCmdCodeWriteMsg,
+        EUsbOstCmdCodeWriteCancel,
+        EUsbOstCmdCodeLast
+    };
+};
+
+RUsbOstComm::RUsbOstComm()
+{
+}
+
+TInt RUsbOstComm::Connect()
+{
+    _LIT(KUsbOstServerName, "!UsbOstRouter");
+    _LIT(KUsbOstServerImageName, "usbostrouter");
+    const TUid KUsbOstServerUid = { 0x200170BE };
+    TInt startupAttempts = 2;
+    for(;;) {
+        TInt ret = CreateSession(KUsbOstServerName, TVersion(1,0,0));
+        if (ret != KErrNotFound && ret != KErrServerTerminated) {
+            return ret;
+        }
+
+        if (startupAttempts-- == 0) {
+            return ret;
+        }
+
+        RProcess server;
+        ret = server.Create(KUsbOstServerImageName, KNullDesC, KUsbOstServerUid);
+        if (ret != KErrNone)
+            return ret;
+
+        TRequestStatus serverDiedRequestStatus;
+        server.Rendezvous(serverDiedRequestStatus);
+
+        if (serverDiedRequestStatus != KRequestPending) {
+            // Abort startup
+            server.Kill(KErrNone);
+        } else {
+            // Logon OK - start the server
+            server.Resume();
+        }
+        User::WaitForRequest(serverDiedRequestStatus);
+        ret = (server.ExitType() == EExitPanic) ? KErrGeneral : serverDiedRequestStatus.Int();
+        server.Close();
+
+        if (ret != KErrNone && ret != KErrAlreadyExists) {
+            return ret;
+        }
+    }
+}
+
+TInt RUsbOstComm::Disconnect()
+{
+    return SendReceive(EUsbOstCmdDisconnect);
+}
+
+TInt RUsbOstComm::Open()
+{
+    return SendReceive(EUsbOstCmdCodeOpen);
+}
+
+TInt RUsbOstComm::Close()
+{
+    TInt err = SendReceive(EUsbOstCmdCodeClose);
+    RHandleBase::Close();
+    return err;
+}
+
+TInt RUsbOstComm::RegisterProtocolID(const TOstProtIds aId, TBool aNeedHeader)
+{
+    TIpcArgs args(aId, aNeedHeader);
+    return SendReceive(EUsbOstCmdCodeRegisterId, args);
+}
+
+void RUsbOstComm::ReadMessage(TRequestStatus& aStatus, TDes8& aDes)
+{
+    TIpcArgs args(aDes.MaxLength(), &aDes);
+    SendReceive(EUsbOstCmdCodeReadMsg, args, aStatus);
+}
+
+TInt RUsbOstComm::ReadCancel()
+{
+    return SendReceive(EUsbOstCmdCodeReadCancel);
+}
+
+void RUsbOstComm::WriteMessage(TRequestStatus& aStatus, const TDesC8& aDes, TBool aHasHeader)
+{
+    TIpcArgs args(aHasHeader, aDes.Length(), &aDes);
+    SendReceive(EUsbOstCmdCodeWriteMsg, args, aStatus);
+}
+
+typedef TVersion (*TVersionFunction)(const RUsbOstComm*);
+const TInt KVersionOrdinal = 17;
+
+TVersion RUsbOstComm::Version() const
+{
+    // This function has to go to the DLL, unfortunately
+    TVersion result; // Return 0.0.0 on any error
+    RLibrary lib;
+    TInt err = lib.Load(_L("usbostcomm"));
+    if (err) return result;
+
+    TLibraryFunction fn = lib.Lookup(KVersionOrdinal);
+    if (fn)
+        result = ((TVersionFunction)fn)(this);
+    lib.Close();
+    return result;
+}
+
+#endif //USBHOSTCOMM_H