summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-20258-4397/+4399
|\
| * Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-191-1/+3
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-05-181-1/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range Fix crashes with regular expressions QtScript on ARM traditional architectures
| | | * Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ↵Simon Hausmann2011-05-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASCII range Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a) and unicode overline (0x203e). ICU and (as it turns out) Symbian's native Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode. Qt's behaviour creates a problem when loading japanese web sites that are encoded in Shift-JIS. When they reference external JavaScript files, those tend to inherit the current page encoding (unless the character set is explicitly specified). Consequently JavaScript tends to contain regular expressions (as a built-in feature of the language), which in turn uses backslashes for escape sequences. Therefore it is crucial that the encodings used to decode the script preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to something else. This patch corrects the behaviour of Qt's Shift-JIS codec to leave all characters < 0x80 unaltered in the process of conversion to and from Unicode. Task: QTBUG-19335 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-183-4/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13458-7827/+7827
| | |/ | |/| | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-17201-3433/+3433
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17198-3380/+3380
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | * | Update licenseheader text in source filesJyri Tahtela2011-05-13198-3380/+3380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-05-161-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in meego graphics system runtime switching.
| | * | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch when the last _visible_ widget is destroyed (and also switch back when a widget is mapped and there are no other visible widgets). Reviewed-by: Armin Berres
* | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1680-24/+6857
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-1265-5/+6490
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlDebug: Fix QmlOstPlugin compilation failure QmlDebug: Fix QmlOstPlugin compilation failure Enable performance monitoring at application startup. Augment documentation QmlDebugger: removing slots in Live Preview QmlDebugger: adding slots to items in Live Preview Fixed license header Fixed compile on Windows Added forgotten file qdeclarativeobserverinterface_p.h Removed some trailing whitespace Introduced a CONFIG option that enables declarative debug services Moved the QML Observer Service and related functionality into Qt QDeclarativeDebugServer: Send hello answer before any service messages Removed some superfluous semicolons
| | * | | | QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix signature of waitForMessage. Reviewed-by: Tom Sutcliffe
| | * | | | QmlDebug: Fix QmlOstPlugin compilation failureTom Sutcliffe2011-05-114-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement waitForMessage()/waitForReadyRead functionality required by bde58ad1e7d2b38d. Reviewed-by: kkoehne
| | * | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-10139-1341/+6255
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qdeclarativedebugserver.cpp src/plugins/qmltooling/qmltooling.pro
| | * | | | | Enable performance monitoring at application startup.Kai Koehne2011-05-102-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser (cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)
| | * | | | | Fixed license headerThorbjørn Lindeijer2011-05-051-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | File added in 35faeb205843c4f0b921d2b878d2d24962c64664
| | * | | | | Fixed compile on WindowsThorbjørn Lindeijer2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This compiled fine on Linux, but on Windows the project root is not automatically included in the INCLUDEPATH. Use the correct relative path to make the include work. Problem introduced with 35faeb205843c4f0b921d2b878d2d24962c64664
| | * | | | | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-0461-2/+6417
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was previously developed as part of Qt Creator in share/qtcreator/qml/qmljsdebugger/ Moving it into Qt will allow us to simplify the setup required before you can debug QML applications. To avoid adding too much weight to the QtDeclarative module, a declarativeobserver plugin was introduced that contains the QDeclarativeViewObserver and related classes. The QDeclarativeObserverService is just a stub service that loads this plugin once a QML debugging client connects. The plugin implements the QDeclarativeObserverInterface A QJSDebugService was separated out of QJSDebuggerAgent, so that the service can be active while the agent is instantiated lazily. Each QDeclarativeEngine adds itself to the QJSDebugService. Currently only the first one is used when instantiating the agent. QDeclarativeObserverService is hooked into QDeclarativeView, with the view registering itself to the service, allowing the QDeclarativeViewObserver to be created for the view once somebody connects to the service. Again, only the first view is used at the moment. Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90 Reviewed-by: Martin Jones Reviewed-by: Michael Brasser
| * | | | | | Remove not supported qmake apiJørgen Lind2011-05-093-6/+0
| | | | | | |
| * | | | | | Added Wayland selection support.Laszlo Agocs2011-05-095-0/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Messed up when I cherry-picked eb0c2e7229bb3559e6f8754122b298479407c153
| * | | | | | Added Wayland selection support.Laszlo Agocs2011-05-096-3/+24
| | | | | | |
| * | | | | | Add the wayland client libraries to rpath if we use rpathJørgen Lind2011-05-091-0/+4
| | | | | | |
| * | | | | | Fix the wayland windowsurface so that we have stencil and depth bufferJørgen Lind2011-05-091-1/+1
| | | | | | |
| * | | | | | Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
| | | | | | |
| * | | | | | Lighthouse: Fix up XlibJørgen Lind2011-05-055-14/+10
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/4.8' into lighthouse-masterJørgen Lind2011-05-043-21/+35
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-113-4/+20
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_p.h src/gui/painting/qgraphicssystem_p.h src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/phononu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtTestu.def
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-102-2/+18
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QtCoreu.def file error Introduce platform extension to QGraphicsSystem Update changes for 4.7.3 Show softkeys when opening a dialog that has a fullscreen parent. QSslCertificate: report fraudulent certificates as invalid QSslCertificate: fix test for blacklisted certs on Windows QSslSocket internals: abort on encountering blacklisted certificates QSslSocket: add test for blacklisted certificates Changes for 4.7.3 Fix for wrong dpi metrics for raster pixmaps on Symbian. Fix qgraphicstransform autotest for Symbian, where qreal is float. QS60Style: QTreeView::indexRowSizeHint returns incorrect value QDeclarativeDebug: Export needed symbols on Symbian Bump Qt version to 4.7.3 Fix QTBUG-17627: build break in mobility bearer applications Fix for major regression in OpenVG clipping Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
| | * | | | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-2/+18
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt on Symbian needs some special capabilities to be able to work on 32MB GPU. This patch introduces some Symbian specific functions to QGraphicsSystem Task-number: QTBUG-17882 Reviewed-by: Laszlo Agocs
| * | | | | Fix -no-guiBernhard Rosenkraenzer2011-05-091-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -no-gui still tried to build the graphicssystem and inputmethod plugins, both of which require QtGui Merge-request: 1215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-05-0425-123/+310
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: Remove warnings Fix Wayland plugin so it works with the wayland bind api wayland: Track wayland changes Support GL ES 2 with uikit. Lighthouse: Fix virtual desktopwidget Added missing function in QWaylandWindow. wayland: Drop a debug qWarning() wayland: Discard motion and button events receive with a NULL pointer focus wayland: Include eglconvenience.pri instead of pulling in individual file wayland: Remove unused EGLConfig field wayland: Add native access interface for Wayland plugin Compile fix for QPA's session manager. Fixes compilation of wayland plugin after latest changes in wayland.
| * | | Remove warningsJørgen Lind2011-05-031-0/+1
| | | |
| * | | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-035-50/+26
| | | | | | | | | | | | | | | | | | | | This is mostly for the xcomposite api, but also we needed to readEvents after doing a connect
| * | | wayland: Track wayland changesKristian Høgsberg2011-04-285-21/+12
| | | | | | | | | | | | | | | | | | | | Pass version number when creating proxies, use wl_ prefix when looking up interfaces and drop wl_egl_display.
| * | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-2814-164/+868
| |\ \ \
| * | | | Support GL ES 2 with uikit.con2011-04-276-43/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For GL ES 2 teach the paint device about the fact that it is doing rendering backed by a framebuffer object, not a system framebuffer (which doesn't exist).
| * | | | Added missing function in QWaylandWindow.Samuel Rødal2011-04-191-0/+3
| | | | |
| * | | | wayland: Drop a debug qWarning()Kristian Høgsberg2011-04-191-3/+0
| | | | |
| * | | | wayland: Discard motion and button events receive with a NULL pointer focusKristian Høgsberg2011-04-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we destroy a surface we NULL out mPointerFocus and mKeyboardFocus pointers, but the server may still send a few events out before it receives the destroy request. Discard such events.
| * | | | wayland: Include eglconvenience.pri instead of pulling in individual fileKristian Høgsberg2011-04-191-5/+4
| | | | |
| * | | | wayland: Remove unused EGLConfig fieldKristian Høgsberg2011-04-191-1/+0
| | | | |
| * | | | wayland: Add native access interface for Wayland pluginKristian Høgsberg2011-04-195-0/+144
| | | | |
| * | | | Fixes compilation of wayland plugin after latest changes in wayland.Samuel Rødal2011-04-181-0/+1
| | | | |
* | | | | Merge branch '4.8-upstream'Thierry Bastian2011-04-2814-164/+868
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix endless loop for property with SCRITABLE false Fix Symbian/Linux compilation breakage in plugins/qmltooling Make QMLViewer startup animation stop after a while Fix excessive scrolling in TextInput with mid string pre-edit text.
| | | * | | Fix Symbian/Linux compilation breakage in plugins/qmltoolingKai Koehne2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use QIODevice header file instead of (wrongly capitablized) QIODevice.h Reviewed-by: Tom Sutcliffe Task-number: QTBUG-18869
| * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-2011-8/+706
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
generated by cgit v0.12 at 2024-10-30 22:08:05 (GMT)