summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-129-24/+61
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed wrong QGroupBox check state Added base 10 to be used with QIntValidator. Mac: Fix the color of check marks in menus with stylesheet Russian translation update Don't directly access QList contents Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
| * Fixed wrong QGroupBox check stateMarkku Heikkila2011-11-112-0/+27
| | | | | | | | | | | | | | | | Handle mouserelease only if mouse is pressed in QGroupBox. Task-number: QTBUG-19170 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Added base 10 to be used with QIntValidator.Mikko Knuutila2011-11-112-1/+11
| | | | | | | | | | | | | | | | | | | | Fixes an error in QIntValidator, which occurred because locale.toInt() was missing a parameter for base value and this led it to presume wrongly that a base 8 is in use. Task-number: QTBUG-21602 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Mac: Fix the color of check marks in menus with stylesheetTero Ahola2011-11-111-3/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-16989 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * Russian translation updateSergey Belyashov2011-11-111-11/+7
| | | | | | | | | | Merge-request: 2715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Don't directly access QList contentsAlberto Mardegan2011-11-111-3/+6
| | | | | | | | | | | | | | | | | | The existing code doesn't work on 64bit machines. We must first convert the list into a QVector, which guarantees that elements are laid out correctly as an array. Merge-request: 1467 Reviewed-by: thiago
| * Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flagjahonkon2011-11-112-6/+3
| | | | | | | | | | | | | | | | | | It is not possible to select text with keyboard when specifying only Qt::TextSelectableByKeyboard flag. Task-number: QTBUG-18952 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-11-124-6/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99
| * | Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas KlingAndreas Kling2011-11-091-1/+1
| | | | | | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)
| * | Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reis Jr Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
| * | Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-091-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reis Jr dos2unix on a webkit source file (fix support for Visual Studio) webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
| * | Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99Zeno Albisser2011-11-096-51/+73
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-124-3/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd Fix warning when using QXmlInputSource with non opened QIODevice HTTP proxy engine - accept standard Connection header
| * | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a HTTP server responds with gzip-encoded empty content without defining Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd will crash because it calls zlib inflateEnd for an uninitialized stream. - Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd. - Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect PMO 279420 Task-number: QTBUG-22660 Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi> Merge-request: 1465 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * | | Fix warning when using QXmlInputSource with non opened QIODeviceShane Kearns2011-11-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setTextModeEnabled on a QIODevice that is not open generates a warning as a result of QTBUG-20905. Previously, it caused incorrect behaviour when called with true. Now only call it if the QIODevice passed in is already opened. If not open, then it is opened by the xml reader without text mode, so there is no difference in behaviour. xml autotests still pass, although this removes several QWARN messages from the qdom autotest. Task-number: QTBUG-22659 Change-Id: Ie3137e44fe776bff6371ebd008428110168717ec Reviewed-by: João Abecasis <joao.abecasis@nokia.com> (cherry picked from commit d457f148cf1efbea3db5fdc87c418cc9647e2baf)
| * | | HTTP proxy engine - accept standard Connection headerShane Kearns2011-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Proxy-Connection header is a non standard header, but is widely used so forming a de-facto standard. Some proxies use the official Connection header, so we should check for that in responses. Otherwise https connections over http proxy fail in case the proxy sends "Connection: close" with the 407 reply. Task-number: QTBUG-22177 Change-Id: If6cfa4ebb7ac9d97d65b6ddcc8257aee20ac0448 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 0ad18e18d1223b173d4a0d374b70ec08c3b22b11)
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-1110-1919/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Update supported platforms and remove commercial page. qdoc3: Replace %REPLACEME% with the correct path
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-108-1917/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Update supported platforms and remove commercial page.
| | * | | | Update supported platforms and remove commercial page.Casper van Donderen2011-11-108-1917/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The supported platforms page conatined a lot of platforms that are untested for Qt 4.8, so those are removed. The platform notes had not been updated since 2009 and were therefore severely outdated. Nokia does not provide a commercial edition of Qt anymore. A user can find the link to purchasing Qt through the Qt Developer Network at http://developer.qt.nokia.com
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-0951-1586/+2174
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (39 commits) Give better error message when using unsupported lookbehinds in QRegExp Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT Add GL_EXT_texture_format_BGRA8888 support. Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916 Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem" Correction for effectiveBoundingRect() calculation for QGraphicsItem Correct faulty 4.7->4.8 merge of Symbian def-files Missing icon in the designer documentation Fridge magnet example code snippet error qpaintdevice-qt3.html documentation errors QWebElement example missed information QSPlitter style-sheet example was invalid Errors in QSqlDriver::handle examples QGLColormap example was invalid QPointer made no mention of QWeakPointer Invalid links to http://developer.symbian.org QNetworkDiskCache documentation missed information ...
| | * | | | Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-11-0851-1586/+2174
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-312-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc3: Replace %REPLACEME% with the correct path
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamMartin Smith2011-10-31104-514/+11462
| | |\ \ \ \ \
| | * | | | | | qdoc3: Replace %REPLACEME% with the correct pathMartin Smith2011-10-312-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-22427
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-31104-514/+11462
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (61 commits) Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1" Harfbuzz shaper: kerning adjustment does not need to be modified by RTL QIODevice - disallow setTextMode when not open Symbian configuration parameter change for linux building Update changelog for Qt 4.8 Improve patch_capabilities script output. Fix possible crash in glyph cache when deleting and creating contexts Fix QtSql autotest server addresses Update SQLite version number in legal document Added Lithuanian translation of Qt. Remove idc from mingw build. Update changelog for Qt 4.8 Update changelog for Qt 4.8 Update SQLite version mentioned in licence document Doc: Fix example code Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504 Add the ability to enable various SSL bug workarounds. Fix performance regression on Mac OS X when creating/destroying QMutex Accepting predicted text using hardware keyboard replaces unwanted part Symbian Linuxification building case changes ...
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-112-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix memory leak in QCursorData Create cleanup stack in idleDetectorThread
| * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-101-0/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix memory leak in QCursorData
| | * | | | | | | | Fix memory leak in QCursorDataMiikka Heikkinen2011-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCursorData::cleanup() was never called on Symbian. Task-number: QTBUG-22643 Reviewed-by: Murray Read
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-101-0/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Create cleanup stack in idleDetectorThread
| | * | | | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-101-0/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Create cleanup stack in idleDetectorThreadhelanti2011-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix a crash problem in idleDetectorThread. idleDetectorThread implementation may use cleanup stack. The culprit is QSysInfo::symbianVersion, which is called in QMutex implementation. The first call of QSysInfo::symbianVersion uses functions with cleanup stack usage. Later calls use cached version info and do not need cleanup stack. Without this fix, if idleDetectorThread starts before version information is cached, a crash happens. Reviewed-by: mread
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QDateEdit calendar pop-up having wrong date
| * | | | | | | | | | Fix QDateEdit calendar pop-up having wrong datejahonkon2011-11-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the calendar pops up it moves the date to maximum instead of keeping the current date. Problem was caused by QCalendarPopup signalling date change to QDateTimeEdit during internal date synchronization from QDateTimeEdit to QCalendarPopup. Task-number: QTBUG-11422 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-11-111-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: fix gdb_dwarf_index.prf for applications, take two fix gdb_dwarf_index.prf for executables
| * | | | | | | | | | | fix gdb_dwarf_index.prf for applications, take twoJoerg Bornemann2011-11-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the case of an empty DESTDIR. Done-with: ossi
| * | | | | | | | | | | fix gdb_dwarf_index.prf for executablesJoerg Bornemann2011-11-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike for libraries, $(TARGET) already contains $(DESTDIR). Changing to $(DESTDIR) does break the command in that case. Reviewed-by: ossi
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-105-29/+88
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Repaint QProgressBar when minimum or maximum changed Fix QProgressBar causing timer event spam Compile fix for Mac OS X 10.7 with 10.6 sdk
| * | | | | | | | | | | Repaint QProgressBar when minimum or maximum changedTero Ahola2011-11-102-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of QProgressBar::setMinimum and setMaximum did not repaint the widget. This caused the widget to be shown incorrectly in case you call setMinimum or setMaximum but not setValue. Task-number: QTBUG-22121 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | | | | | | | | | | Fix QProgressBar causing timer event spamTero Ahola2011-11-102-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows you will get a lot of timer events if you use QProgressBar widget. This is because QWindowsStyle uses a timer to animate a progress bar with unknown state (min and max values both zero). The issue was fixed by starting the timer only if needed. Task-number: QTBUG-10501 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | | | | | | | | | | Compile fix for Mac OS X 10.7 with 10.6 sdkAndy Shaw2011-11-101-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it is an example it is cleaner to just include the header file as it will be available on other platforms anyway. Also ensured that the Qt includes were first before the system ones. Task-number: QTBUG-22641 Merge-request: 1462 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-107-6166/+6828
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: networking: regenerate effective TLD table for cookies QNAM: Fix authentication cache when the password is in the URL
| * | | | | | | | | | networking: regenerate effective TLD table for cookiesPeter Hartmann2011-11-103-6158/+6736
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * | | | | | | | | | QNAM: Fix authentication cache when the password is in the URLOlivier Goffart2011-11-084-8/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems: - The signal cacheCredidentials was not connected in the synchronous case while it must be connected. (Regression when the threaded http was merged) - We cannot cache the credidentials when we proceed the url because at that point, we do not know the realm (this basically reverts 9bc5a32b875b812c3a706034c8c27614f86bd138) Merge-request: 1459 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: QTBUG-18411
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-11-102-3/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix to QtOpenGL crash on Symbian
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-082-3/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix to QtOpenGL crash on Symbian
| | * | | | | | | | | | | Fix to QtOpenGL crash on SymbianJani Hautakangas2011-11-082-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under some rare circumstances EGL context creation fails on Symbian leading to application crash. However, Qt is able to recover from this if context pointers are guarded by null pointer checks in QtOpenGL. Task-number: QT-5334 Reviewed-by: Samuel Rødal
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-1076-42768/+16188
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: WINSCW def file update so that qtgui can pick up virtual from qtcore Add mobile-reduced ts-files for Symbian. Preventing zero-timer lockups when Symbian's active scheduler used Fix memory leak in S60Style Improve whatlog generation for Symbian tools2 builds.
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-0973-42676/+16117
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: WINSCW def file update so that qtgui can pick up virtual from qtcore Add mobile-reduced ts-files for Symbian. Preventing zero-timer lockups when Symbian's active scheduler used
| | * | | | | | | | | | WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui needs the QEventDispatcherSymbian::reactivateDeferredActiveObjects virtual to be exported from QtCore Task-number: QTTH-1494 Reviewed-by: Shane Kearns
| | * | | | | | | | | | Add mobile-reduced ts-files for Symbian.Pasi Pentikainen2011-11-0969-42665/+15959
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add language files translated to all Symbian supported languages, reduced to items likely seen in Symbian. Task-Number: QTBUG-4919 Reviewed-by: Miikka Heikkinen