Mageia: initial QT3 version for TDE 3.5.13

pull/3/head
Francois Andriot 12 years ago
parent 9f07f14135
commit 0704427510

@ -0,0 +1 @@
../redhat/components-3.5.13.txt

@ -0,0 +1,64 @@
--- src/iconview/qiconview.cpp 2009-06-10 17:50:47.000000000 +0200
+++ src/iconview/qiconview.cpp.new 2009-06-10 17:56:38.000000000 +0200
@@ -261,6 +261,7 @@
uint dragging :1;
uint drawActiveSelection :1;
uint inMenuMode :1;
+ uint controlPressed :1;
QIconViewToolTip *toolTip;
QPixmapCache maskCache;
@@ -2758,6 +2759,7 @@
d->lastItem = 0;
d->count = 0;
d->mousePressed = FALSE;
+ d->controlPressed = FALSE;
d->selectionMode = Single;
d->currentItem = 0;
d->highlightedItem = 0;
@@ -3325,7 +3327,18 @@
for ( ; item; item = c->items.next() ) {
if ( d->selectedItems.find( item ) )
continue;
- if ( !item->intersects( nr ) ) {
+ if ( d->selectedItems.find( item ) ) {
+ if ( item->intersects( nr ) && item->isSelected() && d->controlPressed ) {
+ item->setSelected( FALSE );
+ changed = TRUE;
+ rr = rr.unite( item->rect() );
+ } else if ( !item->intersects( nr ) && !item->isSelected() && d->controlPressed ) {
+ item->setSelected( TRUE, TRUE );
+ changed = TRUE;
+ rr = rr.unite( item->rect() );
+ } else
+ continue;
+ } else if ( !item->intersects( nr ) ) {
if ( item->isSelected() ) {
item->setSelected( FALSE );
changed = TRUE;
@@ -4551,7 +4564,7 @@
}
}
} else if ( ( d->selectionMode != Single || e->button() == RightButton )
- && !( e->state() & ControlButton ) )
+ && !( e->state() & ControlButton ) && !( e->state() & ShiftButton ) )
selectAll( FALSE );
setCurrentItem( item );
@@ -4567,7 +4580,7 @@
d->rubber = 0;
d->rubber = new QRect( e->x(), e->y(), 0, 0 );
d->selectedItems.clear();
- if ( ( e->state() & ControlButton ) == ControlButton ) {
+ if ( ( e->state() & ControlButton ) == ControlButton || ( e->state() & ShiftButton ) == ShiftButton ) {
for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
if ( i->isSelected() )
d->selectedItems.insert( i, i );
@@ -4575,6 +4588,7 @@
}
d->mousePressed = TRUE;
+ d->controlPressed = ( ( e->state() & ControlButton ) == ControlButton );
}
emit_signals:

@ -0,0 +1,27 @@
qt-bugs@ issue: 40192
applied: no
author: Frerich Raabe <raabe@kde.org>
This patch should fix QValueList's streaming operator>> for cases where
the stream operates on a byte array smaller than a Q_UINT32 (for instance,
QByteArray objects which are 0-3 bytes in size). It used to read one bogus
item because the loop would get executed once even if reading the 'c'
variable failed.
--- src/tools/qvaluelist.h.orig 2004-01-27 21:10:52.000000000 +0000
+++ src/tools/qvaluelist.h 2004-01-27 21:11:35.000000000 +0000
@@ -636,13 +636,11 @@
l.clear();
Q_UINT32 c;
s >> c;
- for( Q_UINT32 i = 0; i < c; ++i )
+ for( Q_UINT32 i = 0; i < c && !s.atEnd(); ++i )
{
T t;
s >> t;
l.append( t );
- if ( s.atEnd() )
- break;
}
return s;
}

