diff options
| -rw-r--r-- | dist/changes-4.6.3 | 40 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 9 |
3 files changed, 43 insertions, 9 deletions
diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3 index d8e9fb4..c109f21 100644 --- a/dist/changes-4.6.3 +++ b/dist/changes-4.6.3 @@ -40,14 +40,29 @@ Optimizations QtCore ------ - - foo - * bar + - QXmlStreamReader + * [QTBUG-9196] fixed crash when parsing QtGui ----- - - foo - * bar + - QPainter + * [QTBUG-10421] Fixed WebKit-specific justification bug for text containing + more than one script. + + - QTextEdit + * [QTBUG-9599] Fixed crash when copying the current text cursor as a result + of deleting a character. + + - QTextEngine + * [QTBUG-9374] Fixed possible crash in QTextEngine::boundingBox() when using + multiscripted text. + + - QTextLayout + * [QTBUG-9074] Fixed performance regression that was introduced in Qt 4.6.0. + + - Improved scrolling horizontally with a mouse wheel over sliders. + - [QTBUG-7451] Gestures respect panels on QGraphicsView. QtDBus ------ @@ -82,8 +97,13 @@ QtSql QtXml ----- - - foo - * bar + - [QTBUG-8398] QDom: prevent infinite loop when cloning a DTD + +QtXmlPatterns +------------- +- [QTBUG-8920] fixed crash with anonymous types in XsdSchemaChecker +- [QTBUG-8394] include/import/redefine schemas only once +- QXmlSchema: fix crash with referencing elements Qt Plugins ---------- @@ -111,12 +131,16 @@ Qt for Unix (X11 and Mac OS X) Qt for Linux/X11 ---------------- - - + - [MR 458] Improved handling of Shift-Tab with VNC on X11. + - [QTBUG-7063] Changed key bindings (XF86XK_MyComputer, Qt::Key_Launch0, + Key_Calculator) on X11 back to how it was in Qt 4.5 before MR 1742 + accidentally changed it. Qt for Windows -------------- - - + - [QTBUG-6007] On Windows we query if there is a touch screen and do not try + to enable gestures otherwise. Qt for Mac OS X --------------- diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 62cce62..e8946de 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -31,6 +31,9 @@ plugin { #Qt plugins } } +#handle modules +for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) + #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index b2156a9..e27ffc6 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -31,9 +31,16 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0 # Projects linking to webkit need dependency to webkit contains(QT, webkit): { + # these can be overridden by mkspecs/modules/qt_webkit.pri + isEmpty(QT_WEBKIT_MAJOR_VERSION) { + QT_WEBKIT_MAJOR_VERSION = $${QT_MAJOR_VERSION} + QT_WEBKIT_MINOR_VERSION = $${QT_MINOR_VERSION} + QT_WEBKIT_PATCH_VERSION = $${QT_PATCH_VERSION} + } + pkg_depends_webkit += \ "; Dependency to Qt Webkit" \ - "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" + "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION}, {\"QtWebKit\"}" } else { default_deployment.pkg_prerules -= pkg_depends_webkit } |