diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -884,6 +884,7 @@ QT_INSTALL_LIBS= QT_INSTALL_BINS= QT_INSTALL_PLUGINS= QT_INSTALL_IMPORTS= +QT_INSTALL_QML= QT_INSTALL_ARCHDATA= QT_INSTALL_DATA= QT_INSTALL_TRANSLATIONS= @@ -993,7 +994,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style options that pass an argument - -prefix|-docdir|-headerdir|-plugindir|-importdir|-archdatadir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1208,6 +1209,9 @@ while [ "$#" -gt 0 ]; do importdir) QT_INSTALL_IMPORTS="$VAL" ;; + qmldir) + QT_INSTALL_QML="$VAL" + ;; archdatadir) QT_INSTALL_ARCHDATA="$VAL" ;; @@ -2816,6 +2820,12 @@ if [ -z "$QT_INSTALL_IMPORTS" ]; then #default fi QT_INSTALL_IMPORTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_IMPORTS"` +#qml +if [ -z "$QT_INSTALL_QML" ]; then #default + QT_INSTALL_QML="$QT_INSTALL_ARCHDATA/qml" #fallback +fi +QT_INSTALL_QML=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_QML"` + if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default QT_INSTALL_TRANSLATIONS="$QT_INSTALL_DATA/translations" #fallback fi @@ -3012,8 +3022,10 @@ Installation options: (default PREFIX) -plugindir <dir> ...... Plugins will be installed to <dir> (default ARCHDATADIR/plugins) - -importdir <dir> ...... Imports for QML will be installed to <dir> + -importdir <dir> ...... Imports for QML1 will be installed to <dir> (default ARCHDATADIR/imports) + -qmldir <dir> ......... Imports for QML2 will be installed to <dir> + (default ARCHDATADIR/qml) -datadir <dir> ........ Arch-independent data used by Qt will be installed to <dir> (default PREFIX) -docdir <dir> ......... Documentation will be installed to <dir> @@ -3497,6 +3509,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_binspath=$QT_INSTALL_BINS", "qt_plugpath=$QT_INSTALL_PLUGINS", "qt_impspath=$QT_INSTALL_IMPORTS", + "qt_qml2path=$QT_INSTALL_QML", "qt_adatpath=$QT_INSTALL_ARCHDATA", "qt_datapath=$QT_INSTALL_DATA", "qt_trnspath=$QT_INSTALL_TRANSLATIONS", |