Bug 56712 - [Qt] Remove support for Qt 4.6
Summary: [Qt] Remove support for Qt 4.6
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Andreas Kling
URL:
Keywords: Qt, QtTriaged
Depends on:
Blocks:
 
Reported: 2011-03-19 11:25 PDT by Andreas Kling
Modified: 2011-05-04 12:59 PDT (History)
4 users (show)

See Also:


Attachments
Proposed patch (23.73 KB, patch)
2011-03-19 11:26 PDT, Andreas Kling
benjamin: review-
Details | Formatted Diff | Diff
Proposed patch v2 (25.33 KB, patch)
2011-03-19 11:54 PDT, Andreas Kling
benjamin: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Kling 2011-03-19 11:25:13 PDT
As discussed on mailing list(s), we should remove support for Qt 4.6 from trunk.
Comment 1 Andreas Kling 2011-03-19 11:26:48 PDT
Created attachment 86268 [details]
Proposed patch
Comment 2 Benjamin Poulain 2011-03-19 11:47:06 PDT
Comment on attachment 86268 [details]
Proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=86268&action=review

> Source/WebCore/platform/graphics/qt/FontQt.cpp:180
> +

Empty line? :)

> Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:44
>  #define SIGNAL_CONN Qt::DirectConnection

Why not replacing all the instance of SIGNAL_CONN by Qt::DirectConnection?

> Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:382
>              response.setHTTPHeaderField(QString::fromAscii(pair.first), QString::fromAscii(pair.second));

for a follow up: QString::fromAscii() should be QString::fromLatin1().
Comment 3 Andreas Kling 2011-03-19 11:54:13 PDT
Created attachment 86269 [details]
Proposed patch v2
Comment 4 Benjamin Poulain 2011-03-19 12:03:05 PDT
Comment on attachment 86269 [details]
Proposed patch v2

View in context: https://bugs.webkit.org/attachment.cgi?id=86269&action=review

R+ :)
Just update the code to match the coding style before landing.

> Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:553
>      if (m_resourceHandle->firstRequest().reportUploadProgress()) {
> -        connect(m_reply, SIGNAL(uploadProgress(qint64, qint64)),
> -                this, SLOT(uploadProgress(qint64, qint64)), SIGNAL_CONN);
> +        connect(m_reply, SIGNAL(uploadProgress(qint64, qint64)), this, SLOT(uploadProgress(qint64, qint64)));
>      }

Coding style, you don't need the brackets.
Comment 5 Andreas Kling 2011-03-19 12:08:05 PDT
Committed r81553: <http://trac.webkit.org/changeset/81553>
Comment 6 Yury Semikhatsky 2011-03-22 22:29:11 PDT
http://trac.webkit.org/wiki/BuildingQtOnLinux needs update. It states that minimal Qt version is still 4.6
Comment 7 Benjamin Poulain 2011-03-23 03:53:40 PDT
(In reply to comment #6)
> http://trac.webkit.org/wiki/BuildingQtOnLinux needs update. It states that minimal Qt version is still 4.6

Thanks for reporting the doc issue, I fixed the wiki.