summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snippet files for gesture overview documentationmaster-stablePeter Yard2009-08-174-0/+734
|
* Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-163-24/+25
|
* Fixed compile.Rohan McGovern2009-08-151-3/+3
| | | | Put EffectParameter::userType back to EffectParameter::type.
* Fixed compile.Rohan McGovern2009-08-151-1/+1
| | | | | Put QString::toReal back to QString::toDouble, there is no QString::toReal.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-149-69/+206
|\
| * Autotest for correct word wrapping on text next to floating objectEskil Abrahamsen Blomfeldt2009-08-141-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | We set the document's page size to be large enough to contain an image which is 100 pixels wide and one, but not two, instances of the word 'Foobar'. We then render HTML which contains a string with repeated occurrences of the word 'Foobar' next to a floating, right-aligned image which is 100 pixels wide. The layout should break on word boundaries, since this is the default in QTextDocument, and thus each text line should contain one instance of the word 'Foobar'. Task-number: 240325
| * Avoid wrapping outside word boundaries in QTextDocument unless necessaryEskil Abrahamsen Blomfeldt2009-08-141-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | If you have a floating object which affects the width available to the text, we need to recalculate the width of the text line. In the code, the setLineWidth() call to do this would by default have WrapAnywhere as its wrap mode, even when this was not necessary. The code has now been moved so that WrapAnywhere is only used if we try to set the line width to match the available width and detect that the text is too wide (the natural text width exceeds the available space.) Task-number: 240325 Reviewed-by: Simon Hausmann
| * Reimplement qSwap and Q_DECLARE_SHARED differently.Thiago Macieira2009-08-146-41/+92
| | | | | | | | | | | | | | | | | | This enables the use of Q_DECLARE_SHARED with d-pointers that are QExplicitlySharedDataPointer<PrivateClass>. Also, this enables swapping atomically QSharedPointers. Reviewed-by: Harald Fernengel
| * Perform license checks on source files.Frans Englich2009-08-141-19/+65
| | | | | | | | | | | | | | Previously we only checked headers, but we actually care about source files too. This detects about 50 errors all over Qt. Discussed with Thiago.
* | Doc: Removed claims that QDialog supports border style sheet settings.David Boddie2009-08-141-3/+3
|/ | | | | | Task-number: 255853 Reviewed-by: Trust Me I'm-trusting: The information in the task :-)
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-14357-8753/+20007
|\
| * QVariant: more work on avoinding conversion between float and doublesThierry Bastian2009-08-145-16/+16
| | | | | | | | we call QVariant::toReal instead of toDouble when needed
| * Fixed Coverity defect CID 1528.Gabriel de Dietrich2009-08-141-1/+1
| | | | | | | | Reviewed-by: Olivier
| * Removing some unused variables.Alessandro Portale2009-08-146-16/+0
| |
| * QCssParser: reordering initializers to match declarationThierry Bastian2009-08-141-1/+1
| |
| * Fixed coverity warningsThierry Bastian2009-08-1416-37/+26
| | | | | | | | | | Some dead code removed Some member not initialized missing
| * QVariant: added toFloat and toRealThierry Bastian2009-08-1414-48/+90
| | | | | | | | | | | | | | | | Made better use of qreal all over the place. We were previously using QVariant::toDouble a lot. That is triggering unnecessary conversions between float and double on embedded. Reviewed-by: ogoffart
| * Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| | | | | | | | | | | | This matches the logic for the 'lib' template to the one for 'app'. Reviewed-by: Simon Hausmann
| * Cocoa: Fix several issues with the event dispatcherRichard Moe Gustavsen2009-08-146-193/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotest: qcoreapplication, qapplication, qtimer qwidget_window, qwidget Issue 1: stacking order of modal windows was not working correctly. With this patch, we remove the need for rebuilding modal sessions all the time, and when we do, we rebuild them all in the correct order. Issue 2: When running the event processor manually (that is, just calling processEvents in a loop), we sometimes spendt 100% cpu if a window was pending to become modal. The reason was that we need to keep reposting the QCocoaRequestModal event until we could block the calling thread (that is, one of the exec flags was given to processEvents). With this patch, the need for posting QCocoaRequestModal is completly removed in favor of an 'interrupt' approach instead. Issue 3: If using Qt as a plugin, or just add widget to a native cocoa application, it would often lead to closing down the application. The reason is that the event dispatcher needs to restart [NSApp run] now and then. But this approach fails if Qt was not the code that started [NSApp run] in the first place. This patch removes the need to restart NSApp in this situation, at the cost of modal windows not beeing modal if Qt is not spinning the event dispatcher. Normal QDialog::exec etc will always work.
| * Our modifications to freetypeHarald Fernengel2009-08-148-23/+292
| |
| * Add freetype 2.3.9Harald Fernengel2009-08-14661-0/+292236
| |
| * Deleted freetype 2.3.6Harald Fernengel2009-08-14650-282668/+0
| |
| * Simplify WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-2/+2
| | | | | | | | | | | | Limit the changelog to WebKit/qt. Reviewed-by: Trust me
| * QTextFormat: better use QVariant::userType over QVariant::typeThierry Bastian2009-08-141-15/+15
| | | | | | | | | | it was even a bug when checking against QMetaType::Float because Float is a user type so it could never be true
| * Fix WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-0/+3
| | | | | | | | | | | | Exclude platform/wince and platform/graphics/haiku Reviewed-by: Trust me
| * Fix trailing space in snippet file for gesture documentation.Peter Yard2009-08-141-1/+1
| |
| * Gesture Overview DocumentationPeter Yard2009-08-145-0/+1163
| | | | | | | | | | | | | | Overview of QGesture class and reference to QStandardGestures Gesture overview using ImageViewer example to demonstrate use of class by implementer.
| * Make Qt::NoGesture visible. Needed for QGesture subclassing.Peter Yard2009-08-141-1/+1
| |
| * Add stringbuilder auto test to auto.prohjk2009-08-141-0/+1
| | | | | | | | Reviewed-by: trustme
| * Fix MLS testWarwick Allison2009-08-141-1/+2
| | | | | | | | "sm"+ellipsis (...) is same length as "small" in some fonts
| * spelWarwick Allison2009-08-144-14/+14
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-147993-16559/+24002
| |\
| | * qmake's include function now supports three argumentsKeith Isdale2009-08-141-2/+4
| | | | | | | | | | | | | | | | | | | | | The second and third arguments to qmake's include function are optional Task-number: 259398 Reviewed-by: Stian Sandvik Thomassen
| | * Fixed audio auto tests.Kurt Korbatits2009-08-144-129/+229
| | | | | | | | | | | | | | | | | | Handle platforms that don't have backends. Reviewed-by: Bill King
| | * Removed a few bogus includesAlessandro Portale2009-08-133-11/+0
| | |
| | * Compile fix.Alessandro Portale2009-08-131-1/+1
| | | | | | | | | | | | tst_qobject deleteQObjectWhenDeletingEvent needs QtGui.
| * | QT_NO_URL_CAST_FROM_STRING, like QT_NO_CAST_FROM_ASCIIWarwick Allison2009-08-142-0/+28
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-11536-4513/+25163
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-0591-1030/+1495
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-04103-883/+1758
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-031-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-0356-198/+1328
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-312605-204646/+70134
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-17425-1632/+45930
| |\ \ \ \ \ \ \ \
| * | | | | | | | | unwarnWarwick Allison2009-07-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Doc: Included type information for the Qt::ItemDataRole enum.David Boddie2009-08-142-17/+24
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 257116 Reviewed-by: Trust Me
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-1362-681/+2382
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unneeded distinction between Windows and Windows CERitt Konstantin2009-08-131-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1167 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * | | | | | | | | create world TRUSTEE only once in QFSFileEngine (Win)Ritt Konstantin2009-08-131-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't re-create world TRUSTEE everytime in getPermissions() Merge-request: 1167 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * | | | | | | | | use BuildTrusteeWithSid instead of BuildTrusteeWithNameRitt Konstantin2009-08-131-52/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get current user SID from the token of the current process and use it to fill UserTrustee with BuildTrusteeWithSid; Remove workaround for buggy secur32.dll version. Merge-request: 1167 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>