summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3176-993/+993
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Refactor OS X bundle detection for QFileInfoSamuel Gaist2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | CFBundleGetPackageInfoInDirectory originally used tests for the presence of information that are not mandatory in a bundle. Following Apple's documentation, the new approach is to use Uniform Type Identifier which queries the OS directly to check whether the extension conforms to kUTTypeBundle. That includes e.g. applications, frameworks etc. Then it tries to determine if the bundle can be opened with an application that is not Finder. Last thing, it checks whether the package bit is set. (cherry picked from qtbase/72d60ea08c14037250459a5424ffee7a36b909b1) (cherry picked from qtbase/bcfc68f9cd00982decd7ceb312966caf6b1ca05e) (cherry picked from qtbase/afacf694d5a6f34b88989e76971d70d700ce4949) Task-number: QTBUG-31884 Change-Id: I4ce3d8b90d116960b2044d3fafe3f745f6141416 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Updated year in copyright headerKai Koehne2014-03-2676-76/+76
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Completely bootstrap idc.Friedemann Kleint2013-12-052-26/+76
| | | | | | | | | | | idc dynamically loads libraries depending on QtCore.dll whose static instances can then cause clashes. Task-number: QTBUG-35275 Change-Id: I48bb9c4b4ab33b1909d650458c0351c008b46ac0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtactiveqt/ab3e8e80fbd81a38039c713189b0422972e0963e)
* qfilesystemengine_mac.cpp is empty => purgeSamuel Gaist2013-07-051-1/+0
| | | | | | | | | | | All mac related qfilesystemengine operations are done in qfilesystemengine_unix. Purging it like commit bd7ca33889139782f3f0063f93ca9c1f39501a17 in qtbase Change-Id: I16ba494b699d731c3cd688cbd34b81cc67851b47 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Re-enable compilation of idc for MinGWKai Koehne2013-06-041-1/+1
| | | | | | | | | | | | | | | | | | | Re-enable compilation of idc for MinGW to fulfill the activeqt dependency on idc. idc and activeqt compile fine with MinGW, but most examples won't work because of the missing midl compiler. This was the reason activeqt and idc was disabled originally after Qt 4.8.4. Anyhow, 330ca76b then re-enabled compilation for activeqt, but not idc, which broke the build. This patch re-enables compilation of idc, but still by default does not compile activeqt examples. Qt 5 ships with activeqt / idc for MinGW too, btw, so excluding it in Qt 4.8.5 is inconsistent. Task-number: QTBUG-31517 Change-Id: I7d4e7ed56c1954996b7291f56143ff83fcdcb0a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make sure idc links only against QtCoreKai Koehne2013-06-041-0/+2
| | | | | | | | Do not link against QtGui (which might not have been compiled yet). Task-number: QTBUG-22260 Change-Id: I42d926cc30a0bc278fc796f32652281c03f140d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1376-76/+76
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove the timestamp info in genarated filesLiang Qi2012-12-153-10/+3
| | | | | | | | | | | | | | For moc, rcc and uic, then it's friendly for tools like ccache. ccache is using md5 to check file modification, but the different timestamp info will cause different md5 for same meaningful contents, it will disabled ccache. Updated the autotest for uic and rcc. Task-number: QTBUG-26589 Change-Id: I9e72ff022f722809b3f86bd9d7e0ae1e470e8eb2 (back port from qtbase/139f416237c52575b236c3b61e25796c83034567) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix moc from choking on boost headers.Kevin Kofler2012-11-251-0/+4
| | | | | | | | | Fixes several build failures with boost >= 1.48, for example the kdepim build: https://bugs.kde.org/show_bug.cgi?id=304111 Task-number: QTBUG-22829 Change-Id: Ic37a5290955fbfd18894a228cc9d57615edddea6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-12/+0
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2976-1829/+1829
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove qurl.cpp from qmake and bootstrap, it's not needed.David Faure2012-08-211-1/+0
| | | | | | | | (and I need this out to be able to use QMutex in QUrl) Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0176-152/+152
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix symbol visibility warnings when building uic3Andy Shaw2012-04-161-0/+1
| | | | | | | | | When building statically we need to hide the symbols that would otherwise be exported so we add hide_symbols to the CONFIG Task-number: QTBUG-23035 Change-Id: I29245a6650fa81186085484d7b2b9150b89a1729 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1176-76/+76
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove idc from mingw build.Markku Heikkila2011-10-241-1/+1
| | | | | | | | Mingw tool chain does not support com/idl so remove it. Task-number: QTBUG-22260 Merge-request: 2710 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a cast to moc cpp generator to remove armcc warningsPasi Pentikainen2011-09-061-1/+1
| | | | | Task-number: QT-3869 Reviewed-by: Murray Read
* Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-2/+2
| | | | | Merge-request: 1299 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-263-2/+8
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later remove duplicate message fix "Host" header of ipv6 URLs in QNAM uic: Use QString::fromUtf8 for QUrl properties. uic: #include <QLayout> for QToolBox on non-laid-out forms. add test case for ipv6 url parsing
| * uic: Use QString::fromUtf8 for QUrl properties.Friedemann Kleint2011-05-251-1/+1
| | | | | | | | | | | | | | As otherwise the compilation of ui_-files fails when using QT_NO_CAST_FROM_ASCII. Bug reported on mailing list. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
| * uic: #include <QLayout> for QToolBox on non-laid-out forms.Friedemann Kleint2011-05-232-1/+7
| | | | | | | | | | | | | | | | for the fake tab-spacing property, which accesses the internal layout and sets its spacing. Task-number: QTBUG-19339 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-061-0/+1
| |\ \ | | |/ | |/|
| | * fix random miscompilation with msvcOswald Buddenhagen2011-05-061-0/+1
| | | | | | | | | | | | Reviewed-by: joerg
* | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1376-1297/+1297
|/ / | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | moc: qobject_cast cannot be used if the class privately iherit from QObjectOlivier Goffart2011-04-041-1/+3
| | | | | | | | | | because the qobject_cast function do not have the right to access the staticMetaObject.
* | Compile with QStringBuilder and QByteArrayOlivier Goffart2011-04-012-3/+3
| | | | | | | | Reviewed-by: Denis
* | moc: be able to compile if there are private classesOlivier Goffart2011-03-311-4/+4
| | | | | | | | | | Reviewed-by: brad Reviewed-by: thiago
* | Speedup activation of signalsOlivier Goffart2011-03-315-67/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The virtual QObject::qt_metacall will recurse to the whole object hierarchy to find from which class a function should be called. But it is possible to know, at connection time, from which exact QMetaObject a function belongs, and the relative offset into it. So we make the slot calls from the qt_static_metacall function. So activation of signals is faster. - We must not call a slot from a class that has been destroyed. To avoid this, there is a check on the methodOffset. If it is smaller, that means we might be called (indirectly) from the destructor. We fallback to the virtual call to qt_metacall that does the right thing. - The signature of the static method is void (*) (QObject*,MetaCall,int,void**) It returns void, so the compiler is allowed to do tail recusive optimization. Having the QObject* as first parameter make it ready on the stack for the call to the member function. - The new static method has to be a member function in order to be able to access the private slots. Reviewed-by: brad
* | Merge remote branch 'earth-team/master-i18n' into 4.8-earthDenis Dzyubenko2011-03-241-0/+6
|\ \ | | | | | | | | | | | | Conflicts: src/corelib/tools/tools.pri
| * \ Merge remote branch 'earth-team/master' into master-i18nDenis Dzyubenko2011-03-178-15/+145
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale.cpp
| * | | Split monolithic qlocale.cpp into platform-specific filesDenis Dzyubenko2011-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a refactoring change to split huge unreadable qlocale.cpp into multiple files. Reviewed-by: Zeno Albisser
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-03-041-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits) Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. QAbstractSocket: Check for socket state on Unbuffered reads Corrected a mismerge in GCCE link parameters. QAbstractSocket: Check for engine validity on Unbuffered reads tst_qnetworkreply: fix the MiniHttpServer. tst_qnetworkProxyFactory: fix debug output. Fixed incorrect referral to an include file. tst_qnetworkreply: getErrors() only ignore warning for the specific test Check engine existence before increasing reference count Fixed library casing. Fix Q_INVOKABLE declared after Q_PROPERTY tst_qnetworkreply: small improvements QNAM: Add a warning for misuse of the file backend. Keep reference count for cached font engines in QTextEngine QNAM HTTP: Be more strict with HTTP channel state tst_qnetworkreply: Add a test for broken gzip encoding QNAM HTTP: Add qWarning() for double-finished() bug fix documentation typos in isLowSurrogate and requiresSurrogates ...
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-248-14/+141
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreplyimpl.cpp tests/auto/moc/tst_moc.cpp
| * | | | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-241-1/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc was starting to parse function one token too late. This was usually unnoticed because there is usually a semi colon, or a colon, or some other token that are ignored. But in this case, a Q_PROPERTY is not ignored, the parsing would fail. Reviewed-by: brad
* | | | Add a "-nn" option to mocRolland Dudemaine2011-02-223-4/+16
| |/ / |/| | | | | | | | | | | | | | | | | | | | Demote "No relevant classes found" warnings to "notes". "-nn" can be used to silence notes in order to reduce noise on embedded builds Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-048-14/+141
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1976-76/+76
| |\
| * | Allow a revision to be associated with properties and methods.Martin Jones2011-01-058-14/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows a revision to be associated with properties via: Q_PROPERTY(int prop READ prop1 REVISION 1) Allows a revision to be associated with methods via either: public slots Q_REVISION(1): void method1(); or: public slots: Q_REVISION void method1(); Private revision() methods are added to QMetaProperty and QMetaMethod to access the revision info. This is private API for use by QML for now. Task-number: QTBUG-13451 Reviewed-by: Kent Hansen
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1776-76/+76
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | Update copyright year to 2011.Jason McDonald2011-01-1076-76/+76
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-233-0/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-223-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extend ui-format by alignment-attribute for QLayoutItem, handle it in uic and formbuilder. Support in Designer by context menu. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-3120
* | | Use QSystemError to return errors from QFileSystemEngineShane Kearns2010-10-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing done: win32-msvc2008 and Mac OS X - qfile, qfileinfo, qdir, qdiriterator, qtemporaryfile autotests symbian-sbsv2 - qtcore, qtgui, qtxml autotests win32-g++ - compilation test for qmake Reviewed-By: Thomas Zander
* | | Merge commit 'origin/master' into fileEnginesOn47Thomas Zander2010-09-2814-92/+207
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 qmake/qmake.pri src/corelib/io/qdir.cpp src/corelib/io/qfileinfo.cpp src/corelib/io/qfileinfo_p.h src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/tools/bootstrap/bootstrap.pro tests/auto/qfileinfo/tst_qfileinfo.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-107-22/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-086-21/+52
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Work around a compiler bug on 64-bit. Fix handling of braces/no-braces in QUrl::host / setHost. Changes (and minor corrections) to QByteArray documentation. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. uic: Fix compile breakage in case QT_NO_QT3_SUPPORT. uic: Improve messages. Tools (uic/rcc): Improve warning messages. QDir: Removed checks for existance of fileEngine QDir and QFileInfo shouldn't lose properties when detaching Another bug-o introduced in fixing QDirPrivate refactoring Reverting QDir::detach introduced earlier QFileInfo: Prepare for engine-less implementation Removed QFileInfoPrivate::initFileEngine Simplify QDir::cd QDir::makeAbsolute could self-destruct on failure QDir::operator= simplification QDirPrivate refactoring QDirPrivate refactoring ...
| | | * uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.Friedemann Kleint2010-09-081-1/+1
| | | |
| | | * uic: Improve messages.Friedemann Kleint2010-09-071-6/+8
| | | | | | | | | | | | | | | | | | | | Fix some oversights in b21639304b108de0697553f062eb36ccde6a5bd5.