summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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
| | * | Bind QScriptValue to engine when the value is created internallyKent Hansen2009-10-231-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes creation+destruction of the QScriptValue a lot faster because it uses the engine's pool of QScriptValuePrivates instead of qMalloc()/qFree(). Reviewed-by: Olivier Goffart
| | * | Inline internal property lookup functionKent Hansen2009-10-233-28/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also avoid looking up the object's own properties twice (before we called getOwnPropertySlot() and then getPropertySlot() on the same object). Makes QScriptValue::property() ~20% faster when calling it on an "empty" object. Reviewed-by: Olivier Goffart
| | * | Use an inline helper function to check if a QScriptString is validKent Hansen2009-10-233-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::property() ~10% faster. Reviewed-by: Olivier Goffart
| | * | Inline internal QtScript object data() functionsKent Hansen2009-10-232-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::data() 15% faster. Reviewed-by: Olivier Goffart
| | * | Inline internal QtScript object delegate functionsKent Hansen2009-10-234-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptValue::scriptClass() 20% faster. Reviewed-by: Olivier Goffart
| | * | Inline scriptEngineFromExec() functionKent Hansen2009-10-232-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptContext::engine() 80% faster. Reviewed-by: Olivier Goffart
| | * | Inline internal QtScript functions (frameForContext())Kent Hansen2009-10-232-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptContext::parentContext() 50% faster. Reviewed-by: Olivier Goffart
| | * | Inline two internal QtScript functions (contextForFrame() and globalExec())Kent Hansen2009-10-232-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Makes QScriptEngine::currentContext() 25% faster. Reviewed-by: Olivier Goffart
| | * | doc: Relationship of QGraphicsObject::parent && QObject::parentKai Koehne2009-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsObject::parent is actually about the QGraphicsItem hierarchy, not the QObject hierarchy. This is similar to QGraphicsWidget, where 'QObject::parent() should always return 0'. Maybe the explanation in QGraphicsWidget class documentation on this topic should be merged into QGraphicsObject, too? Reviewed-by: Andreas Aardal Hanssen
| | * | Fix bad check for GCC version.Thiago Macieira2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | These macros are available since GCC 2.95. Reviewed-by: Olivier Goffart
| | * | fix line endingOswald Buddenhagen2009-10-231-1/+1
| | | |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-231440-15891/+42346
| | |\ \
| | | * | Better sql unicode tests (still not working correctly tho).Bill King2009-10-232-11/+9
| | | | |
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-221464-16003/+43818
| | | |\ \
| | | | * | Store DirectFB winID as a dynamic propertyAnders Bakken2009-10-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QWS uses the winids for its own purposes I have to store this as a dynamic property. _q_DirectFBWindowID The _q_ is documented to be reserved so this won't break anyone's applications. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | Compile fix for gestures on Windows.Denis Dzyubenko2009-10-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30671 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
| | | | * | Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30670 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
| | | | * | Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | doc: Changed Trolltech to Nokia
| | | | * | Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround to get WebKit to pick up DEF file from std location Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
| | | | * | Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39 by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
| | | | * | Updated WebKit from /home/jturcott/dev/webkit/ to ↵Jocelyn Turcotte2009-10-221270-11675/+33732
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-22102009 ( 0639bb8e812c8923287cd5523248ca64fa5f7a50 ) Changes in WebKit/qt since the last update: Jocelyn: fatal error from script, sha1 in src/3rdparty/webkit/VERSION is bad
| | | | * | Update mkdist-webkit script with latest tag.Jocelyn Turcotte2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Not-reviewed: No-big-deal
| | | | * | Remove declaration of QDirectFBScreen::scrollAnders Bakken2009-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function has been declared since the initial commit but was never actually implemented. The function exists in QDirectFBWindowSurface. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | Compile fix.Denis Dzyubenko2009-10-226-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
| | | | * | QTextEdit: Fix the wrong order for call of Qt::WA_InputMethodEnabled in ↵Liang QI2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setReadOnly. Should set Qt::WA_InputMethodEnabled after set the flags, just because shouldEnableInputMethod() will read the flags. Task-number: QTBUG-4917 Reviewed-by: Shane Kearns
| | | | * | QHttp: Fix bug related to SSL and big POST dataMarkus Goetz2009-10-223-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttp is deprecated, but let's be nice and fix this. POST/PUT now properly works over HTTPS without buffering the whole data when it is not needed. Reviewed-by: Peter Hartmann
| | | | * | QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-224-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
| | | | * | Make warning more helpful.Thomas Zander2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also fix grammer and avoid using combined words.
| | | | * | Change API; the pan gesture now has points for distance, not size.Thomas Zander2009-10-224-24/+24
| | | | | |
| | | | * | Make the already-public calls be documented and publicThomas Zander2009-10-222-3/+2
| | | | | |
| | | | * | Fixed the gestures/graphicsview manualtestDenis Dzyubenko2009-10-222-4/+23
| | | | | |
| | | | * | Implemented gesture event delivery and propagation inside QGraphicsView.Denis Dzyubenko2009-10-223-38/+350
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander
| | | | * | Added debug operator for QGraphicsObjectDenis Dzyubenko2009-10-222-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alexis Menard
| | | | * | Add QGestureEvent::mapToScene for better graphicsView integrationThomas Zander2009-10-224-0/+50
| | | | | |
| | | | * | Fix for the gestures autotest.Denis Dzyubenko2009-10-222-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Improvements for gesture event deliveryDenis Dzyubenko2009-10-227-42/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When delivering GestureOverride events by default both the event and individual gestures will be ignored. We also store the acceptance state of individual gesture in the event and not in the gesture object, along with its target. Reviewed-by: Thomas Zander