summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXTJani Hautakangas2011-11-031-0/+3
| | | | | | | | glGetBooleanv generates an error if this param isn't supported. This error generates wrong warnings in later states. Reviewed-by: Eskil
* Add GL_EXT_texture_format_BGRA8888 support.Jani Hautakangas2011-11-031-1/+2
| | | | | | | | | QtOpenGL supports GL_IMG_texture_format_BGRA8888 but GL_EXT_texture_format_BGRA8888 is missing. These extensions are essentially the same. Task-number: QTBUG-22538 Reviewed-by: Samuel Rødal
* Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"Samuel Rødal2011-11-032-45/+4
| | | | | | | This reverts commit 7925f107814e46deb0848d9e6016721ceebfb521. Needed to fix regressed auto-test tst_qgraphicsview::update_ancestorClipsChildrenToShape2.
* Correction for effectiveBoundingRect() calculation for QGraphicsItemChristophe Oosterlynck2011-11-022-4/+45
| | | | | | | | | | | QGraphicsItemPrivate::effectiveBoundingRect() should use ItemClipsChildrenToShape flag from the parent while looping to check for clipping and not use its own AncestorClipsChildren flag. By using AncestorClipsChildren, you're checking if one of your ancestors clips you, but you really want to know if your direct parent clips you. Merge-request: 1419 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-0292-346/+929
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-0121-46/+61
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: 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 QStyleSheet example used a property that is hidden. QList document referenced to non existing function QXmlQuery::bindVariable documentation bug Fix multiple typos in QLineF documentation. Qmake project file docs lacked information. Documentation error in SSL document Fix multiple typos in documentation. Fix for QVector::toList - code example documentation.
| | * Missing icon in the designer documentationartoka2011-11-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the documentation there was missing icon in the Object Inspector section. Added reference to editbreaklayout.png icon and cleared a bit the description. Added also the image to the doc/src/images - folder. Task-number: QTBUG-17739 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Fridge magnet example code snippet errorartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation states that QTextStream::readLine() is used but the example uses ">>" operator. Changed the example to use readLine()-method. Task-number: QTBUG-7678 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * qpaintdevice-qt3.html documentation errorsartoka2011-11-011-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document instructed to user qApp->x11Info() to access x11Info in the examples. The QApplication doesn't have x11Info() -method, QWidget does. Changed the examples to use QWidget instead of QApplication. Task-number: QTBUG-18544 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QWebElement example missed informationartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example there was told to use button.evaluateJavaScript("click()"); which doesn't work. Instead of "click()" it should be "this.click()". Changed to "this.click()". Task-number: QTBUG-17029 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QSPlitter style-sheet example was invalidartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSPlitter::handle:pressed - example missed "image:" text when image is set. Added "image:". Task-number: QTBUG-20069 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Errors in QSqlDriver::handle examplesartoka2011-11-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the examples the const char* variable was compared to QString with "==" operator which doesn't work. Changed the comparison to use qstrcmp - method. Task-number: QTBUG-20089 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QGLColormap example was invalidartoka2011-11-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLColormap example missed int argc and char *argv[] from main - method. Filling the QGLColormap with for - loop was not working because of the 0 - size. Added arguments to main - method and changed the filling so that for-loop uses size of 256. Task-number: QTBUG-3563 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QPointer made no mention of QWeakPointerartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointer didn't mention QWeakPointer although those are "related" to each other. Added link to "see also" section. Task-number: QTBUG-20721 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Invalid links to http://developer.symbian.orgartoka2011-11-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed "SBSv2" and "Installing qt for the Symbian platform" links from the installation.qdoc. Fixed platform security link from the external-resources.qdoc. Task-numbers: QTBUG-18313, QTBUG-18313, QTBUG-11312 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QNetworkDiskCache documentation missed informationartoka2011-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation didn't mention which unit (B,kB,MB) is used in setMaximumCacheSize and maximumCacheSize. Added unit to be bytes. Task-number: QTBUG-15562 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QStyleSheet example used a property that is hidden.artoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the QStyleSheet documentation an example for boolean used QDialog {etch-disabled-text:1} property that is undocumented. Changed the property to QDialogButtonBox{ dialogbuttonbox-buttons-have-icons: 1; } that is documented. Task-number: QTBUG-11489 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QList document referenced to non existing functionartoka2011-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QList documentation introduces a QStringList-class and states that it has function: QStringList::find. Function does not exist. Changed so that the mention of the QStringList::find-function is removed from the documentation. Task-number: QTBUG-16164 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * QXmlQuery::bindVariable documentation bugartoka2011-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second code example in the documentation stated that the setQuery-method should be called before bindVariable-method. Changed so that bindVariable-method is called first and then the setQuery-method as it should be. Task-number: QTBUG-17025 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Fix multiple typos in QLineF documentation.artoka2011-11-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLineF::angleTo, QLineF::setLength(), QLineF::dx() and QLineF::dy() were missing detailed information QLineF::angleTo - method returns the angle of two lines compared to each other. Documentation stated that the return value is in degrees. This fix adds specific information that the return value (angle) is returned in _positive_ degrees. setLength()-method missed information whether the angle is also changed if the given length is negative. Added mention that angle is also changed. dx() and dy() didn't mention whether the return value is negative or positive. Added mention that positive if p2()>=p1() else negative. Task-numbers: QTBUG-14759, QTBUG-14756, QTBUG-14677 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Qmake project file docs lacked information.artoka2011-11-011-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qmake project files documentation lacked information about "*="-operator usage. Added couple of links pointing to the qmake advanced usage - page where "*="-usage is explained. Task-number: QTBUG-9675 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Documentation error in SSL documentartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The order of setting environment variable OPENSSL_LIBS and configure was wrong. OPENSSL_LIBS is now instructed to be set first before configure. Task-number: QTBUG-14521 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Fix multiple typos in documentation.artoka2011-11-013-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link typo in the forum nokia icon article. Typo in the Symbian qt introduction document. Typos in the Diagram Scene example documentation. The link url was ending with a slash character in the icon article. Slash characted removed. In the symbian introduction doc there was a missing "p" character in the environment variables listing (QT_SIS_OPTIONS). There was 6 typos in the Diagram Scene example documentation. Task-numbers: QTBUG-13983, QTBUG-11820, QTBUG-14732 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Fix for QVector::toList - code example documentation.artoka2011-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Code example in the documentation used QString values in QVector<double>. Task-number: QTBUG-21067 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-014-41/+138
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Supporting parallel pointer event delivery on Symbian Removed unix specific mmap use from QString benchmark
| | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-313-39/+136
| | |\ \ | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Supporting parallel pointer event delivery on Symbian
| | | * | Supporting parallel pointer event delivery on Symbianmread2011-10-313-39/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian's wserv and cone are introducing APIs to send apps position updates for multiple pointers in one message. The change consists of a refactoring of processTouchEvent() to handle multiple pointer changes, enabling receipt of the new messages, and handling of the new messages. Task-number: QTBUG-18286 Reviewed-by: Shane Kearns
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-281-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Removed unix specific mmap use from QString benchmark
| | | * | Removed unix specific mmap use from QString benchmarkmread2011-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mmap flags MAP_ANONYMOUS and MAP_POPULATE are unix specific, and are not supported by Symbian's posix headers. The benchmark code using them, already unix-only, now is removed from Symbian builds. Task-number: QTBUG-18197 Reviewed-by: Shane Kearns
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-011-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: SSL documentation: correct enum name
| | * | | | SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
| | | | | |
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-10-314-2/+116
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Symbian - disable memory mapping in QNetworkDiskCache Adding items to a view with no delegate crashes. Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part Doc: adding link to the Qt Quick Components for Symbian page.
| | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-314-2/+116
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/mainpage.qdoc doc/src/platforms/supported-platforms.qdoc doc/src/qt-webpages.qdoc src/network/access/qnetworkdiskcache.cpp
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-10-281-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian - disable memory mapping in QNetworkDiskCache
| | | | * | | | | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of memory mapped files in Open C requires munmap to be called from the same thread as mmap. As the QIODevice can be handed off to another thread, this breaks application code that works on other operating systems. Task-number: QT-5309 Reviewed-by: Tadaaki Matsumoto
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-279-59/+127
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part Doc: adding link to the Qt Quick Components for Symbian page.
| | | | * | | | | Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-274-2/+27
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/inputmethod/qcoefepinputcontext_s60.cpp
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Adding items to a view with no delegate crashes.
| | | | * | | | | | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no delegate then clear state and return. Change-Id: I786b9bc4018706797056fbd1ad25d25663102707 Task-number: QTBUG-22379 Reviewed-by: Andrew den Exter
| | | | | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-217-62/+37
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fix security problem on webpage due to bad JS Accepting predicted text using hardware keyboard replaces unwanted part
| | | | | | * | | | | Fix security problem on webpage due to bad JSCasper van Donderen2011-10-215-59/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | * | | | | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-212-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current implementation of Symbian input context assumes that predicted word replacement happens so that the original typed text is at the end of the surrounded text. The logic fails, if to-be-predicted text is in the middle of, or in the beginning of another, already accepted word. As a fix, input context need to store the original cursor position, when reset() was called (this happens when word selection list appears). Input context is already storing a copy of a preedit string in this situation. Then, when word replacement happens, this stored cursor position is used instead of current cursor position (the native side might temporarily move the cursor to the end when word selection list opens or closes) to replace the typed word with one selected from suggested word list. Stored cursor position is dismissed immediately after used, or if cached preedit string is dismissed. Task-number: QTBUG-22147 Reviewed-by: Miikka Heikkinen
| | | | | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-21132-716/+1892
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (40 commits) Doc: adding link to the Qt Quick Components for Symbian page. Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4 Workaround to VideoCore III scissor bug. Fix to QGLWidget crash Update def files Fix crash on exit when overriding signal handlers in states. Typo fix Add new signals to indicate GPU resource usage. symbian - search drives for translation files symbian - search drives for translation files Cannot flick to the end of a horizontal list view width LayoutMirroring Backport more imports directory caching changes. Symbian - fix deleteLater not working from RunL Doc updates to installation, platform notes and symbian introduction. Do not let QGLContext get out of sync when doing mixed VG-GL rendering Fix more test DEPLOYMENT statements for Symbian Create auto test for http HEAD request QNAM - fix poor performance of HEAD request with authentication Fix deployment for declarative tests, examples on Symbian symbian - add support for ELangKazakh and ELangEnglish_India ...
| | | | | | * | | | | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-214-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-311-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Updated changelog for Qt 4.8
| | * | | | | | | | | Updated changelog for Qt 4.8Jo Asplin2011-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-226
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-311-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QFile::copy() returning false but error() being NoError
| | * | | | | | | | | Fix QFile::copy() returning false but error() being NoErrorxiechyong2011-10-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling close() after setError() will unset the error. Task-number: QTBUG-11982 Merge-request: 2712 Reviewed-by: ossi
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-2819-86/+81
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Symbian configuration parameter change for linux building
generated by cgit v0.12 at 2025-01-25 01:43:47 (GMT)