diff --git a/scripts/shipping/prepare-linux-qt-for-shipping.sh b/scripts/shipping/prepare-linux-qt-for-shipping.sh new file mode 100755 index 00000000000..7b5910bc988 --- /dev/null +++ b/scripts/shipping/prepare-linux-qt-for-shipping.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash + +workdir=/home/berlin/workdir +destdir=/home/sping/install +dir=qt-x11-opensource-src-4.4.3 +file="${dir}.tar.gz" +[ -z ${MAKE} ] && MAKE=make +envpath=/usr/bin:/bin + +if gcc -dumpversion | grep '^4' ; then + # GCC 4.x machine + webkit= +else + # GCC 3.3.5 machine + webkit='-no-webkit' +fi + + +die() { + echo $1 1>&2 + exit 1 +} + +rand_range() { + incMin=$1 + incMax=$2 + echo $((RANDOM*(incMax-incMin+1)/32768+incMin)) +} + + +setup() { + mkdir -p "${workdir}" + cd "${workdir}" || die "cd failed" +} + +download() { + [ -f "${file}" ] && return + case `rand_range 1 2` in + 1) + mirror=http://ftp.ntua.gr/pub/X11/Qt/qt/source/ + ;; + *) + mirror=http://wftp.tu-chemnitz.de/pub/Qt/qt/source/ + ;; + esac + wget "${mirror}/${file}" || die "Download failed" +} + +unpack() { + [ -d "${dir}" ] && return + tar -xf "${file}" +} + +build() { + ( + cd "${dir}" + if [ ! -f config.status ] ; then + env -i PATH=${envpath} ./configure \ + -prefix "${destdir}" \ + -optimized-qmake \ + -confirm-license \ + \ + -no-mmx -no-sse -no-sse2 -no-3dnow \ + -release -fast \ + ${webkit} \ + -qt-zlib -qt-gif -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg \ + \ + || die "configure failed" + fi + + env -i PATH=${envpath} "${MAKE}" || die "make failed" + ) + ret=$?; [ ${ret} = 0 ] || exit ${ret} +} + +inst() { + ( + cd "${dir}" + mkdir -p "${destdir}" + env -i "${MAKE}" install || die "make install failed" + ) + ret=$?; [ ${ret} = 0 ] || exit ${ret} +} + +main() { + ( + setup + download + unpack + build + inst + ) + ret=$?; [ ${ret} = 0 ] || exit ${ret} +} + +main diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 5794935182c..20d686a90be 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -83,7 +83,7 @@ TextEditorSettings::TextEditorSettings(Internal::TextEditorPlugin *plugin, formatDescriptions.push_back(FormatDescription(QLatin1String(C_PREPROCESSOR), tr("Preprocessor"), Qt::darkBlue)); formatDescriptions.push_back(FormatDescription(QLatin1String(C_LABEL), tr("Label"), Qt::darkRed)); formatDescriptions.push_back(FormatDescription(QLatin1String(C_COMMENT), tr("Comment"), Qt::darkGreen)); - formatDescriptions.push_back(FormatDescription(QLatin1String(C_DISABLED_CODE), tr("Disabled Code"), Qt::lightGray)); + formatDescriptions.push_back(FormatDescription(QLatin1String(C_DISABLED_CODE), tr("Disabled Code"), Qt::gray)); // Diff categories formatDescriptions.push_back(FormatDescription(QLatin1String(C_ADDED_LINE), tr("Added Line"), Qt::blue));