From 312fea50f8f5f2a114061b924a1cbf05850167d9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 19 Sep 2011 09:23:29 +0200 Subject: Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 1374 Reviewed-by: Samuel Rødal --- src/gui/image/qpixmapfilter.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index a33e173..6c03990 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -1362,16 +1362,14 @@ void QPixmapDropShadowFilter::draw(QPainter *p, qt_blurImage(&blurPainter, tmp, d->radius, false, true); blurPainter.end(); - tmp = blurred; - // blacken the image... - tmpPainter.begin(&tmp); - tmpPainter.setCompositionMode(QPainter::CompositionMode_SourceIn); - tmpPainter.fillRect(tmp.rect(), d->color); - tmpPainter.end(); + QPainter blackenPainter(&blurred); + blackenPainter.setCompositionMode(QPainter::CompositionMode_SourceIn); + blackenPainter.fillRect(blurred.rect(), d->color); + blackenPainter.end(); // draw the blurred drop shadow... - p->drawImage(pos, tmp); + p->drawImage(pos, blurred); // Draw the actual pixmap... p->drawPixmap(pos, px, src); -- cgit v0.12 From f9bd50e37bee0bb4d243887ae684b46f6b6750fe Mon Sep 17 00:00:00 2001 From: Reuben Dowle Date: Mon, 19 Sep 2011 09:46:50 +0200 Subject: stop tslib plugin having same file name as linux input plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 1330 Reviewed-by: Samuel Rødal --- src/plugins/generic/tslib/tslib.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro index 74c7fd2..760fbae 100644 --- a/src/plugins/generic/tslib/tslib.pro +++ b/src/plugins/generic/tslib/tslib.pro @@ -1,4 +1,4 @@ -TARGET = qlinuxinputplugin +TARGET = qtslibplugin include(../../qpluginbase.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic -- cgit v0.12 From 5eb449ddc0d9f5019082daf6804a048f88ff39c7 Mon Sep 17 00:00:00 2001 From: Gerhard Roethlin Date: Mon, 19 Sep 2011 10:01:21 +0200 Subject: 4.8 Changes: OpenGL Framebuffer Format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added an entry for the OpenGL Framebuffer Format commit to the 4.8 changelog. Merge-request: 1387 Reviewed-by: Samuel Rødal --- dist/changes-4.8.0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index d094b38..acc107b 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -117,6 +117,8 @@ QtNetwork - Including will not work in combination with GLEW, as QGLFunctions will undefine GLEW's defines. - Optimize behavior of QGLTextureCache + - Reading from the FrameBuffer with Qt now correctly gives an image + marked as premultiplied. QtScript -------- -- cgit v0.12 From 035a05e498568cacbc53017d6f7ee6691c050edb Mon Sep 17 00:00:00 2001 From: Reuben Dowle Date: Mon, 19 Sep 2011 13:04:48 +0200 Subject: Allow generic EGL platform contexts to be shared MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 1331 Reviewed-by: Samuel Rødal --- src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp | 5 +++-- src/plugins/platforms/eglconvenience/qeglplatformcontext.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp b/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp index 4d1d63e..d733cd6 100644 --- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp +++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp @@ -48,7 +48,7 @@ #include -QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi) +QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi, QEGLPlatformContext *shareContext) : QPlatformGLContext() , m_eglDisplay(display) , m_eglSurface(surface) @@ -59,7 +59,8 @@ QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, E } eglBindAPI(m_eglApi); - m_eglContext = eglCreateContext(m_eglDisplay,config, 0,contextAttrs); + EGLContext shareEglContext = shareContext ? shareContext->eglContext() : 0; + m_eglContext = eglCreateContext(m_eglDisplay,config, shareEglContext, contextAttrs); if (m_eglContext == EGL_NO_CONTEXT) { qWarning("Could not create the egl context\n"); eglTerminate(m_eglDisplay); diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h index 9be1480..614b3cb 100644 --- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h +++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h @@ -48,7 +48,7 @@ class QEGLPlatformContext : public QPlatformGLContext { public: - QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi); + QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi, QEGLPlatformContext *shareContext = 0); ~QEGLPlatformContext(); void makeCurrent(); -- cgit v0.12 From 67a1b5e50c1cc90e9c03d9f4cadc9912f6880e15 Mon Sep 17 00:00:00 2001 From: Reuben Dowle Date: Mon, 19 Sep 2011 13:04:50 +0200 Subject: Allow shared EGL contexts for xcb and xlib platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 1331 Reviewed-by: Samuel Rødal --- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- src/plugins/platforms/xlib/qxlibwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 0a02c7e..ed88138 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -516,7 +516,7 @@ QPlatformGLContext *QXcbWindow::glContext() const EGLSurface eglSurface = eglCreateWindowSurface(display,config,(EGLNativeWindowType)m_window,0); QXcbWindow *that = const_cast(this); - that->m_context = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API); + that->m_context = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API, static_cast(widget()->platformWindowFormat().sharedGLContext())); #elif defined(XCB_USE_DRI2) QXcbWindow *that = const_cast(this); that->m_context = new QDri2Context(that); diff --git a/src/plugins/platforms/xlib/qxlibwindow.cpp b/src/plugins/platforms/xlib/qxlibwindow.cpp index 823fae9..16c5ed5 100644 --- a/src/plugins/platforms/xlib/qxlibwindow.cpp +++ b/src/plugins/platforms/xlib/qxlibwindow.cpp @@ -687,7 +687,7 @@ QPlatformGLContext *QXlibWindow::glContext() const eglContextAttrs.append(EGL_NONE); EGLSurface eglSurface = eglCreateWindowSurface(display,config,(EGLNativeWindowType)x_window,0); - that->mGLContext = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API); + that->mGLContext = new QEGLPlatformContext(display, config, eglContextAttrs.data(), eglSurface, EGL_OPENGL_ES_API, static_cast(windowFormat.sharedGLContext())); #endif #endif } -- cgit v0.12 From c750afe0e0f043389d30850070889946e4c6e8af Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Mon, 19 Sep 2011 13:20:13 +0200 Subject: Make sure cursor position doesn't exceed line end If we have trailing spaces at the end of a line, cursor will disappear because the position we returned exceeds line end, thus the widget border. By limiting it within line.width we can make sure it always visible, which is more consistent to the behavior in common platforms. Reviewed-by: Eskil --- src/gui/text/qtextlayout.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index d0c1a0e..a2662c4 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -2612,6 +2612,9 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const x += eng->offsetInLigature(si, pos, end, glyph_pos); } + if (x > line.width) + x = line.width; + *cursorPos = pos + si->position; return x.toReal(); } -- cgit v0.12 From 344ded40e9a250ebfa67f2d778ba89be1b5269b8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 19 Sep 2011 13:43:52 +0200 Subject: Update changelog for Qt 4.8.0 For QtConcurrent and QUuid. --- dist/changes-4.8.0 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index 27c6774..374830a 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -50,6 +50,9 @@ QtCore - QMutexLocker: improved performence of the non contended case by inlining some function - QThreadStorage: Added possibility to store object by value instead of by pointer [QTBUG-15033] - QThread: fixed few race conditions [QTBUG-17257, QTBUG-15030] + - QtConcurrent: Entry points were re-written and interfaces changed. This work was +done in order to add support for QtConcurrent on Symbian, but ultimately it was noted +that the changes lead to a leaner API and the change applies to all platforms. - QtConcurrent: added support for c++0x lambda in few functions - QObject: Improved performence of the signal activation - QObject: added ways to connect signals using QMetaMethod @@ -66,6 +69,9 @@ QtCore - QFile: new open() overloads allow control over whether QFile should close an adopted file handle or not - Fix QProcess emitting two started signals on X11 [QTBUG-7039] - QLocale: added locale dependent to{Upper,Lower} string conversions + - QUuid: Optimize QUuid::toString() and relevant, circa 20 times faster than before on the test machine. [QTBUG-19418] + - QUuid: Add QUuid::toByteArray() and relevant, same behavior with QUuid::toString(). [QTBUG-19419] + - QUuid: Add QUuid::toRfc4122() and fromRfc4122(), provide interfaces by following the RFC-4122 [QTBUG-19420] QtGui ----- @@ -239,6 +245,8 @@ Qt for Symbian - Fixed QProcess::waitForFinished WaitForRequest handling in Symbian [QT-4659] - Changed DEPLOYMENT keyword to accept both .sources and .files [QTBUG-3216] - Removed static vs dynamic library autodetection from qmake in Symbian [QTBUG-13498] + - QtConcurrent is now working both with RVCT 2.2 and GCCE 4.4.1 on Symbian, but not with WINSCW, +the compiler of Symbian emulator (and there is no plan to support it). [QTBUG-5182] [QTBUG-9070] Qt for Windows CE ----------------- -- cgit v0.12 From e037eb6dd00e51195380dd68af2c6a0466977529 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 19 Sep 2011 20:11:04 +0200 Subject: add 4.8 changes created/merged by me --- dist/changes-4.8.0 | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index 374830a..fe7691b 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -60,9 +60,11 @@ that the changes lead to a leaner API and the change applies to all platforms. - QObject: optimize constructions and destruction of objects - QObject: Qt::BlockingQueuedConnection can handle the return value [QTBUG-10440] - QList/QVector/QStringList: added C++0x initilizer lists constructors. + - QList: optimizations - QVarLenghtArray: added method for consistency with QVector - QStringBuilder: added support for QByteArray - qSwap now uses std::swap, specialized std::swap for our container to work better with stl algoritms + - Added member-swap function to containers and implicitly shared (including GUI) classes - QVariant: deprecated global function qVariantSetValue, qVariantValue, qVariantCanConvert, qVariantFromValue - QUrl: add method for retrieving effective top level domain [QTBUG-13601] (MR-1205) - optimised performance of QFileInfo, QDir, QDirIterator, these classes now share metadata and access the filesystem less @@ -72,6 +74,13 @@ that the changes lead to a leaner API and the change applies to all platforms. - QUuid: Optimize QUuid::toString() and relevant, circa 20 times faster than before on the test machine. [QTBUG-19418] - QUuid: Add QUuid::toByteArray() and relevant, same behavior with QUuid::toString(). [QTBUG-19419] - QUuid: Add QUuid::toRfc4122() and fromRfc4122(), provide interfaces by following the RFC-4122 [QTBUG-19420] + - QTextStream, QDataStream and QXmlStreamWriter: added write error reporting [QTBUG-376] + - QProcessEnvironment: added keys() and insert(const QProcessEnvironment &) + - QProcessEnvironment: preserve variable name case on Windows + - QProcessEnvironment: made systemEnvironment() encoding-safe + - QProcessEnvironment: major optimizations, especially on Unix + - Add branch prediction macros Q_LIKELY and Q_UNLIKELY + - QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded QtGui ----- @@ -81,7 +90,7 @@ QtGui - QComboBox: Fixed a color propagation issue with the lineedit. [QTBUG-5950] - QGraphicsLayout: Made setInstantInvalidatePropagation() public - Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4 - - QListView diverses optimisations [QTBUG-11438] + - QListView diverse optimisations [QTBUG-11438] - QTreeWidget/QListWidget: use localeAwareCompare for string comparisons [QTBUG-10839] - PNG image I/O: Much improved support for text annotations, including iTXt fields. - QRawFont and QGlyphRun are introduced for low-level text rendering. [QTBUG-18252] @@ -98,6 +107,8 @@ QtGui - QPainter: Added a fast stroking algorithm for thin (< 1px wide) aliased and antialiased lines, giving a huge improvement in drawing speed for certain cases - Fixed a rare race condition when showing toplevel windows on X11 + - QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed, that + caused unnecessary update events - Accessibility: Fix potential crash in QDockWidget. - Accessibility: Fix crash when asking for relations of child accessibles. - Accessibility: More consistency in reporting names (especially when widget is invisible). @@ -112,6 +123,9 @@ QtGui - Accessibility: Several enablers for accessible graphicsview and Qt Quick applications. - Fixed loading BMP files with version 4 and 5 headers, ignoring extra data. - QTextCursor optimization + - QUndoGroup, QUndoStack: Allow using not only prefixes for undo command text [QTBUG-14442] + - QUndoView: Allow different text for undo actions and items + - QCommonStyle: Fix overrides from the proxy style [QTBUG-20849] QtNetwork --------- @@ -127,6 +141,7 @@ QtNetwork - HTTP cache: do not load resources from cache that must be revalidated [QTBUG-18983] - HTTP cache: change file organization (MR-2505) - SOCKS5: write errors are propagated to the outer socket [QTBUG-18713] + - QNetworkReply: errorString() returns translated messages now [QTBUG-18382] QtOpenGL -------- @@ -202,6 +217,7 @@ Qt for Embedded Linux keyboard and screen drivers. - Improved support for INTEGRITY RTOS - Allow hard-coding the temp path in mkspecs (QT_UNIX_TEMP_PATH_OVERRIDE define) + - Added support for opening LinuxInput devices exclusively (via ioctl EVIOCGRAB) Qt for Symbian -------------- @@ -302,24 +318,33 @@ Qt for Windows CE - qmake + * Look for external Qt modules in $QMAKEPATH * MinGW: fix DEF_FILE for shadow builds. (QTBUG-11643) - -- qmake - Visual Studio project generator - * Support x64 Qt builds. (QTBUG-17911) - * QMAKE_PROJECT_NAME qmake variable introduced to set the project's name. - * Support PCHs with other extensions than ".h". (QTBUG-16639) - * Fix setting PCH options manually via the MSVC compiler flags. - (QTBUG-15594) - * Set the output directory correctly. (QTBUG-16490) - * Fix handling of DEFINES from .prl files. (QTBUG-16024) - * Fix the language settings generated Windows resource files. - (QTBUG-12249) * Implemented "aux" template that allows making use of the INSTALLS variable without building anything. Needed for projects with QML entry point. + * MSVC now link with /DYNAMICBASE /NXCOMPAT in order to increase security. + * Fix the language settings in generated Windows resource files. (QTBUG-12249) + * Write and install pkg-config files for MinGW + * Make PKGCONFIG referencing missing packages fatal; add packagesExist() for + a-priori checks. (QTBUG-11418) + * Make moc use DEFINES from pkg-config. (QTBUG-19922) + * Parsing nested quotes works a bit differently now + * Added -unset option + * Made the Hurd mkspec useful + * Visual Studio project generator + - Support x64 Qt builds. (QTBUG-17911) + - QMAKE_PROJECT_NAME qmake variable introduced to set the project's name. + - Support PCHs with other extensions than ".h". (QTBUG-16639) + - Fix setting PCH options manually via the MSVC compiler flags. (QTBUG-15594) + - Set the output directory correctly. (QTBUG-16490) + - Fix handling of DEFINES from .prl files. (QTBUG-16024) - configure * The endianness for Windows is always set to little endian. - + * [QTBUG-5710] Configure now complains on missing perl on windows + * Removed obsolete -qt-gif option + * Allow setting LD, RANLIB, OBJDUMP, and STRIP. + * Allow selecting imageformats to be built as plugin vs. internal. - qtconfig * removed Qt3support dependency -- cgit v0.12 From 3c3a0f1a8cadfe1299afdd13889ca9c19be310d0 Mon Sep 17 00:00:00 2001 From: Sinan Tanilkan Date: Tue, 20 Sep 2011 12:34:39 +0200 Subject: Update changelog for Qt 4.8 Change recieved from John Brooks --- dist/changes-4.8.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index fe7691b..84e58f9 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -56,6 +56,7 @@ that the changes lead to a leaner API and the change applies to all platforms. - QtConcurrent: added support for c++0x lambda in few functions - QObject: Improved performence of the signal activation - QObject: added ways to connect signals using QMetaMethod + - QObject: added senderSignalIndex method to discover the signal that invoked a slot - QObject: deprecated qFindChild and qFindChildren - QObject: optimize constructions and destruction of objects - QObject: Qt::BlockingQueuedConnection can handle the return value [QTBUG-10440] -- cgit v0.12 From 3dd9e66baaa0848bcc2eb7daecf2b63724624358 Mon Sep 17 00:00:00 2001 From: Ademar de Souza Reis Jr Date: Mon, 19 Sep 2011 10:43:14 -0300 Subject: dos2unix on a webkit source file (fix support for Visual Studio) webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org) --- .../Source/WebCore/bindings/js/JSExceptionBase.h | 86 +++++++++++----------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h index 01c6ac2..a9366ed 100644 --- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h +++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h @@ -1,43 +1,43 @@ -/* - * Copyright (C) 2009 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSExceptionBase_h -#define JSExceptionBase_h - -namespace JSC { - -class JSValue; - -} // namespace JSC - -namespace WebCore { - -class ExceptionBase; - -ExceptionBase* toExceptionBase(JSC::JSValue); - -} // namespace WebCore - -#endif // JSExceptionBase_h +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef JSExceptionBase_h +#define JSExceptionBase_h + +namespace JSC { + +class JSValue; + +} // namespace JSC + +namespace WebCore { + +class ExceptionBase; + +ExceptionBase* toExceptionBase(JSC::JSValue); + +} // namespace WebCore + +#endif // JSExceptionBase_h -- cgit v0.12 From 3489808c1dcd157ac09dd6da16bc057b56696d59 Mon Sep 17 00:00:00 2001 From: Ademar de Souza Reis Jr Date: Tue, 20 Sep 2011 11:12:04 -0300 Subject: Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt --- src/3rdparty/webkit/Source/WebCore/WebCore.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri index 82311d2..00357a1 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri @@ -303,7 +303,7 @@ win32-* { } # Remove whole program optimizations due to miscompilations -win32-msvc2005|win32-msvc2008|wince*:{ +win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{ QMAKE_CFLAGS_RELEASE -= -GL QMAKE_CXXFLAGS_RELEASE -= -GL -- cgit v0.12 From 128c4166ba445112ab73dd98b3e403da0489656e Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Tue, 20 Sep 2011 13:42:35 +0200 Subject: Only limit cursor position when line is wrapped Reviewed-by: Eskil --- src/gui/text/qtextlayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index a2662c4..a86cf05 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -2612,7 +2612,7 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const x += eng->offsetInLigature(si, pos, end, glyph_pos); } - if (x > line.width) + if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width) x = line.width; *cursorPos = pos + si->position; -- cgit v0.12 From 6d1160ebb58a35a70afd689223d167eaf13490fd Mon Sep 17 00:00:00 2001 From: aavit Date: Thu, 22 Sep 2011 11:04:53 +0200 Subject: Update changes-4.8.0 file --- dist/changes-4.8.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index 213068f..a9c0a40 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -33,7 +33,7 @@ General Improvements Third party components ---------------------- - - Updated libpng to version 1.5.1 + - Updated libpng to version 1.5.4 - Updated libjpeg to version 8c - Updated zlib to version 1.2.5 -- cgit v0.12 From a14033620fab5edca44293ec6dfcc904e2e0eb20 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 22 Sep 2011 14:48:44 +0200 Subject: Sentences should end with a period! (Poor man's rebuild trigger.) --- src/3rdparty/webkit/Source/WebCore/WebCore.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri index 00357a1..d8ba8a6 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri @@ -153,7 +153,7 @@ symbian { CONFIG += do_not_build_as_thumb CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3 - # Symbian plugin support + # Symbian plugin support. LIBS += -lefsrv !CONFIG(QTDIR_build) { -- cgit v0.12 From 48f64fc7ae9f0e9e8ab07ab60ccd55d3b053dfab Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Thu, 22 Sep 2011 15:11:42 +0200 Subject: Fix broken Solaris build (getpwnam_r usage) Added ifdef inside qt_tildeExpansion function to use correct version of getpwnam_r depending on _C_POSIX_SOURCE version on Solaris platform. Task-number: QTBUG-21451 Merge-request: 1380 Reviewed-by: ossi --- src/gui/dialogs/qfiledialog.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 5e8533e..817cd38 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -880,7 +880,12 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded passwd *tmpPw; char buf[200]; const int bufSize = sizeof(buf); - int err = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize, &tmpPw); + int err = 0; +#if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L) + tmpPw = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize); +#else + err = getpwnam_r(userName.toLocal8Bit().constData(), &pw, buf, bufSize, &tmpPw); +#endif if (err || !tmpPw) return ret; const QString homePath = QString::fromLocal8Bit(pw.pw_dir); -- cgit v0.12 From 3cd5e01f359d47975c27627ff4866e35258a9d0b Mon Sep 17 00:00:00 2001 From: Sinan Tanilkan Date: Fri, 23 Sep 2011 10:18:34 +0200 Subject: Update changelog for Qt 4.8 Change recieved from James Perrett --- dist/changes-4.8.0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index 84e58f9..4299c1a 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -219,6 +219,7 @@ Qt for Embedded Linux - Improved support for INTEGRITY RTOS - Allow hard-coding the temp path in mkspecs (QT_UNIX_TEMP_PATH_OVERRIDE define) - Added support for opening LinuxInput devices exclusively (via ioctl EVIOCGRAB) + - Added eglnullws QScreen driver for use with OpenGL ES EGL null window system (NullWS). Qt for Symbian -------------- @@ -357,6 +358,9 @@ Qt for Windows CE * New tool to generate text descriptions of the QML components defined in plugins loaded by a QML module. +- syncqt + * Fix to allow $QTDIR to contain any valid pathname characters. + **************************************************************************** * Plugins * **************************************************************************** -- cgit v0.12 From bafaaa85f77259e256581e4cba5d7afcda56a377 Mon Sep 17 00:00:00 2001 From: Ademar de Souza Reis Jr Date: Thu, 22 Sep 2011 14:35:31 -0300 Subject: Update changelog for Qt-4.8.0: add QtWebKit notes --- dist/changes-4.8.0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index 4299c1a..9b118d5 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -163,6 +163,11 @@ QtDBus ------ - Added a method that returns the local machine ID +QtWebKit +-------- + - Update QtWebKit to 2.2.0 + http://trac.webkit.org/wiki/QtWebKitRelease22 + QtSql ----- - Update sqlite to 3.7.7.1 -- cgit v0.12 From 44bf0486fcde32f9ec007e8ed2904114b0ad15fd Mon Sep 17 00:00:00 2001 From: Eero Hyyti Date: Fri, 23 Sep 2011 12:34:34 +0300 Subject: Doc updates to Qt 4.8 platform notes documentation. --- doc/src/platforms/platform-notes.qdoc | 43 +++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 477f125..2cdfc37 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -685,9 +685,7 @@ \ingroup platform-specific \brief Information about the state of support for the Symbian platform. - As with any port, the maturity for Qt for Symbian has not yet reached the - same level as other established Qt ports. This page documents the current - notes for the Symbian port. + This page documents the current notes for the Symbian port. \section1 Source Compatibility @@ -698,18 +696,34 @@ \section1 Binary Compatibility - As with every supported platform, we will strive to maintain - application behavior and binary compatibility throughout the lifetime of - the Qt 4.x series. However, due to the fact that Symbian support is newly - added in 4.6.0, there is a slight possibility that minor corrections to the - application binary interface (ABI) might be required in 4.6.1, in order to - ensure compatibility going forward. Any such change will be clearly - documented in the release notes for 4.6.1. + As with every supported platform, Qt strives to maintain application + behavior and binary compatibility throughout the lifetime of the Qt 4.x + major version and on the Symbian devices that support Qt. Symbian support in + Qt SDK and Ovi Store were introduced with Qt 4.6. Each Qt release contains + bug fixes that might change the API behavior and thereby affect application + compatibility. + + In addition, Symbian devices have different input methods, such as different + keyboard styles or touch input, screen sizes, memory, and CPU and GPU + capabilities. Therefore, you must test applications on specific target + devices to ensure compatibility. In order to build applications that are + supported also on earlier devices, select the target in Qt SDK carefully. + Generally, an earlier target (such as S60 5th Edition) is supported on a + larger number of devices than a later target (such as Symbian Belle). \section1 Supported Devices - See the list of supported devices at - http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian#Supported_Devices + \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian#Supported_Devices}{Nokia Smart Installer for Symbian} + documentation lists supported devices. + + + ###how to formulate this: + Qt 4.6 for Symbian is supported for S60 3rd Edition feature pack 1 devices + and onward via Smart Installer. Qt 4.7.3 is supported in S60 5th Edition + devices and onward. Symbian^3 devices have Qt 4.6 support pre-installed. + Symbian Anna has Qt 4.7.3 pre-installed and Symbian Belle has Qt 4.7.4 in + device firmware (ROM). + \section1 Supported Functionality @@ -736,9 +750,7 @@ \row \o QtSql \o The only driver supported is SQLite. \row \o QtMultimedia - \o Although the module itself is supported, no backend for Symbian - is currently available. However, there is a backend available - for Phonon. + \o For support details see \l {Multimedia and Phonon Support} section. \endtable \section1 Compiler Notes @@ -796,6 +808,7 @@ For more information see the documentation of the individual Qt classes. If a class does not mention Symbian capabilities, it requires none. + \target Multimedia and Phonon Support \section1 Multimedia and Phonon Support Qt provides a high-level API for multimedia functionality with -- cgit v0.12 From a6f87c60ed135c8f92a0de846dba5734fa7cf6c6 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 23 Sep 2011 12:19:02 +0200 Subject: Don't store the alignment attribute for spacers And for QLayoutWidget as it is not allowed and will create a code which doesn't compile Reviewed-by: con Task-number: QTBUG-21575 --- tools/designer/src/lib/uilib/abstractformbuilder.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp index 81f1a3b..665badb 100644 --- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp @@ -1452,6 +1452,8 @@ struct FormBuilderSaveLayoutEntry { explicit FormBuilderSaveLayoutEntry(QLayoutItem *li = 0) : item(li), row(-1), column(-1), rowSpan(0), columnSpan(0), alignment(0) {} + void setAlignment(Qt::Alignment al); + QLayoutItem *item; int row; int column; @@ -1460,6 +1462,20 @@ struct FormBuilderSaveLayoutEntry { Qt::Alignment alignment; }; +// filter out the case of "Spacer" and "QLayoutWidget" widgets +void FormBuilderSaveLayoutEntry::setAlignment(Qt::Alignment al) +{ + if (!item->widget()) + return; + + const QString className = item->widget()->metaObject()->className(); + if (className == QLatin1String("Spacer") + || className == QLatin1String("QLayoutWidget")) + return; + + alignment = al; +} + // Create list from standard box layout static QList saveLayoutEntries(const QLayout *layout) { @@ -1469,7 +1485,7 @@ static QList saveLayoutEntries(const QLayout *layout for (int idx = 0; idx < count; ++idx) { QLayoutItem *item = layout->itemAt(idx); FormBuilderSaveLayoutEntry entry(item); - entry.alignment = item->alignment(); + entry.setAlignment(item->alignment()); rc.append(entry); } } @@ -1486,7 +1502,7 @@ static QList saveGridLayoutEntries(QGridLayout *grid QLayoutItem *item = gridLayout->itemAt(idx); FormBuilderSaveLayoutEntry entry(item); gridLayout->getItemPosition(idx, &entry.row, &entry.column, &entry.rowSpan,&entry.columnSpan); - entry.alignment = item->alignment(); + entry.setAlignment(item->alignment()); rc.append(entry); } } -- cgit v0.12 From 6a8a3f7f8171bb56bc5ff5a5f503213180e6465f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 23 Sep 2011 14:56:23 +0300 Subject: Disabled activeqt/webbrowser example from mingw build. --- examples/activeqt/activeqt.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 79d257a..ad41a47 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -12,6 +12,9 @@ contains(QT_CONFIG, opengl):SUBDIRS += opengl # For now only the contain examples with mingw, for the others you need # an IDL compiler win32-g++*|wince*:SUBDIRS = webbrowser +# Due to build problems, active qt was disabled from mingw build, +# so we have to remove the only one left +win32-g++*:SUBDIRS = # install target.path = $$[QT_INSTALL_EXAMPLES]/activeqt -- cgit v0.12 From caf77de1ea1c15ae4dbeb8ea1182ec6226db210d Mon Sep 17 00:00:00 2001 From: Eero Hyyti Date: Fri, 23 Sep 2011 15:45:01 +0300 Subject: Doc updates to platform notes of Qt 4.8 doc. --- doc/src/platforms/platform-notes.qdoc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 2cdfc37..3134ae0 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -716,13 +716,19 @@ \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian#Supported_Devices}{Nokia Smart Installer for Symbian} documentation lists supported devices. + Qt versions are supported by Symbian devices as follows: + \list + \o Qt 4.6 is supported by S60 3rd Edition feature pack 1 and newer devices + through \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}{Smart Installer}. + \o Qt 4.7.3 is supported by S60 5th Edition and newer devices. + \endlist - ###how to formulate this: - Qt 4.6 for Symbian is supported for S60 3rd Edition feature pack 1 devices - and onward via Smart Installer. Qt 4.7.3 is supported in S60 5th Edition - devices and onward. Symbian^3 devices have Qt 4.6 support pre-installed. - Symbian Anna has Qt 4.7.3 pre-installed and Symbian Belle has Qt 4.7.4 in - device firmware (ROM). + Symbian devices have a pre-installed Qt support as follows: + \list + \o Symbian^3: Qt 4.6 in C: drive. + \o Symbian Anna: Qt 4.7.3 in C: drive. + \o Symbian Belle: Qt 4.7.4 in device firmware (ROM). + \endlist \section1 Supported Functionality -- cgit v0.12 From 140e68ae50411631aa5c1649face4c7d9d1b651d Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Fri, 23 Sep 2011 17:13:39 +0200 Subject: Fix broken qglthreads autotest build on Solaris. qglthreads autotest can not find usleep() function when compiling on Solaris platform. Added qplatformdefs.h include to fix compilation. Task-number: QTBUG-21594 Merge-request: 1394 Reviewed-by: Oswald Buddenhagen --- tests/auto/qglthreads/tst_qglthreads.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp index 859f47f..60fb10c 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -49,6 +49,7 @@ #include // for usleep #define RUNNING_TIME 2000 // save GPU mem by running shorter time. #else +#include "qplatformdefs.h" // for usleep #define RUNNING_TIME 5000 #endif -- cgit v0.12 From 3df9ac2f0719718ceb7385e46445447d95fd7857 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 23 Sep 2011 14:23:52 +0200 Subject: Fix accessible menu not returning child name. When accessible name is set, QAccessibleMenu would always return the menu's name, not that of the child action. Task-Number: QTBUG-21578 Reviewed-by: Jan-Arve --- src/plugins/accessible/widgets/qaccessiblemenu.cpp | 2 +- tests/auto/qaccessibility/tst_qaccessibility.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp index 4ae1d15..e9e5ca8 100644 --- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp +++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp @@ -93,7 +93,7 @@ int QAccessibleMenu::childAt(int x, int y) const QString QAccessibleMenu::text(Text t, int child) const { QString tx = QAccessibleWidgetEx::text(t, child); - if (tx.size()) + if (!child && tx.size()) return tx; switch (t) { diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index d452820..d24f52f 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -2531,6 +2531,12 @@ void tst_QAccessibility::menuTest() QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 4), QString()); QCOMPARE(interface->actionText(QAccessible::DefaultAction, QAccessible::Name, 5), QString("Execute")); + // QTBUG-21578 - after setting accessible name on a menu it would no longer + // return the right names for it's children. + QCOMPARE(interface->text(QAccessible::Name, 1), QString("New...")); + file->setAccessibleName("File"); + QCOMPARE(interface->text(QAccessible::Name, 1), QString("New...")); + QAccessibleInterface *iface = 0; QAccessibleInterface *iface2 = 0; -- cgit v0.12 From e5d7c375d45044cdee261c238e7ab6bd5ab7a0ac Mon Sep 17 00:00:00 2001 From: Eero Hyyti Date: Tue, 27 Sep 2011 09:38:54 +0300 Subject: Doc updates to platform notes document. --- doc/src/platforms/platform-notes.qdoc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 3134ae0..60acb12 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -749,15 +749,30 @@ \endtable The following technologies have limited support: + \table \header \o Technology \o Note \row \o QtSql - \o The only driver supported is SQLite. + \o The supported drivers are SQLite and QSYMSQL. \row \o QtMultimedia \o For support details see \l {Multimedia and Phonon Support} section. \endtable + + It is not recommended to use the following Qt widgets: + \list + \o QFileDialog with the \c DontUseNativeDialog option + \o QColorDialog with the \c DontUseNativeDialog option + \o QFontDialog + \o QWizard + \o QCalendarWidget + \o QDateTimeEdit + \o QMdiArea + \o QMdiSubWindow + \o QDockWidget + \o QPrintPreviewWidget + \endlist \section1 Compiler Notes @@ -827,7 +842,7 @@ In this release the support is experimental. Video playback may show artifacts when the video is moved or resized (for instance during - orientation flips). This problem is present on Symbian^1 and earlier + orientation flips). This problem is present on S60 5th Edition and earlier versions, and on Symbian^3 systems. The audio and video formats that Phonon supports depends on what support -- cgit v0.12 From 99c2bdc8c3346e7b84d2d71ec4dca8fe0ed6688e Mon Sep 17 00:00:00 2001 From: Eero Hyyti Date: Tue, 27 Sep 2011 15:11:36 +0300 Subject: Doc updates to Qt for Symbian installation instructions and platform notes. --- doc/src/getting-started/installation.qdoc | 58 ++++++++++++++++++++++--------- doc/src/platforms/platform-notes.qdoc | 5 ++- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 36d63f5..2936d60 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -510,7 +510,10 @@ in the \l{Qt for the Symbian platform Requirements} document. \section1 Step 1: Install Qt - Run \c{qt-symbian-opensource-%VERSION%.exe} and follow the instructions. + Download the \c {Qt libraries 4.x for Windows} package (for \c minGW or \c {VS 2008}) + from the \l {http://qt.nokia.com/downloads#qt-lib}{downloads} page. + + Run the downloaded package and follow the instructions. \note Qt must be installed on the same drive as the Symbian SDK you are using, and the install path must not contain any spaces. @@ -652,23 +655,39 @@ Binary Package} document. Congratulations, Qt is now ready to use. \section1 Step 7: Installing Qt Libraries on the Device + + To run a Qt application on a device, it must have Qt libraries installed. + + Symbian devices have a pre-installed Qt as follows: + \list + \o Symbian Anna devices have the pre-installed Qt, Qt Mobility, and Qt Webkit. + \o Symbian Belle and later devices have the pre-installed Qt on the device firmware. + \endlist + + \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian} + {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60 + and Symbian devices if the libraries are not pre-installed. + + Nokia Developer site's \l {http://www.developer.nokia.com/Devices/Device_specifications/?filter1=qt} + {Device specifications} provide information on which devices have a + pre-installed Qt and the used Qt version. + + To create your own Qt installation package, do as follows: + + \snippet doc/src/snippets/code/doc_src_installation.qdoc 29 + + The Qt libraries are built with "All -Tcb" capability, so they can support + all types of applications. If you don't have a suitable certificate, you can + patch the binaries in either of the following ways: + + \list + \o If you have no certificate, build a self-signed Qt: + \snippet doc/src/snippets/code/doc_src_installation.qdoc 34 - To run the demo on a real device, you first have to install - the Qt libraries on the device: - -\snippet doc/src/snippets/code/doc_src_installation.qdoc 29 - - The Qt libraries are built with "All -Tcb" capability, so that - they can support all types of application. - If you don't have a suitable certificate, it is possible to patch - the binaries as follows: - - If you have no certificate, build a self signed Qt: -\snippet doc/src/snippets/code/doc_src_installation.qdoc 34 - - If you have a symbian-signed developer certificate, specify the + \o If you have a symbian-signed developer certificate, specify the capabilities you can sign for, for example: -\snippet doc/src/snippets/code/doc_src_installation.qdoc 35 + \snippet doc/src/snippets/code/doc_src_installation.qdoc 35 + \endlist \section1 Running Qt demos @@ -1315,7 +1334,12 @@ We hope you will enjoy using Qt. \brief Setting up the Symbian platform environment for Qt. \previouspage General Qt Requirements - Qt for the Symbian platform requires the following software installed on your development PC: + \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools + and libraries for developing Qt applications. However, if you want to build + Qt itself for Symbian, follow the instructions below. + + Qt for the Symbian platform requires the following software installed on + your development PC: \list \o \l{http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/}{Carbide.c++ v2.3.0 or higher recommended}. \list diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc index 60acb12..e1e8c44 100644 --- a/doc/src/platforms/platform-notes.qdoc +++ b/doc/src/platforms/platform-notes.qdoc @@ -725,7 +725,6 @@ Symbian devices have a pre-installed Qt support as follows: \list - \o Symbian^3: Qt 4.6 in C: drive. \o Symbian Anna: Qt 4.7.3 in C: drive. \o Symbian Belle: Qt 4.7.4 in device firmware (ROM). \endlist @@ -856,7 +855,7 @@ \section1 Hardware Accelerated Rendering - The default graphics system on Symbian^3 is OpenVG, which uses OpenVG + The default graphics system on Symbian Anna is OpenVG, which uses OpenVG hardware to accelerate \l QPainter functions. There are a few exceptions, where Qt will use software rendering fallback. @@ -873,7 +872,7 @@ \section1 QtOpenGL Support in Symbian - Qt 4.7 introduces the \l {QtOpenGL} module to Symbian^3. QtOpenGL is + Qt 4.7 introduces the \l {QtOpenGL} module. QtOpenGL is supported on devices which support OpenGL ES 2.0. Symbian platforms prior to Symbian^3 are not supported. -- cgit v0.12