summaryrefslogtreecommitdiffstats
path: root/src/core/config/mac_osx.pri
Commit message (Collapse)AuthorAgeFilesLines
* Document Mac App Store incompatibilityAlexandru Croitor2017-05-151-2/+0
| | | | | | | | | | | | | The patch also removes the appstore compatibility feature from the feature summary displayed when qmake is invoked, and also makes sure not to pass the relevant compatibility argument to GN. [ChangeLog][macOS] Removed -appstore-compliant configure switch. Task-number: QTBUG-60443 Change-Id: I9c5ced0375195dd62e2416c57484d8e6021ebdd8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove gyp handlingAllan Sandfeld Jensen2017-03-221-39/+17
| | | | | | | Remove now dead GYP related code. Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Support appstore compliancy switch from the new configure systemAlexandru Croitor2017-03-171-0/+2
| | | | | | | Change-Id: Ic7768d9b2677ed488d6af05f34942321b670671e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Don't use_external_popup_menu on macOS so that popups actually appearAlexandru Croitor2017-03-011-1/+2
| | | | | | | | | | | | Using the use_external_popup_menu option forces Chromium to compile a different code path for displaying popup menus on macOS, which is not implemented by the Qt overrides, and thus no popups appear. Thus that option should be disabled, and instead the old code path should be used, just like in previous versions of Qt. Change-Id: Ic0f0dca2e097aac2c01e729d7a91425ce3f52674 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix release builds for debug and release buildsMichal Klocek2017-02-151-1/+2
| | | | | | | | | | | | Small typo makes debug builds make release. Fix core lib and covert tool compilation for debug builds. Updates chromium: b0bb0288 Fix debug builds compilation Change-Id: Id478ab5e2a2a1b3d5716002f76f252451f69f5ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* macOS GN integrationAlexandru Croitor2017-01-271-17/+38
| | | | | Change-Id: I89850d43c8f11ec54b3a47318ef0b3f083ae3dee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add pepper-plugins feature to new configure systemMichal Klocek2017-01-161-2/+1
| | | | | | | | Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I253dab52361afd411dcf545fab752836c19ee3c7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add print and pdf feature to new configure systemMichal Klocek2017-01-161-4/+1
| | | | | | | | | | | | Currently printing and pdf are bounded together. Make compilation optional by adding it as a feature. Fix formatting of embedded_linux.pri Task-number: QTBUG-57731 Task-number: QTBUG-58108 Change-Id: I53a2baea656df0a5b6139365ed06385c9ebc5830 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move the QPrinter and QtWidgets related code out of the PDFium wrapperMichael Brüning2016-11-251-0/+2
| | | | | | | | | | | This moves the actual printing using QPrinter to the WebEngineWidgets part of the API. The printsupport module depends on the widgets module and therefore QtWebEngineCore also had a dependency to widgets. This is removed by this change. Change-Id: If6e5745709a59de18f2123b930cbe6e64390c867 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Pass supported -fstack-protector flag to GYP configAlexandru Croitor2016-09-271-0/+5
| | | | | | | | | Before Xcode 6.3, the shipped compiler din not support the -fstack-protector-strong flag. Inform GYP to use the -fstack-protector flag instead. Change-Id: I91f1e9db5e489b6190423c3d010effd3d86ed9ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Enable PDF for desktop platforms and add chromium dependenciesMichael Bruning2016-08-241-1/+2
| | | | | | | | PDF is enabled globally, but disabled for the embedded platforms currently Change-Id: I44e1ffc8587ff8d8e677a47f8048feaef2e3266a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix building on OS X 10.9 with 10.10 SDKAlexandru Croitor2016-07-011-0/+5
| | | | | | | | | | | | | | | | | | Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update spellchecker APIsMichal Klocek2016-04-181-3/+0
| | | | | | | | | | | | | | * marks new properties in QQuickWebEngineProfile as FINAL * removes QT_NO_SPELLCHECK from API headers * renames spellCheckLanguages() to availableDictionaries() * removes "togle spellcheck" methods and actions * use WEBENGINE_CONFIG instead of CONFIG for disable the feature at compile time: WEBENGINE_CONFIG+=no_spellcheck Done-With: Peter Varga <pvarga@inf.u-szeged.hu> Task-number: QTBUG-52371 Change-Id: I8c8eff497b9e7afe0cec2edc97dec248151487f2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Pass minimum OS X SDK version used during Qt compilation, to GYP.Alexandru Croitor2016-03-221-2/+9
| | | | | | | | | | | | Previously it was hardcoded to 10.7 which caused two issues: 1) It's not the proper version anymore, the minimum required is 10.10.3. 2) In case if there are 2 SDK versions present on the host machine (eg 10.10 and 10.11), if Qt was compiled with 10.11, GYP would still pick up 10.10 as the minimum viable one for compilation. Change-Id: If815a81696d96a7d5f5f20464385235032b664c3 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-041-0/+2
|\ | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Disable printing in ChromiumAllan Sandfeld Jensen2016-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | Disabling printing saves us compiling those files and files off a megabyte on the debug binary. To keep all the configure options in config, the common options are moved to a shared common.pri. Change-Id: Ieffdf9eb7dca58cfdafadd85bd24ea9c2be55ece Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add spell checker supportMichal Klocek2016-02-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate chromium spell checker: * add spellchecker and dependencies to build * underline misspelled words in html text areas * right-click context menu shows up to 4 options to correct the misspelled word * toggle spell check from context menu * add new qml and widget api calls to qwebengineprofile to enable/disable spell check, select spell check language, get list of supported languages/dictionaries * register new qml spell check properties for QtWebEngine 1.3 * CONFIG+="no_spellcheck" to remove spellcheck support Change-Id: Ie61434ab9493597d7759a6f33794f6859c4e3a4c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove superfluous enable_plugins=1Kai Koehne2016-01-271-1/+0
| | | | | | | | | | | | | | | | chromium/build/common.gypi already sets enable_plugins to true by default for desktop platforms. Change-Id: I3805a6856fe70ad3bd89606e974b02858e68e263 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Enable Widevine CDMAllan Sandfeld Jensen2016-01-191-1/+2
|/ | | | | | | | | | | Enable loading Google Chrome's Widevine pepper plugin. Flash and Widevine plugins will now also be searched for in the plugins/ppapi directory. Task-number: QTBUG-50132 Change-Id: I28fb56bb08d7e81629e34420be626621a7981181 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Add support for Shockwave Flash plugin.Zeno Albisser2015-03-301-1/+2
| | | | | | | | | | We will try to load the pepper flash plugin from the places where it is most commonly located. Alternatively the location and flash version can be passed on the command line. Change-Id: I41367586462157e722661aab3630357d6caf6a81 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Prevent OS X from picking a wrong version of clang from the envAndras Becsi2014-09-261-0/+15
| | | | | | | | | | | Until now we relied on the PATH to pick the right clang version on OS X which turned out to be a source of issues on build nodes that have a lot of old cruft lying around which was picked up by gyp. Set make_clang_dir so that gyp uses the configured clang version from Qt and remove the env manipulation from our gyp script. Change-Id: I4ac679ea56fa874eecaa578aad77b462445c0caa Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Define mac_sdk_min and mac_deployment_target instead of mac_sdk_pathAndras Becsi2014-06-041-2/+5
| | | | | | | | | | With Qt 5.3 mac_sdk_path ends up being empty, so make sure to set the proper flags for chromium to pick the right sdk. Also add clang_use_chrome_plugins=0 so we can remove it as well from the Mac-Use-libc-instead-of-stdlibc patch. Change-Id: Ia132f079f905761644ad26c728f7116f538ea62d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Introduce platform specific pri files for all platforms.Zeno Albisser2014-03-281-0/+2
Define qt_os for all supported platforms. Move simple platform specific flags into the pri files. Change-Id: I09b030f4a8a815f48a8100d81669a7729218efc2 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 10:20:54 +0000