From 7c13f5df2fbd64512a99b66f633abb0fd7f87d35 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Wed, 29 May 2019 14:25:32 +0200 Subject: This fixes bug: 639 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add desktop files for: - assistant-qt3 - designer-qt3 - linguist-qt3 - qtconfig-qt3 These files have been made with the contribution of Laurent Dard's patch (see bugzilla:639) with little change/addition from I. Add 'sysshare' option to the configure script. Signed-off-by: gregory guy Signed-off-by: Slávek Banko --- configure | 16 ++- src/tools/qglobal.h | 1 + tools/assistant/assistant-qt3.desktop | 93 +++++++++++++++++ tools/assistant/assistant.pro | 12 ++- tools/designer/designer/designer-qt3.desktop | 145 +++++++++++++++++++++++++++ tools/designer/designer/designer.pro | 13 ++- tools/linguist/linguist/linguist-qt3.desktop | 102 +++++++++++++++++++ tools/linguist/linguist/linguist.pro | 14 ++- tools/qtconfig/qt3config.desktop | 34 +++++++ tools/qtconfig/qtconfig.pro | 12 ++- 10 files changed, 430 insertions(+), 12 deletions(-) create mode 100644 tools/assistant/assistant-qt3.desktop create mode 100644 tools/designer/designer/designer-qt3.desktop create mode 100644 tools/linguist/linguist/linguist-qt3.desktop create mode 100644 tools/qtconfig/qt3config.desktop diff --git a/configure b/configure index 77accf6..b969f4d 100755 --- a/configure +++ b/configure @@ -171,7 +171,7 @@ QT_INSTALL_PLUGINS= QT_INSTALL_DATA= QT_INSTALL_TRANSLATIONS= QT_INSTALL_SYSCONF= - +QT_INSTALL_SHARE= #------------------------------------------------------------------------------- # check SQL drivers and styles available in this package @@ -241,7 +241,7 @@ while [ "$#" -gt 0 ]; do UNKNOWN_ARG=yes fi ;; - -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) + -prefix|-sysshare|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL=$1 @@ -371,6 +371,9 @@ while [ "$#" -gt 0 ]; do sysconfdir) QT_INSTALL_SYSCONF="$VAL" ;; + sysshare) + QT_INSTALL_SHARE="$VAL" + ;; qconfig) CFG_QCONFIG="$VAL" ;; @@ -940,6 +943,8 @@ done [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations # default PREFIX/etc/settings [ -z "$QT_INSTALL_SYSCONF" ] && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/settings +# default PREFIX/share +[ -z "$QT_INSTALL_SHARE" ] && QT_INSTALL_SHARE=$QT_INSTALL_PREFIX/share # generate qconfig.cpp [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools @@ -956,6 +961,7 @@ static const char QT_INSTALL_PLUGINS [267] = "qt_plgpath=$QT_INSTALL_PLUGINS static const char QT_INSTALL_DATA [267] = "qt_datpath=$QT_INSTALL_DATA"; static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=$QT_INSTALL_TRANSLATIONS"; static const char QT_INSTALL_SYSCONF [267] = "qt_cnfpath=$QT_INSTALL_SYSCONF"; +static const char QT_INSTALL_SHARE [267] = "qt_shapath=$QT_INSTALL_SHARE"; /* strlen( "qt_xxxpath=" ) == 11 */ const char *qInstallPath() { return QT_INSTALL_PREFIX + 11; } @@ -967,6 +973,7 @@ const char *qInstallPathPlugins() { return QT_INSTALL_PLUGINS + 11; } const char *qInstallPathData() { return QT_INSTALL_DATA + 11; } const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; } const char *qInstallPathSysconf() { return QT_INSTALL_SYSCONF + 11; } +const char *qInstallPathShare() { return QT_INSTALL_SHARE + 11; } EOF # avoid unecessary rebuilds by copying only if qconfig.cpp has changed @@ -1851,7 +1858,7 @@ if [ "$OPT_HELP" = "yes" ]; then cat <