diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-21 13:36:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 18:59:56 +0200 |
| commit | 2761751ecaf61064c3742c639a37f110120e8292 (patch) | |
| tree | 89f005061e56c4682aae21a188e6437fef896e45 | |
| parent | ff54f45ab004fd9b74ffc712e28505fb17e3b12d (diff) | |
Use global Qt configuration for libudevv5.2.0-beta1
Only build WebKit with libudev dependency if Qt was configured with libudev.
Task-number: QTBUG-34176
Change-Id: Iaabb2401e2dc4a91d46a5e4f759546e0de278a08
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Source/WebCore/WebCore.pri | 3 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 01f7da929..136fec8ec 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -165,7 +165,8 @@ enable?(GAMEPAD) { INCLUDEPATH += \ $$SOURCE_DIR/platform/linux \ $$SOURCE_DIR/Modules/gamepad - PKGCONFIG += libudev + INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV + LIBS += $$QMAKE_LIBS_LIBUDEV } use?(GLIB) { diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 8d1054159..cc2ddea8f 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -125,7 +125,8 @@ defineTest(detectFeatures) { } # Gamepad API Support - packagesExist(libudev): WEBKIT_CONFIG += gamepad + contains(QT_CONFIG, libudev): WEBKIT_CONFIG += gamepad + else:unix: CONFIGURE_WARNINGS += "Qt configured without libudev, gamepad API will not be built" # Support for Graphics Surface # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics |