diff --git a/deploy/build-linux.sh b/deploy/build-linux.sh index 8fa67156..e89286c8 100755 --- a/deploy/build-linux.sh +++ b/deploy/build-linux.sh @@ -71,6 +71,7 @@ if [ $QT_VERSION = 4.8 ] ; then patch -p1 < ../qt48_enable_debugger.patch patch -p1 < ../qt48_fix_inspector.patch patch -p1 < ../qt48_headless_and_pdf_fixes.patch + patch -p1 < ../qt48_enable_file_input_click.patch # Build in lighthose mode for an x-less build if [ "$2" = "--headless" ] ; then echo "Building 4.8 in qpa headless mode" diff --git a/deploy/build-mac.sh b/deploy/build-mac.sh index a6fcffb2..c8ee8b66 100755 --- a/deploy/build-mac.sh +++ b/deploy/build-mac.sh @@ -36,6 +36,7 @@ mv qt-everywhere-opensource-src-$QT_VERSION Qt-$QT_VERSION cd $QT_FOLDER patch configure ../allow-static-qtwebkit.patch patch -p1 < ../qapplication_skip_qtmenu.patch +patch -p1 < ../qt48_enable_file_input_click.patch rm -rf src/3rdparty/webkit/Source/WebKit/qt/tests diff --git a/deploy/qt48_enable_file_input_click.patch b/deploy/qt48_enable_file_input_click.patch new file mode 100644 index 00000000..10358b3d --- /dev/null +++ b/deploy/qt48_enable_file_input_click.patch @@ -0,0 +1,14 @@ +diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderFileUploadControl.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderFileUploadControl.cpp +index 87f6ff1..7d8f2d1 100644 +--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderFileUploadControl.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderFileUploadControl.cpp +@@ -130,9 +130,6 @@ void RenderFileUploadControl::chooseIconForFiles(FileChooser* chooser, const Vec + + void RenderFileUploadControl::click() + { +- // Requires a user gesture to open the file dialog. +- if (!frame() || !frame()->loader()->isProcessingUserGesture()) +- return; + if (Chrome* chromePointer = chrome()) + chromePointer->runOpenPanel(frame(), m_fileChooser); + }