Attachment 119743 Details for Bug 74791 – Only use QtWidgets module if using Qt5, reuse previous test clause

[patch] Only use QtWidgets module if using Qt5, reuse previous test clause

buildfix_qtwidgets_qt5.patch (text/plain), 1.38 KB, created by Adenilson Cavalcanti Silva on 2011-12-17 17:22:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adenilson Cavalcanti Silva

Created: 2011-12-17 17:22:19 PST

Size: 1.38 KB

patch

obsolete

>From 9749c25a4be4c66fb30ab8f7a6ac589d4a7f8a59 Mon Sep 17 00:00:00 2001
>From: Adenilson Cavalcanti <cavalcantii@gmail.com>
>Date: Sat, 17 Dec 2011 18:09:39 -0400
>Subject: [PATCH] Build fix, use QtWidgets module if compiled with Qt5.
>
>Signed-off-by: Adenilson Cavalcanti <cavalcantii@gmail.com>
>---
> Tools/ChangeLog                       |    9 +++++++++
> Tools/QtTestBrowser/QtTestBrowser.pro |    3 ++-
> 2 files changed, 11 insertions(+), 1 deletions(-)
>
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5298cfe..378b0a1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2011-12-17  Adenilson Cavalcanti  <cavalcantii@gmail.com>
>+
>+        [Qt] Fix QtTestBrowser compilation with QtWidgets module
>+        https://bugs.webkit.org/show_bug.cgi?id=74791
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * QtTestBrowser/QtTestBrowser.pro:
>+
> 2011-12-17  Kentaro Hara  <haraken@chromium.org>
> 
>         Remove top-level code completely from prepare-ChangeLog
>diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro
>index aff4d1b..8b6b3fb 100644
>--- a/Tools/QtTestBrowser/QtTestBrowser.pro
>+++ b/Tools/QtTestBrowser/QtTestBrowser.pro
>@@ -42,8 +42,9 @@ CONFIG += qtwebkit
> DESTDIR = $$ROOT_BUILD_DIR/bin
> 
> QT += network
>+
> macx:QT += xml
>-haveQt(5): QT += printsupport
>+haveQt(5): QT += printsupport widgets
> 
> !embedded: PKGCONFIG += fontconfig
> 
>-- 
>1.7.5.4
>

Actions: View | Formatted Diff | Diff

Attachments on bug 74791: 119735 | 119742 | 119743