diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-02 07:03:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-02 07:03:53 +0000 |
| commit | 46798611057285b31c6a134e3f4461ac6aad03c5 (patch) | |
| tree | a441d501f19d57f42b1dec6602acd0cee2bc0139 /configure | |
| parent | 6cbcff49716e8632fa5d41f68fc11e9ebaf1d3c6 (diff) | |
| parent | b894a8def5d9107663e4968d2d395f5ef3059125 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -692,7 +692,7 @@ CFG_EGLFS_EGLDEVICE=no CFG_EGLFS_MALI=no CFG_EGLFS_VIV=no CFG_EGLFS_VIV_WL=no -CFG_DIRECTFB=auto +CFG_DIRECTFB=no CFG_GBM=auto CFG_LINUXFB=auto CFG_INTEGRITYFB=no @@ -2706,8 +2706,8 @@ Additional options: -no-gbm ............ Do not compile backends for GBM. * -gbm ............... Compile backends for GBM. - -no-directfb ....... Do not compile DirectFB support. - * -directfb .......... Compile DirectFB support. + * -no-directfb ....... Do not compile DirectFB support. + -directfb .......... Compile DirectFB support. -no-linuxfb ........ Do not compile Linux Framebuffer support. * -linuxfb ........... Compile Linux Framebuffer support. @@ -3931,7 +3931,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; setBootstrapVariable QMAKE_CXXFLAGS_RELEASE EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" - elif [ "$CFG_DEBUG" = "yes" ]; then + else setBootstrapVariable QMAKE_CFLAGS_DEBUG setBootstrapVariable QMAKE_CXXFLAGS_DEBUG EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" |