summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Symbian - Change working directory of applications in ROMShane Kearns2011-10-171-5/+4
| | | | | | | | Working directory (as opposed to applicationDirPath) was on the Z drive before, change it to be the same. Task-Number: QTBUG-22024 Reviewed-By: mread
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-1411-28/+19
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-10-102-6/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixes: libpng symbols exported from QtGui.dll on Windows omit unassigned (and too recent codepoints) from the text Normalization process Fixed broken window surface flush when depth is 24 and bpp is not 32.
| | * omit unassigned (and too recent codepoints) from the text Normalization processKonstantin Ritt2011-10-072-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > handle any code points that were not defined in the earlier version > as if they were unassigned: such code points will not decompose or compose, > and their Canonical_Combining_Class value will be zero. see http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability for details we should respect that the QChar::Unicode_Unassigned == 0 and thus less than any other QChar::UnicodeVersion value Merge-request: 952 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * | Build fix for WINCE to qfilesystemengine_win.cppjaanttil2011-10-051-1/+0
| | | | | | | | | | | | | | | Merge-request: 2662 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-285-4/+78
| |\ \ | | |/
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-09-204-3/+77
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits) runonphone: Include USB serial ports on OS X for CODA, too runonphone: Implement traceswitch support for coda Fix missing clean up stack panic for a new thread in Symbian Regression in QS60Style when drawing webview scrollbars Cleanup qwidget_s60.cpp Fix panic when global QSettings instance needs flusing at app exit Fix uninitialised variable in temporary files More accurately determine bearer type for symbian GPRS/3G Add documentation for Symbian QSettings locations and security Update QDesktopServices openUrl() documentation on Symbian OS Mark binaries as SMPSAFE in Symbian Fix "sbs -c tools2 --what" output for Qt. Update environment.prf QS60Style: Make spinboxes and lineedits slightly taller runonphone: Add a missing space between a message and the file name runonphone: Allow overriding the temporary sis file name Fix QIcon auto-tests for Symbian Add a cast to moc cpp generator to remove armcc warnings Fix qt.conf for Symbian to use $${EPOCROOT} Remove few unused variables. ...
| * | | Removed obsolete QWS_ALPHA_CURSOR feature.jaanttil2011-09-274-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWS_ALPHA_CURSOR was only mentioned in qfeatures.txt and corresponding QT_NO_QWS_ALPHA_CURSOR was not used anywhere in Qt code. Task-number: QTBUG-20337 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Removed duplicate link from QFinalState documentation.jaanttil2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14553 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Clarified keypad navigation specific event documentation.jaanttil2011-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15631 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | docs: Typo and link fixes.jaanttil2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9224 Task-number: QTBUG-13442 Task-number: QTBUG-19858 Task-number: QTBUG-20957 Task-number: QTBUG-21447 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Use the right callback in QObject::disconnect()Olivier Goffart2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf2f725dd859aa5c960e5889678cac0e139e44b0 Reviewed-on: http://codereview.qt-project.org/5475 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit d5ad900c77af563a1f3cfb0d252fd173249493fb)
* | | | Removing accidental use of double instead of qreal from QLinemread2011-10-061-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLine contained a number of places where conversions and calculations were done as double where qreal should have been used instead. This is caused by the use of raw floating point literals. The fix is to construct the literals as qreal. The angle conversions are simplified to reduce the risk of a growing loss of precision from this change. On Symbian, where qreal is float, this gives a 5-10% performance improvement to the affected functions, as tested by a new benchmark test. The auto tests pass, these contain precision tests which indicates that there is no significant loss of precision with this change. On Windows, where qreal is double, this has no significant effect on performance. Task-number: QTBUG-4894 Reviewed-by: Shane Kearns
* | | | Fix incorrect QFileInfo permissions on windowsShane Kearns2011-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requesting the write permission marked the read permission as known without having retrieved it. A subsequent request for read permission would return false. Task-Number: QTBUG-20714 Reviewed-By: mread
* | | | symbian - document behaviour of QFile::handle()Shane Kearns2011-09-281-0/+7
| | | |
* | | | New plugin detection for Symbianmread2011-09-282-76/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian can have very long running apps, which expect to pick up new plugins without a restart. This change makes the plugin factory, which is used for many internal plugin types, detect plugin changes and update its list of plugins. This uses the QNotifyChangeEvent class to watch for plugin directory changes, including when they do not already exist, including on removable drives with no media currently present. When a change is detected, it triggers a rebuild of the plugin library paths, then rescans for plugins only on the drive that changed. An alternative implementation could have made use of watching software installer P&S keys for notification of change. However these are not triggered by memory card insertion or removal, so file system watchers are used. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
* | | | Added Symbian private API to update libraryPathsmread2011-09-282-17/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library paths on Symbian can change as memory cards are inserted or removed. Potentially there is a \resource\qt\plugins on a card which should be added to the library path. Since some Symbian Qt applications are expected to be very long running, they would not see an updated library path without this abililty to update the path. The update algorithm strips out existing instances of \resource\qt\plugins, places new ones where the first \resource\qt\plugins was, and leaves the rest of the library path unchanged. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
* | | | Making QNotifyChangeEvent, Symbian file watcher, more widely usablemread2011-09-282-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNotifyChangeEvent was being used by QSymbianFileSystemWatcherEngine, but it also helps in the implementation of new plugin watching for QTBUG-20098. So it has been generalised to work with an interface and any class that implements that interface. The Qt file system watchers could not be used in QTBUG-20098, as they will not watch for currently non-existing directories. Task-number: QTBUG-20098 Reviewed-by: Shane Kearns
* | | | Fix plugin implicit loading when calling QPluginLoader::instance().Miikka Heikkinen2011-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPluginLoader::instance() didn't increase loading refcount if another QPluginLoader had already loaded the plugin. This meant that if the another QPluginLoader subsequently unloaded the plugin, the instance would be destroyed even if the second loader still wanted to use it. Also improved the tst_QPluginLoader::deleteinstanceOnUnload() test case to test more combinations of deletion order and explicit/implicit loading. Task-number: QT-5259 Reviewed-by: Sami Merila
* | | | Symbian - perform some FS initialisation previously done by open cShane Kearns2011-09-232-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Qt 4.6 and 4.7, the working directory is set to the same drive the application is installed on by the open c library. The default working directory in symbian is always the private directory on the system drive, but we told people to rely on the open c behaviour. Open C also creates the private path on both the system and installation drives when the application is started. This behaviour is also replicated now in Qt 4.8 for backward compatibility of apps that may rely on it. Similar code to create the private path on the installation drive in QCoreApplication::applicationDirPath() has been removed, as the new code in this patch is always executed first. Task-Number: QTBUG-21527 Reviewed-By: mread
* | | | symbian - Document behaviour of QDir::rootPath / homePathShane Kearns2011-09-231-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The root path was intentionally changed to reflect the real drive root, while home path continues to reflect the user data directory. Task-Number: QTBUG-21527 Reviewed-By: Miikka Heikkinen
* | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-2015-45/+101
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-203-1/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed automatic plugin path resolving for predefined Qt plugins. Resolve a number of compilation issues with INTEGRITY Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
| | * Resolve a number of compilation issues with INTEGRITYRolland Dudemaine2011-09-192-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode. Also, correct a typo and add missing files to io.pri. Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools. Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it. Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition). Merge-request: 2686 Reviewed-by: ossi
| | * Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTUREAndy Shaw2011-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a build issue on Solaris as the symbols were missing so they are now added in the expected way after discussion with the Nokia developer who approved the patch originally for winscw. Task-number: QTBUG-21523 Merge-request: 1389 Reviewed-by: ossi
| * | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14269-16171/+36019
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-09-101-2/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Disable autotest broken by the change to QCache in 7ab0bed Generate glyphs in un-transformed coordinate system. Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT Reset trailingSpaces in relayout Prevent QPixmapCache potentially growing indefinitely. Allocate 16-byte aligned memory independent of platform for raster pool. Fix trailing spaces problem by not adding it to QScriptLine.length Fix RTL layout for fonts when non-printable character has an advance Fix regression in tst_qrawfont Make it compile on mac Fixed compiling error in qvfb. micro optimizations fix "comparison between signed and unsigned" warnings on windows, don't resolve the gdi32's symbols for each QRawFont instance fix typo in the docs QRawFont: add missed operator != optimize QGlyphRun's operator == a bit QGlyphRun: make operator != inlined QGlyphRun: don't detach if the decoration wasn't actually changed QPA event loop: Set a timeout != 0 if there are no timers.
| | | * Prevent QPixmapCache potentially growing indefinitely.Samuel Rødal2011-09-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmapCache has until now refused to throw out shared pixmaps, i.e. ones that still have shallow copies lying around. This leads to problems when someone inserts two shallow copies using different keys, causing the cache itself containing multiple shallow copies and thus forever refusing to throw out those entries. It's rather easy for this to accidentally happen in a user application since QPixmap::load() or QPixmap(const QString &fileName, ...) automatically cache the pixmap in the QPixmapCache, thus if the user then calls QPixmapCache::insert() on the same pixmap or a shallow copy it is locked in the QPixmapCache forever. The only reason for not throwing out a pixmap that's shared would be to prevent re-loading a pixmap from file when a user has a direct reference to it in his application, but in that case the user is unlikely to re-load the pixmap from file in any case. Therefore it seems the best fix is to get rid of this limitation. Task-number: QTBUG-21359 Reviewed-by: John Brooks Reviewed-by: Olivier Goffart
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-09-109-27/+81
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Merge fixes for QDir::operator== QSslCertificate: block all DigiNotar (intermediate and root) certs Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path Fix compile error on MSVC2008 Fix comparison of absolute, unclean paths in QDir Wrap calls to Sequence::push_back
| | | * | Merge fixes for QDir::operator==Shane Kearns2011-09-071-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two fixes in 4.8 which each fixed a part of the problem. Comparing canonical paths is more correct, but is only possible where both directories exist. If neither directory exists, then compare absolute paths instead. Changed a regression test, because /tmp is a symbolic link on MacOS. I.E. "/tmp/.." is canonically "/private" and not "/" as expected. Task-Number: QTBUG-20495 Reviewed-By: joao
| | | * | Restore Qt4.7 behaviour of QFileInfo::absolute(File)PathShane Kearns2011-09-053-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many applications relied on the undefined behaviour that the filesystem engines returned clean paths (despite the documentation stating that they may not), and consequently suffered regressions with Qt 4.8. Unix paths are once again cleaned if necessary. Windows/Symbian paths were already cleaned, but now use the utility function to check if a path is dirty, to avoid duplicated code. Task-number: QTBUG-19995 Change-Id: If8c18469f149291c9d079ae3da23bc2087bbd49a Reviewed-on: http://codereview.qt.nokia.com/4154 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| | | * | Fix comparison of absolute, unclean paths in QDirShane Kearns2011-09-023-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDir::operator== was creating a clean absolute path for comparison purposes if the original path was relative. However original absolute paths were trusted, even though they could be unclean. Now they are checked for cleanliness first. Task-Number: QTBUG-19995 Task-Number: QTBUG-20495 Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4 Reviewed-on: http://codereview.qt.nokia.com/4099 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| | | * | Wrap calls to Sequence::push_backJoão Abecasis2011-09-023-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C++11 push_back is overloaded to support rvalue-references, void std::vector<T>::push_back(const T &); void std::vector<T>::push_back(T &&); so attempting to get the address for push_back is ambiguous. Instead of hardcoding the function signature, the better and more general solution is to allow the compiler to do the required overload resolution itself, also allowing for implicit conversions to take place. Task-number: QTBUG-18996 Done-with: Liang Qi Reviewed-by: Olivier Goffart
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-082-14/+8
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Split CFLAGS from pkg-config properly Ensure that the proxystyle is used over the style's own functions runonphone: Add a missing space between a message and the file name Perl check for windows configure. QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded QSettings: use the common appdata dir when bootstrapping qmake on win Replace explicit surrogate handlers by inline methods of QChar class
| | | * | QSettings: don't assume XDG_CONFIG_HOME is latin1-encodedKonstantin Ritt2011-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use QFile::decodeName() instead Merge-request: 1341 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | QSettings: use the common appdata dir when bootstrapping qmake on winKonstantin Ritt2011-09-071-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSystemLibrary doesn't depend on QObject, so nothing could stop us Merge-request: 1341 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1284 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-09-071-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix assert error on Windows with a negative char. Doc: Fixed the example of an encoded URL in the class description. Added an additional check to workaround an issue on Windows.
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-08-174-11/+24
| | |\ \ \ \
| | * | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20398
| | * | | | | Doc: Clarified the range of return values from QLineF::angle().David Boddie2011-06-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20197
| * | | | | | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| | | | | | |
* | | | | | | Fix missing clean up stack panic for a new thread in SymbianTomi Vihria2011-09-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clean up stack for a new thread was created in a too late phase for a process that doesn't have symbianVersion string in its cache Task-number: QT-5269 Reviewed-by: Murray Read
* | | | | | | Fix panic when global QSettings instance needs flusing at app exitMiikka Heikkinen2011-09-131-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lack of cleanup stack caused panic when the global static QSettings instance in QCoreApplication was deleted if there was pending update in the QSettings instance. Task-number: QTBUG-21421 Reviewed-by: Murray Read
* | | | | | | Fix uninitialised variable in temporary filesShane Kearns2011-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbianFilePos variable was only initialised in the nativeOpen function and not in the constructor called init(). Due to the fix for QTBUG-4796, QTemporaryFile now bypasses the nativeOpen function. Zero initialising in init() ensures it is always valid (it only needs a non zero initialisation when opening a file for append, which is still covered by nativeOpen) Task-Number: QTBUG-21418 Reviewed-By: mread
* | | | | | | Add documentation for Symbian QSettings locations and securityPasi Pentikainen2011-09-131-0/+47
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11192 Reviewed-by: Miikka Heikkinen
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-072-2/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build for desktop Fix the build with -qtnamespace configure options
| * | | | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-Request: 1291 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* | | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-015-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp