From dd62687182830aa353ef573f653fe913fd42a8d0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 13 Jan 2010 10:21:04 +0100 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 ) Changes in WebKit/qt since the last update: * Cherry-pick of http://trac.webkit.org/changeset/53181 ( http://bugreports.qt.nokia.com/browse/QTBUG-7290 ) --- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 12 ++++++++++++ src/3rdparty/webkit/WebCore/WebCore.pro | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index b69ac98..bc6d661 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - bd6591b4acaf2172ab05702153ef539c0ac89cbb + 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index ab5b131..02daf86 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2010-01-13 Miikka Heikkinen + + Reviewed by Simon Hausmann. + + [Qt/Symbian] Added missing vendor information to qtwebkit.sis + + This information is necessary to Symbian sign the package. + + http://bugreports.qt.nokia.com/browse/QTBUG-7290 + + * WebCore.pro: + 2010-01-12 Jakub Wieczorek Reviewed by Adam Barth. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 3eba696..9432217 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -9,6 +9,15 @@ symbian: { webkitlibs.sources = QtWebKit.dll webkitlibs.path = /sys/bin + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + webkitlibs.pkg_prerules = vendorinfo + DEPLOYMENT += webkitlibs TARGET.UID3 = 0x200267C2 -- cgit v0.12 From 15b10bf77dde5235083f383c186e809c16e2e56a Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 13 Jan 2010 10:37:10 +0100 Subject: Remove erroneous warning in QFileInfo::absolutePath() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QFileInfo().absolutePath() is legal and shouldn't produce a warning. Reviewed-by: João Abecasis --- src/corelib/io/qfileinfo.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index b4437db..e90529e 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -573,10 +573,13 @@ QString QFileInfo::canonicalFilePath() const QString QFileInfo::absolutePath() const { Q_D(const QFileInfo); - if (d->data->fileName.isEmpty()) + + if (!d->data->fileEngine) { + return QLatin1String(""); + } else if (d->data->fileName.isEmpty()) { qWarning("QFileInfo::absolutePath: Constructed with empty filename"); - if(!d->data->fileEngine) return QLatin1String(""); + } return d->getFileName(QAbstractFileEngine::AbsolutePathName); } -- cgit v0.12 From 42fc59ed04e1675ecae7fa87303a148c4b0c1ed1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 13 Jan 2010 12:21:09 +0100 Subject: My changes for 4.6.1 --- dist/changes-4.6.1 | 66 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1 index 0f8c2bc..b07551a 100644 --- a/dist/changes-4.6.1 +++ b/dist/changes-4.6.1 @@ -29,7 +29,9 @@ New features Optimizations ------------- - - Optimized foo in QSomeClass + - Optimized empty QUrl creation + * Empty QUrls no longer allocate memory now + * See list of Important Behavior Changes below @@ -45,6 +47,17 @@ QtCore and Symbian by using realpath() system call * Avoid stat() when opening a file + - QLibrary and QPluginLoader + * Do not look at the Qt patch-level version embedded in plugins' + buildkeys when trying to determine if the plugin is compatible + + - QProcessEnvironment + * [QTBUG-6701] Ensure we don't crash in operator== + + - QTextEncoder + * [merge request 399] QTextEncoder::fromUnicode as QT3 support + member + - QXmlStreamreader * [merge request 1926] Fix parsing of DTDs that contain empty markup declarations @@ -72,8 +85,30 @@ QtGui QtDBus ------ - - foo - * bar + - QDBusConnection + * [QTBUG-5979] Fixed the signal-delivery mechanism to update + correctly when the sender name changes/appears on the bus. + * [QTBUG-7041] Fixed marshalling of booleans in release mode. + * [QT-2307] Fixed calls with the QDBus::BlockWithGui mode. + + - QDBusInterface + * Made it continue working even when the remote object + introspection fails. + + - QDBusInterface and qdbuscpp2xml + * [QTBUG-5563] Fixed an issue with generating annotations in + signals + + - QDBusPendingReply and QDBusReply + * [QTBUG-6571] Fixed a crash that would happen if you tried to + make a call with a disconnected QDBusConnection + +QtMultimedia +------------ + + - QAudioOutput + * [Merge request 418] Fixed compilation the example provided for + QAudioOutput::start QtNetwork --------- @@ -82,6 +117,8 @@ QtNetwork * HTTP: Smaller improvements * HTTP: Send our locale with the HTTP request * HTTP: Start Accept-language and Authorization header with capital letter + * HTTP: Fix caching algorithm, matching RFC 2612 and the documentation + * HTTP [QTBUG-7060]: Fix an issue with headers like "private, max-age=300" * file: Introduce special subclass for higher performance with file:// URLs - QTcpSocket * [QTBUG-5799] Fix waitForConnected() on Windows @@ -101,7 +138,7 @@ QtOpenGL compressed textures if the appropriate extensions are present in the GL implementation. -QtwebKit +QtWebKit -------- - Fixed user agent string on Symbian (webkit.org/b/31961) @@ -112,6 +149,7 @@ QtwebKit - Fixed wrapping of QObjects with recurring identity (webkit.org/b/31681) - Fixed compilation with ICC - Fixed assertion when dragging SVG images (webkit.org/b/32511) + - Added the framecapture example to the default build (merge request 2235) QtScript -------- @@ -152,7 +190,15 @@ Third party components Qt for Unix (X11 and Mac OS X) ------------------------------ - - + - [QTBUG-6755] Ensure we don't call select(2) with a negative timeout + if the timer expires during timeout recalculation. + + - Added mkspecs for Sun CC that enable -library=stlport by default, + to restore STL capability with that compiler. + + - [QTBUG-6576] Fixed compilation on HP-UX 11.11 + + - [QTBUG-6961] Fixed compilation on HURD Qt for Linux/X11 ---------------- @@ -244,5 +290,13 @@ Qt for Symbian * Important Behavior Changes * **************************************************************************** - - + - Phonon + * Include headers have been changed. The only official method for + including Phonon headers is or + . This change was necessary because of + frameworks on Mac. + + Compatibility is provided for includes, but is not + guaranteed to work. Including and is not + supported. -- cgit v0.12 From 8c7e85c7b9933949c7a7c05489f5f6bfd1ce4312 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 13 Jan 2010 12:39:16 +0100 Subject: Update my changelog for 4.6.1 --- dist/changes-4.6.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1 index b07551a..b8994df 100644 --- a/dist/changes-4.6.1 +++ b/dist/changes-4.6.1 @@ -30,9 +30,9 @@ Optimizations ------------- - Optimized empty QUrl creation - * Empty QUrls no longer allocate memory now + * [QTBUG-4030] Empty QUrls no longer allocate memory now - * See list of Important Behavior Changes below + * See list of Important Behavior Changes below **************************************************************************** -- cgit v0.12 From cd0772335cc9bcedd582cacc834bf4609ca650b0 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 13 Jan 2010 13:13:07 +0100 Subject: doc: This bug wasn't really a bug; it just required clarification. The reported bug was actually not a bug. It is ok to pass the enum value as a string here, because the enumeration type has been registered with the meta-object system with the Q_ENUMS() macro. However, I have added a bit of text to clarify things a bit. Task-number: QTBUG-7158 --- doc/src/objectmodel/properties.qdoc | 19 +++++++++++-------- doc/src/snippets/code/doc_src_properties.qdoc | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc index 076c544..a807caf 100644 --- a/doc/src/objectmodel/properties.qdoc +++ b/doc/src/objectmodel/properties.qdoc @@ -208,17 +208,20 @@ the property type. The meta-object compiler enforces these requirements. - Given a pointer to an instance of MyClass or a pointer to an - instance of QObject that happens to be an instance of MyClass, we - have two ways to set its priority property. + Given a pointer to an instance of MyClass or a pointer to a + QObject that is an instance of MyClass, we have two ways to set + its priority property: \snippet doc/src/snippets/code/doc_src_properties.qdoc 6 - In the example, the enumeration type used for the property type - was locally declared in MyClass. Had it been declared in another - class, its fully qualified name (i.e., OtherClass::Priority) would - be required. In addition, that other class must also inherit - QObject and register the enum type using Q_ENUMS(). + In the example, the enumeration type that is the property type is + declared in MyClass and registered with the \l{Meta-Object System} + using the Q_ENUMS() macro. This makes the enumeration values + available as strings for use as in the call to setProperty(). Had + the enumeration type been declared in another class, its fully + qualified name (i.e., OtherClass::Priority) would be required, and + that other class would also have to inherit QObject and register + the enumeration type there using the Q_ENUMS() macro. A similar macro, Q_FLAGS(), is also available. Like Q_ENUMS(), it registers an enumeration type, but it marks the type as being a diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc index 38cc139..962d930 100644 --- a/doc/src/snippets/code/doc_src_properties.qdoc +++ b/doc/src/snippets/code/doc_src_properties.qdoc @@ -112,7 +112,7 @@ MyClass *myinstance = new MyClass; QObject *object = myinstance; myinstance->setPriority(MyClass::VeryHigh); -object->setProperty("priority", (int)MyClass::VeryHigh); +object->setProperty("priority", "VeryHigh"); //! [6] -- cgit v0.12 From 6e5b5305a07d89e67d7867f150283476bcf1f72c Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 12 Jan 2010 14:35:05 +0100 Subject: QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket We're using the ones from our parent class instead of own instance. Reviewed-by: Thiago Reviewed-by: joao --- src/network/ssl/qsslsocket_p.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 5615685..8e22664 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -83,9 +83,6 @@ public: QList ignoreErrorsList; bool* readyReadEmittedPointer; - QRingBuffer readBuffer; - QRingBuffer writeBuffer; - QSslConfigurationPrivate configuration; QList sslErrors; -- cgit v0.12 From 82b3e65875fe018c2571d83dabe87bb396e8b60a Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Wed, 13 Jan 2010 14:23:14 +0100 Subject: tst_qnetworkreply benchmark: Properly finish the thread End the thread at the proper point, before possibly failing one of the test conditions. Reviewed-by: TrustMe --- tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp index edaf545..6327123 100644 --- a/tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp @@ -561,15 +561,15 @@ void tst_qnetworkreply::httpUploadPerformance() generator.start(); time.start(); QTestEventLoop::instance().enterLoop(40); + qint64 elapsed = time.elapsed(); + reader.exit(); + reader.wait(); + QVERIFY(reply->isFinished()); QCOMPARE(reply->error(), QNetworkReply::NoError); QVERIFY(!QTestEventLoop::instance().timeout()); - qint64 elapsed = time.elapsed(); qDebug() << "tst_QNetworkReply::httpUploadPerformance" << elapsed << "msec, " << ((UploadSize/1024.0)/(elapsed/1000.0)) << " kB/sec"; - - reader.exit(); - reader.wait(); } -- cgit v0.12