Changeset 156395 in webkit


Ignore:
Timestamp:
Sep 25, 2013 7:57:19 AM (11 years ago)
Author:
allan.jensen@digia.com
Message:

[Qt] Fix build with Qt 5.2 QtPosition module
https://bugs.webkit.org/show_bug.cgi?id=121089

Reviewed by Simon Hausmann.

.:

QtLocation -> QtPositioning

  • Source/sync.profile:

Source/WebKit:

QtLocation -> QtPositioning

  • WebKit1.pri:

Source/WebKit/qt:

QtLocation -> QtPositioning

  • WebCoreSupport/GeolocationClientQt.cpp:

Source/WebKit2:

QtLocation -> QtPositioning

  • Target.pri:
  • UIProcess/qt/WebGeolocationProviderQt.cpp:
  • WebKit2.pri:

Tools:

QtLocation -> QtPositioning. Make sure we set build type before doing configure checks
that might depend on them.

  • qmake/mkspecs/features/default_pre.prf:
  • qmake/mkspecs/features/features.prf:
Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r156328 r156395  
     12013-09-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix build with Qt 5.2 QtPosition module
     4        https://bugs.webkit.org/show_bug.cgi?id=121089
     5
     6        Reviewed by Simon Hausmann.
     7
     8        QtLocation -> QtPositioning
     9
     10        * Source/sync.profile:
     11
    1122013-09-24  Zan Dobersek  <zdobersek@igalia.com>
    213
  • trunk/Source/WebKit/ChangeLog

    r156266 r156395  
     12013-09-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix build with Qt 5.2 QtPosition module
     4        https://bugs.webkit.org/show_bug.cgi?id=121089
     5
     6        Reviewed by Simon Hausmann.
     7
     8        QtLocation -> QtPositioning
     9
     10        * WebKit1.pri:
     11
    1122013-09-23  Patrick Gansterer  <paroga@webkit.org>
    213
  • trunk/Source/WebKit/WebKit1.pri

    r145805 r156395  
    1515have?(qtsensors):if(enable?(DEVICE_ORIENTATION)|enable?(ORIENTATION_EVENTS)): QT += sensors
    1616
    17 have?(qtlocation):enable?(GEOLOCATION): QT += location
     17have?(qtpositioning):enable?(GEOLOCATION): QT += positioning
    1818
    1919contains(CONFIG, texmap): DEFINES += WTF_USE_TEXTURE_MAPPER=1
  • trunk/Source/WebKit/qt/ChangeLog

    r156330 r156395  
     12013-09-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix build with Qt 5.2 QtPosition module
     4        https://bugs.webkit.org/show_bug.cgi?id=121089
     5
     6        Reviewed by Simon Hausmann.
     7
     8        QtLocation -> QtPositioning
     9
     10        * WebCoreSupport/GeolocationClientQt.cpp:
     11
    1122013-09-24  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    213
  • trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp

    r135515 r156395  
    3737#include "QWebPageAdapter.h"
    3838
    39 #include <QtLocation/QGeoPositionInfoSource>
     39#include <QtPositioning/QGeoPositionInfoSource>
    4040
    4141namespace WebCore {
  • trunk/Source/WebKit2/ChangeLog

    r156385 r156395  
     12013-09-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix build with Qt 5.2 QtPosition module
     4        https://bugs.webkit.org/show_bug.cgi?id=121089
     5
     6        Reviewed by Simon Hausmann.
     7
     8        QtLocation -> QtPositioning
     9
     10        * Target.pri:
     11        * UIProcess/qt/WebGeolocationProviderQt.cpp:
     12        * WebKit2.pri:
     13
    1142013-09-24  Sam Weinig  <sam@webkit.org>
    215
  • trunk/Source/WebKit2/Target.pri

    r154321 r156395  
    938938
    939939
    940 have?(qtlocation):enable?(GEOLOCATION): QT += location
     940have?(qtpositioning):enable?(GEOLOCATION): QT += positioning
    941941
    942942use?(3D_GRAPHICS): WEBKIT += angle
  • trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp

    r145805 r156395  
    2222#include "WebGeolocationProviderQt.h"
    2323
    24 #if ENABLE(GEOLOCATION) && HAVE(QTLOCATION)
    25 #include <QtLocation/QGeoPositionInfoSource>
     24#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING)
     25#include <QtPositioning/QGeoPositionInfoSource>
    2626
    2727namespace WebKit {
  • trunk/Source/WebKit2/WebKit2.pri

    r153520 r156395  
    8383have?(QTQUICK): QT += qml quick
    8484
    85 have?(qtlocation):enable?(GEOLOCATION): QT += location
     85have?(qtpositioning):enable?(GEOLOCATION): QT += positioning
    8686
    8787enable?(SECCOMP_FILTERS): PKGCONFIG += libseccomp
  • trunk/Source/sync.profile

    r155694 r156395  
    2121    "qtbase" => "",
    2222    "qtdeclarative" => "",
     23    "qtlocation" => "",
    2324    "qtmultimedia" => "",
    2425    "qtsensors" => "",
  • trunk/Tools/ChangeLog

    r156388 r156395  
     12013-09-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] Fix build with Qt 5.2 QtPosition module
     4        https://bugs.webkit.org/show_bug.cgi?id=121089
     5
     6        Reviewed by Simon Hausmann.
     7
     8        QtLocation -> QtPositioning. Make sure we set build type before doing configure checks
     9        that might depend on them.
     10
     11        * qmake/mkspecs/features/default_pre.prf:
     12        * qmake/mkspecs/features/features.prf:
     13
    1142013-09-25  Mario Sanchez Prada  <mario.prada@samsung.com>
    215
  • trunk/Tools/qmake/mkspecs/features/default_pre.prf

    r153520 r156395  
    6363else: PYTHON = python
    6464
     65# We use private_tests to detect developer build, since the destdir will
     66# always be our webkit build dir. This might change as configure changes.
     67contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build
     68
     69# By default we enable "production build", and build-webkit, which is
     70# used by bots and developers, will disable it, to enable warnings etc.
     71CONFIG += production_build
     72
    6573# Run configure before making decisions that depend on the result
    6674root_project_file {
     
    7583}
    7684
    77 # We use private_tests to detect developer build, since the destdir will
    78 # always be our webkit build dir. This might change as configure changes.
    79 contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build
    80 
    8185# Set some defaults for specific platforms
    8286CONFIG += include_webinspector
     
    8488# Make sure we process the PKGCONFIG variable if applicable
    8589!mac: CONFIG += link_pkgconfig
    86 
    87 # By default we enable "production build", and build-webkit, which is
    88 # used by bots and developers, will disable it, to enable warnings etc.
    89 CONFIG += production_build
    9090
    9191# Limit the creation of thin archives to Linux, since only GNU's ar supports it.
  • trunk/Tools/qmake/mkspecs/features/features.prf

    r155433 r156395  
    3838    qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle
    3939    qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib
    40     qtHaveModule(location): WEBKIT_CONFIG += have_qtlocation
     40    qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning
    4141    qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors
    4242
     
    9898    enable?(css_filters):enable?(webgl): WEBKIT_CONFIG += css_shaders
    9999
    100     # Geolocation support if QtLocation exists or if we're doing a developer build (Mock implementation exists
     100    # Geolocation support if QtPositioning exists or if we're doing a developer build (Mock implementation exists
    101101    # and used for layout tests)
    102     have?(qtlocation)|!production_build: WEBKIT_CONFIG += geolocation
     102    have?(qtpositioning)|!production_build: WEBKIT_CONFIG += geolocation
    103103
    104104    # Orientation support if QtSensors exists or if we're doing a developer build (Mock implementation exists
Note: See TracChangeset for help on using the changeset viewer.