diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-14 14:51:36 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-22 04:38:25 +0100 |
| commit | 1704cecfac5cf42d98c97e552f04dca8f5dbe287 (patch) | |
| tree | 1d464167b1f6c9f00b4341599f0ba49ca5b799ad /configure | |
| parent | 1c63909ad8caee11ba0ec4af998d981bd50d3ee1 (diff) | |
Re-group and re-sort the configure output
G does not come after I. That's actually my fault, in the original
commit. But some options have been added since then in the wrong place
and/or using wrong settings for the report_support function.
Change-Id: Ib3f7d58a41059e5e7f97fd0e223b9629664686ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -6786,6 +6786,7 @@ report_support " Qt D-Bus ..............." "$CFG_DBUS" yes "loading dbus-1 at r report_support " Qt Concurrent .........." "$CFG_CONCURRENT" report_support " Qt GUI ................." "$CFG_GUI" report_support " Qt Widgets ............." "$CFG_WIDGETS" +report_support " Large File ............." "$CFG_LARGEFILE" report_support " JavaScriptCore JIT ....." "$CFG_JAVASCRIPTCORE_JIT" auto "To be decided by JavaScriptCore" report_support " QML debugging .........." "$CFG_QML_DEBUG" report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES" @@ -6801,19 +6802,17 @@ report_support " CUPS ..................." "$CFG_CUPS" [ "$XPLATFORM_MINGW" = "yes" ] && \ report_support " DirectWrite ............" "$CFG_DIRECTWRITE" report_support " FontConfig ............." "$CFG_FONTCONFIG" -report_support " FreeType ..............." "$CFG_FREETYPE" -[ "$CFG_HARFBUZZ" != "no" ] && \ - report_support " HarfBuzz ..............." "$CFG_HARFBUZZ" +report_support " FreeType ..............." "$CFG_FREETYPE" system "system library" yes "bundled copy" +report_support " Glib ..................." "$CFG_GLIB" +report_support " GTK theme .............." "$CFG_QGTKSTYLE" +report_support " HarfBuzz ..............." "$CFG_HARFBUZZ" report_support " Iconv .................." "$CFG_ICONV" report_support " ICU ...................." "$CFG_ICU" report_support " Image formats:" report_support_plugin " GIF .................." "$CFG_GIF" qt QtGui report_support_plugin " JPEG ................." "$CFG_JPEG" "$CFG_LIBJPEG" QtGui report_support_plugin " PNG .................." "$CFG_PNG" "$CFG_LIBPNG" QtGui -report_support " Glib ..................." "$CFG_GLIB" -report_support " GTK theme .............." "$CFG_QGTKSTYLE" report_support " journald ..............." "$CFG_JOURNALD" -report_support " Large File ............." "$CFG_LARGEFILE" report_support " mtdev .................." "$CFG_MTDEV" yes "system library" report_support " Networking:" [ "$XPLATFORM_MAC" = "yes" ] && \ @@ -6823,11 +6822,10 @@ report_support " getifaddrs ..........." "$CFG_GETIFADDRS" report_support " IPv6 ifname .........." "$CFG_IPV6IFNAME" report_support " OpenSSL .............." "$CFG_OPENSSL" yes "loading libraries at run-time" linked "linked to the libraries" report_support " NIS ...................." "$CFG_NIS" -report_support " EGL ...................." "$CFG_EGL" -report_support " EGL on X ..............." "$CFG_EGL_X" -report_support " GLX ...................." "$CFG_XCB_GLX" -report_support " OpenGL ................." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x" -report_support " OpenVG ................." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native" +report_support " OpenGL / OpenVG:" +report_support " EGL .................." "$CFG_EGL" +report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x" +report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native" report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy" if [ -n "$PKG_CONFIG" ]; then report_support " pkg-config ............. yes" @@ -6842,6 +6840,8 @@ report_support " KMS .................." "$CFG_KMS" report_support " LinuxFB .............." "$CFG_LINUXFB" report_support " XCB .................." "$CFG_XCB" system "system library" qt "bundled copy" if [ "$CFG_XCB" != "no" ]; then + report_support " EGL on X ..........." "$CFG_EGL_X" + report_support " GLX ................" "$CFG_XCB_GLX" report_support " MIT-SHM ............" "$CFG_MITSHM" report_support " Xcb-Xlib ..........." "$CFG_XCB_XLIB" report_support " Xcursor ............" "$CFG_XCURSOR" runtime "loaded at runtime" |