summaryrefslogtreecommitdiffstats
path: root/src/core/config/desktop_linux.pri
Commit message (Collapse)AuthorAgeFilesLines
* Pass correct clang prefix directory to GYPJan Kundrát2016-11-151-1/+4
| | | | | | | | | Previously the prefix was hardcoded to "/usr". Now the current environment clang path is considered instead. Change-Id: I23173bb31591dfb6df7a81a37a58502dd6b12886 Task-number: QTBUG-52656 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Disable -Werror on Linux when clang is usedJan Kundrát2016-11-101-0/+1
| | | | | | | | Standard gcc warnings should be considered as errors, but clang warnings should not, because clang has some extra warnings. Change-Id: I298889895af7f9d4e004c3d97e5167738a8c09ad 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-2/+6
|\ | | | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Make sure linux-clang-libc++ mkspec uses clang build parameters.Alexandru Croitor2016-06-081-2/+6
| | | | | | | | | | | | | | | | And also uses the system provided libc++ library. Task-number: QTBUG-53685 Change-Id: Ibc6a773cf65ca057770baecedcff6ab27ffabf66 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | 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-0/+1
|/ | | | | | | | | | | 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>
* Unite commmon linux platform configurationAllan Sandfeld Jensen2015-09-101-31/+2
| | | | | | | Move duplicated linux configuration to linux.pri Change-Id: I9f6f876e09fb748fb78cfbd5201a4326693f0be9 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Enable building linux-clang platformAllan Sandfeld Jensen2015-09-071-2/+3
| | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Respect Qt system-harfbuzz settingAllan Sandfeld Jensen2015-08-251-0/+1
| | | | | | | Link with system harfbuzz when Qt has been configured to do so. Change-Id: I6921397915f069b06e6447987744c0186b6c7ce0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add configurable option for using system FFMPEGAllan Sandfeld Jensen2015-07-281-0/+1
| | | | | | | | | | | Add qmake command line option to use system FFMPEG and report result and option in the configure summary. Also checks libraries FFMPEG and chromium both uses are available on the system since linking will otherwise fail. Does not check if the version of the libav libraries are correct, but leaves that to whomever enables the option. Change-Id: I39c9c47eba19a6e40872a2e9b24a9010cdea1011 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system snappy if availableAllan Sandfeld Jensen2015-07-281-0/+1
| | | | | | | Snappy doesn't use pkg-config so we use a configure check to detect it. Change-Id: I54f02d493139069ca8838f7008041340990fc016 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add post configure step and make using system ICU an optionAllan Sandfeld Jensen2015-07-271-0/+2
| | | | | | | | | | Adds a post configure step to test qmake arguments, summerize options, and make it possible to enable using system ICU, but leaving it default off for now. Also summerizes the proprietary codec configuration. Change-Id: I620a69dcdbb14b49143770d38eecb5aeab48ad05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use system libsrtp if availableAllan Sandfeld Jensen2015-07-191-0/+1
| | | | | | | | Adds configure check and configures chromium to use system libsrtp if available. Change-Id: I134c50e1179bfb6acf01347456f8be26f27bf559 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Detect and use system librariesAllan Sandfeld Jensen2015-07-191-1/+8
| | | | | | | | Uses pkg-config to detect libevent, libwebp, flac, jsoncpp, opus, speex and vpx, and configure chromium to link with system versions. Change-Id: Ic6c5bbe07929a7c2b79abcb760a8c61b0c9ed92f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Unbundle zlib, minizip, libxml2 and libxslt on LinuxAllan Sandfeld Jensen2015-07-011-0/+2
| | | | | | | If available use the system versions of these basic libraries on Linux. Change-Id: Iebcd5c11c53d0d491c457ccff71be04f8b2cac1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Respect the system-png configure optionAllan Sandfeld Jensen2015-07-011-0/+1
| | | | | | | Link to system libpng on Linux if Qt was configured to do so. Change-Id: Ic86120aabb206173738e5a1977cad1d762794f2a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add support for Shockwave Flash plugin.Zeno Albisser2015-03-301-0/+1
| | | | | | | | | | 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>
* Respect use-system-jpeg Qt settingAllan Sandfeld Jensen2015-03-041-0/+2
| | | | | | | Forward the system-jpeg Qt setting to chromium. Change-Id: I646176fdf6a1c7818828dc8b24543cc885cc3688 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-131-0/+1
|\ | | | | | | Change-Id: Ic4388b2c28f46ca8047061c049128672041ceb0b
| * Respect the pulseaudio configuration from Qt.Michael Brüning2015-01-081-0/+1
| | | | | | | | | | | | | | | | It was previously ignored for Desktop Linux. Change-Id: I214171d222a5e7e0ee64afde225a742adbda4adf Task-number: QTBUG-43387 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.Zeno Albisser2015-01-201-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scoped_refptr operator for implicit conversion to pointer has been disabled upstream: https://codereview.chromium.org/510323002 * Group permission API as done upstream: https://codereview.chromium.org/622793002 * content_worker gyp target has been removed upstream. * GetPageThumbnailData moved to DevToolsManagerDelegate. * ui/ui_resources has been renamed to ui/resources * WebPreferences and ResourceType have moved inside content. * Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(): https://codereview.chromium.org/457103003 * Remove obsolete accessibility events. * AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED * AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002 * Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002 * Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate. * Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate https://codereview.chromium.org/560323005 * DevToolsHttpHandler::Start expects a scoped_ptr now. * Make sure event_factory_evdev.h is not included when USE_OZONE is not defined * ErrorPageParams was moved into namespace error_page. * Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission * SpecialStoragePolicy moved to namespace storage * Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate. * RenderPass::Id was renamed to RenderPass::RenderPassId * Include view_messages.h for ViewHostMsg_TextInputState_Param * CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium: https://codereview.chromium.org/449743002 * MailboxManager::ConsumeTexture only takes the mailbox as an argument * Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged. * RenderWidgetHostView::ScrollOffsetChanged has been removed. * SkBitmap::Config was removed upstream. * CopyFromCompositingSurfaceCallback has become an own type. * AcceleratedSurfaceInitialized only takes route_id as an argument. * ServerBoundCertService has been renamed to ChannelIDService. Related API has been renamed accordingly. * TextureImageTransportSurface was removed upstream. * Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature. * AudioStream related functions are gone upstream. https://codereview.chromium.org/569713002 * Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset. * Include generic touch_device implementation. * switches::kDisableDesktopNotifications was removed upstream. https://codereview.chromium.org/607843002 * PageTransition moved to ui. * Messages headers are not guarded. Including them multiple times does hurt. * ScaleGestureDetector does not create a standalone GestureDetector anymore. https://codereview.chromium.org/501503003 * MotionEvent::Cancel and Clone are not virtual anymore. https://codereview.chromium.org/502993004 * Exclude os_exchange_data_provider_mac from build. * Remove argument from ScopedClipboardWriter ctor. https://codereview.chromium.org/558913003 * Remove ShowPopupMenu override from WebContentsQt. The function is not pure virtual anymore, and we never implemented any specifics. * Do not use clang on desktop linux. * Request functions in ContentBrowserClient were merged into RequestPermission. * ninja: use configure.py --bootstrap instead of bootstrap.py Change-Id: I3575612826db7845461a949b4e737264bb4e8d88 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Fix audio not being built on desktop LinuxJocelyn Turcotte2014-05-131-2/+0
| | | | | Change-Id: Idaf5264304d09ae7b2bfe0abee7c53310b50b48f Reviewed-by: Andras Becsi <andras.becsi@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>
* Get rid of GTK dependenciesAndras Becsi2014-03-281-0/+16
Build with aura by default and remove GTK related code. This patch introduces a mechanism for setting gyp build configuration variables using a GYP_CONFIG and adds a desktop_linux.pri configuration for this target. Change-Id: I6b044ba52ebb20c187572669af94a6fc280b0412 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>