summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Text-related API updates after reviewMichael Brasser2009-08-1928-175/+174
| | | | | Rename LineEdit to TextInput; hAlign to horizontalAlignment; vAlign to verticalAlignment. Other assorted fixes.
* Animation classes cleanup.Michael Brasser2009-08-192-91/+27
|
* Complete ParentChangeAction.Michael Brasser2009-08-193-17/+55
| | | | | Make it useful as a non-transition; add the ability to select by target, and set an explicit "to-value".
* Provide a way to match RunScriptActions with RunScripts.Michael Brasser2009-08-183-5/+52
|
* Rename finishPlaying to alwaysRunToEnd.Michael Brasser2009-08-183-18/+18
|
* Rename filter to targets.Michael Brasser2009-08-186-51/+20
|
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-184-21/+20
|\ | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.h
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-1815-513/+37
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Proposed changes following API review.Martin Jones2009-08-183-29/+28
| | |
* | | Some Text cleanup.Michael Brasser2009-08-183-16/+12
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-1824-541/+111
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1820-118/+152
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-1810-90/+78
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | MouseRegion API changes following review.Martin Jones2009-08-1810-28/+74
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1816-176/+110
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-17418-9425/+21277
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Doc cleanup.Yann Bodson2009-08-1713-433/+26
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-1761-524/+355
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Doc cleanup.Yann Bodson2009-08-172-80/+11
| | | | | |
* | | | | | Slightly change implementation of scope chain.Michael Brasser2009-08-183-27/+10
| |_|_|_|/ |/| | | | | | | | | | | | | | Preparation for merge of QtScript's JSC backend.
* | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-18429-9581/+21356
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-179-161/+82
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-17418-9425/+21277
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | More namespace improvementsWarwick Allison2009-08-179-161/+82
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Store and find QML version ranges efficiently - Require version for QmlType-from-string - Removed unused version-ignorant QmlType-from-string functions - Some attached properties now resolve (eg. tst_qmlparser) - Still no better: - interfaces not versioned - some attached properties still hard-codec to Qt
| * | | | Small fixes following API review.Martin Jones2009-08-174-5/+18
| | | | |
| * | | | Make pong example scale.Martin Jones2009-08-171-6/+6
| | | | |
| * | | | Add smooth: true to dial example.Martin Jones2009-08-172-4/+4
| | |/ / | |/| |
| * | | Update more often to avoid odd intervals beteeen second movements.Martin Jones2009-08-171-1/+1
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-08-17412-9404/+21245
| |\ \ \ | | | | | | | | | | | | | | | kinetic-declarativeui
| | * | | Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-163-24/+25
| | | | |
| | * | | Fixed compile.Rohan McGovern2009-08-141-3/+3
| | | | | | | | | | | | | | | | | | | | Put EffectParameter::userType back to EffectParameter::type.
| | * | | Fixed compile.Rohan McGovern2009-08-141-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
| | | | | |