Changeset 156395 in webkit
- Timestamp:
- Sep 25, 2013 7:57:19 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r156328 r156395 1 2013-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 1 12 2013-09-24 Zan Dobersek <zdobersek@igalia.com> 2 13 -
trunk/Source/WebKit/ChangeLog
r156266 r156395 1 2013-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 1 12 2013-09-23 Patrick Gansterer <paroga@webkit.org> 2 13 -
trunk/Source/WebKit/WebKit1.pri
r145805 r156395 15 15 have?(qtsensors):if(enable?(DEVICE_ORIENTATION)|enable?(ORIENTATION_EVENTS)): QT += sensors 16 16 17 have?(qt location):enable?(GEOLOCATION): QT += location17 have?(qtpositioning):enable?(GEOLOCATION): QT += positioning 18 18 19 19 contains(CONFIG, texmap): DEFINES += WTF_USE_TEXTURE_MAPPER=1 -
trunk/Source/WebKit/qt/ChangeLog
r156330 r156395 1 2013-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 1 12 2013-09-24 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 13 -
trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp
r135515 r156395 37 37 #include "QWebPageAdapter.h" 38 38 39 #include <Qt Location/QGeoPositionInfoSource>39 #include <QtPositioning/QGeoPositionInfoSource> 40 40 41 41 namespace WebCore { -
trunk/Source/WebKit2/ChangeLog
r156385 r156395 1 2013-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 1 14 2013-09-24 Sam Weinig <sam@webkit.org> 2 15 -
trunk/Source/WebKit2/Target.pri
r154321 r156395 938 938 939 939 940 have?(qt location):enable?(GEOLOCATION): QT += location940 have?(qtpositioning):enable?(GEOLOCATION): QT += positioning 941 941 942 942 use?(3D_GRAPHICS): WEBKIT += angle -
trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp
r145805 r156395 22 22 #include "WebGeolocationProviderQt.h" 23 23 24 #if ENABLE(GEOLOCATION) && HAVE(QT LOCATION)25 #include <Qt Location/QGeoPositionInfoSource>24 #if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) 25 #include <QtPositioning/QGeoPositionInfoSource> 26 26 27 27 namespace WebKit { -
trunk/Source/WebKit2/WebKit2.pri
r153520 r156395 83 83 have?(QTQUICK): QT += qml quick 84 84 85 have?(qt location):enable?(GEOLOCATION): QT += location85 have?(qtpositioning):enable?(GEOLOCATION): QT += positioning 86 86 87 87 enable?(SECCOMP_FILTERS): PKGCONFIG += libseccomp -
trunk/Source/sync.profile
r155694 r156395 21 21 "qtbase" => "", 22 22 "qtdeclarative" => "", 23 "qtlocation" => "", 23 24 "qtmultimedia" => "", 24 25 "qtsensors" => "", -
trunk/Tools/ChangeLog
r156388 r156395 1 2013-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 1 14 2013-09-25 Mario Sanchez Prada <mario.prada@samsung.com> 2 15 -
trunk/Tools/qmake/mkspecs/features/default_pre.prf
r153520 r156395 63 63 else: PYTHON = python 64 64 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. 67 contains(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. 71 CONFIG += production_build 72 65 73 # Run configure before making decisions that depend on the result 66 74 root_project_file { … … 75 83 } 76 84 77 # We use private_tests to detect developer build, since the destdir will78 # always be our webkit build dir. This might change as configure changes.79 contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build80 81 85 # Set some defaults for specific platforms 82 86 CONFIG += include_webinspector … … 84 88 # Make sure we process the PKGCONFIG variable if applicable 85 89 !mac: CONFIG += link_pkgconfig 86 87 # By default we enable "production build", and build-webkit, which is88 # used by bots and developers, will disable it, to enable warnings etc.89 CONFIG += production_build90 90 91 91 # Limit the creation of thin archives to Linux, since only GNU's ar supports it. -
trunk/Tools/qmake/mkspecs/features/features.prf
r155433 r156395 38 38 qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle 39 39 qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib 40 qtHaveModule( location): WEBKIT_CONFIG += have_qtlocation40 qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning 41 41 qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors 42 42 … … 98 98 enable?(css_filters):enable?(webgl): WEBKIT_CONFIG += css_shaders 99 99 100 # Geolocation support if Qt Locationexists or if we're doing a developer build (Mock implementation exists100 # Geolocation support if QtPositioning exists or if we're doing a developer build (Mock implementation exists 101 101 # and used for layout tests) 102 have?(qt location)|!production_build: WEBKIT_CONFIG += geolocation102 have?(qtpositioning)|!production_build: WEBKIT_CONFIG += geolocation 103 103 104 104 # 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.