SOURCES: qt4-locale.patch, qt4-tools.patch, qt4-antialias.patch, q...
pascalek
pascalek at pld-linux.org
Fri Jun 1 16:10:57 CEST 2007
Author: pascalek Date: Fri Jun 1 14:10:57 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.3.0
---- Files affected:
SOURCES:
qt4-locale.patch (1.10 -> 1.11) , qt4-tools.patch (1.7 -> 1.8) , qt4-antialias.patch (1.5 -> 1.6) , qt4-build-lib-static.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/qt4-locale.patch
diff -u SOURCES/qt4-locale.patch:1.10 SOURCES/qt4-locale.patch:1.11
--- SOURCES/qt4-locale.patch:1.10 Tue Nov 28 20:02:04 2006
+++ SOURCES/qt4-locale.patch Fri Jun 1 16:10:52 2007
@@ -126,31 +126,34 @@
diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp
--- qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp 2006-10-20 17:35:40.000000000 +0200
+++ qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp 2006-11-28 14:22:20.000000000 +0100
-@@ -112,8 +112,8 @@
+@@ -112,11 +112,11 @@
+ QTranslator *qtTranslator = new QTranslator(this);
- QTranslator *translator = new QTranslator;
- QTranslator *qtTranslator = new QTranslator;
-- translator->load(QLatin1String("designer_") + QLocale::system().name().toLower(), resourceDir);
-- qtTranslator->load(QLatin1String("qt_") + QLocale::system().name().toLower(), resourceDir);
-+ translator->load(QLatin1String("qt4-designer_") + QLocale::system().name(), resourceDir);
-+ qtTranslator->load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
- installTranslator(translator);
- installTranslator(qtTranslator);
+ const QString localSysName = QLocale::system().name();
+- QString translatorFileName = QLatin1String("designer_");
++ QString translatorFileName = QLatin1String("qt4-designer_");
+ translatorFileName += localSysName;
+ translator->load(translatorFileName, resourceDir);
+- translatorFileName = QLatin1String("qt_");
++ translatorFileName = QLatin1String("qt4_");
+ translatorFileName += localSysName;
+ qtTranslator->load(translatorFileName, resourceDir);
+ installTranslator(translator);
diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp
--- qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp 2006-10-20 17:35:26.000000000 +0200
+++ qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp 2006-11-28 14:21:19.000000000 +0100
@@ -41,11 +41,11 @@
- QApplication::setOverrideCursor(Qt::WaitCursor);
+ }
QTranslator translator(0);
-- translator.load(QLatin1String("linguist_") + QLocale::system().name(), ".");
-+ translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+- translator.load(QLatin1String("linguist_") + QLocale::system().name(), resourceDir);
++ translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), resourceDir);
app.installTranslator(&translator);
QTranslator qtTranslator(0);
-- qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-+ qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+- qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), resourceDir);
++ qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
app.installTranslator(&qtTranslator);
- app.setOrganizationName("Trolltech");
+ app.setOrganizationName(QLatin1String("Trolltech"));
================================================================
Index: SOURCES/qt4-tools.patch
diff -u SOURCES/qt4-tools.patch:1.7 SOURCES/qt4-tools.patch:1.8
--- SOURCES/qt4-tools.patch:1.7 Wed Oct 4 23:17:38 2006
+++ SOURCES/qt4-tools.patch Fri Jun 1 16:10:52 2007
@@ -1,14 +1,13 @@
--- qt-copy/tools/tools.pro.orig 2005-05-13 16:39:18.000000000 +0200
+++ qt-copy/tools/tools.pro 2005-05-13 20:02:31.761482520 +0200
-@@ -7,7 +7,7 @@
- assistant \
- porting \
- qtestlib \
-- pixeltool
-+ pixeltool qvfb
- contains(QT_EDITION, Console) {
- SUBDIRS += designer/src/uitools # Linguist depends on this
- } else {
+@@ -7,6 +7,7 @@
+ assistant \
+ pixeltool \
+ porting \
++ qvfb \
+ qtestlib
+ contains(QT_EDITION, Console) {
+ SUBDIRS += designer/src/uitools # Linguist depends on this
diff -Nur qt-x11-opensource-src-4.1.4/src/gui/embedded.orig/qlock.cpp qt-x11-opensource-src-4.1.4/src/gui/embedded/qlock.cpp
--- qt-x11-opensource-src-4.1.4/src/gui/embedded.orig/qlock.cpp 1970-01-01 01:00:00.000000000 +0100
+++ qt-x11-opensource-src-4.1.4/src/gui/embedded/qlock.cpp 2006-07-02 11:35:54.386518000 +0200
================================================================
Index: SOURCES/qt4-antialias.patch
diff -u SOURCES/qt4-antialias.patch:1.5 SOURCES/qt4-antialias.patch:1.6
--- SOURCES/qt4-antialias.patch:1.5 Wed Oct 4 23:17:38 2006
+++ SOURCES/qt4-antialias.patch Fri Jun 1 16:10:52 2007
@@ -17,8 +17,8 @@
+ QSettings prefs;
+ bool qt_use_antialiasing = prefs.value( "/qt/useXft", TRUE ).toBool() ;
-+ if (QX11Info::appDepth(screen) <= 8 || ! (qt_use_antialiasing)) {
-- if (QX11Info::appDepth(screen) <= 8) {
+- if (X11->display && QX11Info::appDepth(screen) <= 8) {
++ if (X11->display && (QX11Info::appDepth(screen) <= 8) || ! (qt_use_antialiasing)) {
// can't do antialiasing on 8bpp
FcPatternAddBool(pattern, FC_ANTIALIAS, false);
} else if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
================================================================
Index: SOURCES/qt4-build-lib-static.patch
diff -u SOURCES/qt4-build-lib-static.patch:1.3 SOURCES/qt4-build-lib-static.patch:1.4
--- SOURCES/qt4-build-lib-static.patch:1.3 Wed Oct 4 23:17:38 2006
+++ SOURCES/qt4-build-lib-static.patch Fri Jun 1 16:10:52 2007
@@ -9,16 +9,16 @@
HEADERS = qassistantclient.h \
qassistantclient_global.h
@@ -17,6 +16,10 @@
- QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
}
+ DEFINES += QT_ASSISTANT_CLIENT_LIBRARY
+!contains(CONFIG, static) {
+ CONFIG += dll
+}
+
- !debug_and_release|build_pass {
- CONFIG(debug, debug|release) {
- unix:TARGET = $$member(TARGET, 0)_debug
+ contains(CONFIG, static) {
+ DEFINES += QT_ASSISTANT_CLIENT_STATIC
+ }
--- qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro.orig 2005-12-16 12:52:20.000000000 +0100
+++ qt-x11-opensource-src-4.1.0/tools/designer/src/uitools/uitools.pro 2006-02-13 09:26:05.000000000 +0100
@@ -1,7 +1,7 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/qt4-locale.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SOURCES/qt4-tools.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SOURCES/qt4-antialias.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/qt4-build-lib-static.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list