summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0926-86/+198
|\ | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/getting-started/gettingstartedqml.qdoc
| * Fix QString::arg: When specifying %L1, the group separator would be added ↵Olivier Goffart2010-08-091-5/+8
| | | | | | | | | | | | | | even if the local specify QLocale::OmitGroupSeparator Task-number: QTBUG-9281 Reviewed-by: Denis
| * QtDeclarative: get rid of warnings in public headerOlivier Goffart2010-08-092-6/+6
| | | | | | | | | | | | warning: use of old-style cast Reviewed-by: brad
| * doc: Clarify documentation of QStaticTextEskil Abrahamsen Blomfeldt2010-08-091-4/+12
| | | | | | | | | | | | | | | | | | There has been some confusion concerning what HTML tags can be used when using the rich text format with QStaticText. This patch attempts to make it clearer in the documentation that the tags have to be text related. Reviewed-by: Samuel
| * Fix scrollbar randomly popping up in QPlainTextEditEskil Abrahamsen Blomfeldt2010-08-091-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | When a line break was detected, we would retain the value of the right bearing for the character after the break instead of resetting it to the right bearing of the previous value. This could in some cases cause the bounding rect of the text to be wrong, and could cause unnecessary horizontal scrollbars to pop up. It was especially visible when using WrapAnywhere. Visible e.g. in the compile output in Creator. Done-by: mae Reviewed-by: Eskil Reviewed-by: Lars
| * Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0921-67/+155
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0612-41/+123
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Modified descriptions of QBasicTimer class and isActive() function. Translation work for 4.7 Some more french translations. Some french translations doc: Re-introduced next/previous page links in the footer. Doc: Fixing validation bugs Removed duplicate case for const variable snippet. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some S60 qdoc errors. doc: Fixed some missing images. Adding Getting Started files. Auto test passes. Changed width of the document. Part of the fix for QTBUG-12180 Revert "Doc: Adding GS QML example files" Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 qdoc: added application flags in doc.pri and fixed QTBUG-12388 ...
| | | * Modified descriptions of QBasicTimer class and isActive() function.Jerome Pasion2010-08-061-3/+4
| | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-12313
| | | * Translation work for 4.7Pierre Rossi2010-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
| | | * doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+3
| | | |
| | | * doc: Fixed some qdoc errors.Martin Smith2010-08-061-28/+15
| | | |
| | | * doc: Fixed some qdoc errors.Martin Smith2010-08-062-0/+33
| | | |
| | | * doc: Fixed some S60 qdoc errors.Martin Smith2010-08-062-0/+54
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-065-7/+13
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | | | * Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-061-1/+1
| | | | |
| | | | * Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-08-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it. Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | * QXmlPatterns QAbstractDateTime: only parse 3 digits of time fractionPeter Hartmann2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the XML Schema dateTime type allows for an unlimited precision of fractial time values; this fails for 4 or more digits when creating a QTime. This patch takes only 3 digits of the time fraction into account, since we cannot store more in a QTime or QDateTime anyway. Reviewed-by: Olivier Goffart Task-number: QTBUG-11559
| | | | * Fix link error when building Bearer application with Qt MobilityAlex2010-08-052-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtMobility uses the Qt header when compiling applications which link against Mobility's Bearer library. Therefore QNetworkConfiguration::bearerName() cannot be inline and refer to the new QNetworkConfiguration::bearerTypeName() function (which doesn't exist in Mobility) Task-number: QTBUG-12378 Reviewed-by: Rohan McGovern
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-063-21/+24
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix broken example code Top-level QML item should not have special focus handling. Fix index page Remove some warnings
| | | * | | Fix broken example codeBea Lam2010-08-061-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12705
| | | * | | Top-level QML item should not have special focus handling.Michael Brasser2010-08-061-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's the scene itself that acts as a focus scope, not the top-level item. Task-number: QTBUG-12682 Reviewed-by: Aaron Kennedy
| | | * | | Remove some warningsMartin Jones2010-08-051-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-066-4/+48
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245
| | | * | | Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245Simon Hausmann2010-08-056-4/+48
| | | | |/ | | | |/| | | | | | | | | | | || <https://webkit.org/b/43530> || [Qt] Input mode states are not reset after entering a password field ||
* | | | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-092-4/+4
|/ / / / | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0628-165/+242
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| * | | | Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-062-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we cannot use NEON and VFP concurrently, it is better not to force neon all over the place :) Reviewed-by: Andreas Kling Reviewed-by: Thiago Macieira
| * | | | Use the fast Neon conversion for converting colors of jpeg images.Benjamin Poulain2010-08-061-2/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| * | | | Do the conversion from RGB888 to RGB32 using NeonBenjamin Poulain2010-08-063-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing the conversion with Neon is 700% faster. Help by Thiago Macieira on vacation. Reviewed-by: Thiago Macieira
| * | | | Move the build of Neon file from painting.pri to gui.proBenjamin Poulain2010-08-062-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the build operation of files using Neon from painting.pri to gui.pro. This will make easier to add Neon files in the future. Reviewed-by: Andreas Kling
| * | | | QSharedPointer documentation: specify that it is not safe to operate on the ↵Olivier Goffart2010-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same object in different threads Task-number: QTBUG-12700 Reviewed-by: thiago
| * | | | compilation with QT_NO_DEPRECATEDOlivier Goffart2010-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-067-52/+100
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>"
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-056-100/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove the memory tracking attempt from the runtime graphics system.
| | * | | Remove the memory tracking attempt from the runtime graphics system.Jason Barron2010-08-056-100/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been decided that this logic will not be used by anyone at the moment so let's remove it. This removes an exported (although private) virtual function so breaks binary compatiblity for plugins built with previous versions. Reviewed-by: Jani Hautakangas
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-0512-44/+75
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rename example component file for clarity Improve docs on QML Animation page and associated elements Fix warning from whining complier. Re-enable script program caching on Symbian (used to be disabled due to crash problems that no longer occur). Increase drag distance on Symbian to improve finger usability on capacitive screens Increase maximum heap size of QML Viewer Add missing test file. Make sure onFocusChanged is correctly emitted for items in a FocusScope.
| | * | | Improve docs on QML Animation page and associated elementsBea Lam2010-08-057-26/+67
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12666
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-054-17/+7
| | |\ \ \
| | | * | | Re-enable script program caching on Symbian (used to be disabled due to ↵Joona Petrell2010-08-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash problems that no longer occur). Task-number: QTBUG-12599 Reviewed-by: Martin Jones
| | | * | | Increase drag distance on Symbian to improve finger usability on capacitive ↵Joona Petrell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens Task-number: QTBUG-12594 Reviewed-by: Martin Jones
| | | * | | Make sure onFocusChanged is correctly emitted for items in a FocusScope.Michael Brasser2010-08-052-12/+6
| | | |/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12649 Reviewed-by: Martin Jones
| | * | | Fix warning from whining complier.Martin Jones2010-08-051-1/+1
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-051-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: dont leak these
| | * | dont leak theseLorn Potter2010-08-051-0/+1
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0526-285/+459
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-053-33/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, QTextEngine use int to calculate most of the layout data required. If a string longer than 2^24 is passed into either QTextEngine or classes using it (QStackTextEngine, QPainter, QFontMetrics, etc.), overflow will happen because the memory size required to allocate for layout will become too large for int to handle. This patch will prevent these cases and add error handling mechanism for relevant code. Task-number: QT-3658 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | Replace the SSE prologues by a macroBenjamin Poulain2010-08-053-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the code of the SSE prologue by a macro to avoid copying the prologue everywhere. Reviewed-by: Andreas Kling
| * | | QDom: Do not crash on "<a:>text</a:>"Frank Osterfeld2010-08-051-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "a:" is not a valid tagname. The function creating the element node notices that and returns 0, but the parser ignores it and continues, and then crashes later when processing the "text". This patch aborts the parsing immediately when creating the element node failed and fixes the crash. Merge-request: 2431 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-0578-786/+1066
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-043-1/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
generated by cgit v0.12 at 2025-02-07 00:01:14 (GMT)