summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix "initial" size for remote content.Warwick Allison2009-10-264-2/+20
|
* qmldir not needed if types are qualified.Warwick Allison2009-10-261-2/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-2654-155/+493
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-2623-57/+147
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-10-261760-48962/+105482
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-265-1/+17
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Docs.Martin Jones2009-10-268-20/+38
| | | | |
| | | * | Fix accessing QmlList data as a model.Martin Jones2009-10-262-6/+11
| | | | |
| | * | | Fix to show expression query widget and allow QmlEngineDebug valuesBea Lam2009-10-2610-23/+78
| | | | | | | | | | | | | | | | | | | | for widgets to be changed after construction.
| | * | | Allow canvas sizehint to be configurable and fix signal-slotBea Lam2009-10-225-8/+20
| | | | | | | | | | | | | | | | | | | | connections in engine.cpp
| * | | | use enums rather than strings in examplesYann Bodson2009-10-267-9/+9
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-2623-37/+281
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into kinetic-declarativeui
| | * | | Doc.Michael Brasser2009-10-265-1/+17
| | | |/ | | |/|
| | * | Fix crash.Michael Brasser2009-10-261-3/+3
| | | |
| | * | Flip around perspective originAaron Kennedy2009-10-261-0/+1
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-266-24/+36
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Doc.Michael Brasser2009-10-264-22/+31
| | | | |
| | | * | Fix assert with non-integer Rectangle radius.Michael Brasser2009-10-261-2/+5
| | | | |
| | * | | Ensure cleanup happens before the destruction of QScriptEngineAaron Kennedy2009-10-2611-9/+224
| | | | | | | | | | | | | | | | | | | | This was causing crashes on windows.
| * | | | Improve states & transitions examples.Yann Bodson2009-10-263-52/+56
| |/ / /
* | | | Allow flickr demo to be remote.Warwick Allison2009-10-261-0/+10
| | | |
* | | | Move knowledge of qmldir out of QmlScriptParser.Warwick Allison2009-10-262-6/+11
| | | |
* | | | Wait for qmldir remote content so that imports work remotely.Warwick Allison2009-10-266-74/+131
| | | |
* | | | Work again for URLs.Warwick Allison2009-10-262-43/+45
| | | |
* | | | unwarnWarwick Allison2009-10-263-4/+3
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-261647-47723/+101883
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-251630-47688/+101648
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| | * | Fix a crash in shutdown of QGraphicsEffectRhys Weatherley2009-10-251-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Issue a warning if bindAttributeLocation() is used after shaders linkedRhys Weatherley2009-10-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attribute locations must be bound before a shader program is linked according to the GLSL specification. Issue a warning to the user if they do it in the wrong order, which should help to isolate hard to find bugs much quicker. Reviewed-by: trustme
| | * | Add an extra overload for QMatrix4x4::toTransform()Rhys Weatherley2009-10-254-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 100afe8d fixed a bug in QGraphicsRotation related to when the "distance to plane" projection needed to be performed. As a side effect it made the toTransform() API not do the expected thing when the function is called with no argument. This change makes the default no-argument version of toTransform() do the simple "drop row 3 and column 3" orthographic transformation that normal users of the class expect, and adds a new overload for the "distance to plane" projection case for the special case. Reviewed-by: trustme
| | * | Merge branch '4.5' into 4.6Thiago Macieira2009-10-233-29/+6
| | |\ \
| | | * | QWidget painting regression on Windows.Bjørn Erik Nilsen2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occurred on Windows due to a call to repaint() on a top-level window from setDisabledStyle() in qwidget.cpp. This function is called whenever a window is blocking. In this particular case the children of the repainted window are opaque, and should therefore not be repainted, which also means that the top-level have to subtract the region of the opaque children when filling the background. This region is cached, and the problem was that the cached region was wrong. It was wrong because it was not invalidated properly. Task: QTBUG-4245 Reviewed-by: Paul
| | | * | QWindowsMobileStyle::drawPrimitive(PE_Frame) background color fixedJoerg Bornemann2009-10-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The background color of PE_Frame was palette().light() and has been changed to use palette().background() now. This fixes the autotest tst_QStyleSheetStyle::task188195_baseBackground for Windows mobile. Reviewed-by: thartman
| | | * | move default QAbstractButton font setup on Win mobile to QApplicationJoerg Bornemann2009-10-222-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original approach of modifying the font for QAbstractButtons in QWindowsMobileStyle::polish broke the autotest tst_qstylesheetstyle::fontPropagation. Reviewed-by: thartman
| | * | | Compile on QWSAnders Bakken2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 04d18b38c38c5ff623b30366ea08d56128b9b7d0 Qt didn't compile for QWS. Will email original committer to verify that original intent is maintained. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * | | Add cross compiling pkg-config disabled warningDonald Carr2009-10-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have historically silently disabled pkg-config when cross compiling in order to avoid host pkg-config contamination of the target build. pkg-config files are present on many embedded targets, and make the correct detection/configuration of dependencies far more convenient for the developer. It is therefor valuable to advertise that pkg-config functionality is available but disabled barring direct involvement on their parts, rather than silently disabling it. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | QT_NO_CURSOR build fix on windows. Random corrections for it on mac.Jocelyn Turcotte2009-10-235-1/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | * | | Correct line ending chars imported from webkit.Jocelyn Turcotte2009-10-232-107/+107
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Line spacing fixesJoerg Bornemann2009-10-2327-65/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit (via QTextLayout) and QPlainTextEdit in Qt used to ignore any font leading but added one extra pixel in QFontMetrics. With many freetype fonts, this resulted in a "spacy" text layout. The necessary fixes on X11 and Windows were to take (positive) leading into account, to make the font database convert point sizes to pixel sizes without rounding to plain integer values, and to subtract the extra pixel from QFontMetrics from the font engines' descent value. The change also fixes several places in styles and widgets, where QFontMetrics::lineSpacing() was wrongly used instead of QFontMetrics::height(). Ideally we should also handle negative leading, which would require additional and bigger code changes in QTextLayout and QPlainTextEdit. In addition, all other editors we have tested seem to ignore leading on X11. If we choose to believe the values provided by freetype, our text layout would be one pixel smaller than everybody else's. On the Mac, this change does nothing. There our layout is still too spacy, and for smaller fonts quite ugly compared to native Mac applications. Done with mae. Reviewed-by: mae
| | * | | Doc: Fixed and synchronized QWebView related documentation.David Boddie2009-10-232-7/+91
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Updated the modules for the "Desktop" (Full Framework) edition.David Boddie2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Updated an external link.David Boddie2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Changed the text slightly.David Boddie2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod.Martin Smith2009-10-234-14/+72
| | | | | | | | | | | | | | | | | | | | They works just like the \qmlsignal and \qmlmethod commands.
| | * | | Doc: Reviewed and revised QGraphicsAnchorLayout documentation.David Boddie2009-10-235-59/+216
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Mac: remove obvious commentRichard Moe Gustavsen2009-10-231-1/+0
| | | | | | | | | | | | | | | | | | | | Amending the previous merge request
| | * | | Fix weird behavior when opening a QFileDialog for non-current directory.Andreas Kling2009-10-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldShowFileName() can be called with an empty filename, but must not create and use a QFileInfo("") since that has known undefined behavior. So just return NO right away for empty filenames. Merge-request: 1765 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | * | | Inline QtScript exception helper functionsKent Hansen2009-10-233-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::toNumber() ~50% faster. Reviewed-by: Olivier Goffart
| | * | | Avoid calls to public QScriptValue::engine() functionKent Hansen2009-10-233-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to engine() are mostly done for checking that the "source" and "target" engines are the same, but we don't want those checks to slow us down. Use an inline getEngine() function instead. This makes e.g. QScriptValue::call() ~10% faster for a function like "function(a, b) { return a + b; }". Reviewed-by: Olivier Goffart
| | * | | Speed up QScriptValue creation by avoiding operator= to be calledKent Hansen2009-10-231-32/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non-object values, just return the value immediately; there is no way that the later check (result.isObject()) will be true anyway. This makes qScriptValueFromValue() ~50% faster. Reviewed-by: Olivier Goffart