wok rev 9129
Up: qt4 to 4.7.2.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sat Mar 05 16:37:25 2011 +0000 (2011-03-05) |
parents | b93c62b5d9fc |
children | 3462b29cbd82 |
files | Qt4-dev/receipt QtDesigner/receipt libQt3Support/receipt libQtClucene/receipt libQtCore/receipt libQtDBus/receipt libQtDesigner/receipt libQtGui/receipt libQtHelp/receipt libQtNetwork/receipt libQtOpenGL/receipt libQtScript/receipt libQtSql/receipt libQtSvg/receipt libQtTest/receipt libQtWebkit/receipt libQtXml/receipt qmake/receipt qt4-phonon/receipt qt4/receipt qt4/stuff/add-postgresql9.patch qt4/stuff/fix-qtbug-15857.patch qtconfig/receipt qtconfig/stuff/qtconfig.desktop |
line diff
1.1 --- a/Qt4-dev/receipt Sat Mar 05 16:29:18 2011 +0000 1.2 +++ b/Qt4-dev/receipt Sat Mar 05 16:37:25 2011 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="Qt4-dev" 1.7 -VERSION="4.7.1" 1.8 +VERSION="4.7.2" 1.9 CATEGORY="development" 1.10 SHORT_DESC="qt x11 toolkit" 1.11 MAINTAINER="allan316@gmail.com"
2.1 --- a/QtDesigner/receipt Sat Mar 05 16:29:18 2011 +0000 2.2 +++ b/QtDesigner/receipt Sat Mar 05 16:37:25 2011 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="QtDesigner" 2.7 -VERSION="4.7.1" 2.8 +VERSION="4.7.2" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Qt Designer" 2.11 MAINTAINER="allan316@gmail.com"
3.1 --- a/libQt3Support/receipt Sat Mar 05 16:29:18 2011 +0000 3.2 +++ b/libQt3Support/receipt Sat Mar 05 16:37:25 2011 +0000 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="libQt3Support" 3.7 -VERSION="4.7.1" 3.8 +VERSION="4.7.2" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Qt3 support Library" 3.11 MAINTAINER="allan316@gmail.com"
4.1 --- a/libQtClucene/receipt Sat Mar 05 16:29:18 2011 +0000 4.2 +++ b/libQtClucene/receipt Sat Mar 05 16:37:25 2011 +0000 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="libQtClucene" 4.7 -VERSION="4.7.1" 4.8 +VERSION="4.7.2" 4.9 CATEGORY="development" 4.10 SHORT_DESC="Qt clucene Library" 4.11 MAINTAINER="allan316@gmail.com"
5.1 --- a/libQtCore/receipt Sat Mar 05 16:29:18 2011 +0000 5.2 +++ b/libQtCore/receipt Sat Mar 05 16:37:25 2011 +0000 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="libQtCore" 5.7 -VERSION="4.7.1" 5.8 +VERSION="4.7.2" 5.9 CATEGORY="development" 5.10 SHORT_DESC="Qt Core files" 5.11 MAINTAINER="allan316@gmail.com"
6.1 --- a/libQtDBus/receipt Sat Mar 05 16:29:18 2011 +0000 6.2 +++ b/libQtDBus/receipt Sat Mar 05 16:37:25 2011 +0000 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="libQtDBus" 6.7 -VERSION="4.7.1" 6.8 +VERSION="4.7.2" 6.9 CATEGORY="development" 6.10 SHORT_DESC="Qt Dbus Library" 6.11 MAINTAINER="allan316@gmail.com"
7.1 --- a/libQtDesigner/receipt Sat Mar 05 16:29:18 2011 +0000 7.2 +++ b/libQtDesigner/receipt Sat Mar 05 16:37:25 2011 +0000 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="libQtDesigner" 7.7 -VERSION="4.7.1" 7.8 +VERSION="4.7.2" 7.9 CATEGORY="development" 7.10 SHORT_DESC="Qt Designer" 7.11 MAINTAINER="allan316@gmail.com"
8.1 --- a/libQtGui/receipt Sat Mar 05 16:29:18 2011 +0000 8.2 +++ b/libQtGui/receipt Sat Mar 05 16:37:25 2011 +0000 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="libQtGui" 8.7 -VERSION="4.7.1" 8.8 +VERSION="4.7.2" 8.9 CATEGORY="development" 8.10 SHORT_DESC="Qt Gui Library" 8.11 MAINTAINER="allan316@gmail.com"
9.1 --- a/libQtHelp/receipt Sat Mar 05 16:29:18 2011 +0000 9.2 +++ b/libQtHelp/receipt Sat Mar 05 16:37:25 2011 +0000 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="libQtHelp" 9.7 -VERSION="4.7.1" 9.8 +VERSION="4.7.2" 9.9 CATEGORY="development" 9.10 SHORT_DESC="Qt help Library" 9.11 MAINTAINER="allan316@gmail.com"
10.1 --- a/libQtNetwork/receipt Sat Mar 05 16:29:18 2011 +0000 10.2 +++ b/libQtNetwork/receipt Sat Mar 05 16:37:25 2011 +0000 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="libQtNetwork" 10.7 -VERSION="4.7.1" 10.8 +VERSION="4.7.2" 10.9 CATEGORY="development" 10.10 SHORT_DESC="Qt Network Library" 10.11 MAINTAINER="allan316@gmail.com"
11.1 --- a/libQtOpenGL/receipt Sat Mar 05 16:29:18 2011 +0000 11.2 +++ b/libQtOpenGL/receipt Sat Mar 05 16:37:25 2011 +0000 11.3 @@ -1,7 +1,7 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="libQtOpenGL" 11.7 -VERSION="4.7.1" 11.8 +VERSION="4.7.2" 11.9 CATEGORY="development" 11.10 SHORT_DESC="Qt Network Library" 11.11 MAINTAINER="allan316@gmail.com"
12.1 --- a/libQtScript/receipt Sat Mar 05 16:29:18 2011 +0000 12.2 +++ b/libQtScript/receipt Sat Mar 05 16:37:25 2011 +0000 12.3 @@ -1,7 +1,7 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="libQtScript" 12.7 -VERSION="4.7.1" 12.8 +VERSION="4.7.2" 12.9 CATEGORY="development" 12.10 SHORT_DESC="Qt Script Lib" 12.11 MAINTAINER="allan316@gmail.com"
13.1 --- a/libQtSql/receipt Sat Mar 05 16:29:18 2011 +0000 13.2 +++ b/libQtSql/receipt Sat Mar 05 16:37:25 2011 +0000 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="libQtSql" 13.7 -VERSION="4.7.1" 13.8 +VERSION="4.7.2" 13.9 CATEGORY="development" 13.10 SHORT_DESC="Qt sql Library" 13.11 MAINTAINER="allan316@gmail.com"
14.1 --- a/libQtSvg/receipt Sat Mar 05 16:29:18 2011 +0000 14.2 +++ b/libQtSvg/receipt Sat Mar 05 16:37:25 2011 +0000 14.3 @@ -1,7 +1,7 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="libQtSvg" 14.7 -VERSION="4.7.1" 14.8 +VERSION="4.7.2" 14.9 CATEGORY="development" 14.10 SHORT_DESC="Qt Svg Library" 14.11 MAINTAINER="allan316@gmail.com"
15.1 --- a/libQtTest/receipt Sat Mar 05 16:29:18 2011 +0000 15.2 +++ b/libQtTest/receipt Sat Mar 05 16:37:25 2011 +0000 15.3 @@ -1,7 +1,7 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="libQtTest" 15.7 -VERSION="4.7.1" 15.8 +VERSION="4.7.2" 15.9 CATEGORY="development" 15.10 SHORT_DESC="Qt Test library" 15.11 MAINTAINER="rocky@slitaz.com"
16.1 --- a/libQtWebkit/receipt Sat Mar 05 16:29:18 2011 +0000 16.2 +++ b/libQtWebkit/receipt Sat Mar 05 16:37:25 2011 +0000 16.3 @@ -1,7 +1,7 @@ 16.4 # SliTaz package receipt. 16.5 16.6 PACKAGE="libQtWebkit" 16.7 -VERSION="4.7.1" 16.8 +VERSION="4.7.2" 16.9 CATEGORY="development" 16.10 SHORT_DESC="Web browser engine for Qt" 16.11 MAINTAINER="allan316@gmail.com"
17.1 --- a/libQtXml/receipt Sat Mar 05 16:29:18 2011 +0000 17.2 +++ b/libQtXml/receipt Sat Mar 05 16:37:25 2011 +0000 17.3 @@ -1,7 +1,7 @@ 17.4 # SliTaz package receipt. 17.5 17.6 PACKAGE="libQtXml" 17.7 -VERSION="4.7.1" 17.8 +VERSION="4.7.2" 17.9 CATEGORY="development" 17.10 SHORT_DESC="Qt Xml library" 17.11 MAINTAINER="allan316@gmail.com"
18.1 --- a/qmake/receipt Sat Mar 05 16:29:18 2011 +0000 18.2 +++ b/qmake/receipt Sat Mar 05 16:37:25 2011 +0000 18.3 @@ -1,7 +1,7 @@ 18.4 # SliTaz package receipt. 18.5 18.6 PACKAGE="qmake" 18.7 -VERSION="4.7.1" 18.8 +VERSION="4.7.2" 18.9 CATEGORY="development" 18.10 SHORT_DESC="Qt make" 18.11 MAINTAINER="allan316@gmail.com"
19.1 --- a/qt4-phonon/receipt Sat Mar 05 16:29:18 2011 +0000 19.2 +++ b/qt4-phonon/receipt Sat Mar 05 16:37:25 2011 +0000 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt. 19.5 19.6 PACKAGE="qt4-phonon" 19.7 -VERSION="4.7.1" 19.8 +VERSION="4.7.2" 19.9 CATEGORY="multimedia" 19.10 SHORT_DESC="Qt phonon library" 19.11 MAINTAINER="pankso@slitaz.org"
20.1 --- a/qt4/receipt Sat Mar 05 16:29:18 2011 +0000 20.2 +++ b/qt4/receipt Sat Mar 05 16:37:25 2011 +0000 20.3 @@ -2,7 +2,7 @@ 20.4 20.5 PACKAGE="qt4" 20.6 SOURCE="qt-everywhere-opensource-src" 20.7 -VERSION="4.7.1" 20.8 +VERSION="4.7.2" 20.9 CATEGORY="meta" 20.10 SHORT_DESC="qt x11 toolkit" 20.11 MAINTAINER="allan316@gmail.com" 20.12 @@ -27,10 +27,6 @@ 20.13 compile_rules() 20.14 { 20.15 cd $src 20.16 - 20.17 - # Already fixed upstream 20.18 - patch -Np1 -i $stuff/fix-qtbug-15857.patch 20.19 - patch -Np1 -i $stuff/add-postgresql9.patch 20.20 20.21 ./configure -v \ 20.22 -prefix /usr \
21.1 --- a/qt4/stuff/add-postgresql9.patch Sat Mar 05 16:29:18 2011 +0000 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,215 +0,0 @@ 21.4 -From 03f94089a16cf6b6a3b533ba1f90444eb18c29ab Mon Sep 17 00:00:00 2001 21.5 -From: Charles Yin <charles.yin@nokia.com> 21.6 -Date: Thu, 4 Nov 2010 15:38:57 +1000 21.7 -Subject: [PATCH] Add Postgresql 8.x and 9 supports 21.8 - 21.9 -Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a 21.10 -Task-number:QTBUG-14206 21.11 -Reviewed-by: Michael Goddard 21.12 ---- 21.13 - src/sql/drivers/psql/qsql_psql.cpp | 116 +++++++++++++++++++++--------- 21.14 - src/sql/drivers/psql/qsql_psql.h | 6 ++- 21.15 - tests/auto/qsqldatabase/tst_databases.h | 2 + 21.16 - 3 files changed, 88 insertions(+), 36 deletions(-) 21.17 - 21.18 -diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp 21.19 -index 2a4e595..bf9685f 100644 21.20 ---- a/src/sql/drivers/psql/qsql_psql.cpp 21.21 -+++ b/src/sql/drivers/psql/qsql_psql.cpp 21.22 -@@ -54,7 +54,6 @@ 21.23 - #include <qstringlist.h> 21.24 - #include <qmutex.h> 21.25 - 21.26 -- 21.27 - #include <libpq-fe.h> 21.28 - #include <pg_config.h> 21.29 - 21.30 -@@ -619,6 +618,50 @@ static void setDatestyle(PGconn* connection) 21.31 - PQclear(result); 21.32 - } 21.33 - 21.34 -+static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin) 21.35 -+{ 21.36 -+ switch (vMaj) { 21.37 -+ case 6: 21.38 -+ return QPSQLDriver::Version6; 21.39 -+ case 7: 21.40 -+ { 21.41 -+ switch (vMin) { 21.42 -+ case 1: 21.43 -+ return QPSQLDriver::Version71; 21.44 -+ case 3: 21.45 -+ return QPSQLDriver::Version73; 21.46 -+ case 4: 21.47 -+ return QPSQLDriver::Version74; 21.48 -+ default: 21.49 -+ return QPSQLDriver::Version7; 21.50 -+ } 21.51 -+ break; 21.52 -+ } 21.53 -+ case 8: 21.54 -+ { 21.55 -+ switch (vMin) { 21.56 -+ case 1: 21.57 -+ return QPSQLDriver::Version81; 21.58 -+ case 2: 21.59 -+ return QPSQLDriver::Version82; 21.60 -+ case 3: 21.61 -+ return QPSQLDriver::Version83; 21.62 -+ case 4: 21.63 -+ return QPSQLDriver::Version84; 21.64 -+ default: 21.65 -+ return QPSQLDriver::Version8; 21.66 -+ } 21.67 -+ break; 21.68 -+ } 21.69 -+ case 9: 21.70 -+ return QPSQLDriver::Version9; 21.71 -+ break; 21.72 -+ default: 21.73 -+ break; 21.74 -+ } 21.75 -+ return QPSQLDriver::VersionUnknown; 21.76 -+} 21.77 -+ 21.78 - static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) 21.79 - { 21.80 - QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6; 21.81 -@@ -626,50 +669,44 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) 21.82 - int status = PQresultStatus(result); 21.83 - if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) { 21.84 - QString val = QString::fromAscii(PQgetvalue(result, 0, 0)); 21.85 -+ 21.86 - QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)")); 21.87 - rx.setMinimal(true); // enforce non-greedy RegExp 21.88 -+ 21.89 - if (rx.indexIn(val) != -1) { 21.90 - int vMaj = rx.cap(1).toInt(); 21.91 - int vMin = rx.cap(2).toInt(); 21.92 -- 21.93 -- switch (vMaj) { 21.94 -- case 7: 21.95 -- switch (vMin) { 21.96 -- case 0: 21.97 -- serverVersion = QPSQLDriver::Version7; 21.98 -- break; 21.99 -- case 1: 21.100 -- case 2: 21.101 -- serverVersion = QPSQLDriver::Version71; 21.102 -- break; 21.103 -- default: 21.104 -- serverVersion = QPSQLDriver::Version73; 21.105 -- break; 21.106 -- } 21.107 -- break; 21.108 -- case 8: 21.109 -- switch (vMin) { 21.110 -- case 0: 21.111 -- serverVersion = QPSQLDriver::Version8; 21.112 -- break; 21.113 -- case 1: 21.114 -- serverVersion = QPSQLDriver::Version81; 21.115 -- break; 21.116 -- case 2: 21.117 -- default: 21.118 -- serverVersion = QPSQLDriver::Version82; 21.119 -- break; 21.120 -- } 21.121 -- break; 21.122 -- default: 21.123 -- break; 21.124 -+ serverVersion = qMakePSQLVersion(vMaj, vMin); 21.125 -+#ifdef PG_MAJORVERSION 21.126 -+ if (rx.indexIn(QLatin1String(PG_MAJORVERSION)) != -1) { 21.127 -+ vMaj = rx.cap(1).toInt(); 21.128 -+ vMin = rx.cap(2).toInt(); 21.129 -+ } 21.130 -+ QPSQLDriver::Protocol clientVersion = qMakePSQLVersion(vMaj, vMin); 21.131 -+ 21.132 -+ if (serverVersion >= QPSQLDriver::Version9 && clientVersion < QPSQLDriver::Version9) { 21.133 -+ //Client version before QPSQLDriver::Version9 only supports escape mode for bytea type, 21.134 -+ //but bytea format is set to hex by default in PSQL 9 and above. So need to force the 21.135 -+ //server use the old escape mode when connects to the new server with old client library. 21.136 -+ result = PQexec(connection, "SET bytea_output=escape; "); 21.137 -+ status = PQresultStatus(result); 21.138 -+ } else if (serverVersion == QPSQLDriver::VersionUnknown) { 21.139 -+ serverVersion = clientVersion; 21.140 -+ if (serverVersion != QPSQLDriver::VersionUnknown) 21.141 -+ qWarning("The server version of this PostgreSQL is unknown, falling back to the client version."); 21.142 - } 21.143 -+#endif 21.144 - } 21.145 - } 21.146 - PQclear(result); 21.147 - 21.148 -- if (serverVersion < QPSQLDriver::Version71) 21.149 -+ //keep the old behavior unchanged 21.150 -+ if (serverVersion == QPSQLDriver::VersionUnknown) 21.151 -+ serverVersion = QPSQLDriver::Version6; 21.152 -+ 21.153 -+ if (serverVersion < QPSQLDriver::Version71) { 21.154 - qWarning("This version of PostgreSQL is not supported and may not work."); 21.155 -+ } 21.156 - 21.157 - return serverVersion; 21.158 - } 21.159 -@@ -852,7 +889,10 @@ bool QPSQLDriver::commitTransaction() 21.160 - // This hack can dissapear once there is an API to query this sort of information. 21.161 - if (d->pro == QPSQLDriver::Version8 || 21.162 - d->pro == QPSQLDriver::Version81 || 21.163 -- d->pro == QPSQLDriver::Version82) { 21.164 -+ d->pro == QPSQLDriver::Version82 || 21.165 -+ d->pro == QPSQLDriver::Version83 || 21.166 -+ d->pro == QPSQLDriver::Version84 || 21.167 -+ d->pro == QPSQLDriver::Version9) { 21.168 - transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0; 21.169 - } 21.170 - 21.171 -@@ -963,6 +1003,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const 21.172 - case QPSQLDriver::Version8: 21.173 - case QPSQLDriver::Version81: 21.174 - case QPSQLDriver::Version82: 21.175 -+ case QPSQLDriver::Version83: 21.176 -+ case QPSQLDriver::Version84: 21.177 -+ case QPSQLDriver::Version9: 21.178 - stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " 21.179 - "pg_class.relname " 21.180 - "FROM pg_attribute, pg_class " 21.181 -@@ -1046,6 +1089,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const 21.182 - case QPSQLDriver::Version8: 21.183 - case QPSQLDriver::Version81: 21.184 - case QPSQLDriver::Version82: 21.185 -+ case QPSQLDriver::Version83: 21.186 -+ case QPSQLDriver::Version84: 21.187 -+ case QPSQLDriver::Version9: 21.188 - stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, " 21.189 - "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, " 21.190 - "pg_attrdef.adsrc " 21.191 -diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h 21.192 -index 22871ff..107da87 100644 21.193 ---- a/src/sql/drivers/psql/qsql_psql.h 21.194 -+++ b/src/sql/drivers/psql/qsql_psql.h 21.195 -@@ -97,6 +97,7 @@ class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver 21.196 - Q_OBJECT 21.197 - public: 21.198 - enum Protocol { 21.199 -+ VersionUnknown = -1, 21.200 - Version6 = 6, 21.201 - Version7 = 7, 21.202 - Version71 = 8, 21.203 -@@ -104,7 +105,10 @@ public: 21.204 - Version74 = 10, 21.205 - Version8 = 11, 21.206 - Version81 = 12, 21.207 -- Version82 = 13 21.208 -+ Version82 = 13, 21.209 -+ Version83 = 14, 21.210 -+ Version84 = 15, 21.211 -+ Version9 = 16, 21.212 - }; 21.213 - 21.214 - explicit QPSQLDriver(QObject *parent=0); 21.215 - 21.216 --- 21.217 -1.6.1 21.218 -
22.1 --- a/qt4/stuff/fix-qtbug-15857.patch Sat Mar 05 16:29:18 2011 +0000 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,32 +0,0 @@ 22.4 -From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001 22.5 -From: Jiang Jiang <jiang.jiang@nokia.com> 22.6 -Date: Mon, 6 Dec 2010 13:07:36 +0100 22.7 -Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged() 22.8 - 22.9 -Doing selectAll() after the entire block of text has been removed 22.10 -will cause this crash, because we didn't check if the block we 22.11 -found is valid or not. 22.12 - 22.13 -Task-number: QTBUG-15857 22.14 -Reviewed-by: Eskil 22.15 ---- 22.16 - src/gui/text/qtextcursor.cpp | 3 +++ 22.17 - 1 files changed, 3 insertions(+), 0 deletions(-) 22.18 - 22.19 -diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp 22.20 -index 769ab2f..f73cc4b 100644 22.21 ---- a/src/gui/text/qtextcursor.cpp 22.22 -+++ b/src/gui/text/qtextcursor.cpp 22.23 -@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor 22.24 - bool adjustX = true; 22.25 - QTextBlock blockIt = block(); 22.26 - 22.27 -+ if (!blockIt.isValid()) 22.28 -+ return false; 22.29 -+ 22.30 - if (op >= QTextCursor::Left && op <= QTextCursor::WordRight 22.31 - && blockIt.textDirection() == Qt::RightToLeft) { 22.32 - if (op == QTextCursor::Left) 22.33 --- 22.34 -1.6.1 22.35 -
23.1 --- a/qtconfig/receipt Sat Mar 05 16:29:18 2011 +0000 23.2 +++ b/qtconfig/receipt Sat Mar 05 16:37:25 2011 +0000 23.3 @@ -1,7 +1,7 @@ 23.4 # SliTaz package receipt. 23.5 23.6 PACKAGE="qtconfig" 23.7 -VERSION="4.7.1" 23.8 +VERSION="4.7.2" 23.9 CATEGORY="x-window" 23.10 SHORT_DESC="Qtconfig is a tool that allows users to customize the default settings for Qt applications." 23.11 MAINTAINER="slaxemulator@gmail.com"
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/qtconfig/stuff/qtconfig.desktop Sat Mar 05 16:37:25 2011 +0000 24.3 @@ -0,0 +1,10 @@ 24.4 +[Desktop Entry] 24.5 +Name=Qt Config 24.6 +Comment=Configure Qt behavior, styles, fonts 24.7 +Exec=/usr/bin/qtconfig 24.8 +Icon=qtlogo 24.9 +Terminal=false 24.10 +Encoding=UTF-8 24.11 +Type=Application 24.12 +Categories=Qt;Settings; 24.13 +NoDisplay=true