diff options
| author | Jon Severinsson <jon@severinsson.net> | 2012-12-11 16:19:24 +0000 |
|---|---|---|
| committer | Jon Severinsson <jon@severinsson.net> | 2012-12-12 21:01:33 +0000 |
| commit | f0680b75e32645b4e0626ead645f49325f20b228 (patch) | |
| tree | fa4a0c1dab0bf886490aed4b7cb0a8c12e09398f | |
| parent | a488a08157cf26f2e15908f0f21e9b3e435aabeb (diff) | |
| download | extra-cmake-modules-f0680b75e32645b4e0626ead645f49325f20b228.tar.gz extra-cmake-modules-f0680b75e32645b4e0626ead645f49325f20b228.tar.bz2 | |
QtWebkit is now split in QtWebKit and QtWebKitWidgets
Make FindQt5Transitional.cmake handle this transparently.
REVIEW: 107438
| -rw-r--r-- | find-modules/FindQt5Transitional.cmake | 4 | ||||
| -rw-r--r-- | modules/ECMQt4To5Porting.cmake | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/find-modules/FindQt5Transitional.cmake b/find-modules/FindQt5Transitional.cmake index 9d20a8fe..cae84860 100644 --- a/find-modules/FindQt5Transitional.cmake +++ b/find-modules/FindQt5Transitional.cmake @@ -21,6 +21,7 @@ if (Qt5Core_FOUND) Concurrent UiTools WebKit + WebKitWidgets OpenGL ) find_package(Qt5${_component}) @@ -28,6 +29,9 @@ if (Qt5Core_FOUND) else() foreach(_component ${Qt5Transitional_FIND_COMPONENTS}) find_package(Qt5${_component} REQUIRED) + if ("${_component}" STREQUAL "WebKit") + find_package(Qt5WebKitWidgets REQUIRED) + endif() if ("${_component}" STREQUAL "Gui") find_package(Qt5Widgets REQUIRED) find_package(Qt5PrintSupport REQUIRED) diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake index ce797ebd..0e37d1cc 100644 --- a/modules/ECMQt4To5Porting.cmake +++ b/modules/ECMQt4To5Porting.cmake @@ -165,6 +165,7 @@ set(_qt_modules Xml UiTools WebKit + WebKitWidgets Sql OpenGL ) @@ -180,6 +181,9 @@ endforeach() list(APPEND QT_QTCORE_LIBRARIES ${Qt5Concurrent_LIBRARIES}) list(APPEND QT_QTCORE_LIBRARY ${Qt5Concurrent_LIBRARIES}) +list(APPEND QT_QTWEBKIT_LIBRARIES ${Qt5WebKitWidgets_LIBRARIES}) +list(APPEND QT_QTWEBKIT_LIBRARY ${Qt5WebKitWidgets_LIBRARIES}) + get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake LOCATION) get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION) if (TARGET Qt5::uic) |