summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * ASSERTION FAILED: leftCategory != CalcOther && rightCategory != CalcOther in ↵Martin Hodovan2016-09-274-13/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore::CSSCalcBinaryOperation::createSimplified https://bugs.webkit.org/show_bug.cgi?id=132870 Source/WebCore: According to the standard, calc() should be able to handle angle, time and frequency values as well: http://www.w3.org/TR/css3-values/#calc Patch by Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> on 2014-05-13 Reviewed by Darin Adler. Test: fast/css/calc-with-angle-time-frequency.html * css/CSSCalculationValue.cpp: (WebCore::unitCategory): (WebCore::CSSCalcPrimitiveValue::createCalcExpression): (WebCore::CSSCalcPrimitiveValue::computeLengthPx): (WebCore::CSSCalcPrimitiveValue::addSubtractResult): (WebCore::CSSCalcPrimitiveValue::determineCategory): (WebCore::CSSCalcBinaryOperation::primitiveType) * css/CSSCalculationValue.h: extending CalculationCategory * css/CSSParser.cpp: (WebCore::CSSParser::validCalculationUnit): * css/CSSPrimitiveValue.cpp: (WebCore::CSSPrimitiveValue::primitiveType): LayoutTests: Added test contains calc() expressions with angle, time and frequency values, covering all the newly introduced unit types, each of which used to fail. Patch by Martin Hodovan <mhodovan.u-szeged@partner.samsung.com> on 2014-05-13 Reviewed by Darin Adler. * fast/css/calc-with-angle-time-frequency-expected.txt: Added. * fast/css/calc-with-angle-time-frequency.html: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@168685 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Id342e513bef2aa147dbfc94d2fc5a72e51fd0f57 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Crash on shape-outside when using calc()hmuller@adobe.com2016-09-279-354/+741
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=121020 Reviewed by Dirk Schulze. Source/WebCore: This change prevents a crash caused by specifying a CSS Shape geometry Length attribute with a calc() expression. It adds support for converting Lengths to CSSPrimitive Values, in large part by migrating Blink changes made to the calc classes since the split. Doing so required a few supporting changes in some related classes, notably CSSPrimitiveValue. Tests: fast/shapes/shape-inside/shape-inside-calc-crash.html css3/calc/simplification.html * css/BasicShapeFunctions.cpp: (WebCore::convertToCSSPrimitiveValue): Effectively use the new CSSPrimtiveValue(length,style) constructor to convert Lengths to CSSValues. (WebCore::valueForBasicShape): Use the convertToCSSPrimitiveValue() function. (WebCore::convertToLength): Added the CalculatedConversion convertToLength() flag to enable support for calc() valued Length Shape attributes. * css/BasicShapeFunctions.h: * css/CSSCalculationValue.cpp: (WebCore::hasDoubleValue): (WebCore::buildCssText): (WebCore::CSSCalcValue::clampToPermittedRange): (WebCore::CSSCalcValue::doubleValue): (WebCore::CSSCalcExpressionNode::~CSSCalcExpressionNode): (WebCore::CSSCalcPrimitiveValue::create): (WebCore::CSSCalcPrimitiveValue::toCalcValue): (WebCore::CSSCalcPrimitiveValue::doubleValue): (WebCore::CSSCalcPrimitiveValue::computeLengthPx): (WebCore::CSSCalcPrimitiveValue::primitiveType): (WebCore::CSSCalcPrimitiveValue::CSSCalcPrimitiveValue): (WebCore::determineCategory): (WebCore::isIntegerResult): (WebCore::CSSCalcBinaryOperation::create): (WebCore::CSSCalcBinaryOperation::createSimplified): (WebCore::CSSCalcBinaryOperation::doubleValue): (WebCore::CSSCalcBinaryOperation::buildCssText): (WebCore::CSSCalcBinaryOperation::primitiveType): (WebCore::CSSCalcBinaryOperation::CSSCalcBinaryOperation): (WebCore::CSSCalcBinaryOperation::getNumberSide): (WebCore::CSSCalcBinaryOperation::evaluate): (WebCore::CSSCalcBinaryOperation::evaluateOperator): (WebCore::CSSCalcExpressionNodeParser::parseValue): (WebCore::CSSCalcExpressionNodeParser::parseValueTerm): (WebCore::CSSCalcExpressionNodeParser::parseValueMultiplicativeExpression): (WebCore::CSSCalcExpressionNodeParser::parseAdditiveValueExpression): (WebCore::CSSCalcValue::createExpressionNode): (WebCore::CSSCalcValue::create): * css/CSSCalculationValue.h: (WebCore::CSSCalcExpressionNode::category): (WebCore::CSSCalcValue::create): (WebCore::CSSCalcValue::isInt): (WebCore::CSSCalcValue::permittedValueRange): (WebCore::CSSCalcValue::expressionNode): (WebCore::CSSCalcValue::CSSCalcValue): (WebCore::toCSSCalcValue): * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::propertyValue): Pass the style along to the new valueForBasicShape() function. * css/CSSPrimitiveValue.cpp: (WebCore::CSSPrimitiveValue::unitCategory): Made this function public so that CSSCalculationValue could use it. (WebCore::CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor): Ditto. (WebCore::CSSPrimitiveValue::primitiveType): Cleared trailing whitespace. (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Construct a CSSPrimitiveValue from a Length and a RenderStyle*. (WebCore::CSSPrimitiveValue::init): The common part of the two Length CSSPrimitiveValue constructors. (WebCore::CSSPrimitiveValue::computeLengthDouble): Moved the case labels to the left per check-webkit-style. (WebCore::CSSPrimitiveValue::getStringValue): Ditto. (WebCore::CSSPrimitiveValue::getDoubleValue): Removed trailing whitespace. * css/CSSPrimitiveValue.h: (WebCore::CSSPrimitiveValue::create): Construct a CSSPrimitiveValue from a Length and a RenderStyle*. (WebCore::toCSSPrimitiveValue): Check the CSSValue*'s validity with ASSERT_WITH_SECURITY_IMPLICATION before casting to CSSPrimitiveValue*. * css/CSSValuePool.h: (WebCore::CSSValuePool::createValue): A new overload that delegates to the new CSSPrimitiveValue(length,style) constructor. * platform/CalculationValue.h: (WebCore::CalculationValue::operator==): (WebCore::CalculationValue::isNonNegative): (WebCore::CalculationValue::expression): (WebCore::CalcExpressionNumber::value): (WebCore::toCalcExpressionNumber): (WebCore::CalcExpressionLength::CalcExpressionLength): (WebCore::CalcExpressionLength::length): (WebCore::toCalcExpressionLength): (WebCore::CalcExpressionBinaryOperation::leftSide): (WebCore::CalcExpressionBinaryOperation::rightSide): (WebCore::CalcExpressionBinaryOperation::getOperator): (WebCore::toCalcExpressionBinaryOperation): (WebCore::CalcExpressionBlendLength::CalcExpressionBlendLength): (WebCore::CalcExpressionBlendLength::from): (WebCore::CalcExpressionBlendLength::to): (WebCore::CalcExpressionBlendLength::progress): (WebCore::toCalcExpressionBlendLength): LayoutTests: Specifying a CSS Shape geometry Length attribute with a calc() expression or looking up the value with getComputedStyle(), caused crashes. * fast/shapes/shape-inside/shape-inside-calc-crash-expected.txt: Added. * fast/shapes/shape-inside/shape-inside-calc-crash.html: Added. * css3/calc/simplification-expected.txt: Added * css3/calc/simplification.html: Added * LayoutTests/css3/calc/cssom-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156586 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I38216be400bd7024999444d9c1c7e5ad79cce2de Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * CSS Unit vmax and vmin in border-width not handledGurpreet Kaur2016-09-273-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=121421 Patch by Gurpreet Kaur <k.gurpreet@samsung.com> on 2013-09-19 Reviewed by Darin Adler. Source/WebCore: Border properties were not applied incase its values were given in vmax/vmin units. Tests: fast/css/viewport-vmax-border.html fast/css/viewport-vmin-border.html * css/CSSPrimitiveValue.cpp: (WebCore::CSSPrimitiveValue::computeLengthDouble): * css/CSSPrimitiveValue.h: (WebCore::CSSPrimitiveValue::isViewportPercentageMax): (WebCore::CSSPrimitiveValue::isViewportPercentageMin): * css/DeprecatedStyleBuilder.cpp: (WebCore::ApplyPropertyComputeLength::applyValue): Calculating the border values which has been specified in vmax/vmin units. 1vmax: 1vw or 1vh, whatever is largest. 1vmin: 1vw or 1vh, whatever is smallest. The vh/vw units are calcultated as percent of viewport height and viewport width respectively. LayoutTests: * fast/css/viewport-vmax-border-expected.txt: Added. * fast/css/viewport-vmax-border.html: Added. * fast/css/viewport-vmin-border-expected.txt: Added. * fast/css/viewport-vmin-border.html: Added. Added new tests for verifying that border properties are applied when its values are given in vmax/vmin units. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156091 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I90501069a30cc57be3483c6048aa88568c6570f1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * CSS Unit vw in border-width maps to 0pxGurpreet Kaur2016-09-273-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=109229 Patch by Gurpreet Kaur <k.gurpreet@samsung.com> on 2013-09-12 Reviewed by Darin Adler. Source/WebCore: Border and outline properties were not applied incase its values were given in vh/vw units. Tests: fast/css/viewport-height-border.html fast/css/viewport-height-outline.html fast/css/viewport-width-border.html fast/css/viewport-width-outline.html * css/CSSPrimitiveValue.cpp: (WebCore::CSSPrimitiveValue::computeLengthDouble): Added case CSS_VH and CSS_VW. * css/CSSPrimitiveValue.h: (WebCore::CSSPrimitiveValue::isViewportPercentageWidth): (WebCore::CSSPrimitiveValue::isViewportPercentageHeight): Added APIs to check the unit type(CSS_VW and CSS_VH). * css/DeprecatedStyleBuilder.cpp: (WebCore::ApplyPropertyComputeLength::applyValue): Calculating the border values which has been specified in vh/vw units.The vh/vw units are calcultated as percent of viewport height and viewport width respectively. LayoutTests: * fast/css/viewport-height-border-expected.txt: Added. * fast/css/viewport-height-border.html: Added. * fast/css/viewport-height-outline-expected.txt: Added. * fast/css/viewport-height-outline.html: Added. * fast/css/viewport-width-border-expected.txt: Added. * fast/css/viewport-width-border.html: Added. * fast/css/viewport-width-outline-expected.txt: Added. * fast/css/viewport-width-outline.html: Added. Added new tests for verifying that border and outline properties are applied when its values are given in vh/vw units. * resources/js-test-pre.js: (shouldNotBeEqualToString): Added this API so that can compare two strings.Similiar to shouldBeEqualToString. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155624 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I77c04e5ace2d16158502295622132551a8b866fd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Adjust the size of native popupsVitaliy Slobodin2016-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When WebKit renders a native control without appearance (-webkit-appearance: none;) for the menu list, it uses the width of the element for the popup size. We need to manually adjust the width of the popup to the longest name. Change-Id: I5883095ab0199c3360ed3fe45d2e2dace416cc4a Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-173-4/+44
| | |\ \ | | | |/ | | | | | | | | Change-Id: I1dbddcbe3fa01638c6c9a0ed8b1c2f39d9389558
| | | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-172-1/+41
| | | |\ | | | | | | | | | | | | | | | Change-Id: I18e4b5a903bf689636f112108e59162147708866
| | | | * Changes for 5.6.25.6.2Konstantin Tokarev2016-09-091-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If817b994f89ede46fb1b20e5f54bc9027b2022f9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | | * Fixed documentation of QWebSettings::JavascriptCanOpenWindowsKonstantin Tokarev2016-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e22cba3fb1807302ad2fa868e875d762a369ac0 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * | Fix generator scripts to work with python3Frederik Gladhorn2016-09-151-3/+3
| | | |/ | | | | | | | | | | | | | | | | Change-Id: Ic3f70861e3bbd69821d75527f1206a564ab69e2c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-08-254-7/+12
| | |\ \ | | | |/ | | | | | | | | Change-Id: I012e290914d5ea3030c54c730914204e0f4a8b0b
| | | * Prospective build fix for WindowsSimon Hausmann2016-08-222-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to commit 770a0c91f3fadcdb132d9eb96d085aafbe1bacd0 in qtbase we may need a heuristic for the COPIES assignment for the qmldir file to protect against copying the same file twice to the same location on debug-and-release builds on Windows. Change-Id: I60d34d218856a70c242824b9253d229d2d33d48d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I47a83c520dc57f77666d8a40de30d3bb9fd724f9 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * Dashed and dotted borders having radius have overlong dash lengthsKonstantin Tokarev2016-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit assumes FlatCap as default, while Qt uses SquareCap. In case of dotted borders, they are rendered as solid, because gaps are completely filled by dash caps. Task-number: QTBUG-55171 QTBUG-55175 Change-Id: Ie18f3c9b9a92db55aa716792316d9b0e9263f223 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Skip QtWebKit on UIKit platforms as wellJake Petroules2017-02-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exclusion belongs here, not in qt5.git. Change-Id: Id984dbd31089392b2470e4fc6f0534cfa37d8bc3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | | Fixed conversion of QWebPage::FindFlags to QWebPageAdapter::FindFlagsKonstantin Tokarev2017-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 6255cb893d4 QFlags started to detect signedness of enum type correctly, changing internal storage type of FindFlags to uint. We should use FindFlags::Int type now instead of int. Task-number: QTBUG-58316 Change-Id: Ie346b6062681b49b064fdd9ac0e5897299f4bee5 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-274-2/+4
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I8da8707534812f716c31adb5c3dc90b635b9184b
| * | | Fix compilation after feature modularization in qtbaseLiang Qi2016-09-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I775e8cac3d7e88686b467e07e62574b43d4b8b71 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | Fix loading of QML pluginsSimon Hausmann2016-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: If758dc34a68f07e916ef4a5f9f8aad97998ecc9d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / / | | | | | | | | | Change-Id: If99110166e9e08c208ed6013efde4657c5bcc8f4
* | | Adapt to qtbase configure changes to fix buildSimon Hausmann2016-08-2415-34/+34
| | | | | | | | | | | | | | | Change-Id: I5f84aeb483d01670525aadd53bf10a65c4da9b82 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-026-6/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I54f845386aa362bb77801ffbac6e06339e839fc8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-016-6/+10
| |\ \ | | |/ | | | | | | Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
| | * Fix build with the Intel compilerThiago Macieira2016-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ICC's supplied math.h has #defines for isnan and signbit. So work around that. Change-Id: I149e0540c00745fe8119fffd1463d16ae0047cb1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Define NOMINMAX on Windows buildsThiago Macieira2016-07-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows.h has a #define macro for min and max, which causes breakage when we write things like std::max or std::numeric_limits::max(). I don't know why I suddenly started getting this, but it's a good idea to do this change. Change-Id: Ib57b52598e2f452985e9fffd1459f01996c7fb7e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Update the detection of MSVC versions to be forward-compatibleThiago Macieira2016-07-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.8 may deprecate the win32-msvc20xx mkspecs, so use the MSVC_VER variable to detect which version of MSVC it is. This commit removes the detection for win32-icc, as it really depended on what version of MSVC headers it was targeting. With Qt prior to 5.8, it was not possible to detect it anyway, so the rule was broken anyway (ICC prior to 16 only worked with MSVC <= 2013, but ICC 17 will work with 2015). Change-Id: Ib57b52598e2f452985e9fffd1459e682978341f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Compile Fix for OpenBSD in C++11 modeRalf Nolden2016-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a __cplusplus condition to an already existing OpenBSD defined part to activate the code only on older gcc compilers. Change-Id: I3ae3c4f792af12868e5efe1c3536f9743de78ce3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Allow making production builds with build-webkit.Konstantin Tokarev2016-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't add CONFIG-=production_build if CONFIG+=production_build was passed in arguments. Change-Id: If401b3a8c1391c71273401257e85274e8db8e2b2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Use QWidget::grab() instead of deprecated QPixmap::grabWidget().Konstantin Tokarev2016-06-271-1/+1
| | | | | | | | | | | | | | | Change-Id: Icf8004f6b1e878d456dd6493fd2b33d95116c586 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I6907c0e780f4eab0126be8af8c9ee6422a4d66b4
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-201-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I2f90b96e6b59af71b3c7973345eb44e8213033d9
| * | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Change-Id: If24f96a7404048129db91b42d519e85ce418db07 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-06-1649-164/+368
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1649-164/+368
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ib5bd1f44e83e29501eaa432ddb47320375f5079a
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-06-161-2/+2
| | |\ \ | | | |/ | | | | | | | | Change-Id: Ieffcbc84ccd66fc59c5849a0e083e82d8a846c32
| | | * Added missing PLATFORM(MAC) checks.Konstantin Tokarev2016-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original patch http://trac.webkit.org/changeset/151646 assumed that ConnectionMac.cpp is specific to PLATFORM(MAC), but we use it as well. Change-Id: Ifb09e1576105c40df28040971129ee32dc041194 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-154-6/+15
| | |\ \ | | | |/ | | | | | | | | Change-Id: I842c8369d9c8647c62d9f1219d65e7a5bca0bf70
| | | * Only Mac port needs ObjC API for JSC.Konstantin Tokarev2016-06-151-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I32d6029139ac5b8118c3a350b68d6e55c8093a1a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Don't use deprecated version suffixes of QStyleOption* classes.Konstantin Tokarev2016-06-153-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1510-11/+70
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic399cf8fef1f26f22338a67393066d69cd969579
| | | * Do not warn about invalid imagesAllan Sandfeld Jensen2016-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Null or invalid images are safe since we are not decoding them. Change-Id: I292685863a0116c25931c096ec183275c891a55d Task-number: QTBUG-53989 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-101-0/+49
| | | |\ | | | | | | | | | | | | | | | Change-Id: I338f187fdd3a9fcf3a928c56ce5ff098e8457f08
| | | | * Changes for 5.6.15.6.1Konstantin Tokarev2016-05-301-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7836d6ed95cf3d3d989a5e3cdc2c077fc6d55d84 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Fixed drawing of zoomed border-image with repeat mode.Konstantin Tokarev2016-05-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image::drawPattern has special optimized path for scaled transform which creates pre-scaled brush and removes scale from original transform. However this change makes following translation to (tr.x(), tr.y()) incorrect because it is expected to be done in scaled coordinate system. Change-Id: I570cf82a4e7f61f6abe3fa4cb9b39aea0e51f2e5 Task-number: QTBUG-53532 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | fix ios device&simulator builds againOswald Buddenhagen2016-05-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the assumption stated in c48fd0cb is actually invalid - configure sets build_all without debug_and_release there. debug_and_release does actually imply build_all, though. to make things less confusing, don't let configure inject iphonesimulator_and_iphoneos into all projects, but handle it like debug_and_release instead. Change-Id: I05258d4a88549608c26d8b3dd9618f5736ff7ce3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | | * | Disable touch_slider if touch_events is disabled.Konstantin Tokarev2016-05-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touch_events is a prerequisite for touch_slider, however, touch_slider is added to WEBKIT_CONFIG before user options processing, so it's possible to produce meaningless configuration with disabled touch_events and enabled touch_slider. It's harmless because all ENABLE(TOUCH_SLIDER) code is also guarded with ENABLE(TOUCH_EVENTS), however it still may be confusing. Change-Id: I149c798f488ec9977ea5b168c0f5d7b7c53d1aec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Moved use_leveldb configuration from detectFeatures to sanitizeFeatures.Konstantin Tokarev2016-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise compilation breaks when indexed_database is disabled, because USE(LEVELDB) is always true. Change-Id: I680475baeb6796cdba859ff8daaba0c39a3e8338 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Added missing break statement.Konstantin Tokarev2016-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Fix tst_QObjectBridge::connectAndDisconnect() failArunprasad Rajkumar2016-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <https://webkit.org/b/119933> Patch by Arunprasad Rajkumar <arurajku@cisco.com> on 2013-08-19 Reviewed by Allan Sandfeld Jensen. Latest version of JSC has unquoted undefined in exception messages. So replaced 'undefined' with undefined. * tests/qobjectbridge/tst_qobjectbridge.cpp: (tst_QObjectBridge::connectAndDisconnect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154273 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ife6167e9f67f540fcef3f3468c37fcb85991216d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2c8ef44a746940e6783586e31b1b13b70e8c4fc8
View Lorry Controller Status