summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Don't use EGL surfaces for translucency with 32MB GPU chip.Jani Hautakangas2011-03-103-7/+37
| | | | | | | | | | | Add dynamic GPU chip detection on Symbian to decide if translucent EGL surfaces can be used. With 32MB GPU memory there is not enough memory to create for example transparent video overlay widgets and that's why hw surfaces must not be used. Task-number: QTBUG-18024 Reviewed-by: Jason Barron
* Added missing ifdefs to allow compilation on older Symbian versions.Laszlo Agocs2011-03-092-1/+5
| | | | Reviewed-by: TRUSTME
* Multiple screen support for Symbian in QDeskopWidget.Laszlo Agocs2011-03-096-42/+279
| | | | | | | | | | | | | | | When using TV-out, the TV display can be used as an independent screen. By default the content shown there is a clone of the device screen, however from now on parenting a widget to QDesktopWidget::screen(1) and calling show() will turn off cloning and have the widget shown instead. screenCount() and the screenCountChanged signal can be used to detect the availability of the secondary display, just like on other platforms. Task-number: QT-830 Reviewed-by: Sami Merila Reviewed-by: Jani Hautakangas
* Support partial input modeSami Merila2011-03-082-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | By default Symbian devices use fullscreen editing mode. However, in the latest AVKON releases a partial virtual keyboard is supported. Support the non-fullscreen editing mode from QCoeFepInputContext. The non-fullscreen editing mode is only supported for Symbian^3 and only for graphicsview-based solutions (QGraphicsView, QGraphicsWebView, QDeclarativeView, ...). When native side indicates that the keyboard opens, the graphicsview is possibly translated so that the text cursor position is ensured to be visible. When keyboard closes, the translation is removed. If the graphicsview contains vertical scrollbar, the whole view is resized to the area above the keyboard, since translating it, would move the upper part of the scrollbar out of screen area. There is a new exported private API to control when partial vkb is used. Task-number: QTBUG-16572 Reviewed-by: axis Reviewed-by: Mrudul Pendharkar Reviewed-by: Laszlo Agocs
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-231-6/+6
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
| * Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTSJani Hautakangas2011-02-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | This patch replaces the usage of old flag with new flags which indicate availability of EGL surface transparency SYMBIAN_GRAPHICS_SET_SURFACE_TRANSPARENCY_AVAILABLE and availability of Symbian trasition effects API support SYMBIAN_GRAPHICS_TRANSITION_EFFECTS_SIGNALING_AVAILABE. Task-number: QTBUG-16822 Reviewed-by: Jason Barron
* | Cocoa: Sheets looses focus when moving parent windowRichard Moe Gustavsen2011-02-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | The reason seems to be that we need to be more careful what we answer when cocoa ask us if a sheet should get main window status, and if the parent window should get key status. So we add in two extra checks so we can return the correct answer. Task-number: QTBUG-15474 Reviewed-by: msorvig
* | Cocoa: fix crash when using a drawer with a focus widgetRichard Moe Gustavsen2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happends when you close down an application that has a drawer that contains a widget with keyboard focus. The NSView backing this widget is then the first responder in Cocoa. This bug was a bit more hard-boiled than usual, and I can't say I truly understand whats going on. My findings are that both the drawer and the parent window both points to the same view inside the drawer as its first responder. And when deleting the drawer (togheter with the focus widget), the parent window is left pointing to a first responder that is actually deleted. Is seems that us refusing to release a view as first responder if we have no attached widget is wrong. So we choose to return YES instead, which after all makes much more sense. Task-number: QTBUG-15897 Reviewed-by: msorvig
* | Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-156-50/+80
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-152-4/+18
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix inheritance of widget input contexts.
| | * | Fix inheritance of widget input contexts.Andrew den Exter2011-02-152-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a parent widget has an input context assigned return that from QWidget::inputContext() before returning QApplication::inputContext(). Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e Task-number: QTBUG-17390 Reviewed-by: axis
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-141-1/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Worked around a SC issue in S60 3.x vs 5.0 versions. Apply the gcce link rules for LIBS_PRIVATE too. Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
| | * | Worked around a SC issue in S60 3.x vs 5.0 versions.axis2011-02-141-1/+13
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-16578 RevBy: Gareth Stockwell
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-082-31/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORS Fix the compilation error that the previous fix didn't fix Use the thread-default glib context for the DBus connection in the ICD bearer manager. Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero. Use an increasing size for the getpwuid_r buffer. Make sure we use at least 1024 bytes when calling getpwuid_r. Fix compilation error: symbol is namespaced. Don't crash when creating backtrace for built-in JS function (2nd try) Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" QtDBus: do not wait for reply for AddMatch and RemoveMatch Make qdbus show all types, even those that it doesn't know about Doc: Fix the docs saying what the locale codec is used for Autotest: simple improvements Autotest: Use QElapsedTimer for timings directfb: Pixmap creation always premultiplied the alpha even when it is already premultiplied in the image. Don't crash when BMP color table is broken Designer: Fix a crash in the Signal-Slot-Editor. complain about unmatched quotes/parens use const ref move multiple inclusion check for feature files to correct location ...
| | * | | Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero.Thiago Macieira2011-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX allows this symbol to be defined to -1 to indicate that the interfaces aren't present. On FreeBSD 8, it's defined to -1, but the functions are present (supposedly, they don't work -- just stubs). Guessing that OpenBSD is the same. Also removing the QT_NO_THREAD, since Qt can't be built without threading support. It's only used by our bootstrapped tools, which in turn use QCoreApplication only (no QApplication). Reviewed-By: Bradley T. Hughes
| | * | | Use an increasing size for the getpwuid_r buffer.Thiago Macieira2011-02-081-1/+12
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Bradley T. Hughes
| | * | | Make sure we use at least 1024 bytes when calling getpwuid_r.Thiago Macieira2011-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some systems, sysconf may return -1 to indicate that there's no such limit (limitless), so don't create a buffer of size -1. Reviewed-by: Bradley T. Hughes
| | * | | Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Denis Dzyubenko2011-02-071-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduced regressions with some window managers (for example with metacity when you maximize the window) This reverts commit cdd776a91e65bf5c30cea1bab9823134a3f797d0.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-082-15/+36
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed compilerwarnings regression in public headers. Fix duplicate definition error Fix namespace error Fix the broken QPixmap::fromSymbianRSgImage(). Fix native child window Symbian decoration handling. Fixed "not a valid preprocessing token" on GCCE. Avoided the Linux version of the --no-undefined switch. Added missing edllstub.lib for GCCE. symbian/linux-gcce: Use -u _E32Dll when linking DLLs Revert "Implement Symbian support for enable_backup CONFIG value" Implement Symbian support for enable_backup CONFIG value Fix deployment issues with networkselftest Fix random crashes when bearer suddenly goes down Fixed a bug where the softkeys would leave a see-through "hole".
| | * | | Fix native child window Symbian decoration handling.Jani Hautakangas2011-02-062-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resizing native child window like QVideoWidget caused S60 cba and status pane to appear. Task-number: QTBUG-17040 Reviewed-by: Gareth Stockwell
| | * | | Fixed a bug where the softkeys would leave a see-through "hole".axis2011-02-041-0/+13
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where the widget was created from the event loop instead of main(), the middle three softkeys would not get the right visibility and would leave a "hole" in the application where one could see what was beneath it. It could also be clicked, which would bring the app to the background which was really annoying. Fixed by setting the visibility manually upon creation. It should still be possible to alter the visibility of the toolbar manually after the widget creation, if someone requires that. Task: QTBUG-16578 RevBy: Gareth Stockwell AutoTest: N/A, but tested with various combinations of fullscreen, non-fullscreen and softkey visibility modes. No regressions.
* | | | Merge branch '4.7-upstream' into 4.7Gabriel de Dietrich2011-02-084-7/+12
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-042-4/+4
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-312-4/+4
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-281-0/+6
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-265-23/+69
| | | |\ \
| | | * | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | | | | |
| | | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13190-215/+229
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | | * | | | Doc: Changed description to prevent confusion about managed widgets.David Boddie2011-01-101-3/+3
| | | | | | |
| * | | | | | Carefull free the data from XGetWindowProperty on X11.Denis Dzyubenko2011-02-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we free the data correctly in case of error. Task-number: QTBUG-16616 Patch-by: Juuso Pakarinen Reviewed-by: Ritt Konstantin
| * | | | | | Fixes memory leaks in QX11EmbedDenis Dzyubenko2011-02-021-2/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should XFree the values returned from XGetWindowProperty. Task-number: QTBUG-16597 Reviewed-by: Ritt Konstantin
* | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2011-02-016-20/+109
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Orientation control implementation for Symbianmread2011-01-272-0/+42
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This used the orientation control QWidget attributes API from maemo5, and provides a simple implementation for Symbian. The essense of the implementation is that the latest setting of one of these QWidget orientation attributes will set the orientation for the whole app. Testing the attributes will return only the last attribute set, it will not return the app orientation state. A new task, QTBUG-16972, has been created to provide a more comprehensive implementation in the future. This may provide a more effective emulation of the maemo5 behaviour, or may incorporate further reaching concepts for QML rotations. Task-number: QTBUG-11785 Reviewed-by: Shane Kearns
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-261-0/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix: define hotSpot for Gestures on Mac Fix warnings in PSQL driver: handle VersionUnknown in switch Fix warning in ODBC driver: passing NULL to non-pointer. QNAM FTP: switch to binary mode before sending a SIZE command Change the D-Bus signal filter to return NOT_YET_HANDLED for signals Check if the interpolators have already been deleted. Improve timer ID safety by using a serial counter per ID.
| | * | | Fix: define hotSpot for Gestures on MacZeno Albisser2011-01-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no hotSpot defined for a gesture it cannot be propagated propperly within GraphicsView. Task-number: QTBUG-16618 Reviewed-by: Denis Dzyubenko
| * | | | Add util/xkbdatagen/READMEOlivier Goffart2011-01-261-0/+1
| |/ / / | | | | | | | | | | | | Reviewed-by: Joao
| * | | Improved performance of mapFromGlobal/mapToGlobal on X11Denis Dzyubenko2011-01-251-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't call XTranslateCoordinates anymore, but use the toplevel window offset that we already store to convert between screen coordinates and widget coordinates. Reviewed-by: João Abecasis
| * | | Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivateDenis Dzyubenko2011-01-252-20/+32
| | | | | | | | | | | | | | | | Reviewed-by: João Abecasis
* | | | Plug memory leak when using qt_mac_set_dock_menu() on CocoaAndy Shaw2011-01-261-0/+1
|/ / / | | | | | | | | | | | | Task-number: QTBUG-16918 Reviewed-by: Richard Moe Gustavsen
* | | Supporting Qt application fonts on SymbianAlessandro Portale2011-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch finally implements the missing application font support on Symbian. QFontDatabase's addApplicationFont[FromData], applicationFontFamilies and removeApplicationFont are now functional and allow an application to load, use and unload fonts at run-time. The underlying Symbian API comes with some restrictions/specialties. Most of them are worked around in this patch, the missing ones are left as part of QTBUG-16514: - The font file must be a file, not a memory buffer. Web fonts and qrc fonts come as memory buffers. These buffers are saved to a temporary .ttf file and the file is loaded by the underlying Symbian API. The temporary file can only be deleted after the font is unloaded. - The font file must be in a public location in order to be loadable by Symbian. It can for example not reside in the private application directory. Therefore, all application fonts (also those that are on the file system) become a temporary .ttf file in c:\temp\. - Symbian3/PR2 will come with a font table API which provides direct access to font tables. Symbian3/PR1 and below are missing this API, therefore, an own TFontStore is (ab)used to read font tables out of a font. This patch is considering both code paths in several occasions, making the Qt Symbian font implementation significantly less maintainable. - The fonts are loaded into Symbian's central font server. Loaded fonts from different processes can have colliding font typeface names (not file names) on that server. The server does not separate loaded fonts by their origin processes. Working around such collisions is part of QTBUG-16514. The number of fonts loadable at the same time by a Qt application is limited to the random value 5. Just to prevent abuse of the font server's memory. As usual, this patch was looked at by colleagues, and it was adjusted according to the feedback. But since the bus factor for the interaction of Qt's and Symbian's font systems is 1, I reviewed this patch, myself. Task-Number: QTBUG-6611 Autotest: tst_QFontDatabase::addAppFont
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-171-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix one character displacement for cursor in line edits Fix header not found build error QTBUG-16110 updating the softkeys when app comes to foreground Workaround crash when multiple QNetworkAccessManager instances are used
| * | | QTBUG-16110 updating the softkeys when app comes to foregroundmread2011-01-171-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When an app is in the background and creates a window with softkeys, the softkeys are not updated when the app comes to the foreground, so they look faded. This change updates the softkeys when the app comes to the forground. Task-number: QTBUG-16110 Reviewed-by: Jason Barron
* | | Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
|/ / | | | | | | | | | | | | | | Fix an issue where the double click would be triggered even with different mouse buttons. Task-number: QTBUG-8222 Reviewed-by: Richard Moe Gustavsen
* | Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-111-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Symbian application is launched using RApaLsSession::StartApp, command line parameters can be given with CApaCommandLine::SetTailEndL and will now be correctly interpreted by Qt applications as command line parameters. There are a couple of limitations: 1) The parameters given with CApaCommandLine::SetTailEndL will not be available in main method's argv array; they can be accessed via QCoreApplication::arguments function. 2) CApaCommandLine::SetTailEndL does support any arbitrary binary data as parameter, but only 8-bit string data gets parsed properly into QCoreApplication::arguments. For other kind of tail data, you need to subclass QS60MainAppUi and implement ProcessCommandParametersL callback. Task-number: QTBUG-15987 Reviewed-by: axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-10190-190/+190
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFont/Windows: restrict the pixel size accuracy Update copyright year to 2011. For non-developer builds, skip test that requires private API tst_qhttpnetworkconnection: Compile fix Change QHostInfoCache to use QElapsedTime instead of QTime. Fix for qtdemo bug
| * | Update copyright year to 2011.Jason McDonald2011-01-10190-190/+190
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-101-0/+8
|/ / | | | | | | | | | | | | | | | | | | Currently Symbian doesn't support semi-transparent EGL surfaces. WA_TranslucentBackground attribute is ineffective if set after EGL surface creation. To enable translucency in this case we need to recreate backing store to get raster surface which supports translucency. Task-number: QT-4416 Reviewed-by: Jason Barron
* | Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-071-2/+2
|\ \
| * \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-161-2/+4
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-161-3/+3
| |\ \