From 074501c479de2e7e68c77054ef98b2b787021b55 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 1 Nov 2010 16:25:01 +0100 Subject: fix qdoc doc generation as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs. --- tools/qdoc3/qdoc3.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index ae0bf25..d47e066 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -120,9 +120,9 @@ SOURCES += apigenerator.cpp \ qtPrepareTool(QDOC, qdoc3) -docs.commands = $$QDOC qdoc-manual.qdocconf +html-docs.commands = cd \"$$PWD/doc\" && $$QDOC qdoc-manual.qdocconf -QMAKE_EXTRA_TARGETS += docs +QMAKE_EXTRA_TARGETS += html-docs target.path = $$[QT_INSTALL_BINS] INSTALLS += target -- cgit v0.12 From 12120c47133642a0704799208701fd9164bf0ebf Mon Sep 17 00:00:00 2001 From: Frederik Schwarzer Date: Tue, 2 Nov 2010 12:45:09 +0100 Subject: german translation: minor additions + fixes Merge-request: 902 Reviewed-by: Oswald Buddenhagen --- translations/assistant_de.ts | 37 ++++++++++++++++++++++++++++++++----- translations/qt_de.ts | 4 ++-- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index 95fabaf..3648fdd 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -67,7 +67,7 @@ Grund: Error reading collection file '%1': %2. - Fehler beim Lesen der Katalogdatei '%1': %2 + Fehler beim Lesen der Katalogdatei '%1': %2. Error creating collection file '%1': %2. @@ -741,7 +741,7 @@ Grund: Input File - Eingabedatei: + Datei eingeben Specify the .adp or .dcf file you want to convert to the new Qt help project format and/or collection format. @@ -989,7 +989,7 @@ Grund: <center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p> - + <center><h3>%1</h3><p>Version %2</p></center><p>Copyright (C) 2010 Nokia Corporation und/oder ihre Tochtergesellschaft(en).</p> Could not register file '%1': %2 @@ -1354,7 +1354,19 @@ qcollectiongenerator <collection-config-file> [options] qcollectiongenerator. - + +Aufruf: + +qcollectiongenerator <collection-Konfigurationsdatei> [Optionen] + + -o <collection-Datei> Erstellt eine Collection-Datei mit + dem Namen <collection-Datei>. Wenn + diese Option nicht angegeben ist, wird + der Standardname verwendet. + -v Zeigt die Versionsnummer von + qcollectiongenerator an. + + Could not open %1. @@ -1435,7 +1447,22 @@ qhelpgenerator <help-project-file> [options] qhelpgenerator. - + +Aufruf: + +qhelpgenerator <Hilfe-Projektdatei> [Optionen] + -o <komprimierte-Datei> Erstellt eine komprimierte + Qt-Hilfedatei mit dem Namen + <komprimierte-Datei>. Wenn diese + Option nicht angegeben ist, wird + ein Standardname verwendet. + -c Prüft, ob alle Verknüpfungen in + HTML-Dateien auf Dateien in diesem + Hilfeprojekt verweisen. + -v Zeigt die Versionsnummer von + qhelpgenerator an. + + Could not open %1. diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 3b9bbb0..d167434 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -3700,7 +3700,7 @@ Möchten Sie die Datei trotzdem löschen? <h3>About Qt</h3><p>This program uses Qt version %1.</p> - + <h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1.</p> <p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://qt.nokia.com/">qt.nokia.com</a> for more information.</p> @@ -5186,7 +5186,7 @@ Bitte wählen Sie einen anderen Dateinamen. Find &Previous - Vorhergehende Fundstelle + &Vorhergehende Fundstelle Shift+F3 -- cgit v0.12 From 576a2e2181a9615b8aa1984a924442622fa6922d Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 2 Nov 2010 15:33:41 +0100 Subject: Fixed destination path for the S60 feedback plugin. Reviewed-by: axis --- src/plugins/s60/feedback/feedback.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro index 32ddf6f..1069220 100644 --- a/src/plugins/s60/feedback/feedback.pro +++ b/src/plugins/s60/feedback/feedback.pro @@ -2,6 +2,8 @@ include(../../qpluginbase.pri) TARGET = qtactilefeedback$${QT_LIBINFIX} +QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) { -- cgit v0.12 From 7c8edecd486b71ff84cfaf278d9b1295e24766b9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 2 Nov 2010 16:09:18 +0100 Subject: make the dtd reflect reality --- tools/linguist/shared/ts.dtd | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd index 4d2cdeb..12d3562 100644 --- a/tools/linguist/shared/ts.dtd +++ b/tools/linguist/shared/ts.dtd @@ -4,8 +4,6 @@ ! ! The location element is set as optional since it was introduced first in Qt 4.2. ! The userdata element is set as optional since it was introduced first in Qt 4.4. - ! The source and translation elements are optional starting with version 3.0 - ! (Qt 4.6) to support S60 blank messages. ! --> - + - - @@ -53,12 +48,13 @@ variants (yes|no) "no"> - - - -- cgit v0.12 From 6382a038d6394135a4dc2d8e1e47133d9ea0b659 Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Wed, 3 Nov 2010 09:40:16 +0200 Subject: Qt/Symbian: QInputDialog layout and size are wrong The QInputDialog with anything but QLineEdit as the input widget, will show up as minimal size on device/emulator. Also, the dialog looks bad since the widgets are deployed very close to the dialog borders. As a fix, layout will not get the size policy set on Symbian, but the dialog itself is stretched to occupy screen width and thus, layout grows to occupy the available size. Additionally, style will set layout pixel metrics for dialogs larger than for other widgets, to avoid the layout from putting widgets very close to dialog border. Task-number: QTBUG-14331 Reviewed-by: Janne Anttila --- src/gui/dialogs/qdialog.cpp | 2 +- src/gui/dialogs/qinputdialog.cpp | 3 +++ src/gui/styles/qs60style.cpp | 22 ++++++++++++++++++++-- src/gui/styles/qs60style_p.h | 1 + 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 9e0437c..b7a0026 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -1111,7 +1111,7 @@ QSize QDialog::sizeHint() const // if size is not fixed, try to adjust it according to S60 layoutting if (minimumSize() != maximumSize()) { // In S60, dialogs are always the width of screen (in portrait, regardless of current layout) - return QSize(qMax(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height()); + return QSize(qMin(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height()); } else { return QWidget::sizeHint(); } diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index 700b234..abaaa49 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -231,7 +231,10 @@ void QInputDialogPrivate::ensureLayout() QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); mainLayout = new QVBoxLayout(q); + //we want to let the input dialog grow to available size on Symbian. +#ifndef Q_OS_SYMBIAN mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); +#endif mainLayout->addWidget(label); mainLayout->addWidget(inputWidget); mainLayout->addWidget(buttonBox); diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index d39a2ba..53ca28c 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -112,6 +112,8 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = { // *** End of generated data *** }; +QSet *QS60StylePrivate::m_autoFillDisabledWidgets = 0; + const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0]; // theme background texture @@ -152,6 +154,8 @@ const double KTabFontMul = 0.72; QS60StylePrivate::~QS60StylePrivate() { + delete m_autoFillDisabledWidgets; + m_autoFillDisabledWidgets = 0; clearCaches(); //deletes also background image deleteThemePalette(); #ifdef Q_WS_S60 @@ -2521,9 +2525,9 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const metricValue = QS60StylePrivate::pixelMetric(PM_LayoutLeftMargin); } - if (widget && (metric == PM_LayoutTopMargin)) + if (widget && (metric == PM_LayoutTopMargin || metric == PM_LayoutLeftMargin || metric == PM_LayoutRightMargin)) if (widget->windowType() == Qt::Dialog) - //double the top layout margin for dialogs, it is very close to real value + //double the layout margins (except bottom) for dialogs, it is very close to real value //without having to define custom pixel metric metricValue *= 2; @@ -3184,6 +3188,13 @@ void QS60Style::polish(QWidget *widget) } d->setThemePalette(widget); d->setFont(widget); + + if (widget->autoFillBackground()) { + if (!d->m_autoFillDisabledWidgets) + d->m_autoFillDisabledWidgets = new QSet; + widget->setAutoFillBackground(false); + d->m_autoFillDisabledWidgets->insert(widget); + } } /*! @@ -3218,6 +3229,13 @@ void QS60Style::unpolish(QWidget *widget) if (widget) widget->setPalette(QPalette()); + + if (d->m_autoFillDisabledWidgets && + !d->m_autoFillDisabledWidgets->isEmpty() && + d->m_autoFillDisabledWidgets->contains(widget)) { + widget->setAutoFillBackground(true); + d->m_autoFillDisabledWidgets->remove(widget); + } #if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR) if (QProgressBar *bar = qobject_cast(widget)) { diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index b46f75e..3d66c40 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -625,6 +625,7 @@ private: static qint64 m_webPaletteKey; static QPointer m_pressedWidget; + static QSet *m_autoFillDisabledWidgets; #ifdef Q_WS_S60 //list of progress bars having animation running -- cgit v0.12