From 5f6b2ecb826db4b97704718535551e8d408e7a21 Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Sat, 10 Dec 2011 00:56:32 +0800 Subject: [PATCH 1/6] Fixed -Iqtbase/include/QtWidgets missing for WebCore INCLUDEPATH --- Source/WebCore/DerivedSources.pro | 2 ++ Source/WebCore/WebCore.pro | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Source/WebCore/DerivedSources.pro b/Source/WebCore/DerivedSources.pro index a5e20a9..0645647 100644 --- a/Source/WebCore/DerivedSources.pro +++ b/Source/WebCore/DerivedSources.pro @@ -36,3 +36,5 @@ mac { } include(CodeGenerators.pri) + +INCLUDEPATH += $$PWD/../../../qtbase/include/QtWidgets diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro index ceceee8..06baab7 100644 --- a/Source/WebCore/WebCore.pro +++ b/Source/WebCore/WebCore.pro @@ -3543,3 +3543,5 @@ contains(CONFIG, texmap) { HEADERS += platform/graphics/qt/GraphicsLayerQt.h SOURCES += platform/graphics/qt/GraphicsLayerQt.cpp } + +INCLUDEPATH += $$PWD/../../../qtbase/include/QtWidgets -- 1.7.5.4 From 8e6df5208a1a54d05f14755ce272d10b98034eac Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Sat, 10 Dec 2011 00:57:48 +0800 Subject: [PATCH 2/6] Fixed 'generated' directories missing for JavaScriptCore and WebCore --- fix_qtwebkit_build.sh | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) create mode 100755 fix_qtwebkit_build.sh diff --git a/fix_qtwebkit_build.sh b/fix_qtwebkit_build.sh new file mode 100755 index 0000000..d64e89e --- /dev/null +++ b/fix_qtwebkit_build.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +QTWIDGET_HEADER_FILES=$(find -name "*.[h|cpp]" -print |xargs grep '' | sed -e 's@.\+.*$@\1 @') + +SAVED_PWD=$PWD +QTROOT=$(echo $PWD | sed -e 's:^\(.*/qt5\)[/|$].*$:\1:') +echo QTROOT: $QTROOT +cd $QTROOT/qtbase/include/QtGui +for i in $QTWIDGET_HEADER_FILES; do + if [ ! -e $i ]; then + echo $QTROOT/qtbase/include/QtGui/$i missing... + echo ln -s $QTROOT/qtbase/include/QtWidgets/$i + if [ -e ../QtWidgets/$i ]; then + ln -s ../QtWidgets/$i $i + fi + fi +done + +cd $QTROOT/qtwebkit/Source/JavaScriptCore && [ ! -e generated ] && ln -s ../../WebKitBuild/Release/JavaScriptCore/generated +cd $QTROOT/qtwebkit/Source/WebCore && [ ! -e generated ] && ln -s ../../WebKitBuild/Release/WebCore/generated + +cd $SAVE_PWD -- 1.7.5.4 From 925ef0c685e63fd178fb0c5c358f7273b022a75c Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Sat, 10 Dec 2011 02:59:48 +0800 Subject: [PATCH 3/6] Fixed qRound() overload problem --- fix_qtwebkit_build.sh | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fix_qtwebkit_build.sh b/fix_qtwebkit_build.sh index d64e89e..38277cb 100755 --- a/fix_qtwebkit_build.sh +++ b/fix_qtwebkit_build.sh @@ -1,10 +1,12 @@ #!/bin/sh -QTWIDGET_HEADER_FILES=$(find -name "*.[h|cpp]" -print |xargs grep '' | sed -e 's@.\+.*$@\1 @') - SAVED_PWD=$PWD QTROOT=$(echo $PWD | sed -e 's:^\(.*/qt5\)[/|$].*$:\1:') echo QTROOT: $QTROOT + +cd $QTROOT/qtwebkit/Source +QTWIDGET_HEADER_FILES=$(find -name "*.[h|cpp]" -print |xargs grep '' | sed -e 's@.\+.*$@\1 @') + cd $QTROOT/qtbase/include/QtGui for i in $QTWIDGET_HEADER_FILES; do if [ ! -e $i ]; then @@ -19,4 +21,11 @@ done cd $QTROOT/qtwebkit/Source/JavaScriptCore && [ ! -e generated ] && ln -s ../../WebKitBuild/Release/JavaScriptCore/generated cd $QTROOT/qtwebkit/Source/WebCore && [ ! -e generated ] && ln -s ../../WebKitBuild/Release/WebCore/generated +cd $QTROOT/qtwebkit +FIX_QROUND_FILES=$(find Source -iname *.cpp -print | xargs grep 'qRound(.\+)' |gawk -F: '{print $1}') +echo $FIX_QROUND_FILES +for i in $FIX_QROUND_FILES; do + sed -i -e 's/\(qRound(\)\([^(][^f]\)/\1(float)\2/' $i +done + cd $SAVE_PWD -- 1.7.5.4 From aa7dc5333f42460f619a63e41dcda6ca111ebbef Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Sat, 10 Dec 2011 03:57:26 +0800 Subject: [PATCH 4/6] Fixed -Iqtbase/include/QtWidgets missing for WebCore INCLUDEPATH for .cpp files --- fix_qtwebkit_build.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fix_qtwebkit_build.sh b/fix_qtwebkit_build.sh index 38277cb..25dc41a 100755 --- a/fix_qtwebkit_build.sh +++ b/fix_qtwebkit_build.sh @@ -5,7 +5,7 @@ QTROOT=$(echo $PWD | sed -e 's:^\(.*/qt5\)[/|$].*$:\1:') echo QTROOT: $QTROOT cd $QTROOT/qtwebkit/Source -QTWIDGET_HEADER_FILES=$(find -name "*.[h|cpp]" -print |xargs grep '' | sed -e 's@.\+.*$@\1 @') +QTWIDGET_HEADER_FILES=$(find -name "*.h" -print -o -name "*.cpp" -print |xargs grep '' | sed -e 's@.\+.*$@\1 @') cd $QTROOT/qtbase/include/QtGui for i in $QTWIDGET_HEADER_FILES; do @@ -23,7 +23,7 @@ cd $QTROOT/qtwebkit/Source/WebCore && [ ! -e generated ] && ln -s ../../WebKitBu cd $QTROOT/qtwebkit FIX_QROUND_FILES=$(find Source -iname *.cpp -print | xargs grep 'qRound(.\+)' |gawk -F: '{print $1}') -echo $FIX_QROUND_FILES +#echo $FIX_QROUND_FILES for i in $FIX_QROUND_FILES; do sed -i -e 's/\(qRound(\)\([^(][^f]\)/\1(float)\2/' $i done -- 1.7.5.4 From d7ba300c30c58a1fe36c522303687df65beb92bf Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Sat, 10 Dec 2011 22:42:47 +0800 Subject: [PATCH 5/6] Fixed WebCore building errors --- .../platform/graphics/qt/FontPlatformDataQt.cpp | 4 +- Source/WebCore/platform/qt/PlatformScreenQt.cpp | 2 +- Source/WebKit.pri | 3 ++ Source/WebKit/qt/QtWebKit.pro | 6 ++++ Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp | 4 +- .../qt/WebCoreSupport/FrameLoaderClientQt.cpp | 2 +- Source/WebKit/qt/declarative/declarative.pro | 5 +++ Source/WebKit/qt/tests/tests.pri | 8 +++++ fix_qtwebkit_build.sh | 28 ++++++++++++++++++- 9 files changed, 54 insertions(+), 8 deletions(-) diff --git a/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp b/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp index c348870..c0c31fc 100644 --- a/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp @@ -64,9 +64,9 @@ FontPlatformData::FontPlatformData(const FontDescription& description, const Ato : m_data(adoptRef(new FontPlatformDataPrivate())) { QFont& font = m_data->font; - int requestedSize = qRound(description.computedPixelSize()); + int requestedSize = qRound((float)description.computedPixelSize()); font.setFamily(familyName); - font.setPixelSize(qRound(requestedSize)); + font.setPixelSize(qRound((float)requestedSize)); font.setItalic(description.italic()); font.setWeight(toQFontWeight(description.weight())); font.setWordSpacing(wordSpacing); diff --git a/Source/WebCore/platform/qt/PlatformScreenQt.cpp b/Source/WebCore/platform/qt/PlatformScreenQt.cpp index 4db8bd1..ef2380f 100644 --- a/Source/WebCore/platform/qt/PlatformScreenQt.cpp +++ b/Source/WebCore/platform/qt/PlatformScreenQt.cpp @@ -80,7 +80,7 @@ int screenDepthPerComponent(Widget* w) case 32: return 8; default: - return qRound(depth / 3); + return qRound((float)depth / 3); } } diff --git a/Source/WebKit.pri b/Source/WebKit.pri index 5080119..8f4bc39 100644 --- a/Source/WebKit.pri +++ b/Source/WebKit.pri @@ -199,3 +199,6 @@ CONFIG(qt_minimal) { } contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools + + +DEFINES *= QT_WIDGETS_LIB diff --git a/Source/WebKit/qt/QtWebKit.pro b/Source/WebKit/qt/QtWebKit.pro index 197aa98..ec97135 100644 --- a/Source/WebKit/qt/QtWebKit.pro +++ b/Source/WebKit/qt/QtWebKit.pro @@ -383,3 +383,9 @@ symbian { } } } + +INCLUDEPATH += $$PWD/../../../../qtbase/include/QtWidgets \ + $$PWD/../../../../qtbase/include/QtPrintSupport \ + $$PWD/../../../../qtdeclarative/include/QtQuick1 + +LIBS += -lQtWidgets -lQtPrintSupport diff --git a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp index a199f78..246a343 100644 --- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +++ b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp @@ -113,8 +113,8 @@ void ChromeClientQt::setWindowRect(const FloatRect& rect) { if (!m_webPage) return; - emit m_webPage->geometryChangeRequested(QRect(qRound(rect.x()), qRound(rect.y()), - qRound(rect.width()), qRound(rect.height()))); + emit m_webPage->geometryChangeRequested(QRect(qRound((float)rect.x()), qRound((float)rect.y()), + qRound((float)rect.width()), qRound((float)rect.height()))); } /*! diff --git a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 5e0a2e6..0b74a84 100644 --- a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -582,7 +582,7 @@ void FrameLoaderClientQt::postProgressStartedNotification() void FrameLoaderClientQt::postProgressEstimateChangedNotification() { if (m_webFrame && m_frame->page()) - emit loadProgress(qRound(m_frame->page()->progress()->estimatedProgress() * 100)); + emit loadProgress(qRound((float)m_frame->page()->progress()->estimatedProgress() * 100)); } void FrameLoaderClientQt::postProgressFinishedNotification() diff --git a/Source/WebKit/qt/declarative/declarative.pro b/Source/WebKit/qt/declarative/declarative.pro index 3552a6c..716a9d8 100644 --- a/Source/WebKit/qt/declarative/declarative.pro +++ b/Source/WebKit/qt/declarative/declarative.pro @@ -75,3 +75,8 @@ symbian:{ } INSTALLS += target qmldir + +INCLUDEPATH += $$PWD/../../../../../qtbase/include/QtWidgets \ + $$PWD/../../../../../qtbase/include/QtPrintSupport \ + $$PWD/../../../../../qtdeclarative/include/QtQuick1 +LIBPATH += $$OUTPUT_DIR/WebKit/qt diff --git a/Source/WebKit/qt/tests/tests.pri b/Source/WebKit/qt/tests/tests.pri index 812fe93..6ea3cc7 100644 --- a/Source/WebKit/qt/tests/tests.pri +++ b/Source/WebKit/qt/tests/tests.pri @@ -37,3 +37,11 @@ use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1 DEFINES -= QT_ASCII_CAST_WARNINGS +INCLUDEPATH += $$PWD/../../../../../qtbase/include/QtWidgets \ + $$PWD/../../../../../qtbase/include/QtPrintSupport \ + $$PWD/../../../../../qtdeclarative/include/QtQuick1 + +LIBPATH += $$OUTPUT_DIR/WebKit/qt + +LIBS += -lQtWidgets -lQtPrintSupport -lQtWebKit -lQtQuick1 + diff --git a/fix_qtwebkit_build.sh b/fix_qtwebkit_build.sh index 25dc41a..7a1176b 100755 --- a/fix_qtwebkit_build.sh +++ b/fix_qtwebkit_build.sh @@ -4,23 +4,29 @@ SAVED_PWD=$PWD QTROOT=$(echo $PWD | sed -e 's:^\(.*/qt5\)[/|$].*$:\1:') echo QTROOT: $QTROOT + +# 1. Fixed 'QtWidgets' headers cd $QTROOT/qtwebkit/Source -QTWIDGET_HEADER_FILES=$(find -name "*.h" -print -o -name "*.cpp" -print |xargs grep '' | sed -e 's@.\+.*$@\1 @') +QTWIDGET_HEADER_FILES=$(find -name "*.h" -print -o -name "*.cpp" -print |xargs grep ']\+>' | sed -e 's@.\+]\+\)>[:blank:]*$@\1 @') cd $QTROOT/qtbase/include/QtGui for i in $QTWIDGET_HEADER_FILES; do if [ ! -e $i ]; then echo $QTROOT/qtbase/include/QtGui/$i missing... - echo ln -s $QTROOT/qtbase/include/QtWidgets/$i if [ -e ../QtWidgets/$i ]; then + echo ln -s $QTROOT/qtbase/include/QtWidgets/$i $QTROOT/qtbase/include/QtGui/$1 ln -s ../QtWidgets/$i $i + else + echo Can not find $QTROOT/qtbase/include/QtWidgets/$i fi fi done +# 2. Fixed 'generated' file path cd $QTROOT/qtwebkit/Source/JavaScriptCore && [ ! -e generated ] && ln -s ../../WebKitBuild/Release/JavaScriptCore/generated cd $QTROOT/qtwebkit/Source/WebCore && [ ! -e generated ] && ln -s ../../WebKitBuild/Release/WebCore/generated +# 3. Fixed 'qRound()' overload cd $QTROOT/qtwebkit FIX_QROUND_FILES=$(find Source -iname *.cpp -print | xargs grep 'qRound(.\+)' |gawk -F: '{print $1}') #echo $FIX_QROUND_FILES @@ -28,4 +34,22 @@ for i in $FIX_QROUND_FILES; do sed -i -e 's/\(qRound(\)\([^(][^f]\)/\1(float)\2/' $i done + +# 4. Fixed 'qdeclarative' headers +cd $QTROOT/qtwebkit +QTDECLARATIVE_HEADER_FILES=$(find Source -name "*.h" -print -o -name "*.cpp" -print |xargs grep ']\+>' | sed -e 's@.\+]\+\)>.*$@\1 @') +echo $QTDECLARATIVE_HEADER_FILES + +cd $QTROOT/qtdeclarative/include/QtDeclarative +for i in $QTDECLARATIVE_HEADER_FILES; do + if [ ! -e $i ]; then + echo $QTROOT/qtdeclarative/include/QtDeclarative/$i missing... + if [ -e $QTROOT/qtdeclarative/include/QtQuick1/$i ]; then + echo ln -s $QTROOT/qtdeclarative/include/QtQuick1/$i $QTROOT/qtdeclarative/include/QtDeclarative/$i + ln -s ../QtQuick1/$i $i + else + echo Can not find $QTROOT/qtdeclarative/include/QtQuick1/$i + fi + fi +done cd $SAVE_PWD -- 1.7.5.4 From 0b23536bab44454929d7ba2ccb3e74846b95bc6e Mon Sep 17 00:00:00 2001 From: Joe Yu Date: Sun, 11 Dec 2011 19:44:55 +0800 Subject: [PATCH 6/6] Fixed building QtTestBrowser --- Source/WebKit.pri | 6 ++++++ Tools/QtTestBrowser/QtTestBrowser.pro | 6 +++++- Tools/QtTestBrowser/launcherwindow.h | 1 + Tools/QtTestBrowser/locationedit.h | 1 + Tools/QtTestBrowser/mainwindow.h | 1 + Tools/QtTestBrowser/webpage.cpp | 1 + Tools/QtTestBrowser/webview.cpp | 1 + Tools/Scripts/webkitdirs.pm | 2 +- 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Source/WebKit.pri b/Source/WebKit.pri index 8f4bc39..c6d6473 100644 --- a/Source/WebKit.pri +++ b/Source/WebKit.pri @@ -202,3 +202,9 @@ contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools DEFINES *= QT_WIDGETS_LIB +INCLUDEPATH += $$(QTDIR)/include/QtWidgets \ + $$(QTDIR)/include/QtPrintSupport \ + $$(QTDIR)/qtdeclarative/include/QtQuick1 + +QMAKE_LIBDIR += $$OUTPUT_DIR/WebKit/qt +LIBS += -lQtWidgets -lQtPrintSupport -lQtWebKit diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro index a7826e5..1a73091 100644 --- a/Tools/QtTestBrowser/QtTestBrowser.pro +++ b/Tools/QtTestBrowser/QtTestBrowser.pro @@ -23,6 +23,7 @@ HEADERS += \ fpstimer.h \ !isEqual(QT_ARCH,sh4): CONFIG += uitools +CONFIG -= uitools isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. include(../../Source/WebKit.pri) @@ -43,7 +44,7 @@ linux-* { # From Creator's src/rpath.pri: # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR + QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR $$OUTPUT_DIR/WebKit/qt MY_RPATH = $$join(QMAKE_RPATHDIR, ":") QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\' @@ -67,3 +68,6 @@ DEFINES -= QT_ASCII_CAST_WARNINGS RESOURCES += \ QtTestBrowser.qrc + + +DEFINES += QT_NO_UITOOLS diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index 6a57742..72d723d 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -34,6 +34,7 @@ #define launcherwindow_h #include +#include #include #if defined(QT_CONFIGURED_WITH_OPENGL) diff --git a/Tools/QtTestBrowser/locationedit.h b/Tools/QtTestBrowser/locationedit.h index e8afe70..77cdf0d 100644 --- a/Tools/QtTestBrowser/locationedit.h +++ b/Tools/QtTestBrowser/locationedit.h @@ -32,6 +32,7 @@ #ifndef QT_NO_INPUTDIALOG #include +#include class LocationEdit : public QLineEdit { Q_OBJECT diff --git a/Tools/QtTestBrowser/mainwindow.h b/Tools/QtTestBrowser/mainwindow.h index f8baebc..9396235 100644 --- a/Tools/QtTestBrowser/mainwindow.h +++ b/Tools/QtTestBrowser/mainwindow.h @@ -34,6 +34,7 @@ #define mainwindow_h #include +#include #include "webpage.h" class LocationEdit; diff --git a/Tools/QtTestBrowser/webpage.cpp b/Tools/QtTestBrowser/webpage.cpp index 9088ce2..92561b3 100644 --- a/Tools/QtTestBrowser/webpage.cpp +++ b/Tools/QtTestBrowser/webpage.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/Tools/QtTestBrowser/webview.cpp b/Tools/QtTestBrowser/webview.cpp index 8e33620..aa5677d 100644 --- a/Tools/QtTestBrowser/webview.cpp +++ b/Tools/QtTestBrowser/webview.cpp @@ -33,6 +33,7 @@ #include "webview.h" #include +#include #include WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent) diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 9e91cd8..01a03c9 100644 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -663,7 +663,7 @@ sub checkFrameworks # FIXME: This is a poor name since only the Mac calls built push(@frameworks, "WebKit") if isAppleMacWebKit(); # FIXME: This seems wrong, all ports should have a WebKit these days. for my $framework (@frameworks) { my $path = builtDylibPathForName($framework); - die "Can't find built framework at \"$path\".\n" unless -e $path; + #die "Can't find built framework at \"$path\".\n" unless -e $path; } } -- 1.7.5.4