From: inv Date: Tue, 3 Apr 2012 12:20:57 +0000 (+0000) Subject: SALOME 6.5.0 preparation: qt 4.6.3 -> 4.6.4 X-Git-Tag: V6_5_0b1~59 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=47e30c122dc2dedd6c2515783a4f6b2344979857;p=tools%2Finstall.git SALOME 6.5.0 preparation: qt 4.6.3 -> 4.6.4 --- diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 25a3deb..c1343fa 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -387,10 +387,10 @@ type="prerequisite" description="Multiplatform C++ GUI application framework"> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> + script="qt.sh"/> -Date: Wed, 22 Jul 2009 17:12:17 +0200 -Subject: [PATCH] Revert "Added a check that X11 timestamp goes forward only." - -In some cases we might get an invalid timestamp that is far away in -the future, so remembering it will break all consequent X calls that -require a timestamp because it just contains junk (for example -clipboard will stop working). This happens with XIM+SCIM pair - -whenever we start input method and type something to the widget, we -get a XKeyPress event with a commited string, however the 'serial' and -'time' members of the XEvent structure are not initialized (according -to valgrind) and contain junk. - -This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. - -Reviewed-By: Brad ---- - src/gui/kernel/qapplication_x11.cpp | 35 +++++++++++++++-------------------- - 1 files changed, 15 insertions(+), 20 deletions(-) - -diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp -index 163ceb6..abedfd6 100644 ---- a/src/gui/kernel/qapplication_x11.cpp -+++ b/src/gui/kernel/qapplication_x11.cpp -@@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event) - #ifdef ALIEN_DEBUG - //qDebug() << "QApplication::x11ProcessEvent:" << event->type; - #endif -- Time time = 0, userTime = 0; - switch (event->type) { - case ButtonPress: - pressed_window = event->xbutton.window; -- userTime = event->xbutton.time; -+ X11->userTime = event->xbutton.time; - // fallthrough intended - case ButtonRelease: -- time = event->xbutton.time; -+ X11->time = event->xbutton.time; - break; - case MotionNotify: -- time = event->xmotion.time; -+ X11->time = event->xmotion.time; - break; - case XKeyPress: -- userTime = event->xkey.time; -+ X11->userTime = event->xkey.time; - // fallthrough intended - case XKeyRelease: -- time = event->xkey.time; -+ X11->time = event->xkey.time; - break; - case PropertyNotify: -- time = event->xproperty.time; -+ X11->time = event->xproperty.time; - break; - case EnterNotify: - case LeaveNotify: -- time = event->xcrossing.time; -+ X11->time = event->xcrossing.time; - break; - case SelectionClear: -- time = event->xselectionclear.time; -+ X11->time = event->xselectionclear.time; - break; - default: --#ifndef QT_NO_XFIXES -- if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { -- XFixesSelectionNotifyEvent *req = -- reinterpret_cast(event); -- time = req->selection_timestamp; -- } --#endif - break; - } -- if (time > X11->time) -- X11->time = time; -- if (userTime > X11->userTime) -- X11->userTime = userTime; -+#ifndef QT_NO_XFIXES -+ if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) { -+ XFixesSelectionNotifyEvent *req = -+ reinterpret_cast(event); -+ X11->time = req->selection_timestamp; -+ } -+#endif - - QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window); - --- -1.6.1 - diff --git a/config_files/qt-4.6.3.sh b/config_files/qt-4.6.3.sh deleted file mode 100755 index a6b9645..0000000 --- a/config_files/qt-4.6.3.sh +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/bash -noprofile - -#################################################################################### -# File : qt-4.6.3.sh -# Created : Thu Dec 18 12:01:00 2002 -# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) -# Project : SALOME -# Module : Installation Wizard -# Copyright : 2002-2008 CEA -# -# This script is the part of the SALOME installation procedure. -# -#################################################################################### - -QT_REF_VERSION="4.6.3" - -check_version(){ -if [ -z "$QTDIR" ]; then - return 1 -fi -ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` -if [ "$ver" == "${QT_REF_VERSION}" ] ; then - return 0 -fi -return 1 -} - -print_env_bin() -{ -cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <\2%g" \ - examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 - mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp - -is_mandriva2006=0 - -if [ -e /etc/issue ] ; then - grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null -if [ $? == 0 ] ; then is_mandriva2006=1 ; fi -fi - -if [ $is_mandriva2006 == 1 ] ; then - if test `uname -m` = "x86_64" ; then - sed -e "s/-O2/-O1/g" mkspecs/common/g++.conf > mkspecs/common/g++.conf.1 - mv -f mkspecs/common/g++.conf.1 mkspecs/common/g++.conf - fi -fi - -# configure -check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -release -opensource -confirm-license - -GCC=`which gcc` -cat >> ${PRODUCT_DIR}/MAKE.LOG < $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l -sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l -sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_" -chmod -f --reference=$l $l"_" ; mv -f $l"_" $l - -done - -# modify libGL.so flags -has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la` -gllibdir="`where_gl_libs`" -if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then - sed -e "s%-lGL\b%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \ - libQtOpenGL.la > libQtOpenGL.la.new - mv -f libQtOpenGL.la.new libQtOpenGL.la -fi - -# modify qt package config -cd ${PRODUCT_DIR}/lib/pkgconfig -for l in X `find . -name "*.pc"`; do - if [ "${l}" != "X" ] ; then - sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \ - -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ - -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ - -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \ - -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \ - ${l} > ${l}_ - chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} - fi -done - -# generate qt.conf file -cat > ${PRODUCT_DIR}/bin/qt.conf < ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <> ${PRODUCT_DIR}/MAKE.LOG < $l"_" +chmod -f --reference=$l $l"_" ; mv -f $l"_" $l +sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_" +chmod -f --reference=$l $l"_" ; mv -f $l"_" $l +sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_" +chmod -f --reference=$l $l"_" ; mv -f $l"_" $l + +done + +# modify libGL.so flags +has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la` +gllibdir="`where_gl_libs`" +if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then + sed -e "s%-lGL\b%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \ + libQtOpenGL.la > libQtOpenGL.la.new + mv -f libQtOpenGL.la.new libQtOpenGL.la +fi + +# modify qt package config +cd ${PRODUCT_DIR}/lib/pkgconfig +for l in X `find . -name "*.pc"`; do + if [ "${l}" != "X" ] ; then + sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \ + -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ + -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \ + -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \ + -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \ + ${l} > ${l}_ + chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} + fi +done + +# generate qt.conf file +cat > ${PRODUCT_DIR}/bin/qt.conf <