diff options
Diffstat (limited to 'src/core/api/configure.cmake')
| -rw-r--r-- | src/core/api/configure.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index e2543cfac..d712f1c2a 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -1,7 +1,7 @@ #### Libraries if(NOT QT_CONFIGURE_RUNNING) - find_package(GLIB2 COMPONENTS gio) + find_package(GLIB2 COMPONENTS GIO) find_package(GSSAPI) find_package(PkgConfig) if(PkgConfig_FOUND) @@ -72,11 +72,6 @@ qt_feature("webengine-system-pulseaudio" PRIVATE AUTODETECT UNIX CONDITION PULSEAUDIO_FOUND ) -qt_feature("webengine-pepper-plugins" PRIVATE - LABEL "Pepper Plugins" - PURPOSE "Enables use of Pepper Flash plugins." - AUTODETECT NOT QT_FEATURE_webengine_embedded_build -) qt_feature("webengine-printing-and-pdf" PRIVATE LABEL "Printing and PDF" PURPOSE "Provides printing and output to PDF." @@ -84,6 +79,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND (CUPS_FOUND OR WIN32) ) +qt_feature("webengine-pepper-plugins" PRIVATE + LABEL "Pepper Plugins" + PURPOSE "Enables use of Pepper plugins." + AUTODETECT QT_FEATURE_webengine_printing_and_pdf +) qt_feature("webengine-webchannel" PUBLIC SECTION "WebEngine" LABEL "WebChannel support" @@ -118,7 +118,7 @@ qt_feature("webengine-extensions" PUBLIC LABEL "Extensions" PURPOSE "Enables Chromium extensions within certain limits. Currently used by the pdf viewer and hangout webrtc extension." AUTODETECT ON - CONDITION QT_FEATURE_webengine_printing_and_pdf OR QT_FEATURE_webengine_printing_and_pdf + CONDITION QT_FEATURE_webengine_printing_and_pdf OR QT_FEATURE_webengine_webrtc ) qt_feature("webengine-webrtc" PRIVATE LABEL "WebRTC" |