@ -0,0 +1,71 @@
qt-bugs@ issue : none
bugs.kde.org number : 83974
applied: no
author: Lubos Lunak <l.lunak@kde.org>
An ugly hack to get real transparency in Konsole working somehow, with Qt not having
any support for the ARGB visual. QApplication has one ctor that allows passing
any X connection and X visual, but that has some side effects, so this patch
adds a magic flag to turn the side effects off.
--- src/kernel/qapplication.cpp.sav 2007-02-23 14:01:19.000000000 +0100
+++ src/kernel/qapplication.cpp 2007-05-29 15:42:39.000000000 +0200
@@ -317,6 +317,7 @@ void qt_init( int *, char **, QApplicati
void qt_cleanup();
#if defined(Q_WS_X11)
void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE );
+void qt_init( int *, char **, Display* dpy, Qt::HANDLE, Qt::HANDLE );
#endif
Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop );
@@ -905,7 +906,7 @@ QApplication::QApplication(Display *dpy,
qt_init( &argc, argv, GuiClient );
} else {
- qt_init(dpy, visual, colormap);
+ qt_init( &argc, argv, dpy, visual, colormap);
}
process_cmdline( &argc, argv );
--- src/kernel/qapplication_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200
+++ src/kernel/qapplication_x11.cpp 2007-05-29 16:24:58.000000000 +0200
@@ -196,6 +196,7 @@ static bool noxim = FALSE; // connect t
static Display *appDpy = 0; // X11 application display
static char *appDpyName = 0; // X11 display name
static bool appForeignDpy = FALSE; // we didn't create display
+Q_EXPORT bool qt_no_foreign_hack = false;
static bool appSync = FALSE; // X11 synchronization
#if defined(QT_DEBUG)
static bool appNoGrab = FALSE; // X11 grabbing enabled
@@ -1541,7 +1542,7 @@ void qt_init_internal( int *argcptr, cha
setlocale( LC_ALL, "" ); // use correct char set mapping
setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work
- if ( display ) {
+ if ( display && !qt_no_foreign_hack ) {
// Qt part of other application
appForeignDpy = TRUE;
@@ -1698,7 +1699,9 @@ void qt_init_internal( int *argcptr, cha
// Connect to X server
if( qt_is_gui_used ) {
- if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
+ if( display != NULL && qt_no_foreign_hack )
+ appDpy = display;
+ else if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
qWarning( "%s: cannot connect to X server %s", appName,
XDisplayName(appDpyName) );
qApp = 0;
@@ -2345,6 +2348,10 @@ void qt_init( Display *display, Qt::HAND
qt_init_internal( 0, 0, display, visual, colormap );
}
+void qt_init( int *argcptr, char **argv, Display *display, Qt::HANDLE visual, Qt::HANDLE colormap )
+{
+ qt_init_internal( argcptr, argv, display, visual, colormap );
+}
/*****************************************************************************
qt_cleanup() - cleans up when the application is finished

@ -0,0 +1,15 @@
# fix .qtrc for Japanese
if [ "$LANG" = ja_JP ]; then
[ ! -d $HOME/.qt ] && mkdir $HOME/.qt
if [ ! -r $HOME/.qt/qtrc ] || ! grep -q '[General]' $HOME/.qt/qtrc; then
cat >> $HOME/.qt/qtrc <<EOF
[General]
XIMInputStyle=Over The Spot
EOF
elif ! grep -q XIMInputStyle $HOME/.qt/qtrc; then
rm -f $HOME/.qt/qtrc.$$
sed "s/\[General\]/[General]\nXIMInputStyle=Over The Spot/" < $HOME/.qt/qtrc > $HOME/.qt/qtrc.$$
mv -f $HOME/.qt/qtrc.$$ $HOME/.qt/qtrc
fi
fi

@ -0,0 +1,15 @@
--- src/kernel/qwidget_x11.cpp 2006-02-17 15:45:54.000000000 -0500
+++ src/kernel/qwidget_x11.cpp.orig 2006-02-17 16:27:07.000000000 -0500
@@ -2753,10 +2753,8 @@
*/
void QWidget::createInputContext()
{
-#if !defined(QT_NO_IM_EXTENSIONS)
- if( !isInputMethodEnabled() )
- return;
-#endif
+ if( !isInputMethodEnabled() || QApplication::closingDown() )
+ return;
QWidget *icWidget = icHolderWidget();
#ifndef QT_NO_IM

@ -0,0 +1,17 @@
--- ./src/kernel/qapplication_x11.cpp 2006-02-17 15:45:55.000000000 -0500
+++ ./src/kernel/qapplication_x11.cpp.orig 2006-02-17 16:05:43.000000000 -0500
@@ -5217,11 +5217,12 @@
} else {
key = (int)(long)keyDict->find( keycode );
if ( key )
- if( !willRepeat ) // Take out key of dictionary only if this call.
+ if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
keyDict->take( keycode );
long s = (long)textDict->find( keycode );
if ( s ) {
- textDict->take( keycode );
+ if( statefulTranslation )
+ textDict->take( keycode );
ascii = (char)(s-256);
}
}

@ -0,0 +1,18 @@
--- src/kernel/qinputcontext.cpp
+++ src/kernel/qinputcontext.cpp 2004/09/03 15:27:45
@@ -769,6 +769,7 @@
*/
QCString QInputContext::identifierName()
{
+ return "";
}
@@ -790,6 +791,7 @@
*/
QCString QInputContext::language()
{
+ return "";
}

@ -0,0 +1,13 @@
--- qt-x11-free-3.1.1/config.tests/x11/xfreetype.test-- 2002-12-17 17:26:19.000000000 +0100
+++ qt-x11-free-3.1.1/config.tests/x11/xfreetype.test 2002-12-17 17:36:31.000000000 +0100
@@ -6,8 +6,8 @@ VERBOSE=$2
SRCDIR=$3
OUTDIR=$4
shift 4
-IN_LIBDIRS=""
-IN_INCDIRS=""
+IN_LIBDIRS="/usr/lib/"
+IN_INCDIRS="/usr/include/fontconfig /usr/include/Xft2 /usr/include/Xft2/X11/Xft"
PARAMS=$@
for PARAM in $PARAMS; do
PREFIX=`echo $PARAM | sed 's/^\(..\).*/\1/'`

@ -0,0 +1,11 @@
--- qt-x11-free-3.2.3/src/dialogs/qprintdialog.cpp-- 2004-04-28 14:29:11.943776549 +0200
+++ qt-x11-free-3.2.3/src/dialogs/qprintdialog.cpp 2004-04-28 14:30:22.202024626 +0200
@@ -779,7 +779,7 @@ static char * parseCupsOutput( QListView
cups_dest_t * d;
QLibrary lib( "cups" );
typedef int (*CupsGetDests)(cups_dest_t **dests);
- CupsGetDests _cupsGetDests = (CupsGetDests)lib.resolve( "cupsGetDests" );
+ CupsGetDests _cupsGetDests = (CupsGetDests)QLibrary::resolve( "libcups.so.2", "cupsGetDests" );
if ( _cupsGetDests ) {
nd = _cupsGetDests( &d );
if ( nd < 1 )

@ -0,0 +1,11 @@
--- qt-x11-free-3.3.2/configure-- 2004-06-03 09:44:18.137414194 +0200
+++ qt-x11-free-3.3.2/configure 2004-06-03 09:44:54.007847860 +0200
@@ -3189,7 +3189,7 @@ if [ -n "$QCONFIG_FLAGS" ]; then
cat >>$outpath/include/qconfig.h.new << EOF
#ifndef $cfg
-# define $cfg
+#define $cfg
#endif
EOF

@ -0,0 +1,10 @@
--- qt-x11-free-3.3.3/plugins/src/accessible/widgets/widgets.pro-- 2004-08-26 12:04:30.408520889 +0200
+++ qt-x11-free-3.3.3/plugins/src/accessible/widgets/widgets.pro 2004-08-26 12:04:47.606921352 +0200
@@ -13,3 +13,7 @@ SOURCES += main.cpp \
HEADERS += qaccessiblewidget.h \
qaccessiblemenu.h
+
+target.path += $$plugins.path/accessible
+INSTALLS += target
+

@ -0,0 +1,12 @@
--- src/tools/qgpluginmanager.cpp
+++ src/tools/qgpluginmanager.cpp 2004/09/25 11:46:41
@@ -377,6 +377,9 @@
QString basename = (*git).left( (*git).find( QChar(0xfffd) ) );
++git;
+ // WARNING: this line should only exist on lib64 systems !
+ basename += ".lib64";
+
QStringList sameBasename;
while( git != group.end() &&
basename == (*git).left( (*git).find( QChar(0xfffd) ) ) ) {

@ -0,0 +1,24 @@
--- qt-x11-free-3.3.6/src/tools/qfile_unix.cpp-- 2006-07-31 09:03:52.000000000 +0200
+++ qt-x11-free-3.3.6/src/tools/qfile_unix.cpp 2006-07-31 09:06:52.000000000 +0200
@@ -164,8 +164,9 @@
bool QFile::open( int m )
{
if ( isOpen() ) { // file already open
-#if defined(QT_CHECK_STATE)
- qWarning( "QFile::open: File already open" );
+#if defined(QT_CHECK_STATE)
+ QString error = QString("QFile::open: File (%1) already open").arg(fn);
+ qWarning( error );
#endif
return FALSE;
}
@@ -179,7 +180,8 @@
setMode( m );
if ( !(isReadable() || isWritable()) ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "QFile::open: File access not specified" );
+ QString error = QString("QFile::open: File access (%1) not specified").arg(fn);
+ qWarning( error );
#endif
return FALSE;
}

@ -0,0 +1,67 @@
--- qt-x11-free-3.3.6/src/tools/qfile_unix.cpp-- 2006-08-10 09:55:59.000000000 +0200
+++ qt-x11-free-3.3.6/src/tools/qfile_unix.cpp 2006-08-10 10:06:42.000000000 +0200
@@ -339,7 +339,8 @@
{
if ( isOpen() ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "QFile::open: File already open" );
+ QString error = QString("QFile::open: File (%1) already open").arg(fn);
+ qWarning( error );
#endif
return FALSE;
}
@@ -411,7 +412,8 @@
{
if ( isOpen() ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "QFile::open: File already open" );
+ QString error = QString("QFile::open: File (%1) already open").arg(fn);
+ qWarning( error );
#endif
return FALSE;
}
@@ -507,7 +509,8 @@
{
if ( !isOpen() ) {
#if defined(QT_CHECK_STATE)
- qWarning( "QFile::at: File is not open" );
+ QString error = QString("QFile::at: File (%1) is not open").arg(fn);
+ qWarning( error );
#endif
return FALSE;
}
@@ -563,11 +566,14 @@
#endif
#if defined(QT_CHECK_STATE)
if ( !isOpen() ) {
- qWarning( "QFile::readBlock: File not open" );
+ QString error = QString("QFile::readBlock: File (%1) not open").arg(fn);
+ qWarning( error );
+
return -1;
}
if ( !isReadable() ) {
- qWarning( "QFile::readBlock: Read operation not permitted" );
+ QString error = QString("QFile::readBlock: Read operation not permitted in file %1 ").arg(fn);
+ qWarning( error );
return -1;
}
#endif
@@ -632,11 +638,15 @@
#endif
#if defined(QT_CHECK_STATE)
if ( !isOpen() ) { // file not open
- qWarning( "QFile::writeBlock: File not open" );
+ QString error = QString("QFile::writeBlock: File (%1) not open").arg(fn);
+ qWarning( error );
+
return -1;
}
if ( !isWritable() ) { // writing not permitted
- qWarning( "QFile::writeBlock: Write operation not permitted" );
+ QString error = QString("QFile::writeBlock: Write operation not permitted in file %1 ").arg(fn);
+ qWarning( error );
+
return -1;
}
#endif

@ -0,0 +1,65 @@
Index: src/kernel/qgplugin.h
===================================================================
--- qt-x11-free-3.3.4/src/kernel/qgplugin.h (revision 423270)
+++ qt-x11-free-3.3.4/src/kernel/qgplugin.h (working copy)
@@ -90,35 +90,19 @@
return i->iface(); \
}
-# ifdef Q_WS_WIN
-# ifdef Q_CC_BOR
-# define Q_EXPORT_PLUGIN(PLUGIN) \
- Q_PLUGIN_VERIFICATION_DATA \
- Q_EXTERN_C __declspec(dllexport) \
- const char * __stdcall qt_ucm_query_verification_data() \
- { return qt_ucm_verification_data; } \
- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
- __stdcall ucm_instantiate() \
- Q_PLUGIN_INSTANTIATE( PLUGIN )
-# else
-# define Q_EXPORT_PLUGIN(PLUGIN) \
- Q_PLUGIN_VERIFICATION_DATA \
- Q_EXTERN_C __declspec(dllexport) \
- const char *qt_ucm_query_verification_data() \
- { return qt_ucm_verification_data; } \
- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
- Q_PLUGIN_INSTANTIATE( PLUGIN )
-# endif
-# else
-# define Q_EXPORT_PLUGIN(PLUGIN) \
+#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
+# define Q_STDCALL __stdcall
+#else
+# define Q_STDCALL
+#endif
+
+#define Q_EXPORT_PLUGIN(PLUGIN) \
Q_PLUGIN_VERIFICATION_DATA \
- Q_EXTERN_C \
- const char *qt_ucm_query_verification_data() \
+ Q_EXTERN_C Q_EXPORT \
+ const char * Q_STDCALL qt_ucm_query_verification_data() \
{ return qt_ucm_verification_data; } \
- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
Q_PLUGIN_INSTANTIATE( PLUGIN )
-# endif
-
#endif
struct QUnknownInterface;
Index: src/tools/qglobal.h
===================================================================
--- qt-x11-free-3.3.4/src/tools/qglobal.h (revision 423270)
+++ qt-x11-free-3.3.4/src/tools/qglobal.h (working copy)
@@ -865,6 +865,10 @@
# define Q_TEMPLATE_EXTERN
# undef Q_DISABLE_COPY /* avoid unresolved externals */
# endif
+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
+# define Q_EXPORT __attribute__((visibility("default")))
+# undef QT_MAKEDLL /* ignore these for other platforms */
+# undef QT_DLL
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL

@ -0,0 +1,50 @@
--- qt-x11-free-3.3.4/qmake/project.cpp.linux32 2005-01-21 12:16:26.000000000 -0500
+++ qt-x11-free-3.3.4/qmake/project.cpp 2005-04-11 08:18:48.734289865 -0400
@@ -47,6 +47,13 @@
#include <stdio.h>
#include <stdlib.h>
+#if defined(__linux__) && defined(__x86_64__)
+#include <sys/syscall.h>
+#include <sys/personality.h>
+
+#define is_linux32() ((syscall(SYS_personality, 0xffffffff) & PER_MASK) == PER_LINUX32)
+#endif
+
#ifdef Q_OS_WIN32
#define QT_POPEN _popen
#else
@@ -63,6 +70,15 @@ static void qmake_error_msg(const char *
fprintf(stderr, "%s:%d: %s\n", parser.file.latin1(), parser.line_no, msg);
}
+static QString qmake_mkspecs_default()
+{
+#ifdef is_linux32
+ if (!is_linux32())
+ return "default64";
+#endif
+ return "default";
+}
+
QStringList qmake_mkspec_paths()
{
QStringList ret;
@@ -552,7 +568,7 @@ QMakeProject::read(uchar cmd)
QStringList mkspec_roots = qmake_mkspec_paths();
if(Option::mkfile::qmakespec.isEmpty()) {
for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) {
- QString mkspec = (*it) + QDir::separator() + "default";
+ QString mkspec = (*it) + QDir::separator() + qmake_mkspecs_default();
QFileInfo default_info(mkspec);
if(default_info.exists() && default_info.isSymLink()) {
Option::mkfile::qmakespec = mkspec;
@@ -717,7 +733,7 @@ QMakeProject::isActiveConfig(const QStri
if((regex && re.exactMatch(spec)) || (!regex && spec == x))
return TRUE;
#ifdef Q_OS_UNIX
- else if(spec == "default") {
+ else if(spec == qmake_mkspecs_default()) {
static char *buffer = NULL;
if(!buffer)
buffer = (char *)malloc(1024);

@ -0,0 +1,48 @@
--- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig 2005-10-21 10:09:12.000000000 -0200
+++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro 2005-10-21 10:09:34.000000000 -0200
@@ -3,8 +3,7 @@
VERSION = 1.0
CONFIG += qt warn_on release
-CONFIG += staticlib
-CONFIG -= dll
+CONFIG += dll
SOURCES = qassistantclient.cpp
HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h
*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro 2003-12-20 22:48:51.000000000 -0200
--- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new 2005-12-06 18:47:04.000000000 -0200
***************
*** 1,6 ****
TEMPLATE = lib
! CONFIG += qt warn_on staticlib
! CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
completion.h \
--- 1,6 ----
TEMPLATE = lib
! CONFIG += qt warn_on
! CONFIG += dll
HEADERS = editor.h \
parenmatcher.h \
completion.h \
*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro 2004-04-29 19:31:32.000000000 -0300
--- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new 2005-12-06 18:46:29.000000000 -0200
***************
*** 1,7 ****
TEMPLATE = lib
! CONFIG += qt warn_on staticlib qmake_cache
! CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
CONFIG += dll
--- 1,7 ----
TEMPLATE = lib
! CONFIG += qt warn_on qmake_cache
! CONFIG += dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
CONFIG += dll

@ -0,0 +1,21 @@
--- mkspecs/linux-g++-64/qmake.conf
+++ mkspecs/linux-g++-64/qmake.conf
@@ -59,7 +59,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl
--- mkspecs/linux-g++/qmake.conf
+++ mkspecs/linux-g++/qmake.conf
@@ -56,7 +56,6 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl

@ -0,0 +1,11 @@
--- src/kernel/qtranslator.cpp.sav 2004-08-12 14:32:07.000000000 +0200
+++ src/kernel/qtranslator.cpp 2005-03-15 18:05:29.620141650 +0100
@@ -990,7 +990,7 @@ QTranslatorMessage QTranslator::findMess
char con[256];
for ( ;; ) {
t >> len;
- if ( len == 0 )
+ if ( len == 0 || t.atEnd())
return QTranslatorMessage();
t.readRawBytes( con, len );
con[len] = '\0';

@ -0,0 +1,56 @@
--- qt-x11-free-3.3.6/config.tests/unix/checkavail.lib64 2003-05-27 11:19:12.000000000 -0400
+++ qt-x11-free-3.3.6/config.tests/unix/checkavail 2006-09-01 10:50:28.000000000 -0400
@@ -9,11 +9,41 @@ SUCCESS=
MODULE_NAME=$1
VERBOSE=$2
shift 2
-LIBDIRS="/lib /usr/lib"
LIBNAMES=""
INCLUDEDIRS="/usr/include"
INCLUDES=""
+# Detect libdir name for Linux systems (*/lib or */lib64)
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`
+case "$UNAME_SYSTEM" in
+Linux)
+ tmpc="conftest.c"
+ tmpo="conftest.o"
+ echo 'int i;' > $tmpc
+ is_64bit_output=no
+ if gcc -c $tmpc -o $tmpo; then
+ case `/usr/bin/file $tmpo` in
+ *"ELF 64"*)
+ is_64bit_output=yes
+ ;;
+ esac
+ fi
+ rm -rf $tmpc $tmpo
+ ;;
+esac
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null`
+case $UNAME_MACHINE:$is_64bit_output in
+ ppc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+ LIB="lib64"
+ ;;
+*:*)
+ LIB="lib"
+ ;;
+esac
+
+LIBDIRS="/$LIB /usr/$LIB"
+
PARAMS=$@
for PARAM in $PARAMS
do
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.lib64 2006-09-01 10:28:16.000000000 -0400
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-09-01 10:37:41.000000000 -0400
@@ -46,7 +46,7 @@ QMAKE_LIBDIR =
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
QMAKE_INCDIR_QT = $(QTDIR)/include
-QMAKE_LIBDIR_QT = $(QTDIR)/lib
+QMAKE_LIBDIR_QT = $(QTDIR)/lib64
QMAKE_INCDIR_OPENGL = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64

@ -0,0 +1,41 @@
--- src/kernel/qfontdatabase_x11.cpp 2006-12-28 21:40:34.000000000 +0200
+++ src/kernel/qfontdatabase_x11.cpp 2006-12-28 21:43:44.000000000 +0200
@@ -1504,13 +1504,24 @@
convert the pixel size to a point size and request that.
*/
double size_value = request.pixelSize;
+ double dpi = QPaintDevice::x11AppDpiY(fp->screen);
double scale = 1.;
if ( size_value > MAXFONTSIZE_XFT ) {
scale = (double)size_value/(double)MAXFONTSIZE_XFT;
size_value = MAXFONTSIZE_XFT;
}
-
- size_value = size_value*72./QPaintDevice::x11AppDpiY(fp->screen);
+#ifdef QT_XFT2
+ /*
+ 2006-12-28 If QT is not compiled against xft1, there is no need
+ for the workaround above (confirmed). Thus, in addition, add
+ font pixelsize to the pattern to avoid fontconfig making wrong
+ guesses. Also provide a DPI value for fontconfig so it never
+ attempts to fallback to its default.
+ */
+ XftPatternAddDouble(pattern, XFT_PIXEL_SIZE, size_value);
+ XftPatternAddDouble(pattern, XFT_DPI, dpi);
+#endif
+ size_value = size_value*72./dpi;
XftPatternAddDouble( pattern, XFT_SIZE, size_value );
#ifdef XFT_MATRIX
@@ -1875,6 +1886,11 @@
FcResult result;
FcFontSet *fs = 0;
FcPattern *fsp = 0;
+
+ // Properly conform to fontconfig API. We need to call FcDefaultSubstitute()
+ // before FcFontSort()/FcFontMatch().
+ FcDefaultSubstitute(pattern);
+
if( use_fontsort ) {
fs = FcFontSort(0, pattern, FcFalse, 0, &result);
if (!fs)

@ -0,0 +1,33 @@
diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600
+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600
@@ -49,6 +49,7 @@
#include "qvaluelist.h"
#endif // QT_H
+#include <cstddef>
#ifndef QT_NO_STL
#include <iterator>
#include <map>
diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600
+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600
@@ -47,6 +47,7 @@
#include "qdatastream.h"
#endif // QT_H
+#include <cstddef>
#ifndef QT_NO_STL
#include <iterator>
#include <list>
diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600
+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600
@@ -45,6 +45,7 @@
#include "qdatastream.h"
#endif // QT_H
+#include <cstddef>
#ifndef QT_NO_STL
#include <vector>
#endif

@ -0,0 +1,35 @@
--- configure.libpng 2011-09-15 07:20:32.000000000 +0200
+++ configure 2011-09-15 07:21:36.000000000 +0200
@@ -2971,8 +2971,8 @@
if [ "$CFG_LIBPNG" = "system" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG system-png"
if [ "$CFG_PNG" = "yes" ]; then
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng\""
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng\""
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng12\""
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng12\""
fi
fi
if [ "$CFG_PNG" = "no" ]; then
--- plugins/src/imageformats/png/png.pro.libpng 2011-09-15 07:20:46.000000000 +0200
+++ plugins/src/imageformats/png/png.pro 2011-09-15 07:21:56.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES += main.cpp
system-png {
- unix:LIBS += -lpng
+ unix:LIBS += -lpng12
win32:LIBS += libpng.lib
}
!system-png {
--- src/kernel/qt_gfx.pri.libpng 2011-09-15 07:21:19.000000000 +0200
+++ src/kernel/qt_gfx.pri 2011-09-15 07:22:13.000000000 +0200
@@ -102,7 +102,7 @@
SOURCES+=$$KERNEL_CPP/qpngio.cpp
png {
system-png {
- unix:LIBS += -lpng
+ unix:LIBS += -lpng12
win32:LIBS += libpng.lib
} else {
INCLUDEPATH += 3rdparty/libpng

@ -0,0 +1,111 @@
--- src/sql/drivers/odbc/qsql_odbc.cpp 2008-01-15 17:09:13.000000000 -0200
+++ src/sql/drivers/odbc/qsql_odbc.cpp.new 2009-02-09 16:02:25.000000000 -0200
@@ -263,8 +263,7 @@
{
QString fieldVal;
SQLRETURN r = SQL_ERROR;
- QSQLLEN lengthIndicator = 0;
-
+ SQLLEN lengthIndicator = 0;
if ( colSize <= 0 ) {
colSize = 256;
} else if ( colSize > 65536 ) { // limit buffer size to 64 KB
@@ -319,14 +318,14 @@
return fieldVal;
}
-static QByteArray qGetBinaryData( SQLHANDLE hStmt, int column, QSQLLEN& lengthIndicator, bool& isNull )
+static QByteArray qGetBinaryData( SQLHANDLE hStmt, int column, SQLLEN& lengthIndicator, bool& isNull )
{
QByteArray fieldVal;
SQLSMALLINT colNameLen;
SQLSMALLINT colType;
- QSQLULEN colSize;
- SQLSMALLINT colScale;
+ SQLULEN colSize;
SQLSMALLINT nullable;
+ SQLSMALLINT colScale;
SQLRETURN r = SQL_ERROR;
SQLTCHAR colName[COLNAMESIZE];
@@ -356,7 +355,7 @@
column+1,
SQL_C_BINARY,
(SQLPOINTER) buf,
- (QSQLLEN)colSize,
+ (SQLLEN)colSize,
&lengthIndicator );
if ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) {
if ( lengthIndicator == SQL_NULL_DATA ) {
@@ -393,7 +392,7 @@
{
QSQLLEN intbuf = 0;
isNull = FALSE;
- QSQLLEN lengthIndicator = 0;
+ SQLLEN lengthIndicator = 0;
SQLRETURN r = SQLGetData( hStmt,
column+1,
SQL_C_SLONG,
@@ -410,7 +409,7 @@
static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull )
{
SQLDOUBLE dblbuf;
- QSQLLEN lengthIndicator = 0;
+ SQLLEN lengthIndicator = 0;
isNull = FALSE;
SQLRETURN r = SQLGetData( hStmt,
column+1,
@@ -430,7 +429,7 @@
{
SQLBIGINT lngbuf = Q_INT64_C( 0 );
isNull = FALSE;
- QSQLLEN lengthIndicator = 0;
+ SQLLEN lengthIndicator = 0;
SQLRETURN r = SQLGetData( hStmt,
column+1,
SQL_C_SBIGINT,
@@ -468,7 +467,7 @@
{
SQLSMALLINT colNameLen;
SQLSMALLINT colType;
- QSQLULEN colSize;
+ SQLULEN colSize;
SQLSMALLINT colScale;
SQLSMALLINT nullable;
SQLRETURN r = SQL_ERROR;
@@ -866,7 +865,7 @@
if ( fieldCache.contains( field ) )
return fieldCache[ field ];
SQLRETURN r(0);
- QSQLLEN lengthIndicator = 0;
+ SQLLEN lengthIndicator = 0;
bool isNull = FALSE;
int current = fieldCache.count();
for ( ; current < (field + 1); ++current ) {
@@ -930,7 +929,7 @@
break;
case QVariant::ByteArray: {
isNull = FALSE;
- QByteArray val = qGetBinaryData( d->hStmt, current, lengthIndicator, isNull );
+ QByteArray val = qGetBinaryData( d->hStmt, current, (SQLLEN&)lengthIndicator, isNull );
fieldCache[ current ] = QVariant( val );
nullCache[ current ] = isNull;
break; }
@@ -979,7 +978,7 @@
int QODBCResult::numRowsAffected()
{
- QSQLLEN affectedRowCount(0);
+ SQLLEN affectedRowCount(0);
SQLRETURN r = SQLRowCount( d->hStmt, &affectedRowCount );
if ( r == SQL_SUCCESS )
return affectedRowCount;
@@ -1084,7 +1083,7 @@
QVariant val;
for ( it = extension()->index.begin(); it != extension()->index.end(); ++it ) {
val = extension()->values[ it.data() ].value;
- QSQLLEN *ind = new QSQLLEN( SQL_NTS );
+ SQLLEN *ind = new SQLLEN( SQL_NTS );
tmpStorage.append( qAutoDeleter(ind) );
if ( val.isNull() ) {
*ind = SQL_NULL_DATA;

@ -0,0 +1,85 @@
--- plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp.orig 2006-02-17 16:15:21.000000000 -0500
+++ plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2006-02-17 16:17:55.000000000 -0500
@@ -306,8 +306,8 @@
currentIMKey = key;
- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
- imIndex, (const char *)_slave->identifierName() );
+ //qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
+ // imIndex, (const char *)_slave->identifierName() );
}
}
--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp.orig 2006-02-17 16:15:33.000000000 -0500
+++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2006-02-17 16:18:49.000000000 -0500
@@ -140,7 +140,7 @@
// only one character. See description of
// QInputContext::filterEvent() about key compression.
val = text[0].unicode();
- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
+ //qDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
}
// Store value
@@ -164,14 +164,14 @@
void QSimpleInputContext::setFocus()
{
- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
- this, focusWidget() );
+ //qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
+ // this, focusWidget() );
}
void QSimpleInputContext::unsetFocus()
{
- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
- this, focusWidget() );
+ //qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
+ // this, focusWidget() );
reset();
}
@@ -188,8 +188,8 @@
case QEvent::MouseButtonRelease:
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
- qDebug( "QSimpleInputContext::mouseHandler: "
- "x=%d, type=%d, button=%d, state=%d", x, type, button, state );
+ //qDebug( "QSimpleInputContext::mouseHandler: "
+ // "x=%d, type=%d, button=%d, state=%d", x, type, button, state );
break;
default:
break;
@@ -240,7 +240,7 @@
// no entries were found
if ( p == composeTable->data + composeTable->size ) {
- qDebug( "no match" );
+ //qDebug( "no match" );
clearComposeBuffer();
return FALSE;
}
@@ -250,18 +250,18 @@
// check if partial match
if ( composeBuffer[i] == 0 && p->keys[i] ) {
- qDebug("partial match");
+ //qDebug("partial match");
return TRUE;
}
if ( composeBuffer[i] != p->keys[i] ) {
- qDebug("different entry");
+ //qDebug("different entry");
clearComposeBuffer();
return i!=0;
}
}
- qDebug("match exactly");
+ //qDebug("match exactly");
// match exactly
commitChar( p->value );

@ -0,0 +1,57 @@
--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.xorg7.1 2006-03-08 11:48:20.000000000 -0500
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-09-01 13:14:19.000000000 -0400
@@ -40,12 +40,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
QMAKE_INCDIR =
QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 = /usr/X11R6/include
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+QMAKE_INCDIR_X11 = /usr/include
+QMAKE_LIBDIR_X11 = /usr/lib
QMAKE_INCDIR_QT = $(QTDIR)/include
QMAKE_LIBDIR_QT = $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL = /usr/include
+QMAKE_LIBDIR_OPENGL = /usr/lib
QMAKE_LINK = g++
QMAKE_LINK_SHLIB = g++
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.xorg7.1 2006-09-01 12:50:46.000000000 -0400
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-09-01 12:50:46.000000000 -0400
@@ -43,12 +43,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
QMAKE_INCDIR =
QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 = /usr/X11R6/include
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
+QMAKE_INCDIR_X11 = /usr/include
+QMAKE_LIBDIR_X11 = /usr/lib64
QMAKE_INCDIR_QT = $(QTDIR)/include
QMAKE_LIBDIR_QT = $(QTDIR)/lib64
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
+QMAKE_INCDIR_OPENGL = /usr/include
+QMAKE_LIBDIR_OPENGL = /usr/lib64
QMAKE_LINK = g++
QMAKE_LINK_SHLIB = g++
--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.xorg7.1 2006-09-01 12:50:46.000000000 -0400
+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-09-01 13:13:00.000000000 -0400
@@ -40,12 +40,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
QMAKE_INCDIR =
QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 = /usr/X11R6/include
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+QMAKE_INCDIR_X11 = /usr/include
+QMAKE_LIBDIR_X11 = /usr/lib
QMAKE_INCDIR_QT = $(QTDIR)/include
QMAKE_LIBDIR_QT = $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL = /usr/include
+QMAKE_LIBDIR_OPENGL = /usr/lib
QMAKE_LINK = g++
QMAKE_LINK_SHLIB = g++

@ -0,0 +1,21 @@
You should not need to set QTDIR because it should already been automatically
configured (in '/etc/profile.d/qt.sh' and '/etc/profile.d/qt.csh').
To check if it is the case, do 'echo $QTDIR'. Answer should be '/usr/lib/qt3'.
If it is not the case, do 'export QTDIR=/usr/lib/qt3' if you use bash or
'setenv QTDIR /usr/lib/qt3/' if you use csh.
Qt documentation is in /usr/lib/doc/qt3-QtVersion/ (you need to
install package libqt3-devel-PackageVersion if it is not already
done).
Other Qt things are in /usr/lib/qt3/ (which contains needed symlinks
to create a fake QTDIR).
Examples and tutorials are compressed to save space. If you want to use them,
you need to uncompress them somewhere in your home directory using:
'tar jxf /usr/lib/doc/qt3--QtVersion your_directory'.
XFT support (Anti Aliasing) is enable by default. The QT_XFT environmental
variable is setted in '/etc/profile.d/qt.sh' and '/etc/profile.d/qt.csh'.

@ -0,0 +1,17 @@
#!/bin/sh
# Support script to properly set environments for Designer to run
LIBSUFFIX="lib"
if [ `uname -m` = "x86_64" ]; then
LIBSUFFIX="lib64"
fi
export QTDIR=/usr/lib/qt3/
export LD_LIBRARY_PATH=$QTDIR/$LIBSUFFIX:$LD_LIBRARY_PATH
export PATH=$QTDIR/bin:$PATH
export MOC=$QTDIR/bin/moc
export UIC=$QTDIR/bin/uic
exec $QTDIR/bin/assistant "$@"

@ -0,0 +1,10 @@
[Desktop Entry]
TryExec=assistant
Exec=assistant-qt3
Name=Qt Assistant 3
Comment=Tool for online help doc
MapNotify=true
MimeType=application/x-assistant;
Terminal=false
Icon=assistant
Type=Application

@ -0,0 +1,17 @@
#!/bin/sh
# Support script to properly set environments for Designer to run
LIBSUFFIX="lib"
if [ `uname -m` = "x86_64" ]; then
LIBSUFFIX="lib64"
fi
export QTDIR=/usr/lib/qt3/
export LD_LIBRARY_PATH=$QTDIR/$LIBSUFFIX:$LD_LIBRARY_PATH
export PATH=$QTDIR/bin:$PATH
export MOC=$QTDIR/bin/moc
export UIC=$QTDIR/bin/uic
exec $QTDIR/bin/designer "$@"

@ -0,0 +1,77 @@
[Desktop Entry]
Exec=/usr/bin/designer-qt3
Name=Qt Designer
Name[bg]=Qt Дизайнер
Name[br]=Ergrafer Qt
Name[ca]=Dissenyador Qt
Name[cs]=Qt designer
Name[de]=Qt-Designer
Name[eo]=Qt-Desegnilo
Name[es]=Diseñador Qt
Name[et]=Qt disainer
Name[eu]=Qt Diseinatzailea
Name[gl]=Deseñador de Qt
Name[he]=Qt בצעמ
Name[it]=Designer Qt
Name[ja]=Qtデザイナー
Name[ko]=Qt 디자이너
Name[lv]=Qt Dizainers
Name[mk]=Qt дизајнер
Name[no]=Qt-designer
Name[oc]=Dessinador Qt
Name[pl]=Projektant Qt
Name[sk]=Qt Dizajnér
Name[sl]=Snovalnik Qt
Name[ta]=Qt À¨¼ôÀ¡Ç÷
Name[uk]=Дизайнер Qt
Name[zh_CN]=Qt 设计者
Name[zh_TW]=Qt 設計器
Comment=Qt interface designer
Comment[az]=Qt axtar üz dizayn proqramı
Comment[bg]=Qt interface дизайнер
Comment[br]=Ergrafer etrefas Qt
Comment[ca]=Dissenyador d'interfícies Qt
Comment[cs]=Editor UI pro Qt
Comment[da]=Qt grænseflade designer
Comment[de]=Schnittstellen-Designer für Qt
Comment[el]=Σχεδιασμός περιβάλλοντων Qt
Comment[eo]=Qt-Interfacdesegnilo
Comment[es]=Diseñador de interfaces de Qt
Comment[et]=Qt dialoogide redaktor
Comment[eu]=Qt interfaze diseinatzailea
Comment[fi]=Qt:n käyttöliittymäsuunnittelija
Comment[fr]=Conception d'interfaces avec Qt
Comment[gl]=Editor de interfaces de Qt
Comment[he]=Qt-ל םיקשממ בצעמ
Comment[hu]=Qt felülettervező
Comment[is]=Viðmótshönnunartól fyrir Qt
Comment[it]=Editor per le interfaccie Qt
Comment[ja]=Qtインターフェースデザイナー
Comment[ko]=Qt 인터페이스 디자이너
Comment[lt]=Qt sąsajos redaktorius
Comment[lv]=Qt starsejas dizainers
Comment[mk]=Дизајнер на Qt дијалози
Comment[nl]=Qt interface-ontwerper
Comment[no]=Qt-grensesnittdesigner
Comment[no_NY]=Redigering av Qt-miljø
Comment[oc]=Dessinador d'interfacies Qt
Comment[pl]=Projektant interfejsu Qt
Comment[pt]=Editor de interfaces do Qt
Comment[pt_BR]=Designer de interface Qt
Comment[ro]=Dezvoltator de interfeţe Qt
Comment[ru]=редактор интерфейсов приложений Qt
Comment[sk]=Qt dizajnér rozhrania
Comment[sl]=Snovalnik vmesnikov za Qt
Comment[sr]=Dizajner Qt interfejsa
Comment[sv]=Editor för gränssnitt till Qt
Comment[ta]=Qt À¨¼ôÀ¡Ç÷
Comment[tr]=Qt arayüz tasarım programı
Comment[uk]=Редактор інтерфейсу для Qt
Comment[zh_CN]=Qt 界面设计程序
Comment[zh_TW]=Qt 介面編輯器
MapNotify=true
MimeType=application/x-designer;
Icon=designer
Terminal=false
Type=Application

@ -0,0 +1,26 @@
[Desktop Entry]
TryExec=linguist
Exec=linguist
Name=Qt Assistant - 3
Name[de]=Qt-Linguist - 3
Name[eo]=Qt-Lingvisto - 3
Name[es]=Lingüista Qt - 3
Name[ko]=Qt 언어학자 - 3
Name[lv]=Qt Lingvists - 3
Comment=Tool for translating message catalogues of Qt based programs
Comment[da]=Redskab til at oversætte Qt baserede programmer
Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt basieren
Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt-bazitaj programoj
Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt
Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
Comment[hu]=Segédprogram a Qt-alapú programok üzenetfájljainak lefordításához
Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt bāzētās programmās
Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt
Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt
Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt-baserade program
MapNotify=true
MimeType=application/x-linguist;
Terminal=false
Icon=linguist
Type=Application

@ -0,0 +1,7 @@
#!/bin/sh
# Support script to properly set environments for uic to run
export QTDIR=/usr/lib/qt3/
export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
exec /usr/lib/qt3/bin/uic.real "$@"

@ -0,0 +1,36 @@
%qt3dir %_prefix/lib/qt3
%qt3lib %_libdir
%qt3bin %qt3dir/bin
%qt3include %{qt3dir}/include
%qt3plugins %_libdir/qt3/plugins
%configure_qt3 \\\
%before_configure ; \
%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
PATH="%qt3bin:$PATH" ; export PATH ; \
$CONFIGURE_TOP/configure --build=%{_target_platform} \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
--bindir=%{_bindir} \\\
--sbindir=%{_sbindir} \\\
--sysconfdir=%{_sysconfdir} \\\
--datadir=%{_datadir} \\\
--includedir=%{_includedir} \\\
--libdir=%{_libdir} \\\
--libexecdir=%{_libexecdir} \\\
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
--mandir=%{_mandir} \\\
--infodir=%{_infodir} \\\
--disable-rpath \\\
$CONFIGURE_XPATH
%qmake_qt3 \
CPPFLAGS="${CPPFLAGS:-%optflags -DPIC -fPIC}" ; export CPPFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags -DPIC -fPIC}" ; export CXXFLAGS ; \
CFLAGS="${CFLAGS:-%optflags -DPIC -fPIC}" ; export CFLAGS ; \
QTDIR="%qt3dir" ; export QTDIR ; \
%{qt3bin}/qmake

File diff suppressed because it is too large Load Diff

@ -0,0 +1,14 @@
--- plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2006-02-17 16:16:37.000000000 -0500
+++ plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.new 2006-02-17 16:30:47.000000000 -0500
@@ -491,8 +491,11 @@
ximServerName.ascii());
else {
Display *dpy = QPaintDevice::x11AppDisplay();
+ XWindowAttributes attr; // XIM unselects all events on the root window
+ XGetWindowAttributes( dpy, QPaintDevice::x11AppRootWindow(),&attr );
XRegisterIMInstantiateCallback(dpy, 0, 0, 0,
(XIMProc) xim_create_callback, 0);
+ XSelectInput( dpy, QPaintDevice::x11AppRootWindow(), attr.your_event_mask );
}
#else // !USE_X11R6_XIM
else if ( XSetLocaleModifiers ("") == 0 )

@ -0,0 +1 @@
../redhat/genrpm.sh
Loading…
Cancel
Save