From 245a68a0aad0473fcf56cd75e78b951480d39e2b Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 16 Jul 2010 19:25:31 +0200 Subject: Doc: Added more license information. Task-number: QT-3585 Reviewed-by: Trust Me --- doc/src/legal/licenses.qdoc | 46 +++++++++-- doc/src/snippets/legal/CatharonLicense.txt | 123 +++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 doc/src/snippets/legal/CatharonLicense.txt diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index a04a256..12aca6b 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -262,14 +262,14 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\br -     * Redistributions of source code must retain the above copyright -       notice, this list of conditions and the following disclaimer.\br -     * Redistributions in binary form must reproduce the above copyright -       notice, this list of conditions and the following disclaimer in the -       documentation and/or other materials provided with the distribution.\br -     * Neither the name of Research In Motion Limited nor the -       names of its contributors may be used to endorse or promote products -       derived from this software without specific prior written permission. + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer.\br + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution.\br + * Neither the name of Research In Motion Limited nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY Research In Motion Limited ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -476,6 +476,24 @@ \hr + Copyright 2001, 2002 Catharon Productions Inc. + + This file is part of the Catharon Typography Project and shall only + be used, modified, and distributed under the terms of the Catharon + Open Source License that should come with this file under the name + `CatharonLicense.txt'. By continuing to use, modify, or distribute + this file you indicate that you have read the license and + understand and accept it fully. + + Note that this license is compatible with the FreeType license. + + \list + \o Included in the build system of the FreeType library + \o See \l{CatharonLicense.txt} for more information + \endlist + + \hr + Copyright (C) 2006 Apple Computer, Inc. All rights reserved.\br Copyright (C) 2007 Eric Seidel \br Copyright (C) 2008 Kelvin W Sherlock (ksherlock@gmail.com)\br @@ -987,3 +1005,15 @@ and have given a quick thought about whether Roman might perhaps be interested to read what you did with his stuff. Horizontal rules don't apply.} */ + +/*! + \page catharon-license.html + \title CatharonLicense.txt + \ingroup licensing + \brief The Catharon License used in parts of FreeType. + + See the \l{Other Licenses Used in Qt} document for information on the + context in which this license is applied to code in the FreeType library. + + \quotefile doc/src/snippets/legal/CatharonLicense.txt +*/ diff --git a/doc/src/snippets/legal/CatharonLicense.txt b/doc/src/snippets/legal/CatharonLicense.txt new file mode 100644 index 0000000..789c8c9 --- /dev/null +++ b/doc/src/snippets/legal/CatharonLicense.txt @@ -0,0 +1,123 @@ + The Catharon Open Source LICENSE + ---------------------------- + + 2000-Jul-04 + + Copyright (C) 2000 by Catharon Productions, Inc. + + + +Introduction +============ + + This license applies to source files distributed by Catharon + Productions, Inc. in several archive packages. This license + applies to all files found in such packages which do not fall + under their own explicit license. + + This license was inspired by the BSD, Artistic, and IJG + (Independent JPEG Group) licenses, which all encourage inclusion + and use of free software in commercial and freeware products + alike. As a consequence, its main points are that: + + o We don't promise that this software works. However, we are + interested in any kind of bug reports. (`as is' distribution) + + o You can use this software for whatever you want, in parts or + full form, without having to pay us. (`royalty-free' usage) + + o You may not pretend that you wrote this software. If you use + it, or only parts of it, in a program, you must acknowledge + somewhere in your documentation that you have used the + Catharon Code. (`credits') + + We specifically permit and encourage the inclusion of this + software, with or without modifications, in commercial products. + We disclaim all warranties covering the packages distributed by + Catharon Productions, Inc. and assume no liability related to + their use. + + +Legal Terms +=========== + +0. Definitions +-------------- + + Throughout this license, the terms `Catharon Package', `package', + and `Catharon Code' refer to the set of files originally + distributed by Catharon Productions, Inc. + + `You' refers to the licensee, or person using the project, where + `using' is a generic term including compiling the project's source + code as well as linking it to form a `program' or `executable'. + This program is referred to as `a program using one of the + Catharon Packages'. + + This license applies to all files distributed in the original + Catharon Package(s), including all source code, binaries and + documentation, unless otherwise stated in the file in its + original, unmodified form as distributed in the original archive. + If you are unsure whether or not a particular file is covered by + this license, you must contact us to verify this. + + The Catharon Packages are copyright (C) 2000 by Catharon + Productions, Inc. All rights reserved except as specified below. + +1. No Warranty +-------------- + + THE CATHARON PACKAGES ARE PROVIDED `AS IS' WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OF OR THE INABILITY TO + USE THE CATHARON PACKAGE. + +2. Redistribution +----------------- + + This license grants a worldwide, royalty-free, perpetual and + irrevocable right and license to use, execute, perform, compile, + display, copy, create derivative works of, distribute and + sublicense the Catharon Packages (in both source and object code + forms) and derivative works thereof for any purpose; and to + authorize others to exercise some or all of the rights granted + herein, subject to the following conditions: + + o Redistribution of source code must retain this license file + (`license.txt') unaltered; any additions, deletions or changes + to the original files must be clearly indicated in + accompanying documentation. The copyright notices of the + unaltered, original files must be preserved in all copies of + source files. + + o Redistribution in binary form must provide a disclaimer that + states that the software is based in part on the work of + Catharon Productions, Inc. in the distribution documentation. + + These conditions apply to any software derived from or based on + the Catharon Packages, not just the unmodified files. If you use + our work, you must acknowledge us. However, no fee need be paid + to us. + +3. Advertising +-------------- + + Neither Catharon Productions, Inc. and contributors nor you shall + use the name of the other for commercial, advertising, or + promotional purposes without specific prior written permission. + + We suggest, but do not require, that you use the following phrase + to refer to this software in your documentation: 'this software is + based in part on the Catharon Typography Project'. + + As you have not signed this license, you are not required to + accept it. However, as the Catharon Packages are copyrighted + material, only this license, or another one contracted with the + authors, grants you the right to use, distribute, and modify it. + Therefore, by using, distributing, or modifying the Catharon + Packages, you indicate that you understand and accept all the + terms of this license. + +--- end of license.txt --- -- cgit v0.12 From aafdc4d4c795ee25a0da1087fada999fbe6c47bc Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 27 Jul 2010 23:38:54 +0100 Subject: Move note on connectToBus() not actually being able to reconnect to connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it. --- src/dbus/qdbusconnection.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 4382032..9aa1cc5 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -173,6 +173,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP The connection is then torn down using the disconnectFromBus() function. + Once disconnected, calling connectToBus() will not reestablish a + connection, you must create a new QDBusConnection instance. + As a convenience for the two most common connection types, the sessionBus() and systemBus() functions return open connections to the session server daemon and the system server daemon, @@ -853,10 +856,6 @@ QDBusConnectionInterface *QDBusConnection::interface() const /*! Returns true if this QDBusConnection object is connected. - - If it isn't connected, calling connectToBus() on the same - connection name will not make be connected. You need to call the - QDBusConnection constructor again. */ bool QDBusConnection::isConnected() const { -- cgit v0.12 From d754440bf7ce91a2f4a56a8873b6bfa546719c08 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 27 Jul 2010 23:40:39 +0100 Subject: Remove useless QString::clear() from QSharedData example snippet. --- doc/src/snippets/sharedemployee/employee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h index 18b47e0..2c9ba6f 100644 --- a/doc/src/snippets/sharedemployee/employee.h +++ b/doc/src/snippets/sharedemployee/employee.h @@ -48,7 +48,7 @@ class EmployeeData : public QSharedData { public: - EmployeeData() : id(-1) { name.clear(); } + EmployeeData() : id(-1) { } EmployeeData(const EmployeeData &other) : QSharedData(other), id(other.id), name(other.name) { } ~EmployeeData() { } -- cgit v0.12 From 8f0e2e8a995f16fe737e538ce6f35e91b5a100b5 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 26 Jul 2010 14:04:52 +0100 Subject: Clear Qt::WA_OutsideWSRange when making window fullscreen Task-number: QTBUG-10269 Reviewed-by: Jason Barron --- src/gui/kernel/qwidget_s60.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 46f3254..d06328c 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -1130,8 +1130,10 @@ void QWidget::setWindowState(Qt::WindowStates newstate) const bool cbaVisibilityHint = windowFlags() & Qt::WindowSoftkeysVisibleHint; if (newstate & Qt::WindowFullScreen && !cbaVisibilityHint) { + setAttribute(Qt::WA_OutsideWSRange, false); window->SetExtentToWholeScreen(); } else if (newstate & Qt::WindowMaximized || ((newstate & Qt::WindowFullScreen) && cbaVisibilityHint)) { + setAttribute(Qt::WA_OutsideWSRange, false); TRect maxExtent = qt_QRect2TRect(qApp->desktop()->availableGeometry(this)); window->SetExtent(maxExtent.iTl, maxExtent.Size()); } else { -- cgit v0.12 From f1257358b4432abf874460f58cba73bce17981ab Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 27 Jul 2010 16:23:52 +0100 Subject: Ensure that window rectangle is updated when CBA visibility changes In S60, there are two pieces of screen furniture, changes in whose visibility or size can affect the size of the Qt application window. These are the status pane, at the top of the screen, and the CBA at the bottom. QSymbianControl listens for changes in status pane visibility and size by implementing MEikStatusPaneObserver. Notifications received via this interface trigger a call to QSymbianControl::handleClientAreaChange() which resizes the control. There is no corresponding interface through which to receive notifications of changes in CBA visibility. This patch introduces a utility function for setting the visibility of both the status pane and CBA, which ensures that the control's rectangle is updated when either one changes. Task-number: QTBUG-5320 Reviewed-by: Jason Barron --- src/gui/kernel/qapplication_s60.cpp | 36 +++++++++++++++++++++++++----------- src/gui/kernel/qt_s60_p.h | 3 +++ src/gui/kernel/qwidget_s60.cpp | 15 +++++---------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index d5ff792..7dbf4b7 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -102,6 +102,25 @@ QS60Data* qGlobalS60Data() return qt_s60Data(); } +#ifdef Q_WS_S60 +void QS60Data::setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible) +{ + bool buttonGroupVisibilityChanged = false; + if (CEikButtonGroupContainer *const b = buttonGroupContainer()) { + buttonGroupVisibilityChanged = (b->IsVisible() != buttonGroupVisible); + b->MakeVisible(buttonGroupVisible); + } + bool statusPaneVisibilityChanged = false; + if (CEikStatusPane *const s = statusPane()) { + statusPaneVisibilityChanged = (s->IsVisible() != statusPaneVisible); + s->MakeVisible(statusPaneVisible); + } + if (buttonGroupVisibilityChanged && !statusPaneVisibilityChanged) + // Ensure that control rectangle is updated + static_cast(QApplication::activeWindow()->winId())->handleClientAreaChange(); +} +#endif + bool qt_nograb() // application no-grab option { #if defined(QT_DEBUG) @@ -999,17 +1018,12 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle()); #ifdef Q_WS_S60 // If widget is fullscreen/minimized, hide status pane and button container otherwise show them. - CEikStatusPane *statusPane = S60->statusPane(); - CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer(); - TBool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized)); - if (statusPane) - statusPane->MakeVisible(visible); - if (buttonGroup) { - // Visibility - const TBool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen; - const TBool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint; - buttonGroup->MakeVisible(visible || (isFullscreen && cbaVisibilityHint)); - } + const bool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized)); + const bool statusPaneVisibility = visible; + const bool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen; + const bool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint; + const bool buttonGroupVisibility = (visible || (isFullscreen && cbaVisibilityHint)); + S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility); #endif } else if (QApplication::activeWindow() == qwidget->window()) { if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog() || S60->menuBeingConstructed) { diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index bec51b8..bf71062 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -148,6 +148,7 @@ public: static inline CAknTitlePane* titlePane(); static inline CAknContextPane* contextPane(); static inline CEikButtonGroupContainer* buttonGroupContainer(); + static void setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, bool buttonGroupVisible); TTrapHandler *s60InstalledTrapHandler; #endif @@ -226,6 +227,8 @@ private: #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event); #endif + +public: void handleClientAreaChange(); private: diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index d06328c..fe0d083 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -1110,15 +1110,10 @@ void QWidget::setWindowState(Qt::WindowStates newstate) // The window decoration visibility has to be changed before doing actual window state // change since in that order the availableGeometry will return directly the right size and // we will avoid unnecessarty redraws - CEikStatusPane *statusPane = S60->statusPane(); - CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer(); - TBool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized)); - if (statusPane) - statusPane->MakeVisible(visible); - if (buttonGroup) { - // Visibility - buttonGroup->MakeVisible(visible || (isFullscreen && cbaRequested)); - } + const bool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized)); + const bool statusPaneVisibility = visible; + const bool buttonGroupVisibility = (visible || (isFullscreen && cbaRequested)); + S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility); #endif // Q_WS_S60 // Ensure the initial size is valid, since we store it as normalGeometry below. @@ -1142,7 +1137,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate) // accurate because it did not consider the status pane. This means that when returning // normal mode after showing the status pane, the geometry would overlap so we should // move it if it never had an explicit position. - if (!wasMoved && statusPane && visible) { + if (!wasMoved && S60->statusPane() && visible) { TPoint tl = static_cast(S60->appUi())->ClientRect().iTl; normalGeometry.setTopLeft(QPoint(tl.iX, tl.iY)); } -- cgit v0.12 From 9a059c53caaf19cd2ff722df6e47870a2843ee43 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Fri, 30 Jul 2010 11:38:37 +0200 Subject: Fix proxy widgets with the OpenVG paint engine. Proxy widgets use the shared painter functionality and this implies that the paint engine's begin function does not get called for each new widget that gets painted. This causes a problem because the system clip gets modified by QPainter, but the paint engine does not realize that this happened and fails to use the new clip. The result is that you can end up painting outside the intended clip area. The fix is to reimplement the virtual systemStateChanged() function in QVGPaintEnginePrivate and make it call updateScissor() to re-evaluate the clipping flags and update the current clip accordingly. A similar fix was done to the OpenGL paint engine way back in 307c2954. Task-number: QTBUG-12486 Reviewed-by: Rhys Weatherley --- src/openvg/qpaintengine_vg.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 7de09ce..e368c32 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -120,6 +120,7 @@ private: class QVGPaintEnginePrivate : public QPaintEngineExPrivate { + Q_DECLARE_PUBLIC(QVGPaintEngine) public: // Extra blending modes from VG_KHR_advanced_blending extension. // Use the QT_VG prefix to avoid conflicts with any definitions @@ -150,7 +151,7 @@ public: QT_VG_BLEND_XOR_KHR = 0x2026 }; - QVGPaintEnginePrivate(); + QVGPaintEnginePrivate(QVGPaintEngine *q_ptr); ~QVGPaintEnginePrivate(); void init(); @@ -171,6 +172,7 @@ public: void setBrushTransform(const QBrush& brush, VGMatrixMode mode); void setupColorRamp(const QGradient *grad, VGPaint paint); void setImageOptions(); + void systemStateChanged(); #if !defined(QVG_SCISSOR_CLIP) void ensureMask(QVGPaintEngine *engine, int width, int height); void modifyMask @@ -299,6 +301,9 @@ public: // Clear all lazily-set modes. void clearModes(); + +private: + QVGPaintEngine *q; }; inline void QVGPaintEnginePrivate::setImageMode(VGImageMode mode) @@ -350,7 +355,7 @@ void QVGPaintEnginePrivate::clearModes() imageQuality = (VGImageQuality)0; } -QVGPaintEnginePrivate::QVGPaintEnginePrivate() +QVGPaintEnginePrivate::QVGPaintEnginePrivate(QVGPaintEngine *q_ptr) : q(q_ptr) { init(); } @@ -1452,7 +1457,7 @@ QVGPainterState::~QVGPainterState() } QVGPaintEngine::QVGPaintEngine() - : QPaintEngineEx(*new QVGPaintEnginePrivate) + : QPaintEngineEx(*new QVGPaintEnginePrivate(this)) { } @@ -2995,6 +3000,11 @@ void QVGPaintEnginePrivate::setImageOptions() } } +void QVGPaintEnginePrivate::systemStateChanged() +{ + q->updateScissor(); +} + static void drawVGImage(QVGPaintEnginePrivate *d, const QRectF& r, VGImage vgImg, const QSize& imageSize, const QRectF& sr) -- cgit v0.12 From 4cf313be8d440e2ef9bdb4a586fbcba20c3ee317 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 28 Jul 2010 14:05:52 +0100 Subject: Added support to Phonon MMF backend for playback of Qt resource files The backend accesses the resource file path via MediaSource::url(). A small patch to Phonon was required to enable this, because by default, Phonon passes a QIODevice, rather than the resource file path, to the backend. The backend uses this path to create a QResource object, through which the memory buffer into which the resource file has been read can be accessed. This buffer is wrapped in a Symbian 8-bit descriptor and passed to the OpenDesL() function of the appropriate MMF client utility API. Task-number: QTBUG-6562 --- src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 28 ++++++++-- src/3rdparty/phonon/mmf/abstractmediaplayer.h | 6 ++- src/3rdparty/phonon/mmf/abstractplayer.h | 4 +- src/3rdparty/phonon/mmf/abstractvideoplayer.cpp | 6 +++ src/3rdparty/phonon/mmf/abstractvideoplayer.h | 1 + src/3rdparty/phonon/mmf/audioplayer.cpp | 6 +++ src/3rdparty/phonon/mmf/audioplayer.h | 1 + src/3rdparty/phonon/mmf/dummyplayer.cpp | 2 +- src/3rdparty/phonon/mmf/dummyplayer.h | 2 +- src/3rdparty/phonon/mmf/mediaobject.cpp | 71 ++++++++++++++++++++++--- src/3rdparty/phonon/mmf/mediaobject.h | 11 ++-- src/3rdparty/phonon/phonon/mediasource.cpp | 5 ++ 12 files changed, 123 insertions(+), 20 deletions(-) diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp index be2a568..bca0891 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp @@ -16,6 +16,7 @@ along with this library. If not, see . */ +#include #include #include "abstractmediaplayer.h" @@ -216,9 +217,10 @@ void MMF::AbstractMediaPlayer::doSetTickInterval(qint32 interval) TRACE_EXIT_0(); } -void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) +void MMF::AbstractMediaPlayer::open() { - TRACE_CONTEXT(AbstractMediaPlayer::setFileSource, EAudioApi); + TRACE_CONTEXT(AbstractMediaPlayer::open, EAudioApi); + const MediaSource source = m_parent->source(); TRACE_ENTRY("state %d source.type %d", privateState(), source.type()); close(); @@ -229,7 +231,9 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) switch (source.type()) { case MediaSource::LocalFile: { - symbianErr = openFile(file); + RFile *const file = m_parent->file(); + Q_ASSERT(file); + symbianErr = openFile(*file); if (KErrNone != symbianErr) errorMessage = tr("Error opening file"); break; @@ -237,9 +241,10 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) case MediaSource::Url: { const QUrl url(source.url()); - if (url.scheme() == QLatin1String("file")) { - symbianErr = openFile(file); + RFile *const file = m_parent->file(); + Q_ASSERT(file); + symbianErr = openFile(*file); if (KErrNone != symbianErr) errorMessage = tr("Error opening file"); } else { @@ -251,6 +256,19 @@ void MMF::AbstractMediaPlayer::open(const MediaSource &source, RFile& file) break; } + case MediaSource::Stream: { + QResource *const resource = m_parent->resource(); + if (resource && resource->isValid()) { + m_buffer.Set(resource->data(), resource->size()); + symbianErr = openDescriptor(m_buffer); + if (KErrNone != symbianErr) + errorMessage = tr("Error opening resource"); + } else { + errorMessage = tr("Error opening source: resource not valid"); + } + break; + } + // Other source types are handled in MediaObject::createPlayer // Protection against adding new media types and forgetting to update this switch diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h index 7d28caf..e795ecb 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h @@ -47,7 +47,7 @@ protected: AbstractMediaPlayer(MediaObject *parent, const AbstractPlayer *player); public: - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); // MediaObjectInterface virtual void play(); @@ -70,6 +70,7 @@ protected: virtual int setDeviceVolume(int mmfVolume) = 0; virtual int openFile(RFile& file) = 0; virtual int openUrl(const QString& url) = 0; + virtual int openDescriptor(const TDesC8 &des) = 0; virtual int bufferStatus() const = 0; void updateMetaData(); @@ -123,6 +124,9 @@ private: bool m_prefinishMarkSent; bool m_aboutToFinishSent; + // Used for playback of resource files + TPtrC8 m_buffer; + QMultiMap m_metaData; }; diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h index 30d5243..dd98c7c 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.h +++ b/src/3rdparty/phonon/mmf/abstractplayer.h @@ -26,8 +26,6 @@ along with this library. If not, see . #include "abstractvideooutput.h" -class RFile; - QT_BEGIN_NAMESPACE namespace Phonon @@ -54,7 +52,7 @@ class AbstractPlayer : public QObject public: AbstractPlayer(const AbstractPlayer *player); - virtual void open(const Phonon::MediaSource&, RFile&) = 0; + virtual void open() = 0; virtual void close() = 0; // MediaObjectInterface (implemented) diff --git a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp index 9ea4d18..fb20bea 100644 --- a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp @@ -144,6 +144,12 @@ int MMF::AbstractVideoPlayer::openUrl(const QString &url) return err; } +int MMF::AbstractVideoPlayer::openDescriptor(const TDesC8 &des) +{ + TRAPD(err, m_player->OpenDesL(des)); + return err; +} + int MMF::AbstractVideoPlayer::bufferStatus() const { int result = 0; diff --git a/src/3rdparty/phonon/mmf/abstractvideoplayer.h b/src/3rdparty/phonon/mmf/abstractvideoplayer.h index d854793..3ff3c75 100644 --- a/src/3rdparty/phonon/mmf/abstractvideoplayer.h +++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.h @@ -66,6 +66,7 @@ public: virtual int setDeviceVolume(int mmfVolume); virtual int openFile(RFile &file); virtual int openUrl(const QString &url); + virtual int openDescriptor(const TDesC8 &des); virtual int bufferStatus() const; virtual void close(); diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp index f49e898..7c8b9bd 100644 --- a/src/3rdparty/phonon/mmf/audioplayer.cpp +++ b/src/3rdparty/phonon/mmf/audioplayer.cpp @@ -137,6 +137,12 @@ int MMF::AudioPlayer::openUrl(const QString& /*url*/) return 0; } +int MMF::AudioPlayer::openDescriptor(const TDesC8 &des) +{ + TRAPD(err, m_player->OpenDesL(des)); + return err; +} + int MMF::AudioPlayer::bufferStatus() const { int result = 0; diff --git a/src/3rdparty/phonon/mmf/audioplayer.h b/src/3rdparty/phonon/mmf/audioplayer.h index 0eb8bb7..e43cadd 100644 --- a/src/3rdparty/phonon/mmf/audioplayer.h +++ b/src/3rdparty/phonon/mmf/audioplayer.h @@ -67,6 +67,7 @@ typedef CMdaAudioPlayerUtility NativePlayer; virtual int setDeviceVolume(int mmfVolume); virtual int openFile(RFile& file); virtual int openUrl(const QString& url); + virtual int openDescriptor(const TDesC8 &des); virtual int bufferStatus() const; virtual void close(); diff --git a/src/3rdparty/phonon/mmf/dummyplayer.cpp b/src/3rdparty/phonon/mmf/dummyplayer.cpp index d39ef76..ba75b02 100644 --- a/src/3rdparty/phonon/mmf/dummyplayer.cpp +++ b/src/3rdparty/phonon/mmf/dummyplayer.cpp @@ -92,7 +92,7 @@ qint64 MMF::DummyPlayer::totalTime() const return 0; } -void MMF::DummyPlayer::open(const Phonon::MediaSource &, RFile &) +void MMF::DummyPlayer::open() { } diff --git a/src/3rdparty/phonon/mmf/dummyplayer.h b/src/3rdparty/phonon/mmf/dummyplayer.h index 9d45696..5b00411 100644 --- a/src/3rdparty/phonon/mmf/dummyplayer.h +++ b/src/3rdparty/phonon/mmf/dummyplayer.h @@ -57,7 +57,7 @@ public: virtual qint64 totalTime() const; // AbstractPlayer - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); virtual void close(); virtual void doSetTickInterval(qint32 interval); }; diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index d264377..e16bdf3 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -34,6 +34,7 @@ along with this library. If not, see . #include "mediaobject.h" #include +#include #include QT_BEGIN_NAMESPACE @@ -52,6 +53,8 @@ using namespace Phonon::MMF; MMF::MediaObject::MediaObject(QObject *parent) : MMF::MediaNode::MediaNode(parent) , m_recognizerOpened(false) , m_nextSourceSet(false) + , m_file(0) + , m_resource(0) { m_player.reset(new DummyPlayer()); @@ -68,7 +71,12 @@ MMF::MediaObject::~MediaObject() TRACE_CONTEXT(MediaObject::~MediaObject, EAudioApi); TRACE_ENTRY_0(); - m_file.Close(); + delete m_resource; + + if (m_file) + m_file->Close(); + delete m_file; + m_fileServer.Close(); m_recognizer.Close(); @@ -122,12 +130,13 @@ MMF::MediaType MMF::MediaObject::fileMediaType const QHBufC fileNameSymbian(QDir::toNativeSeparators(fileName)); - m_file.Close(); - TInt err = m_file.Open(m_fileServer, *fileNameSymbian, EFileRead | EFileShareReadersOnly); + Q_ASSERT(!m_file); + m_file = new RFile; + TInt err = m_file->Open(m_fileServer, *fileNameSymbian, EFileRead | EFileShareReadersOnly); if (KErrNone == err) { TDataRecognitionResult recognizerResult; - err = m_recognizer.RecognizeData(m_file, recognizerResult); + err = m_recognizer.RecognizeData(*m_file, recognizerResult); if (KErrNone == err) { const TPtrC mimeType = recognizerResult.iDataType.Des(); result = Utils::mimeTypeToMediaType(mimeType); @@ -142,6 +151,23 @@ MMF::MediaType MMF::MediaObject::fileMediaType return result; } +MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size) +{ + TRACE_CONTEXT(MediaObject::bufferMediaType, EAudioInternal); + MediaType result = MediaTypeUnknown; + if (openRecognizer()) { + TDataRecognitionResult recognizerResult; + const TPtrC8 des(data, size); + const TInt err = m_recognizer.RecognizeData(des, recognizerResult); + if (KErrNone == err) { + const TPtrC mimeType = recognizerResult.iDataType.Des(); + result = Utils::mimeTypeToMediaType(mimeType); + } else { + TRACE("RApaLsSession::RecognizeData error %d", err); + } + } + return result; +} //----------------------------------------------------------------------------- // MediaObjectInterface @@ -228,9 +254,17 @@ void MMF::MediaObject::setSource(const MediaSource &source) void MMF::MediaObject::switchToSource(const MediaSource &source) { + if (m_file) + m_file->Close(); + delete m_file; + m_file = 0; + + delete m_resource; + m_resource = 0; + createPlayer(source); m_source = source; - m_player->open(m_source, m_file); + m_player->open(); emit currentSourceChanged(m_source); } @@ -272,10 +306,25 @@ void MMF::MediaObject::createPlayer(const MediaSource &source) case MediaSource::Invalid: case MediaSource::Disc: - case MediaSource::Stream: errorMessage = tr("Error opening source: type not supported"); break; + case MediaSource::Stream: + { + const QString fileName = source.url().toLocalFile(); + if (fileName.startsWith(QLatin1String(":/")) || fileName.startsWith(QLatin1String("qrc://"))) { + Q_ASSERT(!m_resource); + m_resource = new QResource(fileName); + if (m_resource->isValid()) + mediaType = bufferMediaType(m_resource->data(), m_resource->size()); + else + errorMessage = tr("Error opening source: resource not valid"); + } else { + errorMessage = tr("Error opening source: type not supported"); + } + } + break; + case MediaSource::Empty: TRACE_0("Empty media source"); break; @@ -374,6 +423,16 @@ void MMF::MediaObject::volumeChanged(qreal volume) m_player->volumeChanged(volume); } +RFile* MMF::MediaObject::file() const +{ + return m_file; +} + +QResource* MMF::MediaObject::resource() const +{ + return m_resource; +} + //----------------------------------------------------------------------------- // MediaNode //----------------------------------------------------------------------------- diff --git a/src/3rdparty/phonon/mmf/mediaobject.h b/src/3rdparty/phonon/mmf/mediaobject.h index f15eb21..5399e27 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.h +++ b/src/3rdparty/phonon/mmf/mediaobject.h @@ -33,6 +33,8 @@ along with this library. If not, see . QT_BEGIN_NAMESPACE +class QResource; + namespace Phonon { namespace MMF @@ -87,6 +89,9 @@ public: void setVideoOutput(AbstractVideoOutput* videoOutput); + RFile* file() const; + QResource* resource() const; + public Q_SLOTS: void volumeChanged(qreal volume); void switchToNextSource(); @@ -117,6 +122,7 @@ private: // Audio / video media type recognition MediaType fileMediaType(const QString& fileName); + MediaType bufferMediaType(const uchar *data, qint64 size); // TODO: urlMediaType function static qint64 toMilliSeconds(const TTimeIntervalMicroSeconds &); @@ -132,9 +138,8 @@ private: MediaSource m_nextSource; bool m_nextSourceSet; - // Storing the file handle here to work around KErrInUse error - // from MMF player utility OpenFileL functions - RFile m_file; + RFile* m_file; + QResource* m_resource; QScopedPointer m_player; diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index be22dc3..925ff32 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -58,6 +58,11 @@ MediaSource::MediaSource(const QString &filename) d->type = Stream; d->ioDevice = new QFile(filename); d->setStream(new IODeviceStream(d->ioDevice, d->ioDevice)); +#ifdef Q_OS_SYMBIAN + // On Symbian, we need to access the resource buffer directly, rather than + // via QFile indirection + d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); +#endif #else d->type = Invalid; #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM -- cgit v0.12 From 2e0a41f304e7505602699c9623a96b6174165150 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 28 Jul 2010 17:12:10 +0100 Subject: Updated tst_mediaobject resource playback test cases * Removed Q_SKIP on Symbian * Divided test into two, to exercise the two possible ways of providing the resource path to Phonon::MediaSource Task-number: QTBUG-6562 --- tests/auto/mediaobject/tst_mediaobject.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 994057b..99a16db 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -124,7 +124,8 @@ class tst_MediaObject : public QObject void init(); void cleanup(); - void testPlayFromResource(); + void testPlayFromResourceDirect(); + void testPlayFromResourceFile(); void testPlayIllegalFile(); void initTestCase(); void checkForDefaults(); @@ -199,11 +200,22 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat QWARN(QByteArray(QByteArray(QTest::toString(oldstate)) + " to " + QByteArray(QTest::toString(newstate)))); } -void tst_MediaObject::testPlayFromResource() +void tst_MediaObject::testPlayFromResourceDirect() +{ + MediaObject media; + media.setCurrentSource(Phonon::MediaSource(MEDIA_FILEPATH)); + QVERIFY(media.state() != Phonon::ErrorState); + if (media.state() != Phonon::StoppedState) + QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); + QCOMPARE(media.state(), Phonon::StoppedState); + media.play(); + if (media.state() != Phonon::PlayingState) + QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); + QCOMPARE(media.state(), Phonon::PlayingState); +} + +void tst_MediaObject::testPlayFromResourceFile() { -#ifdef Q_OS_SYMBIAN - QSKIP("Not implemented yet.", SkipAll); -#else QFile file(MEDIA_FILEPATH); MediaObject media; media.setCurrentSource(&file); @@ -215,7 +227,6 @@ void tst_MediaObject::testPlayFromResource() if (media.state() != Phonon::PlayingState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); QCOMPARE(media.state(), Phonon::PlayingState); -#endif } void tst_MediaObject::testPlayIllegalFile() -- cgit v0.12 From 7b70dd1d7f5f6819b1aa28647826e2137504de54 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Wed, 28 Jul 2010 14:05:52 +0100 Subject: Added support to Phonon MMF backend for playback of Qt resource files The backend accesses the resource file path via MediaSource::url(). A small patch to Phonon was required to enable this, because by default, Phonon passes a QIODevice, rather than the resource file path, to the backend. The backend uses this path to create a QResource object, through which the memory buffer into which the resource file has been read can be accessed. This buffer is wrapped in a Symbian 8-bit descriptor and passed to the OpenDesL() function of the appropriate MMF client utility API. Playback only works for certain file formats, as the Symbian MIME type recognizer does not always work. For example, playback of an audio WAV resource file works, while playback of an MP3 resource file does not. Task-number: QTBUG-6562 Reviewed-by: Justin McPherson --- src/3rdparty/phonon/mmf/abstractmediaplayer.cpp | 4 ++-- src/3rdparty/phonon/mmf/mediaobject.cpp | 10 +++++++--- src/3rdparty/phonon/phonon/mediasource.cpp | 4 ---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp index bca0891..3702560 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp @@ -258,13 +258,13 @@ void MMF::AbstractMediaPlayer::open() case MediaSource::Stream: { QResource *const resource = m_parent->resource(); - if (resource && resource->isValid()) { + if (resource) { m_buffer.Set(resource->data(), resource->size()); symbianErr = openDescriptor(m_buffer); if (KErrNone != symbianErr) errorMessage = tr("Error opening resource"); } else { - errorMessage = tr("Error opening source: resource not valid"); + errorMessage = tr("Error opening source: resource not opened"); } break; } diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index e16bdf3..b476535 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -315,10 +315,14 @@ void MMF::MediaObject::createPlayer(const MediaSource &source) if (fileName.startsWith(QLatin1String(":/")) || fileName.startsWith(QLatin1String("qrc://"))) { Q_ASSERT(!m_resource); m_resource = new QResource(fileName); - if (m_resource->isValid()) - mediaType = bufferMediaType(m_resource->data(), m_resource->size()); - else + if (m_resource->isValid()) { + if (m_resource->isCompressed()) + errorMessage = tr("Error opening source: resource is compressed"); + else + mediaType = bufferMediaType(m_resource->data(), m_resource->size()); + } else { errorMessage = tr("Error opening source: resource not valid"); + } } else { errorMessage = tr("Error opening source: type not supported"); } diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index 925ff32..8bde565 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -58,11 +58,7 @@ MediaSource::MediaSource(const QString &filename) d->type = Stream; d->ioDevice = new QFile(filename); d->setStream(new IODeviceStream(d->ioDevice, d->ioDevice)); -#ifdef Q_OS_SYMBIAN - // On Symbian, we need to access the resource buffer directly, rather than - // via QFile indirection d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); -#endif #else d->type = Invalid; #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM -- cgit v0.12 From 7f4e72f438362da7b862ea682f36ec959070e1cb Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 2 Aug 2010 10:09:49 +0100 Subject: Enabled tst_mediaobject::testPlayFromResource on Symbian Task-number: QTBUG-6562 Reviewed-by: Justin McPherson --- tests/auto/mediaobject/tst_mediaobject.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 99a16db..613a086 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -124,8 +124,7 @@ class tst_MediaObject : public QObject void init(); void cleanup(); - void testPlayFromResourceDirect(); - void testPlayFromResourceFile(); + void testPlayFromResource(); void testPlayIllegalFile(); void initTestCase(); void checkForDefaults(); @@ -200,7 +199,7 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat QWARN(QByteArray(QByteArray(QTest::toString(oldstate)) + " to " + QByteArray(QTest::toString(newstate)))); } -void tst_MediaObject::testPlayFromResourceDirect() +void tst_MediaObject::testPlayFromResource() { MediaObject media; media.setCurrentSource(Phonon::MediaSource(MEDIA_FILEPATH)); @@ -214,21 +213,6 @@ void tst_MediaObject::testPlayFromResourceDirect() QCOMPARE(media.state(), Phonon::PlayingState); } -void tst_MediaObject::testPlayFromResourceFile() -{ - QFile file(MEDIA_FILEPATH); - MediaObject media; - media.setCurrentSource(&file); - QVERIFY(media.state() != Phonon::ErrorState); - if (media.state() != Phonon::StoppedState) - QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); - QCOMPARE(media.state(), Phonon::StoppedState); - media.play(); - if (media.state() != Phonon::PlayingState) - QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); - QCOMPARE(media.state(), Phonon::PlayingState); -} - void tst_MediaObject::testPlayIllegalFile() { QString filename = QDir::tempPath() + QString("/test.wav"); -- cgit v0.12 From 1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Mon, 2 Aug 2010 12:10:14 +0100 Subject: Fixed build break on Symbian versions earlier than S^3 The following overload was added in S^3: TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const In order to allow the backend to compile against earlier versions of the platform, this patch calls the RecognizeData overload which taking the same arguments as above, plus a filename (for which KNullDesC is passed). Task-number: QTBUG-6562 Reviewed-by: trustme --- src/3rdparty/phonon/mmf/mediaobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index b476535..98326b8 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -158,7 +158,7 @@ MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size) if (openRecognizer()) { TDataRecognitionResult recognizerResult; const TPtrC8 des(data, size); - const TInt err = m_recognizer.RecognizeData(des, recognizerResult); + const TInt err = m_recognizer.RecognizeData(KNullDesC, des, recognizerResult); if (KErrNone == err) { const TPtrC mimeType = recognizerResult.iDataType.Des(); result = Utils::mimeTypeToMediaType(mimeType); -- cgit v0.12 From 88917087b64a014a69d12946a162ab6588e733e6 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 3 Aug 2010 10:52:26 +1000 Subject: setUniformValue(QSize) was setting (w,w) not (w,h) Task-number: QTBUG-12591 Reviewed-by: Daniel Pope --- src/opengl/qglshaderprogram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index bbfc2d5..edbb635 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -1971,7 +1971,7 @@ void QGLShaderProgram::setUniformValue(int location, const QSize& size) Q_D(QGLShaderProgram); Q_UNUSED(d); if (location != -1) { - GLfloat values[4] = {size.width(), size.width()}; + GLfloat values[4] = {size.width(), size.height()}; glUniform2fv(location, 1, values); } } -- cgit v0.12 From bf5c25c4e7571475255e1d9de307913bee228d10 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 3 Aug 2010 11:23:37 +1000 Subject: Don't resolve GLSL extensions if no shaders If the GL server is 1.x, but the client is 2.x, then the qt_resolve_glsl_extensions() function was returning true because the functions existed client-side, when it should have returned false because the functionality didn't exist server-side. Task-number: QTBUG-12478 Reviewed-by: Sarah Smith --- src/opengl/qglextensions.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index c091191..433ccae 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -233,6 +233,10 @@ bool qt_resolve_glsl_extensions(QGLContext *ctx) if (glCreateShader) return true; + // Must at least have the FragmentShader extension to continue. + if (!(QGLExtensions::glExtensions() & QGLExtensions::FragmentShader)) + return false; + glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShader")); if (glCreateShader) { glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource")); -- cgit v0.12 From 3246586d5a98465c38c21f191e9714e821788958 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 3 Aug 2010 10:17:33 +0100 Subject: Fixed test regression on Mac Mac Phonon backend does not support opening a resource file via the MediaSource(const QString &) overload. The MediaSource(QIODevice *) overload must be used. The Symbian backend, on the other hand, requires the former overload to be used. Task-number: QTBUG-6562 Reviewed-by: trustme --- tests/auto/mediaobject/tst_mediaobject.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 613a086..6367392 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -202,7 +202,12 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat void tst_MediaObject::testPlayFromResource() { MediaObject media; +#ifdef Q_OS_SYMBIAN media.setCurrentSource(Phonon::MediaSource(MEDIA_FILEPATH)); +#else + QFile file(MEDIA_FILEPATH); + media.setCurrentSource(&file); +#endif QVERIFY(media.state() != Phonon::ErrorState); if (media.state() != Phonon::StoppedState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); -- cgit v0.12 From c7b9ee03339774bd1cae7793d91dad7809be987a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 3 Aug 2010 19:41:55 +0200 Subject: Add QDir::homePath() for the log file in QTestFileLogger in testlib on Symbian, both hardware and emulator. Task-number: QTBUG-12622 Reviewed-by: Shane Kearns --- src/testlib/qtestfilelogger.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp index a5cdc80..9d1ee6a 100644 --- a/src/testlib/qtestfilelogger.cpp +++ b/src/testlib/qtestfilelogger.cpp @@ -44,6 +44,8 @@ #include "QtTest/private/qtestlog_p.h" #include "QtTest/private/qtestresult_p.h" +#include + #include #include @@ -69,11 +71,19 @@ QTestFileLogger::~QTestFileLogger() void QTestFileLogger::init() { char filename[100]; + int index = 0; +#if defined(Q_OS_SYMBIAN) + QByteArray ba(QDir::toNativeSeparators(QString(QDir::homePath()+QDir::separator())).toUtf8()); + index = ba.length(); + QTest::qt_snprintf(filename, sizeof(filename), "%s%s.log", + ba.constData(), QTestResult::currentTestObjectName()); +#else QTest::qt_snprintf(filename, sizeof(filename), "%s.log", QTestResult::currentTestObjectName()); - - // Keep filenames simple - for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) { +#endif + + // Keep filenames simple + for (uint i = index; i < sizeof(filename) && filename[i]; ++i) { char& c = filename[i]; if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) { -- cgit v0.12 From 262bdce40f7bb38f000eff09ed546a08cfe74fa3 Mon Sep 17 00:00:00 2001 From: Justin McPherson Date: Wed, 4 Aug 2010 11:40:33 +1000 Subject: Phonon; Update CMakeLists.txt --- src/3rdparty/phonon/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/phonon/CMakeLists.txt b/src/3rdparty/phonon/CMakeLists.txt index e2054d3..fd6368c 100644 --- a/src/3rdparty/phonon/CMakeLists.txt +++ b/src/3rdparty/phonon/CMakeLists.txt @@ -94,7 +94,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: -- cgit v0.12 From 3378fe13f8d865463c79f34017a1d82e03cdf147 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 4 Aug 2010 16:32:00 +0200 Subject: Doc: Fixed typo in a shortcut string. Reviewed-by: Trust Me Task-number: QTBUG-12355 --- examples/phonon/qmusicplayer/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/phonon/qmusicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp index 4778138..0e8e780 100644 --- a/examples/phonon/qmusicplayer/mainwindow.cpp +++ b/examples/phonon/qmusicplayer/mainwindow.cpp @@ -248,7 +248,7 @@ void MainWindow::aboutToFinish() void MainWindow::setupActions() { playAction = new QAction(style()->standardIcon(QStyle::SP_MediaPlay), tr("Play"), this); - playAction->setShortcut(tr("Crl+P")); + playAction->setShortcut(tr("Ctrl+P")); playAction->setDisabled(true); pauseAction = new QAction(style()->standardIcon(QStyle::SP_MediaPause), tr("Pause"), this); pauseAction->setShortcut(tr("Ctrl+A")); -- cgit v0.12 From 22e95ba2502f893d741b774c37fc8c7bdc4b05c5 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 4 Aug 2010 17:16:33 +0200 Subject: Improving text coordinate rounding in the OpenVG paint engine Commit b0bbabe728fedb8531fc2837403856bd5ed44e1b fixed text blurriness in the OpenVG paint engine by forcing the coordinates of the text items to integer coordinates (for unrotated, unscaled text). That was not yet enough. In addition to the coordinates, also the d->pathTransform in QVGPaintEngine can have a non-integer translation. This patch makes sure that the text item coordinate combined with the translation result in final integer coordinates. Since it is not possible to set an absolute translation of a QTransform (only relative is possible), first dx() is added to p.x(), then after rounding, it is again substracted. Sam for y, but with opposite prefix, since the y-axis in Qt and in transformation matrices are in opposite directions. The ceil stunt (which I cerated by trial and error) was replaced by floor(x + aliasedCoordinateDelta), which *exactly* what other paint engines do. Task-number: QTBUG-12330 Reviewed-by: Jason Barron --- src/openvg/qpaintengine_vg.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index e368c32..318e2b1 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -76,6 +76,9 @@ QT_BEGIN_NAMESPACE #if !defined(QVG_NO_DRAW_GLYPHS) +// use the same rounding as in qrasterizer.cpp (6 bit fixed point) +static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; + Q_DECL_IMPORT extern int qt_defaultDpiX(); Q_DECL_IMPORT extern int qt_defaultDpiY(); @@ -3439,9 +3442,10 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) // Set the transformation to use for drawing the current glyphs. QTransform glyphTransform(d->pathTransform); if (d->transform.type() <= QTransform::TxTranslate) { - // Prevent blurriness of unscaled, unrotated text by using integer coordinates. - // Using ceil(x-0.5) instead of qRound() or int-cast, behave like other paint engines. - glyphTransform.translate(ceil(p.x() - 0.5), ceil(p.y() - 0.5)); + // Prevent blurriness of unscaled, unrotated text by forcing integer coordinates. + glyphTransform.translate( + floor(p.x() + glyphTransform.dx() + aliasedCoordinateDelta) - glyphTransform.dx(), + floor(p.y() - glyphTransform.dy() + aliasedCoordinateDelta) + glyphTransform.dy()); } else { glyphTransform.translate(p.x(), p.y()); } -- cgit v0.12 From 9423ef31eb40e2bd0209621de1d1caf796ec7501 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Aug 2010 11:24:10 +0200 Subject: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bbff6182e525fcf58dbc7426a1fbbf8f31588214 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-08-05 David Leong Reviewed by Simon Hausmann. [Qt] Input mode states are not reset after entering a password field https://bugs.webkit.org/show_bug.cgi?id=43530 Input mode hints are not reset if clicking on password elements then clicking on
+ diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp index facee59..14f2362 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp @@ -251,30 +251,37 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'tel' field webView->fireMouseClick(QPoint(20, 110)); QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'number' field webView->fireMouseClick(QPoint(20, 160)); QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'email' field webView->fireMouseClick(QPoint(20, 210)); QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'url' field webView->fireMouseClick(QPoint(20, 260)); QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'password' field webView->fireMouseClick(QPoint(20, 60)); QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); // 'text' type webView->fireMouseClick(QPoint(20, 10)); @@ -284,6 +291,18 @@ void tst_QWebView::focusInputTypes() #else QVERIFY(webView->inputMethodHints() == Qt::ImhNone); #endif + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + // 'password' field + webView->fireMouseClick(QPoint(20, 60)); + QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); + + qWarning("clicking on text area"); + // 'text area' field + webView->fireMouseClick(QPoint(20, 320)); + QVERIFY(webView->inputMethodHints() == Qt::ImhNone); + QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled)); delete webView; -- cgit v0.12 From 7f59bc3c7f13058e2b8fca076072e99136dd4648 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 5 Aug 2010 13:00:36 +0300 Subject: Fix run and runonphone targets for projects that have TARGET with path Sis files are always generated in the pro file directory even if TARGET indicates another target directory. Reviewed-by: axis --- mkspecs/features/symbian/run_on_phone.prf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf index 818151a..f77369c 100644 --- a/mkspecs/features/symbian/run_on_phone.prf +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -13,23 +13,25 @@ else:!equals(DEPLOYMENT, default_deployment) { equals(GENERATE_RUN_TARGETS, true) { symbian-abld|symbian-sbsv2 { sis_destdir = + sis_file = $$basename(TARGET).sis } else { sis_destdir = $$DESTDIR + sis_file = $${TARGET}.sis !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/ contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\") } contains(SYMBIAN_PLATFORMS, "WINSCW"):contains(TEMPLATE, "app") { run_target.target = run - run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" $(QT_RUN_OPTIONS) + run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$$basename(TARGET).exe" $(QT_RUN_OPTIONS) QMAKE_EXTRA_TARGETS += run_target } runonphone_target.target = runonphone runonphone_target.depends = sis - runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis" - contains(TEMPLATE, "app"):runonphone_target.commands += "$${TARGET}.exe" $(QT_RUN_OPTIONS) + runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${sis_file}" + contains(TEMPLATE, "app"):runonphone_target.commands += "$$basename(TARGET).exe" $(QT_RUN_OPTIONS) QMAKE_EXTRA_TARGETS += runonphone_target } -- cgit v0.12 From 64ca5d3ac1dc1b1e82c409cf011d97ca8f76f6ed Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 5 Aug 2010 14:55:27 +0300 Subject: Fix some autotest deployments to work in case Qt is already deployed Reviewed-by: Shane Kearns --- tests/auto/qdom/qdom.pro | 4 +++- tests/auto/qsvgrenderer/qsvgrenderer.pro | 4 +++- tests/auto/qtextcodec/test/test.pro | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/qdom/qdom.pro index 5434ada..9040b91 100644 --- a/tests/auto/qdom/qdom.pro +++ b/tests/auto/qdom/qdom.pro @@ -9,7 +9,9 @@ wince*|symbian: { addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } !symbian:DEFINES += SRCDIR=\\\"\\\" } else { diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro index 8cfbcce..0b785e3 100644 --- a/tests/auto/qsvgrenderer/qsvgrenderer.pro +++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro @@ -13,6 +13,8 @@ wince*|symbian { addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qsvg + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qsvg + } } diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro index efa2e85..b85032a 100644 --- a/tests/auto/qtextcodec/test/test.pro +++ b/tests/auto/qtextcodec/test/test.pro @@ -20,7 +20,9 @@ wince*|symbian { addFiles.sources = ../*.txt addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs + } } wince*: { -- cgit v0.12 From bba4b0caa9865ee021a3e477e1bb861c56000f68 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 5 Aug 2010 15:53:44 +0300 Subject: Fix duplicate binary names issues in Symbian autotests In Symbian each binary name must be unique as all binaries are stored in the same directory on the device. Some autotests created helper binaries that had same names on different tests, which caused build and installation issues when building entire autotest project tree. Reviewed-by: Shane Kearns --- tests/auto/qfile/qfile.pro | 2 +- tests/auto/qpluginloader/lib/lib.pro | 2 +- tests/auto/qpluginloader/tst/tst.pro | 2 +- tests/auto/qpluginloader/tst_qpluginloader.cpp | 2 +- tests/auto/qtextcodec/qtextcodec.pro | 2 +- tests/auto/qtextcodec/tst_qtextcodec.cpp | 2 ++ tests/auto/qtextstream/qtextstream.pro | 3 ++- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/auto/qfile/qfile.pro b/tests/auto/qfile/qfile.pro index 0383e30..727f660 100644 --- a/tests/auto/qfile/qfile.pro +++ b/tests/auto/qfile/qfile.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -wince*:{ +wince*|symbian:{ SUBDIRS = test } else { SUBDIRS = test stdinprocess diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/qpluginloader/lib/lib.pro index 96a9732..ce9bf13 100644 --- a/tests/auto/qpluginloader/lib/lib.pro +++ b/tests/auto/qpluginloader/lib/lib.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += dll CONFIG -= staticlib SOURCES = mylib.c -TARGET = mylib +TARGET = tst_qpluginloaderlib DESTDIR = ../bin QT = core diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro index 2de0912..2d757e7 100644 --- a/tests/auto/qpluginloader/tst/tst.pro +++ b/tests/auto/qpluginloader/tst/tst.pro @@ -20,7 +20,7 @@ wince*: { } symbian: { - libDep.sources = mylib.dll + libDep.sources = tst_qpluginloaderlib.dll libDep.path = /sys/bin pluginDep.sources = theplugin.dll pluginDep.path = bin diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index 705e600..e913cb5 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -169,7 +169,7 @@ void tst_QPluginLoader::errorString() QCOMPARE(loader.errorString(), unknown); } { - QPluginLoader loader( sys_qualifiedLibraryName("mylib")); //not a plugin + QPluginLoader loader( sys_qualifiedLibraryName("tst_qpluginloaderlib")); //not a plugin bool loaded = loader.load(); #ifdef SHOW_ERRORS qDebug() << loader.errorString(); diff --git a/tests/auto/qtextcodec/qtextcodec.pro b/tests/auto/qtextcodec/qtextcodec.pro index 0bcf067..6cb13a9 100644 --- a/tests/auto/qtextcodec/qtextcodec.pro +++ b/tests/auto/qtextcodec/qtextcodec.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = test -!wince*:SUBDIRS += echo +!wince*:!symbian:SUBDIRS += echo diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 0946c93..cc41591 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -1946,6 +1946,8 @@ void tst_QTextCodec::toLocal8Bit() { #ifdef QT_NO_PROCESS QSKIP("This test requires QProcess", SkipAll); +#elif defined(Q_OS_SYMBIAN) + QSKIP("This test requires streams support in QProcess", SkipAll); #else QProcess process; process.start("echo/echo"); diff --git a/tests/auto/qtextstream/qtextstream.pro b/tests/auto/qtextstream/qtextstream.pro index 8346d7f..a2dcc81 100644 --- a/tests/auto/qtextstream/qtextstream.pro +++ b/tests/auto/qtextstream/qtextstream.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = test stdinProcess readAllStdinProcess readLineStdinProcess +SUBDIRS = test +!symbian: SUBDIRS += stdinProcess readAllStdinProcess readLineStdinProcess -- cgit v0.12 From f732113f45a918fcb39ed073f82bcf0de5b455b2 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 6 Aug 2010 10:40:16 +0300 Subject: Added $$MW_LAYER_SYSTEMINCLUDE to some autotests These autotests couldn't find e32svr.h in Symbian^3 env because that header has moved. Reviewed-by: TrustMe --- tests/auto/qfileinfo/qfileinfo.pro | 1 + tests/auto/qlocale/test/test.pro | 2 ++ tests/auto/qsslsocket/qsslsocket.pro | 1 + 3 files changed, 4 insertions(+) diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index ef5ed22..30656e2 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -16,6 +16,7 @@ wince*:|symbian: { symbian { TARGET.CAPABILITY=AllFiles LIBS *= -lefsrv + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } # support for running test from shadow build directory diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro index e33d0fe..6512e19 100644 --- a/tests/auto/qlocale/test/test.pro +++ b/tests/auto/qlocale/test/test.pro @@ -37,3 +37,5 @@ symbian:contains(S60_VERSION,3.2) { "$${LITERAL_HASH}endif" MMP_RULES += custom_paged_rule } + +symbian: INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro index 3557fc8..accfa89 100644 --- a/tests/auto/qsslsocket/qsslsocket.pro +++ b/tests/auto/qsslsocket/qsslsocket.pro @@ -29,6 +29,7 @@ wince* { certFiles.sources = certs ssl.tar.gz certFiles.path = . DEPLOYMENT += certFiles + INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE # Needed for e32svr.h in S^3 envs } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -- cgit v0.12 From 339270016bd8805b081f0b4ff550906a6bcfec5b Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Fri, 6 Aug 2010 10:09:16 +0300 Subject: Register window types for Symbian system effects Set the purpose of the window (dialog/popup/child window etc...). Notify WServ when modal window is shown/hidden Notify WServ when temporary surface deallocation happens. Notify WServ when the application is going to shutdown. Task-number: QT-2027 Reviewed-by: Jason Barron --- src/gui/kernel/qapplication.h | 3 ++ src/gui/kernel/qapplication_p.h | 1 + src/gui/kernel/qapplication_s60.cpp | 58 ++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index 799d4c2..0242582 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -412,6 +412,9 @@ private: #if defined(QT_RX71_MULTITOUCH) Q_PRIVATE_SLOT(d_func(), void _q_readRX71MultiTouchEvents()) #endif +#if defined(Q_OS_SYMBIAN) + Q_PRIVATE_SLOT(d_func(), void _q_aboutToQuit()) +#endif }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 53205b5..8dc16e0 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -519,6 +519,7 @@ public: int symbianHandleCommand(const QSymbianEvent *symbianEvent); int symbianResourceChange(const QSymbianEvent *symbianEvent); + void _q_aboutToQuit(); #endif #if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) void sendSyntheticEnterLeave(QWidget *widget); diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 1f6a4ae..52f0db6 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -87,6 +87,10 @@ #include #include +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS +#include +#endif + QT_BEGIN_NAMESPACE // Goom Events through Window Server @@ -372,7 +376,7 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) { if (!desktop) { - if (isWindowOwning or !qwidget->parentWidget()) + if (isWindowOwning || !qwidget->parentWidget()) CreateWindowL(S60->windowGroup()); else /** @@ -395,6 +399,34 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop) DrawableWindow()->SetPointerGrab(ETrue); } + +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + if (OwnsWindow()) { + TTfxWindowPurpose windowPurpose(ETfxPurposeNone); + switch (qwidget->windowType()) { + case Qt::Dialog: + windowPurpose = ETfxPurposeDialogWindow; + break; + case Qt::Popup: + windowPurpose = ETfxPurposePopupWindow; + break; + case Qt::Tool: + windowPurpose = ETfxPurposeToolWindow; + break; + case Qt::ToolTip: + windowPurpose = ETfxPurposeToolTipWindow; + break; + case Qt::SplashScreen: + windowPurpose = ETfxPurposeSplashScreenWindow; + break; + default: + windowPurpose = (isWindowOwning || !qwidget->parentWidget()) + ? ETfxPurposeWindow : ETfxPurposeChildWindow; + break; + } + Window().SetPurpose(windowPurpose); + } +#endif } QSymbianControl::~QSymbianControl() @@ -1483,6 +1515,10 @@ void qt_init(QApplicationPrivate * /* priv */, int) systemFont.setFamily(systemFont.defaultFamily()); QApplicationPrivate::setSystemFont(systemFont); +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + QObject::connect(qApp, SIGNAL(aboutToQuit()), qApp, SLOT(_q_aboutToQuit())); +#endif + /* ### Commented out for now as parameter handling not needed in SOS(yet). Code below will break testlib with -o flag int argc = priv->argc; @@ -1572,6 +1608,9 @@ bool QApplicationPrivate::modalState() void QApplicationPrivate::enterModal_sys(QWidget *widget) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeEnter); +#endif if (widget) { static_cast(widget->effectiveWinId())->FadeBehindPopup(ETrue); // Modal partial screen dialogs (like queries) capture pointer events. @@ -1587,6 +1626,9 @@ void QApplicationPrivate::enterModal_sys(QWidget *widget) void QApplicationPrivate::leaveModal_sys(QWidget *widget) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeExit); +#endif if (widget) { static_cast(widget->effectiveWinId())->FadeBehindPopup(EFalse); // ### FixMe: Add specialized behaviour for fullscreen modal dialogs @@ -1883,6 +1925,9 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent break; QRefCountedWidgetBackingStore &backingStore = window->d_func()->maybeTopData()->backingStore; if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdDeallocateLayer); +#endif // Decrement backing store reference count backingStore.deref(); // In order to ensure that any resources used by the window surface @@ -1893,6 +1938,9 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent // Increment backing store reference count backingStore.ref(); } else { +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + S60->wsSession().SendEffectCommand(ETfxCmdRestoreLayer); +#endif // Create backing store with an initial reference count of 1 backingStore.create(window); backingStore.ref(); @@ -2268,6 +2316,14 @@ void QApplication::restoreOverrideCursor() #endif // QT_NO_CURSOR +void QApplicationPrivate::_q_aboutToQuit() +{ +#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS + // Send the shutdown tfx command + S60->wsSession().SendEffectCommand(ETfxCmdAppShutDown); +#endif +} + QS60ThreadLocalData::QS60ThreadLocalData() { CCoeEnv *env = CCoeEnv::Static(); -- cgit v0.12 From 6b61a2787759673f246493453c0809d24c9d6ae5 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 10:56:44 +0100 Subject: Make input methods work correctly with Symbian^3 FEP in numeric mode Enable alphanumeric modes to use EAknEditorFlagUseSCTNumericCharmap flag so that all symbols are shown when you press the * key when the FEP is in portrait mode (traditional 4x3 mobile phone keypad emulation) Enable text input mode as well as numeric input mode for ImhFormattedNumbersOnly or ImhDialableCharactersOnly, as the '*' key on the virtual keypad does not work to launch the symbols menu otherwise. Task-number: QT-3681 Reviewed-by: Jason Barron --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 999edda..cd05e38 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -359,10 +359,10 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) commitTemporaryPreeditString(); - bool numbersOnly = hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly; - bool noOnlys = !(numbersOnly || hints & ImhUppercaseOnly - || hints & ImhLowercaseOnly); + bool numbersOnly = (hints & ImhDigitsOnly) || (hints & ImhFormattedNumbersOnly) + || (hints & ImhDialableCharactersOnly); + bool noOnlys = !(numbersOnly || (hints & ImhUppercaseOnly) + || (hints & ImhLowercaseOnly)); TInt flags; Qt::InputMethodHints oldHints = hints; @@ -388,8 +388,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) hints |= ImhPreferLowercase; } else if (hints & ImhUppercaseOnly) { hints |= ImhPreferUppercase; - } else if (hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly) { + } else if (numbersOnly) { hints |= ImhPreferNumbers; } } @@ -406,6 +405,11 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (numbersOnly) { flags |= EAknEditorNumericInputMode; } + if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly)) { + //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. + flags |= EAknEditorTextInputMode; + } if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) { flags |= EAknEditorTextInputMode; } @@ -456,6 +460,9 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (hints & ImhNoPredictiveText || hints & ImhHiddenText) { flags |= EAknEditorFlagNoT9; } + // if alphanumeric input, then make all symbols available in numeric mode too. + if (!numbersOnly) + flags |= EAknEditorFlagUseSCTNumericCharmap; m_fepState->SetFlags(flags); ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateFlagsUpdate); -- cgit v0.12 From 0210bbbd7bf8254be5f7f19f524068cd39fc34c2 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Fri, 6 Aug 2010 13:18:24 +0300 Subject: Use ARGB32 premultiplied backing store format in Symbian^3 raster paint engine for translucent windows. Task-number: QTBUG-12710 Reviewed-by: Jason Barron --- src/gui/kernel/qapplication_s60.cpp | 3 ++- src/gui/painting/qwindowsurface_s60.cpp | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 52f0db6..a14b1a7 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1087,7 +1087,8 @@ void QSymbianControl::Draw(const TRect& controlRect) const break; case QWExtra::ZeroFill: - if (Window().DisplayMode() == EColor16MA) { + if (Window().DisplayMode() == EColor16MA + || Window().DisplayMode() == Q_SYMBIAN_ECOLOR16MAP) { gc.SetBrushStyle(CGraphicsContext::ESolidBrush); gc.SetDrawMode(CGraphicsContext::EDrawModeWriteAlpha); gc.SetBrushColor(TRgb::Color16MA(0)); diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp index 477bd93..8bac1f5 100644 --- a/src/gui/painting/qwindowsurface_s60.cpp +++ b/src/gui/painting/qwindowsurface_s60.cpp @@ -67,10 +67,14 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget) TDisplayMode mode = S60->screenDevice()->DisplayMode(); bool isOpaque = qt_widget_private(widget)->isOpaque; - if (mode == EColor16MA && isOpaque) - mode = EColor16MU; // Faster since 16MU -> 16MA is typically accelerated - else if (mode == EColor16MU && !isOpaque) - mode = EColor16MA; // Try for transparency anyway + if (isOpaque) { + mode = EColor16MU; + } else { + if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3) + mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 WServ has support for ARGB32_PRE + else + mode = EColor16MA; // Symbian prior to Symbian^3 sw accelerates EColor16MA + } // We create empty CFbsBitmap here -> it will be resized in setGeometry CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap); // CBase derived object needs check on new -- cgit v0.12 From d2a52ba7d5fa48632d6f0092da8db97188993252 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 11:38:18 +0100 Subject: Test code for input method hints A simple test application to set any combination of input method hints on a QLineEdit widget. This makes it easier to debug when the original report relies on webkit. Task-number: QT-3681 Reviewed-by: Miikka Heikkinen --- tests/manual/inputmethodhints/inputmethodhints.cpp | 99 +++++++++++++++ tests/manual/inputmethodhints/inputmethodhints.h | 63 ++++++++++ tests/manual/inputmethodhints/inputmethodhints.pro | 13 ++ tests/manual/inputmethodhints/inputmethodhints.ui | 138 +++++++++++++++++++++ tests/manual/inputmethodhints/main.cpp | 53 ++++++++ 5 files changed, 366 insertions(+) create mode 100644 tests/manual/inputmethodhints/inputmethodhints.cpp create mode 100644 tests/manual/inputmethodhints/inputmethodhints.h create mode 100644 tests/manual/inputmethodhints/inputmethodhints.pro create mode 100644 tests/manual/inputmethodhints/inputmethodhints.ui create mode 100644 tests/manual/inputmethodhints/main.cpp diff --git a/tests/manual/inputmethodhints/inputmethodhints.cpp b/tests/manual/inputmethodhints/inputmethodhints.cpp new file mode 100644 index 0000000..0c00b8d --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "inputmethodhints.h" + +inputmethodhints::inputmethodhints(QWidget *parent) + : QMainWindow(parent) +{ + ui.setupUi(this); + connect(ui.cbDialableOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbDigitsOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbEmailOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbFormattedNumbersOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbHiddenText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbLowercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbNoAutoUppercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbNoPredictiveText, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferLowercase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferNumbers, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbPreferUpperCase, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbUppercaseOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); + connect(ui.cbUrlOnly, SIGNAL(stateChanged(int)), this, SLOT(checkboxChanged(int))); +} + +inputmethodhints::~inputmethodhints() +{ + +} + +void inputmethodhints::checkboxChanged(int) +{ + int flags = 0; + if (ui.cbDialableOnly->isChecked()) + flags |= Qt::ImhDialableCharactersOnly; + if (ui.cbDigitsOnly->isChecked()) + flags |= Qt::ImhDigitsOnly; + if (ui.cbEmailOnly->isChecked()) + flags |= Qt::ImhEmailCharactersOnly; + if (ui.cbFormattedNumbersOnly->isChecked()) + flags |= Qt::ImhFormattedNumbersOnly; + if (ui.cbHiddenText->isChecked()) + flags |= Qt::ImhHiddenText; + if (ui.cbLowercaseOnly->isChecked()) + flags |= Qt::ImhLowercaseOnly; + if (ui.cbNoAutoUppercase->isChecked()) + flags |= Qt::ImhNoAutoUppercase; + if (ui.cbNoPredictiveText->isChecked()) + flags |= Qt::ImhNoPredictiveText; + if (ui.cbPreferLowercase->isChecked()) + flags |= Qt::ImhPreferLowercase; + if (ui.cbPreferNumbers->isChecked()) + flags |= Qt::ImhPreferNumbers; + if (ui.cbPreferUpperCase->isChecked()) + flags |= Qt::ImhPreferUppercase; + if (ui.cbUppercaseOnly->isChecked()) + flags |= Qt::ImhUppercaseOnly; + if (ui.cbUrlOnly->isChecked()) + flags |= Qt::ImhUrlCharactersOnly; + ui.lineEdit->clear(); + ui.lineEdit->setInputMethodHints(Qt::InputMethodHints(flags)); +} diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h new file mode 100644 index 0000000..988a4be --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.h @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef INPUTMETHODHINTS_H +#define INPUTMETHODHINTS_H + +#include +#include "ui_tst_inputmethodhints.h" + +class inputmethodhints : public QMainWindow +{ + Q_OBJECT + +public: + inputmethodhints(QWidget *parent = 0); + ~inputmethodhints(); + +public slots: + void checkboxChanged(int); + +private: + Ui::MainWindow ui; +}; + +#endif // INPUTMETHODHINTS_H diff --git a/tests/manual/inputmethodhints/inputmethodhints.pro b/tests/manual/inputmethodhints/inputmethodhints.pro new file mode 100644 index 0000000..7298ec6 --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.pro @@ -0,0 +1,13 @@ +TEMPLATE = app +TARGET = tst_inputmethodhints + +QT += core \ + gui + +HEADERS += inputmethodhints.h +SOURCES += main.cpp \ + inputmethodhints.cpp +FORMS += inputmethodhints.ui +RESOURCES += + +symbian:TARGET.UID3 = 0xE4938ABC diff --git a/tests/manual/inputmethodhints/inputmethodhints.ui b/tests/manual/inputmethodhints/inputmethodhints.ui new file mode 100644 index 0000000..d0dc01d --- /dev/null +++ b/tests/manual/inputmethodhints/inputmethodhints.ui @@ -0,0 +1,138 @@ + + + MainWindow + + + + 0 + 0 + 360 + 640 + + + + MainWindow + + + + + + + 1 + + + + behaviour + + + + + + ImhHiddenText + + + + + + + ImhNoAutoUppercase + + + + + + + ImhPreferNumbers + + + + + + + ImhPreferUppercase + + + + + + + ImhPreferLowercase + + + + + + + ImhNoPredictiveText + + + + + + + + restrictions + + + + + + ImhDigitsOnly + + + + + + + ImhFormattedNumbersOnly + + + + + + + ImhUppercaseOnly + + + + + + + ImhLowercaseOnly + + + + + + + ImhDialableCharactersOnly + + + + + + + ImhEmailCharactersOnly + + + + + + + ImhUrlCharactersOnly + + + + + + + + + + + + + + + + diff --git a/tests/manual/inputmethodhints/main.cpp b/tests/manual/inputmethodhints/main.cpp new file mode 100644 index 0000000..022bf3f --- /dev/null +++ b/tests/manual/inputmethodhints/main.cpp @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "inputmethodhints.h" + +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + inputmethodhints w; + w.showMaximized(); + return a.exec(); +} -- cgit v0.12 From e4c144db1cde192745a198160a01fca1416fe855 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 12:00:54 +0100 Subject: fix compile error Task-number: QT-3681 Reviewed-by: Trust Me --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index cd05e38..ae51b1c 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -406,7 +406,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) flags |= EAknEditorNumericInputMode; } if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 - && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly)) { + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. flags |= EAknEditorTextInputMode; } -- cgit v0.12 From 5988d0dfcca6374f7bc06bad3ec9e3a3b8ebc22f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 6 Aug 2010 12:44:12 +0300 Subject: Rename Symbian generated mmp/mk files to include target in filename Mmp and mk files previously contained UID3 as unique identifier in the filename. However, this was not particularly useful for building subprojects in massive project trees such as Qt, as it was difficult to remember UID for each subproject. Now with intuitive naming of mmps, it is possible to build a subproject like this: sbs -c armv6_urel -p qtcore_dll.mmp Task-number: QTBUG-12715 Reviewed-by: Jason Barron --- qmake/generators/symbian/symmake.cpp | 33 +++++++++++++------------------ qmake/generators/symbian/symmake.h | 2 ++ qmake/generators/symbian/symmake_abld.cpp | 9 ++------- qmake/generators/symbian/symmake_abld.h | 2 +- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index ff58270..cf6bd13 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -241,13 +241,8 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) writeMkFile(wrapperFileName, false); - QString shortProFilename = project->projectFile(); - shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString("")); - shortProFilename.replace(Option::pro_ext, QString("")); - - QString mmpFilename = Option::output_dir + QLatin1Char('/') + shortProFilename + QLatin1Char('_') - + uid3 + Option::mmp_ext; - writeMmpFile(mmpFilename, symbianLangCodes); + QString absoluteMmpFileName = Option::output_dir + QLatin1Char('/') + mmpFileName; + writeMmpFile(absoluteMmpFileName, symbianLangCodes); if (targetType == TypeExe) { if (!project->isActiveConfig("no_icon")) { @@ -281,6 +276,15 @@ void SymbianMakefileGenerator::init() project->values("MAKEFILE") += BLD_INF_FILENAME; // .mmp + mmpFileName = fixedTarget; + if (targetType == TypeExe) + mmpFileName.append("_exe"); + else if (targetType == TypeDll || targetType == TypePlugin) + mmpFileName.append("_dll"); + else if (targetType == TypeLib) + mmpFileName.append("_lib"); + mmpFileName.append(Option::mmp_ext); + initMmpVariables(); uid2 = project->first("TARGET.UID2"); @@ -480,7 +484,7 @@ void SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t) t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl; t << "// This file is generated by qmake and should not be modified by the" << endl; t << "// user." << endl; - t << "// Name : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length() - 4, 4))) << Option::mmp_ext << endl; + t << "// Name : " << mmpFileName << endl; t << "// ==============================================================================" << endl << endl; } @@ -890,8 +894,6 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy // Add includes of subdirs bld.inf files - QString mmpfilename = escapeFilePath(fileFixify(project->projectFile())); - mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf("."), 4, Option::mmp_ext); QString currentPath = qmake_getpwd(); QDir directory(currentPath); @@ -973,15 +975,8 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy t << endl << mmpTag << endl << endl; writeBldInfMkFilePart(t, addDeploymentExtension); - if (targetType != TypeSubdirs) { - QString shortProFilename = project->projectFile(); - shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString("")); - shortProFilename.replace(Option::pro_ext, QString("")); - - QString mmpFilename = shortProFilename + QString("_") + uid3 + Option::mmp_ext; - - t << mmpFilename << endl; - } + if (targetType != TypeSubdirs) + t << mmpFileName << endl; userItems = userBldInfRules.value(mmpTag); foreach(QString item, userItems) diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h index 9853790..a1a8e88 100644 --- a/qmake/generators/symbian/symmake.h +++ b/qmake/generators/symbian/symmake.h @@ -59,6 +59,7 @@ class SymbianMakefileGenerator : public MakefileGenerator, public SymbianCommonG protected: QString platform; QString uid2; + QString mmpFileName; QMap sources; QMap systeminclude; QMap library; @@ -78,6 +79,7 @@ protected: QString generateUID3(); void initMmpVariables(); + void generateMmpFileName(); void handleMmpRulesOverrides(QString &checkString, bool &inResourceBlock, QStringList &restrictedMmpKeywords, diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index d60528b..c896ac6 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -70,10 +70,6 @@ SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { } void SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); - QFile ft(gnuMakefileName); if (ft.open(QIODevice::WriteOnly)) { generatedFiles << ft.fileName(); @@ -471,9 +467,8 @@ void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool ad // Normally emulator deployment gets done via regular makefile, but since subdirs // do not get that, special deployment only makefile is generated for them if needed. if (targetType != TypeSubdirs || addDeploymentExtension) { - QString gnuMakefileName = QLatin1String("Makefile_") + uid3; - removeEpocSpecialCharacters(gnuMakefileName); - gnuMakefileName.append(".mk"); + gnuMakefileName = QLatin1String("Makefile_") + fileInfo(mmpFileName).completeBaseName() + + QLatin1String(".mk"); t << "gnumakefile " << gnuMakefileName << endl; } } diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h index f998b28..214e0c5 100644 --- a/qmake/generators/symbian/symmake_abld.h +++ b/qmake/generators/symbian/symmake_abld.h @@ -58,7 +58,7 @@ protected: virtual void appendAbldTempDirs(QStringList& sysincspaths, QString includepath); bool writeDeploymentTargets(QTextStream &t, bool isRom); - + QString gnuMakefileName; public: SymbianAbldMakefileGenerator(); -- cgit v0.12 From 6eb7a210eed1b392431fc913d13d205b8ccc1933 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 6 Aug 2010 16:25:15 +0100 Subject: Fixes for combining multiple Qt::ImhXXXOnly with S60 FEP When one restriction is a superset of another (e.g. ImhDigitsOnly | ImhDialableCharactersOnly), the less restrictive one is used When two restrictions are incompatible (e.g. ImhDialableCharactersOnly | ImhFormattedNumbersOnly), fall back to allowing all symbols Note for some combinations additional characters not in the union can be entered, this is a limitation of the API to AVKON FEP. Before this change, some characters in the union could not be entered at all, which is worse. Tested on I8510 (3.2), 5800XM (5.0), N8(symbian^3) Task Number: QTBUG-12726 Reviewed-by: Alessandro Portale --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 52 ++++++++++++++----------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index ae51b1c..44fe7da 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -359,10 +359,10 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) commitTemporaryPreeditString(); - bool numbersOnly = (hints & ImhDigitsOnly) || (hints & ImhFormattedNumbersOnly) - || (hints & ImhDialableCharactersOnly); - bool noOnlys = !(numbersOnly || (hints & ImhUppercaseOnly) - || (hints & ImhLowercaseOnly)); + const bool anynumbermodes = hints & (ImhDigitsOnly | ImhFormattedNumbersOnly | ImhDialableCharactersOnly); + const bool anytextmodes = hints & (ImhUppercaseOnly | ImhLowercaseOnly | ImhEmailCharactersOnly | ImhUrlCharactersOnly); + const bool numbersOnly = anynumbermodes && !anytextmodes; + const bool noOnlys = !(hints & ImhExclusiveInputMask); TInt flags; Qt::InputMethodHints oldHints = hints; @@ -374,8 +374,7 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) } if (!noOnlys) { // Make sure that the preference is within the permitted set. - if (hints & ImhPreferNumbers && !(hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly - || hints & ImhDialableCharactersOnly)) { + if (hints & ImhPreferNumbers && !anynumbermodes) { hints &= ~ImhPreferNumbers; } else if (hints & ImhPreferUppercase && !(hints & ImhUppercaseOnly)) { hints &= ~ImhPreferUppercase; @@ -402,18 +401,21 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) m_fepState->SetCurrentInputMode(EAknEditorTextInputMode); } flags = 0; - if (numbersOnly) { - flags |= EAknEditorNumericInputMode; + if (noOnlys || (anynumbermodes && anytextmodes)) { + flags = EAknEditorAllInputModes; } - if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 - && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { - //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. - flags |= EAknEditorTextInputMode; + else if (anynumbermodes) { + flags |= EAknEditorNumericInputMode; + if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 + && ((hints & ImhFormattedNumbersOnly) || (hints & ImhDialableCharactersOnly))) { + //workaround - the * key does not launch the symbols menu, making it impossible to use these modes unless text mode is enabled. + flags |= EAknEditorTextInputMode; + } } - if (hints & ImhUppercaseOnly || hints & ImhLowercaseOnly) { + else if (anytextmodes) { flags |= EAknEditorTextInputMode; } - if (flags == 0) { + else { flags = EAknEditorAllInputModes; } m_fepState->SetPermittedInputModes(flags); @@ -460,27 +462,33 @@ void QCoeFepInputContext::applyHints(Qt::InputMethodHints hints) if (hints & ImhNoPredictiveText || hints & ImhHiddenText) { flags |= EAknEditorFlagNoT9; } - // if alphanumeric input, then make all symbols available in numeric mode too. - if (!numbersOnly) + // if alphanumeric input, or if multiple incompatible number modes are selected; + // then make all symbols available in numeric mode too. + if (!numbersOnly || ((hints & ImhFormattedNumbersOnly) && (hints & ImhDialableCharactersOnly))) flags |= EAknEditorFlagUseSCTNumericCharmap; m_fepState->SetFlags(flags); ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateFlagsUpdate); - if (hints & ImhFormattedNumbersOnly) { + if (hints & ImhDialableCharactersOnly) { + // This is first, because if (ImhDialableCharactersOnly | ImhFormattedNumbersOnly) + // is specified, this one is more natural (# key enters a #) + flags = EAknEditorStandardNumberModeKeymap; + } else if (hints & ImhFormattedNumbersOnly) { + // # key enters decimal point flags = EAknEditorCalculatorNumberModeKeymap; } else if (hints & ImhDigitsOnly) { + // This is last, because it is most restrictive (# key is inactive) flags = EAknEditorPlainNumberModeKeymap; } else { - // ImhDialableCharactersOnly is the fallback as well, so we don't need to check for - // that flag. flags = EAknEditorStandardNumberModeKeymap; } m_fepState->SetNumericKeymap(static_cast(flags)); - if (hints & ImhEmailCharactersOnly) { - m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG); - } else if (hints & ImhUrlCharactersOnly) { + if (hints & ImhUrlCharactersOnly) { + // URL characters is everything except space, so a superset of the other restrictions m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG); + } else if (hints & ImhEmailCharactersOnly) { + m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_EMAIL_ADDR_SPECIAL_CHARACTER_TABLE_DIALOG); } else { m_fepState->SetSpecialCharacterTableResourceId(R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG); } -- cgit v0.12 From 44d5bcde1713a5f51b7140259e9fd4e426a868a8 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 9 Aug 2010 16:11:30 +1000 Subject: PathView required some diagonal movement before a drag was initiated. Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell --- src/declarative/graphicsitems/qdeclarativepathview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 06ac275..5771f84 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1061,7 +1061,7 @@ void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (!d->stealMouse) { QPointF delta = event->pos() - d->startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance()) + if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) d->stealMouse = true; } -- cgit v0.12 From 8c4de17eb643af324a13b16d20c301772183022b Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:23 +1000 Subject: Explain Flipable example further --- src/declarative/graphicsitems/qdeclarativeflipable.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 8c9d2dd..b266273 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -83,10 +83,16 @@ public: \image flipable.gif - The \l Rotation element is used to specify the angle and axis of the flip, - and the \l State defines the changes in angle which produce the flipping - effect. Finally, the \l Transition creates the animation that changes the - angle over one second. + The \l Rotation element is used to specify the angle and axis of the flip. + When \c flipped is \c true, the item changes to the "back" state, where + the angle is changed to 180 degrees to produce the flipping effect. + Finally, the \l Transition creates the animation that changes the + angle over one second: when the item changes between its "back" and + default states, the NumberAnimation animates the angle between + its old and new values. + + See the \l {QML States} and \l {QML Animation} documentation for more + details on state changes and how animations work within transitions. \sa {declarative/ui-components/flipable}{Flipable example} */ -- cgit v0.12 From 983882f68a8f7463aa4adf6d379fd4ef5dd4f915 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:43 +1000 Subject: Merge sections about when property and default state --- doc/src/declarative/qdeclarativestates.qdoc | 95 ++++++++++++++++++----------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc index 0b91756..274040a 100644 --- a/doc/src/declarative/qdeclarativestates.qdoc +++ b/doc/src/declarative/qdeclarativestates.qdoc @@ -84,18 +84,34 @@ Rectangle. \snippet doc/src/snippets/declarative/states.qml 0 -A \l State item defines all the changes to be made in the new state. You +The \l State item defines all the changes to be made in the new state. It could specify additional properties to be changed, or create additional -PropertyChanges for other objects. (Note that a \l State can modify the -properties of other objects, not just the object that owns the state.) +PropertyChanges for other objects. It can also modify the properties of other +objects, not just the object that owns the state. For example: -For example: +\qml +Rectangle { + ... + states: [ + State { + name: "moved" + PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } + PropertyChanges { target: someOtherItem; width: 1000 } + } + ] +} +\endqml + +As a convenience, if an item only has one state, its \l {Item::}{states} +property can be defined as a single \l State, without the square-brace list +syntax: \qml -State { - name: "moved" - PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } - PropertyChanges { target: someOtherItem; width: 1000 } +Item { + ... + states: State { + ... + } } \endqml @@ -118,54 +134,61 @@ transitions between them. Of course, the \l Rectangle in the example above could have simply been moved by setting its position to (50, 50) in the mouse area's \c onClicked handler. -However, aside from enabling batched property changes, the use of states allows -an item to revert to its \e {default state}, which contains all of the items' -initial property values before they were modified in a state change. +However, aside from enabling batched property changes, one of the features of +QML states is the ability of an item to revert to its \e {default state}. +The default state contains all of an item's initial property values before +they were modified in a state change. -The default state is specified by an empty string. If the MouseArea in the -above example was changed to this: +For example, suppose the \l Rectangle should move to (50,50) when the mouse is +pressed, and then move back to its original position when the mouse is +released. This can be achieved by using the \l {State::}{when} property, +like this: -\qml -MouseArea { - anchors.fill: parent - onClicked: myRect.state == 'moved' ? myRect.state = "" : myRect.state = 'moved'; -} -\endqml - -This would toggle the \l Rectangle's state between the \e moved and \e default -states when clicked. The properties can be reverted to their initial -values without requiring the definition of another \l State that defines these -value changes. +\qml +Rectangle { + ... + MouseArea { + id: mouseArea + anchors.fill: parent + } + states: State { + name: "moved"; when: mouseArea.pressed + ... + } +} +\endqml -\section1 The "when" property +The \l {State::}{when} property is set to an expression that evaluates to +\c true when the item should be set to that state. When the mouse is pressed, +the state is changed to \e moved. When it is released, the item reverts to its +\e default state, which defines all of the item's original property values. -The \l {State::}{when} property is useful for specifying when a state should be -applied. This can be set to an expression that evaluates to \c true when an -item should change to a particular state. +Alternatively, an item can be explicitly set to its default state by setting its +\l {Item::}{state} property to an empty string (""). For example, instead of +using the \l {State::}{when} property, the above code could be changed to: -If the above example was changed to this: - \qml Rectangle { ... MouseArea { - id: mouseArea anchors.fill: parent + onPressed: myRect.state = 'moved'; + onReleased: myRect.state = ''; } states: State { - name: "moved"; when: mouseArea.pressed + name: "moved" ... } +} \endqml -The \l Rectangle would automatically change to the \e moved state when the -mouse is pressed, and revert to the default state when it is released. This is -simpler (and a better, more declarative method) than creating \c onPressed -and \c onReleased handlers in the MouseArea to set the current state. +Obviously it makes sense to use the \l {State::}{when} property when possible +as it provides a simpler (and a better, more declarative) solution than +assigning the state from signal handlers. \section1 Animating state changes -- cgit v0.12 From db91a8849bbe9581d096aa486708b9a655fc092f Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 11:10:22 +1000 Subject: Mention QML_IMPORT_TRACE in Modules docs --- doc/src/declarative/modules.qdoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 9e51a40..467b7d0 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -302,5 +302,13 @@ For examples of \c qmldir files for plugins, see the \l {declarative/cppextensions/plugins}{Plugins} example and \l {Tutorial: Writing QML extensions with C++}. + +\section1 Debugging + +The \c QML_IMPORT_TRACE environment variable can be useful for debugging +when there are problems with finding and loading modules. See +\l{Debugging module imports} for more information. + + */ / -- cgit v0.12 From 0d060e71a5a03f21df5b2edbb4f6de1e928b9ada Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 17:08:23 +1000 Subject: XmlListModel doc fixes Task-number: QTBUG-12749 --- src/declarative/util/qdeclarativexmllistmodel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 7c1e1fd..8bd829e 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -560,7 +560,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListPropertyprogress; } +/*! + \qmlmethod void XmlListModel::errorString() + + Returns a string description of the last error that occurred + if \l status is XmlListModel::Error. +*/ QString QDeclarativeXmlListModel::errorString() const { Q_D(const QDeclarativeXmlListModel); -- cgit v0.12 From 7ee7f19502bfd9193c624045bed07bdfdb23d1df Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 9 Aug 2010 09:17:27 +0200 Subject: I18N: Update German translations for 4.7.0. --- translations/assistant_de.ts | 345 +++--- translations/designer_de.ts | 1380 +--------------------- translations/linguist_de.ts | 438 +------ translations/qt_de.ts | 2666 +----------------------------------------- translations/qt_help_de.ts | 78 +- 5 files changed, 278 insertions(+), 4629 deletions(-) diff --git a/translations/assistant_de.ts b/translations/assistant_de.ts index bfafc71..0f4d0d6 100644 --- a/translations/assistant_de.ts +++ b/translations/assistant_de.ts @@ -4,7 +4,6 @@ AboutDialog - &Close &Schließen @@ -12,19 +11,16 @@ AboutLabel - Warning Achtung - Unable to launch external application. Fehler beim Starten der externen Anwendung. - OK OK @@ -32,17 +28,14 @@ Assistant - Error registering documentation file '%1': %2 Beim Registrieren der Dokumentationsdatei '%1' trat ein Fehler auf: %2 - Error: %1 Fehler: %1 - Could not register documentation file %1 @@ -54,12 +47,10 @@ Grund: %2 - Documentation successfully registered. Dokumentation erfolgreich registriert. - Could not unregister documentation file %1 @@ -71,27 +62,22 @@ Grund: %2 - Documentation successfully unregistered. Dokumentation erfolgreich entfernt. - Error reading collection file '%1': %2. Fehler beim Lesen der Katalogdatei '%1': %2 - Error creating collection file '%1': %2. Fehler beim Erstellen der Katalogdatei '%1': %2. - Error reading collection file '%1': %2 Fehler beim Lesen der Katalogdatei '%1': %2 - Cannot load sqlite database driver! Der Datenbanktreiber für SQLite kann nicht geladen werden. @@ -99,139 +85,229 @@ Grund: BookmarkDialog - Add Bookmark Lesezeichen hinzufügen - Bookmark: Lesezeichen: - Add in Folder: Erstellen in: - New Folder Neuer Ordner - + + + + Rename Folder + Ordner umbenennen + BookmarkManager - Untitled Ohne Titel - Remove Entfernen - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Wenn Sie diesen Ordner löschen, wird auch<br>dessen kompletter Inhalt gelöscht. Möchten Sie wirklich fortfahren? - Manage Bookmarks... Lesezeichen verwalten... - Add Bookmark... Lesezeichen hinzufügen ... - Ctrl+D Ctrl+D - Delete Folder Ordner löschen - Rename Folder Ordner umbenennen - Show Bookmark Lesezeichen öffnen - Show Bookmark in New Tab Lesezeichen in neuem Reiter öffnen - Delete Bookmark Lesezeichen löschen - Rename Bookmark Lesezeichen umbenennen + BookmarkManagerWidget + + Manage Bookmarks + Lesezeichen verwalten + + + Search: + Suche: + + + Remove + Entfernen + + + Import and Backup + Importieren und Sichern + + + OK + OK + + + Import... + Importieren... + + + Export... + Exportieren... + + + Open File + Datei öffnen + + + Files (*.xbel) + Dateien (*.xbel) + + + Save File + Datei speichern + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Die Lesezeichen konnten nicht gespeichert werden. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Beim Löschen des Ordners wird auch dessen Inhalt entfernt.<br>Möchten Sie fortsetzen? + + + Delete Folder + Ordner löschen + + + Rename Folder + Ordner umbenennen + + + Show Bookmark + Lesezeichen anzeigen + + + Show Bookmark in New Tab + Lesezeichen in neuem Reiter öffnen + + + Delete Bookmark + Lesezeichen löschen + + + Rename Bookmark + Lesezeichen umbenennen + + + + BookmarkModel + + Name + Name + + + Address + Adresse + + + Bookmarks Menu + Lesezeichen-Menü + + + + BookmarkWidget + + Bookmarks + Lesezeichen + + + Filter: + Filter: + + + Add + Hinzufügen + + + Remove + Entfernen + + + CentralWidget - Add new page Neue Seite hinzufügen - Close current page Aktuelle Seite schließen - Print Document Drucken - - unknown unbekannt - Add New Page Neue Seite hinzufügen - Close This Page Aktuelle Seite schließen - Close Other Pages Andere Seiten schließen - Add Bookmark for this Page... Lesezeichen für diese Seite hinzufügen ... - Search Suchen @@ -239,62 +315,50 @@ Grund: CmdLineParser - Unknown option: %1 Unbekannte Option: %1 - Unknown widget: %1 Unbekanntes Widget-Objekt: %1 - The collection file '%1' does not exist. Die Katalogdatei '%1' existiert nicht. - Missing collection file. Fehlende Katalogdatei. - Invalid URL '%1'. Ungültige URL '%1'. - Missing URL. Fehlende URL. - Missing widget. Fehlendes Widget-Objekt. - The Qt help file '%1' does not exist. Die Hilfedatei '%1' existiert nicht. - Missing help file. Fehlende Hilfedatei. - Missing filter argument. Das Filter-Argument fehlt. - Error Fehler - Notice Hinweis @@ -302,12 +366,10 @@ Grund: ContentWindow - Open Link Link öffnen - Open Link in New Tab Link in neuem Reiter öffnen @@ -315,40 +377,52 @@ Grund: FilterNameDialogClass - Add Filter Name Filternamen hinzufügen - Filter Name: Filtername: + FindWidget + + Previous + Voriges + + + Next + Nächstes + + + Case Sensitive + Groß/Kleinschreibung beachten + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Seitenende erreicht + + + FontPanel - Font Schriftart - &Writing system S&kript - &Family &Schriftart - &Style S&chriftschnitt - &Point size &Schriftgrad @@ -356,30 +430,37 @@ Grund: HelpViewer - <title>about:blank</title> <title>about:blank</title> - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Fehler 404 ...</title><div align="center"><br><br><h1>Die Seite kann nicht gefunden werden.</h1><br><h3>'%1'</h3></div> + + Copy &Link Location + &Link-Adresse kopieren + + + Open Link in New Tab Ctrl+LMB + Link in neuem Reiter öffnen (Strg + linke Maustaste) + + + Open Link in New Tab + Link in neuem Reiter öffnen + IndexWindow - &Look for: Suchen &nach: - Open Link Link öffnen - Open Link in New Tab Link in neuem Reiter öffnen @@ -387,99 +468,76 @@ Grund: InstallDialog - - Install Documentation Dokumentation installieren - Downloading documentation info... Dokumentationsinformation herunterladen ... - Download canceled. Herunterladen abgebrochen. - - - Done. Fertig. - The file %1 already exists. Do you want to overwrite it? Die Datei %1 existiert bereits. Möchten Sie sie überschreiben? - Unable to save the file %1: %2. Die Datei %1 kann nicht gespeichert werden: %2. - Downloading %1... Herunterladen der Datei %1 ... - - - Download failed: %1. Herunterladen fehlgeschlagen: %1. - Documentation info file is corrupt! Die Dokumentationsdatei ist beschädigt. - Download failed: Downloaded file is corrupted. Herunterladen fehlgeschlagen: Die Datei ist wahrscheinlich beschädigt. - Installing documentation %1... Dokumentation %1 installieren ... - Error while installing documentation: %1 Fehler bei der Installation von: %1 - Available Documentation: Verfügbare Dokumentation: - Install Installieren - Cancel Abbrechen - Close Schließen - Installation Path: Installationsordner: - ... ... @@ -487,297 +545,234 @@ Grund: MainWindow - - Index Index - - Contents Inhalt - - Bookmarks Lesezeichen - Search Suchen - - - Qt Assistant Qt Assistant - Page Set&up... S&eite einrichten ... - Print Preview... Druckvorschau ... - &Print... &Drucken ... - New &Tab Neuer &Reiter - &Close Tab Reiter &schließen - &Quit &Beenden - CTRL+Q CTRL+Q - &Copy selected Text Ausgewählten Text &kopieren - &Find in Text... &Textsuche ... - &Find &Suchen - Find &Next &Weitersuchen - Find &Previous &Vorheriges suchen - Preferences... Einstellungen ... - Zoom &in &Vergrößern - Zoom &out Ver&kleinern - Normal &Size Standard&größe - Ctrl+0 Ctrl+0 - ALT+C ALT+C - ALT+I ALT+I - ALT+S ALT+S - &Home &Startseite - &Back &Rückwärts - &Forward &Vorwärts - Sync with Table of Contents Seite mit Inhaltsangabe abgleichen - Sync Synchronisieren - Next Page Nächste Seite - Ctrl+Alt+Right Ctrl+Alt+Right - Previous Page Vorherige Seite - Ctrl+Alt+Left Ctrl+Alt+Left - Could not register file '%1': %2 Die Datei '%1' konnte nicht registriert werden: %2 - About... Über ... - Navigation Toolbar Navigationsleiste - Toolbars Werkzeugleisten - Filter Toolbar Filterleiste - Filtered by: Filter: - Address Toolbar Adressleiste - Address: Adresse: - Could not find the associated content item. Der zugehörige Inhaltseintrag konnte nicht gefunden werden. - About %1 Über %1 - Updating search index Suchindex wird aufgebaut - Looking for Qt Documentation... Suche nach Qt-Dokumentation ... - &Window &Fenster - Minimize Minimieren - Ctrl+M Ctrl+M - Zoom Zoom - &File &Datei - &Edit &Bearbeiten - &View &Ansicht - &Go &Gehe zu - ALT+Home ALT+Home - &Bookmarks &Lesezeichen - &Help &Hilfe - ALT+O ALT+O @@ -785,48 +780,38 @@ Grund: PreferencesDialog - - Add Documentation Dokumentation hinzufügen - Qt Compressed Help Files (*.qch) Komprimierte Hilfedateien (*.qch) - The specified file is not a valid Qt Help File! Die angegebene Datei ist keine Qt-Hilfedatei. - The namespace %1 is already registered! Der Namespace %1 ist bereits registriert. - Remove Documentation Dokumentation entfernen - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Einige der derzeit geöffneten Dokumente stammen aus der Dokumentation, die Sie gerade zu löschen versuchen. Sie werden beim Löschen geschlossen. - Cancel Abbrechen - OK OK - Use custom settings Benutzerdefinierte Einstellungen verwenden @@ -834,117 +819,94 @@ Grund: PreferencesDialogClass - Preferences Einstellungen - Fonts Schriftart - Font settings: Schriftart: - Browser Browser - Application Anwendung - Filters Filter - Filter: Filter: - Attributes: Attribute: - 1 1 - Add Hinzufügen - Remove Entfernen - Documentation Dokumentation - Registered Documentation: Registrierte Dokumentation: - Add... Hinzufügen ... - Options Einstellungen - Current Page Aktuelle Seite - Restore to default Voreinstellung wiederherstellen - Homepage Startseite - On help start: Zu Beginn: - Show my home page Startseite zeigen - Show a blank page Leere Seite zeigen - Show my tabs from last session Reiter aus letzter Sitzung zeigen - Blank Page Leere Seite @@ -952,12 +914,10 @@ Grund: RemoteControl - Debugging Remote Control Debugging Remote Control - Received Command: %1 %2 Empfangenes Kommando: %1 : %2 @@ -965,22 +925,18 @@ Grund: SearchWidget - &Copy &Kopieren - Copy &Link Location &Link-Adresse kopieren - Open Link in New Tab Link in neuem Reiter öffnen - Select All Alles markieren @@ -988,27 +944,22 @@ Grund: TopicChooser - Choose a topic for <b>%1</b>: Wählen Sie ein Thema für <b>%1</b>: - Choose Topic Thema wählen - &Topics &Themen - &Display &Anzeigen - &Close &Schließen diff --git a/translations/designer_de.ts b/translations/designer_de.ts index b508b7f..9ff5099 100644 --- a/translations/designer_de.ts +++ b/translations/designer_de.ts @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Vorige - &Next &Nächste - &Case sensitive &Groß/Kleinschreibung - Whole &words Nur ganze &Worte - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Die Suche hat das Ende erreicht @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Link einfügen - Title: Titel: - URL: URL: @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Zusätzliche Schriftarten @@ -58,37 +49,30 @@ AppFontManager - '%1' is not a file. '%1' ist keine Datei. - The font file '%1' does not have read permissions. Die Fontdatei '%1' hat keinen Lesezugriff. - The font file '%1' is already loaded. Die Fontdatei ist bereits geladen. - The font file '%1' could not be loaded. Die Fontdatei '%1' konnte nicht geladen werden. - '%1' is not a valid font id. '%1' ist keine gültige Id einer Schriftart. - There is no loaded font matching the id '%1'. Es ist keine Schriftart mit der Id '%1' geladen. - The font '%1' (%2) could not be unloaded. Die Schriftart '%1' (%2) konnte nicht entladen werden. @@ -96,52 +80,42 @@ AppFontWidget - Fonts Schriftarten - Add font files Schriftarten hinzufügen - Remove current font file Schriftart entfernen - Remove all font files Alle Schriftarten entfernen - Add Font Files Schriftarten hinzufügen - Font files (*.ttf) Schriftarten (*.ttf) - Error Adding Fonts Fehler beim Hinzufügen einer Schriftart - Error Removing Fonts Fehler beim Entfernen von Schriftarten - Remove Fonts Schriftarten entfernen - Would you like to remove all fonts? Möchten Sie alle Schriftarten entfernen? @@ -149,12 +123,10 @@ AppearanceOptionsWidget - Form Formular - User Interface Mode Fenstermodus @@ -162,17 +134,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Fehler beim Senden einer Anforderung: Das Programm Assistant antwortet nicht. - The binary '%1' does not exist. Die ausführbare Datei '%1' existiert nicht. - Unable to launch assistant (%1). Das Programm Assistant kann nicht gestartet werden (%1). @@ -180,92 +149,74 @@ BrushPropertyManager - Style Stil - No brush Kein Muster - Solid Voll - Dense 1 Dichte 1 - Dense 2 Dichte 2 - Dense 3 Dichte 3 - Dense 4 Dichte 4 - Dense 5 Dichte 5 - Dense 6 Dichte 6 - Dense 7 Dichte 7 - Horizontal Horizontal - Vertical Vertikal - Cross Kreuzende Linien - Backward diagonal Rückwärtslehnende Diagonalen - Forward diagonal Vorwärtslehnende Diagonalen - Crossing diagonal Kreuzende Diagonalen - Color Farbe - [%1, %2] [%1, %2] @@ -273,360 +224,277 @@ Command - - Change signal Signal ändern - - Change slot Slot ändern - Change signal-slot connection Signale-Slotverbindung ändern - Change sender Sender ändern - Change receiver Empfänger ändern - Add connection Verbindung hinzufügen - Adjust connection Verbindung anpassen - Delete connections Verbindungen löschen - Change source Startpunkt ändern - Change target Endpunkt ändern - Insert '%1' '%1' einfügen - Raise '%1' '%1' nach vorn - Lower '%1' '%1' nach hinten - Delete '%1' '%1' löschen - Reparent '%1' '%1' einem anderen Widget zuordnen - Promote to custom widget Platzhalter für benutzerdefinierte Klasse erzeugen - Demote from custom widget Platzhalter für benutzerdefinierte Klasse entfernen - Lay out using grid Objekte tabellarisch anordnen - Lay out vertically Objekte senkrecht anordnen - Lay out horizontally Objekte waagrecht anordnen - Break layout Layout auflösen - - - Move Page Seite verschieben - - - - Delete Page Seite löschen - - Page Seite - page Seite - - - - Insert Page Seite einfügen - Change Tab order Seite ändern - Create Menu Bar Menü erzeugen - Delete Menu Bar Menüleiste löschen - Create Status Bar Statuszeile erzeugen - Delete Status Bar Statuszeile löschen - Add Tool Bar Werkzeugleiste hinzufügen - Add Dock Window Dockfenster hinzufügen - Adjust Size of '%1' Größe von '%1' anpassen - Change Form Layout Item Geometry Ändern des Formularlayout-Elements - Change Layout Item Geometry Geometrie des Layoutelements ändern - Change Table Contents Tabelleninhalt ändern - Change Tree Contents Bauminhalt ändern - - Add action Aktion hinzufügen - - Remove action Aktion löschen - Add menu Menü hinzufügen - Remove menu Menü löschen - Create submenu Untermenü erzeugen - Delete Tool Bar Werkzeugleiste löschen - Set action text Text der Aktion setzen - Insert action Aktion einfügen - - Move action Aktion verschieben - Change Title Titel ändern - Insert Menu Menü einfügen - Change signals/slots Signale/Slots ändern - Delete Subwindow Subfenster löschen - Insert Subwindow Subfenster einfügen - subwindow subwindow - Subwindow Subwindow - Change Z-order of '%1' Z-Reihenfolge von '%1' ändern - Simplify Grid Layout Tabellarisches Layout vereinfachen - Create button group Buttons gruppieren - Break button group Button-Gruppierung aufheben - Break button group '%1' Gruppierung '%1' aufheben - Add buttons to group Buttons zur Gruppierung hinzufügen - Remove buttons from group Buttons aus Gruppierung entfernen - Morph %1/'%2' into %3 MorphWidgetCommand description %1/'%2' in %3 umwandeln - Change layout of '%1' from %2 to %3 Layout von '%1' von %2 in %3 umwandeln - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup '%1' zu '%2' hinzufügen - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup '%1' aus '%2' entfernen - Change script Skript ändern - Changed '%1' of '%2' '%1' von '%2' geändert - Changed '%1' of %n objects Singular will never be shown @@ -635,12 +503,10 @@ - Reset '%1' of '%2' '%1' von '%2' zurücksetzen - Reset '%1' of %n objects Singular will never be shown @@ -649,12 +515,10 @@ - Add dynamic property '%1' to '%2' Dynamische Eigenschaft '%1' zu '%2' hinzufügen - Add dynamic property '%1' to %n objects Singular will never be shown @@ -663,12 +527,10 @@ - Remove dynamic property '%1' from '%2' Dynamische Eigenschaft '%1' von '%2' entfernen - Remove dynamic property '%1' from %n objects Dynamische Eigenschaft '%1' des Objektes entfernen @@ -679,22 +541,18 @@ ConnectDialog - Configure Connection Verbindung bearbeiten - GroupBox GroupBox - Edit... Ändern... - Show signals and slots inherited from QWidget Signale und Slots von QWidget anzeigen @@ -702,17 +560,14 @@ ConnectionDelegate - <object> <Objekt> - <signal> <Signal> - <slot> <Slot> @@ -720,19 +575,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Standardauflösung (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - High (192 x 192) Embedded device high definition screen resolution Hohe Auflösung (192 x 192) @@ -741,89 +593,72 @@ Designer - Qt Designer Qt Designer - Unable to launch %1. %1 konnte nicht gestartet werden. - %1 timed out. Zeitüberschreitung bei der Ausführung von %1. - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Das Formular enthält freistehende Layoutelemente, die <b>nicht</b> gespeichert wurden. - Perhaps you forgot to create a layout? Haben Sie ein Layout eingefügt? - This file cannot be read because it was created using %1. Die Datei kann nicht gelesen werden, da sie mit %1 erzeugt wurde. - This file was created using Designer from Qt-%1 and cannot be read. Die Datei kann nicht gelesen werden, da sie mit dem Designer der Version %1 erzeugt wurde. - This file cannot be read because the extra info extension failed to load. Die Datei kann nicht gelesen werden (Fehler beim Laden der Daten der ExtraInfoExtension). - The converted file could not be read. Die konvertierte Datei konnte nicht gelesen werden. - Invalid UI file: The root element <ui> is missing. Fehler beim Lesen der ui-Datei: Das Wurzelelement <ui> fehlt. - An error has occurred while reading the UI file at line %1, column %2: %3 Fehler beim Lesen der ui-Datei bei Zeile %1, Spalte %2: %3 - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Die Datei wurde mit dem Designer der Version %1 erzeugt und wird zu einem neuen Formular konvertiert. - The old form has not been touched, but you will have to save the form under a new name. Sie bleibt unverändert.Das neue Formular muss unter einem neuen Namen abgespeichert werden. - This file was created using Designer from Qt-%1 and could not be read: %2 Das Lesen der von Designer %1 erzeugten Datei schlug fehl: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Bitte wandeln Sie sie mit dem Befehl <b>uic3&nbsp;-convert</b> zum Format von Qt 4. - Custom Widgets Benutzerdefinierte Widgets - Promoted Widgets Platzhalter für benutzerdefinierte Klassen @@ -831,12 +666,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 ist kein gültiger Wert der Aufzählung '%2'. - '%1' could not be converted to an enumeration value of type '%2'. '%1' konnte nicht in einen Wert der Aufzählung '%2' konvertiert werden. @@ -844,7 +677,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. '%1' konnte nicht in einen Wert des Maskentyps '%2' konvertiert werden. @@ -852,13 +684,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' ist keine gültige Zahl. - An invalid tag <%1> was encountered. Ein ungültiges Element '%1' wurde festgestellt. @@ -866,27 +696,22 @@ DeviceProfileDialog - &Family Schrift&familie - &Point Size Punktgröße - Style Stil - Device DPI Bildschirmauflösung - Name Name @@ -894,57 +719,46 @@ DeviceSkin - The image file '%1' could not be loaded. Die Pixmap-Datei '%1' konnte nicht geladen werden. - The skin directory '%1' does not contain a configuration file. Das Skin-Verzeichnis '%1' enthält keine Konfigurationsdatei. - The skin configuration file '%1' could not be opened. Die Skin-Konfigurationsdatei '%1' konnte nicht geöffnet werden. - Syntax error: %1 Syntaxfehler: %1 - The skin cursor image file '%1' does not exist. Die Skin-Bilddatei '%1' für den Cursor existiert nicht. - Syntax error in area definition: %1 Die Bereichsdefinition enthält einen Syntaxfehler: %1 - Mismatch in number of areas, expected %1, got %2. Die angegebene Anzahl der Bereiche (%1) stimmt nicht; es wurden %2 Bereiche gefunden. - The skin configuration file '%1' could not be read: %2 Die Skin-Konfigurationsdatei '%1' konnte nicht gelesen werden: %2 - The skin "up" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (oben) existiert nicht. - The skin "down" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (unten) existiert nicht. - The skin "closed" image file '%1' does not exist. Die Skin-Konfigurationsdatei '%1' (geschlossen) existiert nicht. @@ -952,7 +766,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Stil</b></td><td>%3</td></tr><tr><td><b>Auflösung</b></td><td>%4 x %5</td></tr></table></html> @@ -961,13 +774,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Embedded-Entwurf - Device Profiles EmbeddedOptionsControl group box" Profile @@ -976,27 +787,22 @@ FontPanel - Font Schriftart - &Writing system Schrifts&ystem - &Family Schrift&familie - &Style &Stil - &Point size &Punktgröße @@ -1004,22 +810,18 @@ FontPropertyManager - PreferDefault Voreinstellung bevorzugt - NoAntialias Keine Kantenglättung - PreferAntialias Kantenglättung bevorzugen - Antialiasing Kantenglättung @@ -1027,43 +829,44 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Ungültiger Stretch-Wert für '%1': '%2' - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values FormEditorOptionsPage - %1 % %1 % - Preview Zoom Vergrößerungsfaktor für Vorschau - Default Zoom Vorgabe für Vergrößerungsfaktor - Forms Tab in preferences dialog Formulare - Default Grid Raster für neue Formulare @@ -1071,37 +874,30 @@ FormLayoutRowDialog - Add Form Layout Row Formularlayoutzeile hinzufügen - &Label text: Be&schriftung: - Field &type: &Datentyp: - &Field name: &Feldname: - &Buddy: &Buddy: - &Row: &Zeile: - Label &name: &Label-Name: @@ -1109,12 +905,10 @@ FormWindow - Unexpected element <%1> Ungültiges Element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Fehler beim Einfügen der Zwischenablage, Zeile %1, Spalte %2: %3 @@ -1122,62 +916,50 @@ FormWindowSettings - Form Settings Formulareinstellungen - Layout &Default &Layout-Standardwerte - &Spacing: A&bstand: - &Margin: &Rand: - &Layout Function Layout&funktion - Ma&rgin: Ra&nd: - Spa&cing: Abstan&d: - Embedded Design Embedded-Entwurf - &Author &Autor - &Include Hints &Include-Dateien - &Pixmap Function &Pixmapfunktion - Grid Raster @@ -1185,7 +967,6 @@ IconSelector - All Pixmaps ( Alle Pixmap-Dateien ( @@ -1193,7 +974,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser Ausgewähltes Icon, aus @@ -1202,33 +982,27 @@ MainWindowBase - Main Not currently used (main tool bar) Haupt-Werkzeugleiste - File Datei - Edit Bearbeiten - Tools Werkzeuge - Form Formular - Qt Designer Qt Designer @@ -1236,52 +1010,42 @@ NewForm - C&reate &Neu von Vorlage - Recent Zuletzt bearbeitet - &Close &Schließen - &Open... &Öffnen... - &Recent Forms &Zuletzt bearbeitete Formulare - Read error Lesefehler - New Form Neues Formular - Show this Dialog on Startup Diesen Dialog zu Beginn anzeigen - A temporary form file could not be created in %1. In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden. - The temporary form file %1 could not be written. Die temporäre Formulardatei %1 konnte nicht geschrieben werden. @@ -1289,22 +1053,18 @@ ObjectInspectorModel - Object Objekt - Class Klasse - separator Trenner - <noname> <unbenannt> @@ -1312,12 +1072,10 @@ ObjectNameDialog - Change Object Name Objektnamen bearbeiten - Object Name Objektname @@ -1325,12 +1083,10 @@ PluginDialog - Plugin Information Plugins - 1 1 @@ -1338,7 +1094,6 @@ PreferencesDialog - Preferences Einstellungen @@ -1346,32 +1101,26 @@ PreviewConfigurationWidget - Form Formular - Print/Preview Configuration Druck/Vorschau - Style Stil - Style sheet Style sheet - ... ... - Device skin Geräte-Skin @@ -1379,7 +1128,6 @@ PromotionModel - Not used Usage of promoted widgets Nicht verwendet @@ -1388,8 +1136,6 @@ Q3WizardContainer - - Page Seite @@ -1397,58 +1143,47 @@ QAbstractFormBuilder - Unexpected element <%1> Ungültiges Element <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Fehler beim Lesen der ui-Datei bei Zeile %1, Spalte %2: %3 - Invalid UI file: The root element <ui> is missing. Fehler beim Lesen der ui-Datei: Das Wurzelelement <ui> fehlt. - The creation of a widget of the class '%1' failed. Es konnte kein Widget der Klasse '%1' erzeugt werden. - Attempt to add child that is not of class QWizardPage to QWizard. Es wurde versucht, einem Objekt der Klasse QWizard eine Seite hinzuzufügen, die nicht vom Typ QWizardPage ist. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Es wurde versucht, ein Layout auf das Widget '%1' (%2) zu setzen, welches bereits ein Layout vom Typ %3 hat. Das deutet auf eine Inkonsistenz in der ui-Datei hin. - Empty widget item in %1 '%2'. Leeres Widget-Item in %1 '%2'. - Flags property are not supported yet. Eigenschaften des Typs "Flag" werden nicht unterstützt. - While applying tab stops: The widget '%1' could not be found. Fehler beim Setzen der Tabulatorreihenfolge: Es konnte kein Widget mit dem Namen '%1' gefunden werden. - Invalid QButtonGroup reference '%1' referenced by '%2'. Ungültige Referenz der Buttongruppe '%1', referenziert von '%2'. - This version of the uitools library is linked without script support. Dies Version der uitools-Bibliothek unterstützt keine Skripte. @@ -1456,12 +1191,10 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - ActiveX control ActiveX-Steuerelement - ActiveX control widget ActiveX-Widget @@ -1469,22 +1202,18 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - Set Control Steuerelement setzen - Reset Control Steuerelement zurücksetzen - Licensed Control Lizensiertes Steuerelement - The control requires a design-time license Das Steuerelement erfordert eine Lizenz zur Entwurfszeit @@ -1492,67 +1221,54 @@ This indicates an inconsistency in the ui-file. QCoreApplication - %1 is not a promoted class. %1 ist kein Platzhalter für eine benutzerdefinierte Klasse. - The base class %1 is invalid. %1 ist keine gültige Basisklasse. - The class %1 already exists. Es existiert bereits eine Klasse namens %1. - Promoted Widgets Platzhalter für benutzerdefinierte Klassen - The class %1 cannot be removed Die Klasse %1 kann nicht gelöscht werden - The class %1 cannot be removed because it is still referenced. Die Klasse %1 kann nicht gelöscht werden, da sie gegenwärtig verwendet wird. - The class %1 cannot be renamed Die Klasse %1 kann nicht umbenannt werden - The class %1 cannot be renamed to an empty name. Der Klassennamen darf nicht leer sein (%1). - There is already a class named %1. Es existiert bereits eine Klasse namens %1. - Cannot set an empty include file. Der Name der Include-Datei darf nicht leer sein. - Exception at line %1: %2 Ausnahmefehler bei Zeile %1: %2 - Unknown error Unbekannter Fehler - An error occurred while running the script for %1: %2 Script: %3 Bei der Ausführung des Skripts für %1 trat ein Fehler auf: %2Skript: %3 @@ -1561,17 +1277,14 @@ Script: %3 QDesigner - %1 - warning %1 - Warnung - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Diese Anwendung kann in der Qt-Konsolen-Edition nicht benutzt werden @@ -1579,207 +1292,162 @@ Script: %3 QDesignerActions - Edit Widgets Widgets bearbeiten - &Quit &Beenden - &Minimize &Minimieren - Bring All to Front Alle Formulare anzeigen - Preferences... Einstellungen... - Clear &Menu Menü &löschen - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+R CTRL+R - CTRL+M CTRL+M - Qt Designer &Help &Hilfe zum Qt Designer - Current Widget Help Hilfe zum ausgewählten Widget - What's New in Qt Designer? Was gibt es Neues beim Qt Designer? - About Plugins Plugins - - About Qt Designer Über Qt Designer - About Qt Über Qt - - Open Form Formular öffnen - - - Designer UI files (*.%1);;All Files (*) Designer-UI-Dateien (*.%1);;Alle Dateien (*) - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Möchten Sie sie überschreiben? - Saved %1. Das Formular %1 wurde gespeichert... - &Recent Forms &Zuletzt bearbeitete Formulare - Designer Designer - Feature not implemented yet! Diese Funktionalität ist noch nicht implementiert. - Read error Lesefehler - %1 Do you want to update the file location or generate a new form? %1 Möchten Sie einen anderen Namen eingeben oder ein neues Formular erzeugen? - &Update &Anderer Name - &New Form &Neues Formular - - Save Form? Formular speichern? - Could not open file Die Datei konnte nicht geöffnet werden - - The backup file %1 could not be written. Hintergrundsicherung: Die Datei %1 konnte nicht geschrieben werden. - The backup directory %1 could not be created. Hintergrundsicherung: Das Verzeichnis %1 konnte nicht angelegt werden. - The temporary backup directory %1 could not be created. Hintergrundsicherung: Das temporäre Verzeichnis %1 konnte nicht angelegt werden. - Please close all forms to enable the loading of additional fonts. Bitte schließen Sie alle Formulare, um zusätzliche Schriftarten zu laden. - Select New File Andere Datei - Could not write file Die Datei konnte nicht geschrieben werden - &Close Preview Vorschau &schließen - Save &Image... &Vorschaubild speichern... - &Print... &Drucken... - Additional Fonts... &Zusätzliche Schriftarten... - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1788,7 +1456,6 @@ Would you like to retry or select a different file? Möchten Sie es noch einmal versuchen oder eine andere Datei auswählen? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1797,96 +1464,74 @@ Would you like to retry? Möchten Sie es noch einmal versuchen? - Image files (*.%1) Bilddateien (*.%1) - - Save Image Bild speichern - The file %1 could not be written. Die Datei %1 konnte nicht geschrieben werden. - &New... &Neu... - &Open... &Öffnen... - &Save &Speichern - Save &As... Speichern &unter... - Save A&ll &Alles speichern - Save As &Template... Als Vor&lage abspeichern... - - &Close &Schließen - View &Code... &Code anzeigen... - - Save Form As Formular unter einem anderen Namen speichern - Preview failed Es konnte keine Vorschau erzeugt werden - Code generation failed Es konnte kein Code generiert werden - - Assistant Assistant - Saved image %1. Das Vorschaubild wurde unter %1 gespeichert. - Printed %1. %1 wurde gedruckt. - ALT+CTRL+S ALT+CTRL+S @@ -1894,7 +1539,6 @@ Möchten Sie es noch einmal versuchen? QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Ansicht @@ -1903,17 +1547,14 @@ Möchten Sie es noch einmal versuchen? QDesignerAppearanceOptionsWidget - Docked Window Dockfenster-Modus - Multiple Top-Level Windows Multifenster-Modus - Toolwindow Font Font für Dockfenster @@ -1921,22 +1562,18 @@ Möchten Sie es noch einmal versuchen? QDesignerAxWidget - Reset control Steuerelement zurücksetzen - Set control Steuerelement setzen - Control loaded Steuerelement geladen - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Beim Methodenaufruf des Typs %1, index %2 von "%3" trat eine COM-Ausnahme auf. @@ -1944,17 +1581,14 @@ Möchten Sie es noch einmal versuchen? QDesignerFormBuilder - Script errors occurred: Es sind Skriptfehler aufgetreten: - The preview failed to build. Es konnte keine Vorschau erzeugt werden. - Designer Designer @@ -1962,22 +1596,18 @@ Möchten Sie es noch einmal versuchen? QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Formular speichern? - Do you want to save the changes to this document before closing? Möchten Sie die Änderungen an diesem Formular speichern? - If you don't save, your changes will be lost. Die Änderungen gehen verloren, wenn Sie nicht speichern. @@ -1985,38 +1615,30 @@ Möchten Sie es noch einmal versuchen? QDesignerMenu - Type Here Geben Sie Text ein - Add Separator Trenner hinzufügen - Insert separator Trenner einfügen - Remove action '%1' Aktion '%1' löschen - Remove separator Trenner löschen - - Add separator Trenner hinzufügen - Insert action Aktion einfügen @@ -2024,22 +1646,18 @@ Möchten Sie es noch einmal versuchen? QDesignerMenuBar - Type Here Geben Sie Text ein - Remove Menu '%1' Menü '%1' öschen - Remove Menu Bar Menüleiste löschen - Menu Menü @@ -2047,37 +1665,30 @@ Möchten Sie es noch einmal versuchen? QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Fehler beim Auswerten des XML des benutzerdefinierten Widgets %1: %2 - A required attribute ('%1') is missing. Bei dem Element fehlt ein erforderliches Attribut ('%1'). - An invalid property specification ('%1') was encountered. Supported types: %2 '%1' ist keine gültige Spezifikation einer Eigenschaft. Die folgenden Typen werden unterstützt: %2 - '%1' is not a valid string property specification. '%1' ist keine gültige Spezifikation einer Zeichenketten-Eigenschaft. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. Der XML-Code für das Widget %1 enthält kein gültiges Wurzelelement (<widget>, <ui>). - The class attribute for the class %1 is missing. Das Klassenattribut der Klasse %1 fehlt. - The class attribute for the class %1 does not match the class name %2. Das Klassenattribut der Klasse %1 entspricht nicht dem Klassennamen (%2). @@ -2085,7 +1696,6 @@ Möchten Sie es noch einmal versuchen? QDesignerPropertySheet - Dynamic Properties Dynamische Eigenschaften @@ -2093,31 +1703,26 @@ Möchten Sie es noch einmal versuchen? QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Der Layout-Typ '%1' wird nicht unterstützt; es wurde ein Grid-Layout erzeugt. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Die Container-Extension des Widgets '%1' (%2) gab für Seite %5 ein Widget '%3' (%4) zurück, was nicht von Designer verwaltet wird. Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifiziert werden. - Unexpected element <%1> Parsing clipboard contents Ungültiges Element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Fehler beim Einfügen der Zwischenablage, Zeile %1, Spalte %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Fehler beim Einfügen der Zwischenablage: Das Wurzelelement <ui> fehlt. @@ -2126,12 +1731,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerSharedSettings - The template path %1 could not be created. Das Vorlagenverzeichnis %1 konnte nicht angelegt werden. - An error has been encountered while parsing device profile XML: %1 Beim Lesen des Profils trat ein Fehler auf: %1 @@ -2139,32 +1742,26 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerToolWindow - Property Editor Eigenschaften - Action Editor Aktionseditor - Object Inspector Objektanzeige - Resource Browser Ressourcen - Signal/Slot Editor Signale und Slots - Widget Box Widget-Box @@ -2172,97 +1769,78 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QDesignerWorkbench - &File &Datei - F&orm F&ormular - Preview in Vorschau im - &Window &Fenster - &Help &Hilfe - Edit Bearbeiten - Toolbars Werkzeugleisten - Save Forms? Formulare speichern? - &View &Ansicht - &Settings &Einstellungen - Widget Box Widgetbox - If you do not review your documents, all your changes will be lost. Die Änderungen gehen verloren, wenn Sie sich die Formulare nicht noch einmal ansehen. - Discard Changes Änderungen verwerfen - Review Changes Änderungen ansehen - Backup Information Information zur Hintergrundsicherung - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Designer wurde offenbar nicht ordnungsgemäß beendet; es existieren noch Dateien von der Hintergrundsicherung. Möchten Sie sie laden? - The file <b>%1</b> could not be opened. Die Datei <b>%1</b> konnte nicht geöffnet werden. - The file <b>%1</b> is not a valid Designer UI file. Die Datei <b>%1</b> ist keine gültige Designer-Datei. - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Das Formular wurde geändert. Möchten Sie sich die Änderungen ansehen, bevor Sie das Programm beenden? @@ -2273,53 +1851,47 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Der Methode %1 wurde ein leerer Klassennamen übergeben (Name '%2'). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder konnte kein benutzerdefiniertes Widget der Klasse '%1' erzeugen; es wurde ein Widget der Basisklasse '%2' erzeugt. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder konnte kein Objekt der Klasse '%1' erzeugen. - The layout type `%1' is not supported. Layouts des Typs `%1' werden nicht unterstützt. - The set-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Menge). - The enumeration-type property %1 could not be read. Die Eigenschaft %1 konnte nicht gelesen werden (Typ: Aufzählung). - Reading properties of the type %1 is not supported yet. Das Lesen von Eigenschaften des Typs %1 wird nicht unterstützt. - The property %1 could not be written. The type %2 is not supported yet. Die Eigenschaft %1 konnte nicht geschrieben werden, da der Typ %2 nicht unterstützt wird. - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Der Aufzählungswert '%1' ist ungültig. Es wird der Vorgabewert '%2' verwendet. - The flag-value '%1' is invalid. Zero will be used instead. Der Flag-Wert '%1' ist ungültig. Es wird der Wert 0 verwendet. @@ -2327,48 +1899,38 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QStackedWidgetEventFilter - Previous Page Vorige Seite - Next Page Nächste Seite - Delete Löschen - Before Current Page Davor - After Current Page Danach - Change Page Order... Seiten umordnen.... - Change Page Order Seiten umordnen - Page %1 of %2 Seite %1 von %2 - - Insert Page Seite einfügen @@ -2376,12 +1938,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Gehe zur vorigen Seite von %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Gehe zur nächste Seite von %1 '%2' (%3/%4). @@ -2389,28 +1949,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QTabWidgetEventFilter - Delete Löschen - Before Current Page Davor - After Current Page Danach - Page %1 of %2 Seite %1 von %2 - - Insert Page Seite einfügen @@ -2418,37 +1972,30 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QToolBoxHelper - Delete Page Seite löschen - Before Current Page Davor - After Current Page Danach - Change Page Order... Seiten umordnen.... - Change Page Order Seiten umordnen - Page %1 of %2 Seite %1 von %2 - Insert Page Seite einfügen @@ -2456,15 +2003,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolEdit - - - True Wahr - - False Falsch @@ -2472,12 +2014,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtBoolPropertyManager - True Wahr - False Falsch @@ -2485,7 +2025,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtCharEdit - Clear Char Zeichen löschen @@ -2493,7 +2032,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtColorEditWidget - ... ... @@ -2501,22 +2039,18 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtColorPropertyManager - Red Rot - Green Grün - Blue Blau - Alpha Alpha @@ -2524,97 +2058,78 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtCursorDatabase - Arrow Pfeil - Up Arrow Pfeil hoch - Cross Kreuzende Linien - Wait Sanduhr - IBeam IBeam - Size Vertical Vertikal vergrößern - Size Horizontal Horizontal vergrößern - Size Backslash Vergrößern/Backslash - Size Slash Vergrößern/Slash - Size All Alles vergrößern - Blank Leer - Split Vertical Vertikal aufteilen - Split Horizontal Horizontal aufteilen - Pointing Hand Hand - Forbidden Verboten - Open Hand Geöffnete Hand - Closed Hand Geschlossene Hand - What's This What's This - Busy Beschäftigt @@ -2622,12 +2137,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtFontEditWidget - ... ... - Select Font Schriftart auswählen @@ -2635,37 +2148,30 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtFontPropertyManager - Family Familie - Point Size Punktgröße - Bold Fett - Italic Kursiv - Underline Unterstreichen - Strikeout Durchgestrichen - Kerning Kerning @@ -2673,7 +2179,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientDialog - Edit Gradient Gradienten bearbeiten @@ -2681,304 +2186,242 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientEditor - Start X Anfangswert X - Start Y Anfangswert Y - Final X Endwert X - Final Y Endwert Y - - Central X Mittelpunkt X - - Central Y Mittelpunkt Y - Focal X Fokus X - Focal Y Fokus Y - Radius Radius - Angle Winkel - Linear Linear - Radial Radial - Conical Konisch - Pad Auffüllen - Repeat Wiederholen - Reflect Spiegeln - Form Form - Gradient Editor Gradienten bearbeiten - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Bezugspunkte - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. Diese Fläche dient zum Bearbeiten der Bezugspunkte. Doppelklicken Sie auf einen Bezugspunkt, um ihn zu duplizieren. Doppelklicken Sie auf die Fläche, um einen neuen Bezugspunkt zu erzeugen. Benutzen Sie Drag & Drop um einen Punkt zu verschieben. Die rechte Maustaste aktiviert ein Menü mit weiteren Optionen. - Zoom Vergrößern - Position Position - Hue Farbton - H H - Saturation Sättigung - S S - Sat Sättigung - Value Wert - V V - Val Wert - Alpha Alpha - A A - Type Typ - Spread Ausbreitung - Color Farbe - Current stop's color Farbe des Bezugspunkts - HSV HSV - RGB RGB - Current stop's position Position des Bezugspunkts - % % - Zoom In Vergrößern - Zoom Out Verkleinern - Toggle details extension Weiter Optionen einblenden - > > - Linear Type Typ linear - ... ... - Radial Type Typ radial - Conical Type Typ konisch - Pad Spread Auffüllen - Repeat Spread Wiederholen - Reflect Spread Spiegeln - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. Dieser Bereich zeigt eine Vorschau des in Bearbeitung befindlichen Gradienten. Hier können Gradienttyp-spezifische Parameter, wie Start- und Endpunkt, Radius etc. per Drag & Drop bearbeitet werden. - Show HSV specification HSV-Spezifikation anzeigen - Show RGB specification RGB-Spezifikation anzeigen - Reset Zoom Vergrößerung zurücksetzen @@ -2986,37 +2429,30 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientStopsWidget - New Stop Neuer Bezugspunkt - Delete Löschen - Flip All Alles umkehren - Select All Alles auswählen - Zoom In Vergrößern - Zoom Out Verkleinern - Reset Zoom Vergrößerung zurücksetzen @@ -3024,46 +2460,34 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientView - Grad Grad - Remove Gradient Gradient löschen - Are you sure you want to remove the selected gradient? Möchten Sie den ausgewählten Gradienten löschen? - - New... Neu... - - Edit... Ändern... - - Rename Umbenennen - - Remove Löschen - Gradient View Gradientenanzeige @@ -3071,8 +2495,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtGradientViewDialog - - Select Gradient Gradienten auswählen @@ -3080,7 +2502,6 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtKeySequenceEdit - Clear Shortcut Tastenkürzel löschen @@ -3088,17 +2509,14 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtLocalePropertyManager - %1, %2 %1, %2 - Language Sprache - Country Land @@ -3106,17 +2524,14 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3124,17 +2539,14 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3142,12 +2554,10 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3155,27 +2565,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Breite - Height Höhe @@ -3183,27 +2588,22 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Breite - Height Höhe @@ -3211,33 +2611,26 @@ Container-Seiten sollten ausschließlich im XML der domXML()-Methode spezifizier QtResourceEditorDialog - Edit Resources Ressourcen bearbeiten - New... Neu... - - New Resource File Neue Ressourcendatei - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Hinweis:</b><p>Die gewählte Datei: </p><p>%1</p><p>befindet sich außerhalb des Verzeichnisses der Ressourcendatei:</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Bitte wählen Sie:</p><table><tr><th align="left">Kopieren</th><td>um die Datei in das Verzeichnis der Ressourcendatei zu kopieren.</td></tr><tr><th align="left">Kopieren nach...</th><td>um die Datei in ein Unterverzeichnis der Ressourcendatei zu kopieren.</td></tr><tr><th align="left">Beibehalten</th><td>um die Datei in ihrem gegenwärtigen Verzeichnis zu verwenden.</td></tr></table> - Could not copy %1 to @@ -3248,248 +2641,192 @@ zu: %2 - A parse error occurred at line %1, column %2 of %3: %4 In der Datei %3 wurde bei Zeile %1, Spalte %2 ein Fehler gefunden: %4 - Open... Öffnen... - - Remove Löschen - - Move Up Nach oben - - Move Down Nach unten - - Add Prefix Präfix hinzufügen - Add Files... Dateien hinzufügen... - Change Prefix Präfix ändern - Change Language Sprache ändern - Change Alias Alias ändern - Clone Prefix... Präfix doppeln... - Prefix / Path Präfix / Pfad - Language / Alias Sprache / Alias - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Warnung:</b> Beim Neuladen der Ressourcen traten Fehler auf:</p><pre>%1</pre></html> - Resource Warning Ressourcen - Warnung - Dialog Dialog - New File Neue Datei - N N - Remove File Datei löschen - R L - I I - New Resource Neue Ressource - A A - Remove Resource or File Datei oder Ressource löschen - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Wollen Sie sie überschreiben? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Die Datei ist offenbar keine Ressourcendatei; an Stelle des erwarteten Elements '%2' wurde das Element '%1' gefunden. - %1 [read-only] %1 [schreibgeschützt] - - %1 [missing] %1 [fehlt] - <no prefix> <kein Präfix> - - Resource files (*.qrc) Ressourcendateien (*.qrc) - Import Resource File Ressourcendatei importieren - newPrefix newPrefix - Add Files Dateien hinzufügen - Incorrect Path Fehlerhafte Pfadangabe - - - - Copy Kopieren - Copy As... Kopieren nach... - Keep Beibehalten - Skip Überspringen - Clone Prefix Präfix doppeln - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Bitte geben Sie den Suffix ein, der an den Namen der gedoppelten Dateien angehängt werden soll. Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. - - Copy As Kopieren nach - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Die gewählte Datei: </p><p>%1</p><p>befindet sich außerhalb des Verzeichnisses der Ressourcendatei:</p><p>%2</p><p>Bitte wählen Sie einen anderen Pfad, der im Verzeichnis der Ressourcendatei enthalten ist.</p> - Could not overwrite %1. %1 konnte nicht überschrieben werden. - Save Resource File Ressourcendatei speichern - Could not write %1: %2 Die Datei %1konnte nicht geschrieben werden: %2 - Open Resource File Ressourcendatei öffnen @@ -3497,24 +2834,20 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtResourceView - Size: %1 x %2 %3 Größe: %1 x %2 %3 - Edit Resources... Ressourcen bearbeiten... - Reload Neu laden - Copy Path Pfad kopieren @@ -3522,7 +2855,6 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtResourceViewDialog - Select Resource Ressource auswählen @@ -3530,17 +2862,14 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Breite - Height Höhe @@ -3548,33 +2877,26 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePolicyPropertyManager - - <Invalid> <Ungültig> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Horizontale Einstellung - Vertical Policy Vertikale Einstellung - Horizontal Stretch Horizontaler Dehnungsfaktor - Vertical Stretch Vertikaler Dehnungsfaktor @@ -3582,17 +2904,14 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtSizePropertyManager - %1 x %2 %1 x %2 - Width Breite - Height Höhe @@ -3600,107 +2919,86 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtToolBarDialog - < S E P A R A T O R > < T R E N N E R > - Customize Toolbars Werkzeugleisten anpassen - 1 1 - Actions Aktionen - Toolbars Werkzeugleisten - New Neu - Remove Löschen - Rename Umbenennen - Up Nach oben - <- <- - -> -> - Down Nach unten - Current Toolbar Actions Aktionen - Custom Toolbar Benutzerdefinierte Werkzeugleiste - Add new toolbar Neue Werkzeugleiste hinzufügen - Remove selected toolbar Ausgewählte Werkzeugleiste '%1' löschen - Rename toolbar Werkzeugleiste umbenennen - Move action up Aktion eins nach oben - Remove action from toolbar Aktion aus Werkzeugleiste entfernen - Add action to toolbar Aktion zu Werkzeugleiste hinzufügen - Move action down Aktion eins nach unten @@ -3708,12 +3006,10 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. QtTreePropertyBrowser - Property Eigenschaft - Value Wert @@ -3721,64 +3017,52 @@ Dies kann zum Beispiel eine Sprachkennung wie "_de" sein. SaveFormAsTemplate - Add path... Verzeichnis anlegen... - Template Exists Die Vorlage existiert bereits - A template with the name %1 already exists. Do you want overwrite the template? Es existiert bereits eine Vorlage mit dem Namen %1. Möchten Sie sie überschreiben? - Overwrite Template Vorlage überschreiben - Open Error Fehler beim Öffnen - There was an error opening template %1 for writing. Reason: %2 Die Vorlage %1 konnte nicht in eine Datei geschrieben werden: %2 - Write Error Schreibfehler - There was an error writing the template %1 to disk. Reason: %2 Die Vorlage %1 konnte nicht in eine Datei geschrieben werden: %2 - Pick a directory to save templates in Wählen Sie ein Verzeichnis zum Abspeichern der Vorlagen aus - Save Form As Template Formular als Vorlage abspeichern - &Category: &Kategorie: - &Name: &Name: @@ -3786,7 +3070,6 @@ Möchten Sie sie überschreiben? ScriptErrorDialog - An error occurred while running the scripts for "%1": Bei der Ausführung der Skripte für "%1" sind Fehler aufgetreten: @@ -3796,22 +3079,18 @@ Möchten Sie sie überschreiben? SelectSignalDialog - Go to slot - Select signal - signal Signal - class Klasse @@ -3819,7 +3098,6 @@ Möchten Sie sie überschreiben? SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) SENDER(%1), SIGNAL(%2), EMPFÄNGER(%3), SLOT(%4) @@ -3827,32 +3105,26 @@ Möchten Sie sie überschreiben? SignalSlotDialogClass - Signals and slots Signale und Slots - Slots Slots - ... ... - Signals Signale - Add Hinzufügen - Delete Löschen @@ -3860,12 +3132,10 @@ Möchten Sie sie überschreiben? Spacer - Horizontal Spacer '%1', %2 x %3 Horizontales Füllelement '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Vertikales Füllelement '%1', %2 x %3 @@ -3873,7 +3143,6 @@ Möchten Sie sie überschreiben? TemplateOptionsPage - Template Paths Tab in preferences dialog Verzeichnisse für Vorlagen @@ -3882,52 +3151,42 @@ Möchten Sie sie überschreiben? ToolBarManager - Configure Toolbars... Werkzeugleiste konfigurieren... - Window Fenster - Help Hilfe - Style Stil - Dock views Dockfenster - File Datei - Edit Bearbeiten - Tools Werkzeuge - Form Formular - Toolbars Werkzeugleisten @@ -3935,30 +3194,64 @@ Möchten Sie sie überschreiben? VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Version %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + VideoPlayerTaskMenu + + Available Mime Types + Verfügbare Mime-Typen + + + Display supported mime types... + Verfügbare Mime-Typen anzeigen... + + + Load... + Laden... + + + Play + Wiedergabe + + + Pause + Pause + + + Stop + Stop + + + Choose Video Player Media Source + Medienquelle wählen + + + An error has occurred in '%1': %2 + In '%1' ist ein Fehler aufgetreten: %2 + + + Video Player Error + Video Player Fehler + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Die Datei enthält ein benutzerdefiniertes Widget '%1' dessen Basisklasse (%2) nicht mit dem Eintrag in der Widget-Datenbank übereinstimmt. Die Widget-Datenbank wird nicht geändert. @@ -3966,87 +3259,70 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionEditor - Actions Aktionen - New... Neu... - Delete Löschen - New action Neue Aktion - Edit action Aktion ändern - Edit... Ändern... - Go to slot... Slot anzeigen... - Copy Kopieren - Cut Ausschneiden - Paste Einfügen - Select all Alles auswählen - Icon View Icon-Ansicht - Detailed View Detaillierte Ansicht - Remove actions Aktionen löschen - Remove action '%1' Aktion '%1' löschen - Used In Verwendet in - Configure Action Editor Aktionseditor konfigurieren @@ -4054,32 +3330,26 @@ Möchten Sie sie überschreiben? qdesigner_internal::ActionModel - Name Name - Used Verwendet - Text Text - Shortcut Tastenkürzel - Checkable Ankreuzbar - ToolTip ToolTip @@ -4087,27 +3357,22 @@ Möchten Sie sie überschreiben? qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. Bei dem Element fehlt das erforderliche Attribut '%2'. - Empty brush name encountered. Fehlender Name bei der Brush-Definition. - An unexpected element '%1' was encountered. Ein ungültiges Element '%1' wurde festgestellt. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Fehler beim Lesen der Brush-Datei '%1' bei Zeile %2, Spalte %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Fehler beim Lesen der Ressourcen-Datei '%1' bei Zeile %2, Spalte %3: %4 @@ -4115,17 +3380,14 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditor - Add buddy Buddy hinzufügen - Remove buddies Buddies löschen - Remove %n buddies Buddy löschen @@ -4133,7 +3395,6 @@ Möchten Sie sie überschreiben? - Add %n buddies Buddy hinzufügen @@ -4141,7 +3402,6 @@ Möchten Sie sie überschreiben? - Set automatically Automatisch setzen @@ -4149,7 +3409,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorPlugin - Edit Buddies Buddies bearbeiten @@ -4157,7 +3416,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::BuddyEditorTool - Edit Buddies Buddies bearbeiten @@ -4165,12 +3423,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::ButtonGroupMenu - Select members Mitglieder auswählen - Break Aufheben @@ -4178,32 +3434,26 @@ Möchten Sie sie überschreiben? qdesigner_internal::ButtonTaskMenu - Assign to button group Gruppierung - Button group Gruppierung - New button group Neue Gruppierung - Change text... Text ändern... - None Keine - Button group '%1' Gruppierung '%1' @@ -4211,57 +3461,46 @@ Möchten Sie sie überschreiben? qdesigner_internal::CodeDialog - Save... Speichern... - Copy All Alles kopieren - &Find in Text... &Suchen... - A temporary form file could not be created in %1. In dem Verzeichnis %1 konnte keine temporäre Formulardatei angelegt werden. - The temporary form file %1 could not be written. Die temporäre Formulardatei %1 konnte nicht geschrieben werden. - %1 - [Code] %1 - [Code] - Save Code Code speichern - Header Files (*.%1) Include-Dateien (*.%1) - The file %1 could not be opened: %2 Die Datei %1 konnte nicht geöffnet werden: %2 - The file %1 could not be written: %2 Die Datei %1 konnte nicht geschrieben werden: %2 - %1 - Error %1 - Fehler @@ -4269,7 +3508,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::ColorAction - Text Color Schriftfarbe @@ -4277,12 +3515,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::ComboBoxTaskMenu - Edit Items... Einträge ändern... - Change Combobox Contents Inhalt der Combobox ändern @@ -4290,7 +3526,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Beschreibung ändern... @@ -4298,17 +3533,14 @@ Möchten Sie sie überschreiben? qdesigner_internal::ConnectionEdit - Select All Alles auswählen - Delete Löschen - Deselect All Auswahl rücksetzen @@ -4316,52 +3548,42 @@ Möchten Sie sie überschreiben? qdesigner_internal::ConnectionModel - Sender Sender - Signal - Receiver Empfänger - Slot Slot - <sender> <Sender> - <signal> <Signal> - <receiver> <Receiver> - <slot> <Slot> - Signal and Slot Editor Signal/Slot editor - The connection already exists!<br>%1 Diese Verbindung existiert bereits!<br>%1</br> @@ -4369,42 +3591,34 @@ Möchten Sie sie überschreiben? qdesigner_internal::ContainerWidgetTaskMenu - Insert Page Before Current Page Seite davor einfügen - Insert Page After Current Page Seite danach einfügen - Add Subwindow Subfenster hinzufügen - Delete Löschen - Insert Einfügen - Subwindow Subwindow - Page Seite - Page %1 of %2 Seite %1 von %2 @@ -4412,19 +3626,16 @@ Möchten Sie sie überschreiben? qdesigner_internal::DPI_Chooser - x DPI X/Y separator x - System (%1 x %2) System resolution System (%1 x %2) - User defined Benutzerdefiniert @@ -4432,49 +3643,38 @@ Möchten Sie sie überschreiben? qdesigner_internal::DesignerPropertyManager - - AlignLeft Linksbündig ausrichten - AlignHCenter Horizontal zentrieren - AlignRight Rechtsbündig ausrichten - AlignJustify Blocksatz - AlignTop Am oberen Rand ausrichten - - AlignVCenter Vertikal zentrieren - AlignBottom Am unteren Rand zentrieren - %1, %2 %1, %2 - Customized (%n roles) Angepasst (eine Rolle) @@ -4482,75 +3682,58 @@ Möchten Sie sie überschreiben? - Inherited Geerbt - Horizontal Horizontal - Vertical Vertikal - Normal Off Normal, aus - Normal On Normal, ein - Disabled Off Nicht verfügbar, aus - Disabled On Verfügbar, ein - Active Off Aktiv, aus - Active On Aktiv, ein - Selected Off Ausgewählt, aus - Selected On Ausgewählt, ein - - translatable Übersetzung - - disambiguation Kennung - - comment Kommentar @@ -4558,48 +3741,38 @@ Möchten Sie sie überschreiben? qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profile - Default Vorgabe - Save Profile Profil speichern - Save Profile - Error Fehler beim Speichern des Profils - Unable to open the file '%1' for writing: %2 Die Datei '%1' konnte nicht zum Schreiben geöffnet werden: %2 - Unable to open the file '%1' for reading: %2 Die Datei '%1' konnte nicht zum Lesen geöffnet werden: %2 - '%1' is not a valid profile: %2 '%1' ist kein gültiges Profil: %2 - Open profile Profil öffnen - - Open Profile - Error Fehler beim Öffnen des Profils @@ -4607,57 +3780,46 @@ Möchten Sie sie überschreiben? qdesigner_internal::Dialog - Dialog Dialog - StringList Liste von Zeichenketten - New String Neue Zeichenkette - &New &Neu - Delete String Zeichenkette löschen - &Delete &Löschen - &Value: &Wert: - Move String Up Zeichenkette eins nach oben - Up Hoch - Move String Down Zeichenkette eins nach unten - Down Runter @@ -4665,52 +3827,42 @@ Möchten Sie sie überschreiben? qdesigner_internal::EmbeddedOptionsControl - None Vorgabe - Add a profile Profil hinzufügen - Edit the selected profile Ausgewähltes Profil modifizieren - Delete the selected profile Ausgewähltes Profil löschen - Add Profile Profil hinzufügen - New profile Neues Profil - Edit Profile Profil ändern - Delete Profile Profil löschen - Would you like to delete the profile '%1'? Möchten Sie das Profil '%1' löschen? - Default Vorgabe @@ -4718,12 +3870,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FilterWidget - Filter Filter - Clear text Text löschen @@ -4731,12 +3881,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormEditor - Resource File Changed Änderung einer Ressourcendatei - The file "%1" has changed outside Designer. Do you want to reload it? Die Ressourcendatei "%1" wurde außerhalb Designer geändert. Möchten Sie sie neu laden? @@ -4744,7 +3892,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormLayoutMenu - Add form layout row... Zeile hinzufügen... @@ -4752,43 +3899,34 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindow - Edit contents Ändern - F2 F2 - Resize Größe ändern - Key Move Verschieben mittels Tastatur - Paste error Fehler beim Einfügen - Lay out Layout - - Drop widget Widget einfügen - Paste %n action(s) Eine Aktion einfügen @@ -4796,17 +3934,14 @@ Möchten Sie sie überschreiben? - Insert widget '%1' Widget '%1' einfügen - Key Resize Größe ändern mittels Tastatur - Paste %n widget(s) Widget einfügen @@ -4814,37 +3949,30 @@ Möchten Sie sie überschreiben? - Paste (%1 widgets, %2 actions) Einfügen (%1 Widgets, %2 Aktionen) - Cannot paste widgets. Designer could not find a container without a layout to paste into. Die Widgets konnten nicht eingefügt werden, da kein Container gefunden werden konnte, der nicht bereits ein Layout hat. - Break the layout of the container you want to paste into, select this container and then paste again. Bitte lösen Sie das Layout des gewünschten Containers auf und wählen Sie ihn erneut aus, um die Widgets einzufügen. - Select Ancestor Übergeordnetes Widget auswählen - A QMainWindow-based form does not contain a central widget. Ein auf QMainWindow basierendes Formular enthält kein zentrales Widget. - Raise widgets Widgets nach vorn bringen - Lower widgets Widgets nach hinten setzen @@ -4852,12 +3980,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowBase - Delete Löschen - Delete '%1' '%1' löschen @@ -4865,200 +3991,159 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowManager - Cu&t &Ausschneiden - Cuts the selected widgets and puts them on the clipboard Schneidet die ausgewählten Widgets aus und legt sie in der Zwischenablage ab - &Copy &Kopieren - Copies the selected widgets to the clipboard Kopiert die ausgewählten Widgets in die Zwischenablage - &Paste &Einfügen - Pastes the clipboard's contents Fügt den Inhalt der Zwischenablage ein - &Delete &Löschen - Deletes the selected widgets Löscht die ausgewählten Widgets - Select &All &Alles auswählen - Selects all widgets Wählt alle Widget aus - Bring to &Front Nach &vorn - - Raises the selected widgets Bringt das ausgewählte Widget nach vorn - Send to &Back Nach &hinten - - Lowers the selected widgets Stellt das ausgewählte Widget nach hinten - Adjust &Size &Größe anpassen - Adjusts the size of the selected widget Berechnet die Größe des ausgewählten Widgets aus dem Layout und passt das Widget an - Lay Out &Horizontally Objekte &waagrecht anordnen - Lays out the selected widgets horizontally Ordnet die ausgewähltenObjekte waagrecht an - Lay Out &Vertically Objekte &senkrecht anordnen - Lays out the selected widgets vertically Ordnet die ausgewählten Objekte senkrecht an - Lay Out in a &Grid Objekte &tabellarisch anordnen - Lays out the selected widgets in a grid Ordnet die ausgewählten Objekte tabellarisch an - Lay Out Horizontally in S&plitter Objekte waagrecht um Spl&itter anordnen - Lays out the selected widgets horizontally in a splitter Ordnet die ausgewählten Objekte um einen Splitter waagrecht an - Lay Out Vertically in Sp&litter Objekte senkrecht um Spl&itter anordnen - Lays out the selected widgets vertically in a splitter Ordnet die ausgewählten Objekte um einen Splitter senkecht an - &Break Layout La&yout auflösen - Breaks the selected layout Löst das ausgewählte Layout auf - &Preview... &Vorschau... - Preview current form Vorschau des Formulars - Form &Settings... Formular&einstellungen... - Break Layout Layout auflösen - Adjust Size Größe anpassen - Could not create form preview Title of warning message box Es konnte keine Vorschau erzeugt werden - Form Settings - %1 Formulareinstellungen - %1 - Removes empty columns and rows Entfernt unbesetzte Zeilen und Spalten - Lay Out in a &Form Layout Objekte in &Formularlayout anordnen - Lays out the selected widgets in a form layout Ordnet die ausgewählten Objekte in einem zweispaltigen Formularlayout an - Si&mplify Grid Layout Tabellarisches Layout &vereinfachen @@ -5066,12 +4151,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::FormWindowSettings - None Kein - Device Profile: %1 Profil: %1 @@ -5079,37 +4162,30 @@ Möchten Sie sie überschreiben? qdesigner_internal::GridPanel - Visible Sichtbar - Snap Einschnappen - Reset Rücksetzen - Form Formular - Grid Raster - Grid &X Raster &X - Grid &Y Raster &Y @@ -5117,7 +4193,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::GroupBoxTaskMenu - Change title... Titel ändern... @@ -5125,7 +4200,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::HtmlTextEdit - Insert HTML entity HTML-Sonderzeichen einfügen @@ -5133,92 +4207,74 @@ Möchten Sie sie überschreiben? qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Die Pixmap-Datei '%1' kann nicht gelesen werden. - The file '%1' does not appear to be a valid pixmap file: %2 Die Datei '%1' ist keine gültige Pixmap-Datei: %2 - The file '%1' could not be read: %2 Die Datei '%1' konnte nicht gelesen werden: %2 - Pixmap Read Error Fehler beim Lesen der Pixmap - ... ... - Normal Off Normal, aus - Normal On Normal, ein - Disabled Off Nicht verfügbar, aus - Disabled On Verfügbar, ein - Active Off Aktiv, aus - Active On Aktiv, ein - Selected Off Ausgewählt, aus - Selected On Ausgewählt, ein - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - Reset Rücksetzen - Reset All Alle rücksetzen - Choose a Pixmap Pixmap-Datei auswählen @@ -5226,58 +4282,46 @@ Möchten Sie sie überschreiben? qdesigner_internal::ItemListEditor - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - Items List Liste der Elemente - New Item Neues Element - &New &Neu - Delete Item Element löschen - &Delete &Löschen - Move Item Up Element eins nach oben - U U - Move Item Down Element eins nach unten - D D @@ -5285,12 +4329,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::LabelTaskMenu - Change rich text... Formatierbaren Text ändern... - Change plain text... Text ändern... @@ -5298,7 +4340,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::LanguageResourceDialog - Choose Resource Ressource auswählen @@ -5306,7 +4347,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::LineEditTaskMenu - Change text... Text ändern... @@ -5314,17 +4354,14 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetEditor - Edit List Widget List-Widget ändern - Edit Combobox Combobox ändern - New Item Neues Element @@ -5332,12 +4369,10 @@ Möchten Sie sie überschreiben? qdesigner_internal::ListWidgetTaskMenu - Edit Items... Elemente ändern... - Change List Contents Inhalt der Liste ändern @@ -5345,22 +4380,18 @@ Möchten Sie sie überschreiben? qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Nächste Unterfenster - Previous Subwindow Voriges Unterfenster - Tile Nebeneinander anordnen - Cascade Stapeln @@ -5368,7 +4399,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::MenuTaskMenu - Remove Löschen @@ -5376,7 +4406,6 @@ Möchten Sie sie überschreiben? qdesigner_internal::MorphMenu - Morph into Widget umwandeln in @@ -5384,42 +4413,34 @@ Möchten Sie sie überschreiben? qdesigner_internal::NewActionDialog - New Action... Neue Aktion... - &Text: &Text: - Shortcut: Tastenkürzel - Checkable: Ankreuzbar: - ToolTip: ToolTip: - ... ... - &Icon: &Icon: - Object &name: Objekt&name: @@ -5427,40 +4448,33 @@ Möchten Sie sie überschreiben? qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Namen der Eigenschaft setzen - The current object already has a property named '%1'. Please select another, unique one. Das Objekt besitzt eine bereits eine Eigenschaft namens '%1'. Bitte wählen Sie einen anderen, eindeutigen Namen. - Create Dynamic Property Dynamische Eigenschaft erzeugen - Property Name Name der Eigenschaft - Property Type Typ der Eigenschaft - The '_q_' prefix is reserved for the Qt library. Please select another name. Der Präfix '_q_' wird von der Qt-Bibliothek für interne Zwecke verwendet.Bitte wählen Sie einen anderen Namen. - horizontalSpacer @@ -5468,83 +4482,67 @@ Please select another name. qdesigner_internal::NewFormWidget - Default size Vorgabe - QVGA portrait (240x320) QVGA Hochformat (240x320) - QVGA landscape (320x240) QVGA Querformat (320x240) - VGA portrait (480x640) VGA Hochformat (480x640) - VGA landscape (640x480) VGA Querformat (640x480) - Widgets New Form Dialog Categories Widgets - Custom Widgets Benutzerdefinierte Widgets - None Kein - Error loading form Das Formular konnte nicht geladen werden - Unable to open the form template file '%1': %2 Die Formularvorlage '%1' konnte nicht geöffnet werden: %2 - Internal error: No template selected. Interner Fehler: Es ist keine Vorlage selektiert. - 0 0 - Choose a template for a preview Wählen Sie eine Vorlage für die Vorschau - Embedded Design Embedded-Entwurf - Device: Geräteprofil: - Screen Size: Bildschirmgröße: @@ -5552,37 +4550,30 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - Add Hinzufügen - New Promoted Class Neue Klasse - Base class name: Basisklasse: - Promoted class name: Klassenname: - Header file: Include-Datei: - Global include Globale Include-Datei - Reset Rücksetzen @@ -5590,12 +4581,10 @@ Please select another name. qdesigner_internal::ObjectInspector - Change Current Page Seite wechseln - &Find in Text... &Suchen... @@ -5603,32 +4592,26 @@ Please select another name. qdesigner_internal::OrderDialog - Index %1 (%2) Position %1 (%2) - Change Page Order Seiten umordnen - Page Order Reihenfolge - Move page up Seite eins nach oben - Move page down Seite eins nach unten - %1 %2 %1 %2 @@ -5636,47 +4619,38 @@ Please select another name. qdesigner_internal::PaletteEditor - Edit Palette Palette ändern - Tune Palette Palette - Show Details Details einblenden - Compute Details Details berechnen - Quick Einfach - Preview Vorschau - Disabled Ausgegraut - Inactive Inaktiv - Active Aktiv @@ -5684,7 +4658,6 @@ Please select another name. qdesigner_internal::PaletteEditorButton - Change Palette Palette ändern @@ -5692,22 +4665,18 @@ Please select another name. qdesigner_internal::PaletteModel - Color Role Farbrolle - Active Aktiv - Inactive Inaktiv - Disabled Ausgegraut @@ -5715,28 +4684,22 @@ Please select another name. qdesigner_internal::PixmapEditor - Copy Path Pfad kopieren - Paste Path Pfad einfügen - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - - ... ... @@ -5744,7 +4707,6 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - Edit text Text bearbeiten @@ -5752,37 +4714,30 @@ Please select another name. qdesigner_internal::PluginDialog - Components Komponenten - Plugin Information Plugins - Refresh Neu laden - Scan for newly installed custom widget plugins. Nach neu installierten Plugins mit benutzerdefinierten Widgets suchen. - Qt Designer couldn't find any plugins Qt Designer kann keine Plugins finden - Qt Designer found the following plugins Qt Designer hat die folgenden Plugins gefunden - New custom widget plugins have been found. Es wurden neu installierte Plugins mit benutzerdefinierten Widgets gefunden. @@ -5790,7 +4745,6 @@ Please select another name. qdesigner_internal::PreviewActionGroup - %1 Style %1-Stil @@ -5798,47 +4752,38 @@ Please select another name. qdesigner_internal::PreviewConfigurationWidget - Default Vorgabe - None Kein - Browse... Durchsuchen... - Load Custom Device Skin Benutzerdefinierten Geräte-Skin laden - All QVFB Skins (*.%1) Alle QVFB-Skins (*.%1) - %1 - Duplicate Skin %1 - Skin bereits vorhanden - The skin '%1' already exists. Der Skin '%1' ist bereits vorhanden. - %1 - Error %1 - Fehler - %1 is not a valid skin directory: %2 %1 ist kein gültiges Verzeichnis eines Skins: @@ -5848,24 +4793,20 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - &Portrait &Hochformat - Landscape (&CCW) Rotate form preview counter-clockwise Querformat (&entgegen Uhrzeigersinn) - &Landscape (CW) Rotate form preview clockwise Querformat (im &Uhrzeigersinn) - &Close &Schließen @@ -5873,7 +4814,6 @@ Please select another name. qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [Vorschau] @@ -5881,7 +4821,6 @@ Please select another name. qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5891,57 +4830,46 @@ ate the goose who was loose. qdesigner_internal::PreviewWidget - Preview Window Vorschaufenster - LineEdit - ComboBox - PushButton - ButtonGroup2 - CheckBox1 - CheckBox2 - ButtonGroup - RadioButton1 - RadioButton2 - RadioButton3 @@ -5949,22 +4877,18 @@ ate the goose who was loose. qdesigner_internal::PromotionModel - Name Name - Header file Include-Datei - Global include Globale Include-Datei - Usage Verwendet @@ -5972,27 +4896,22 @@ ate the goose who was loose. qdesigner_internal::PromotionTaskMenu - Promoted widgets... Benutzerdefinierte Klassen... - Promote to ... Als Platzhalter für benutzerdefinierte Klasse festlegen... - Promote to Als Platzhalter für benutzerdefinierte Klasse festlegen - Demote to %1 Platzhalter für benutzerdefinierte Klasse entfernen und in %1 wandeln - Change signals/slots... Signale/Slots ändern... @@ -6000,59 +4919,48 @@ ate the goose who was loose. qdesigner_internal::PropertyEditor - Add Dynamic Property... Dynamische Eigenschaft hinzufügen... - Remove Dynamic Property Dynamische Eigenschaft löschen - Tree View Baumansicht - Drop Down Button View Detailansicht - Object: %1 Class: %2 Objekt: %1 Klasse: %2 - Sorting Sortiert - Color Groups Farbige Hervorhebung - Configure Property Editor Anzeige der Eigenschaften konfigurieren - String... Zeichenkette... - Bool... Boolescher Wert... - Other... Anderer Typ... @@ -6060,7 +4968,6 @@ Klasse: %2 qdesigner_internal::PropertyLineEdit - Insert line break Zeilenumbruch einfügen @@ -6068,27 +4975,22 @@ Klasse: %2 qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Platzhalter für benutzerdefinierte Widgets - Promoted Classes Platzhalter für benutzerdefinierte Klassen - Promote Anwenden - %1 - Error %1 - Fehler - Change signals/slots... Signale/Slots ändern... @@ -6096,22 +4998,18 @@ Klasse: %2 qdesigner_internal::QDesignerResource - Loading qrc file Laden der Ressourcendatei - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Die Ressourcendatei <p><b>%1</b></p><p> konnte nicht gefunden werden. Möchten Sie einen neuen Pfad eingeben?</p> - New location for %1 Neuer Pfad für %1 - Resource files (*.qrc) Ressourcendateien (*.qrc) @@ -6119,67 +5017,54 @@ Klasse: %2 qdesigner_internal::QDesignerTaskMenu - Change objectName... Objektnamen ändern... - Change toolTip... ToolTip ändern... - Change whatsThis... WhatsThis ändern... - Change styleSheet... Stylesheet ändern... - Create Menu Bar Menüleiste erzeugen - Add Tool Bar Werkzeugleiste hinzufügen - Create Status Bar Statuszeile hinzufügen - Remove Status Bar Statuszeile löschen - Change script... Skript ändern... - Change signals/slots... Signale/Slots ändern... - Go to slot... Slot anzeigen... - no signals available Es sind keine Signale vorhanden - Set size constraint on %n widget(s) Größenbeschränkung eines Widgets festlegen @@ -6187,47 +5072,38 @@ Klasse: %2 - Size Constraints Größe - Set Minimum Width Minimalbreite festlegen - Set Minimum Height Minimalhöhe festlegen - Set Minimum Size Minimalgröße festlegen - Set Maximum Width Maximalbreite festlegen - Set Maximum Height Maximalhöhe festlegen - Set Maximum Size Maximalgröße festlegen - Edit ToolTip ToolTip bearbeiten - Edit WhatsThis What'sThis bearbeiten @@ -6235,41 +5111,33 @@ Klasse: %2 qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Ungültiges Element <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Der XML-Code für das Widget %3 enthält einen Fehler bei Zeile %1, Spalte %2:%4: %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Der XML-Code für das Widget %1 enthält keine Widgets.%2 - An error has been encountered at line %1 of %2: %3 Fehler bei Zeile %1 von %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> An Stelle des erwarteten <widget>- oder <ui>-Elementes wurde <%1> gefunden - Unexpected end of file encountered when parsing widgets. Vorzeitiges Dateiende beim Lesen der Widget-Box-Konfiguration. - A widget element could not be found. Es fehlt das Widget-Element. @@ -6277,73 +5145,58 @@ Klasse: %2 qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Farbton - Sat Sättigung - Val Wert - Saturation Sättigung - Value Wert - R R - G G - B B - Red Rot - Green Grün - Blue Blau @@ -6351,27 +5204,22 @@ Klasse: %2 qdesigner_internal::RichTextEditorDialog - Edit text Text bearbeiten - &OK &OK - &Cancel &Abbrechen - Rich Text Text - Source Quelltext @@ -6379,72 +5227,58 @@ Klasse: %2 qdesigner_internal::RichTextEditorToolBar - Bold Fett - CTRL+B CTRL+F - Italic Kursiv - CTRL+I CTRL+K - Underline Unterstreichen - CTRL+U CTRL+U - Left Align Linksbündig ausrichten - Center Zentrieren - Right Align Rechtsbündig ausrichten - Justify Blocksatz - Superscript Hochstellung - Subscript Tiefstellung - Insert &Link &Link einfügen - Insert &Image &Bild einfügen @@ -6452,17 +5286,14 @@ Klasse: %2 qdesigner_internal::ScriptDialog - Edit script Skript bearbeiten - Syntax error Syntaxfehler - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Geben Sie ein Qt-Skript zur Ausführung während des Formularaufbaus ein.<br>Auf das Widget und seine untergeordneten Widgets kann durch die Variablen <i>widget</i> und <i>childWidgets</i> zugegriffen werden. @@ -6470,7 +5301,6 @@ Klasse: %2 qdesigner_internal::ScriptErrorDialog - Script errors Skriptfehler @@ -6478,23 +5308,18 @@ Klasse: %2 qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Es existiert bereits ein Slot mit der Signatur '%1'. - There is already a signal with the signature '%1'. Es existiert bereits ein Signal mit der Signatur '%1'. - %1 - Duplicate Signature %1 - Doppelte Signatur - - Signals/Slots of %1 Signale/Slots von %1 @@ -6502,12 +5327,10 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Signale und Slots bearbeiten - F4 F4 @@ -6515,7 +5338,6 @@ Klasse: %2 qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Signale und Slots bearbeiten @@ -6523,7 +5345,6 @@ Klasse: %2 qdesigner_internal::StatusBarTaskMenu - Remove Löschen @@ -6531,7 +5352,6 @@ Klasse: %2 qdesigner_internal::StringListEditorButton - Change String List Zeichenkettenliste ändern @@ -6539,38 +5359,30 @@ Klasse: %2 qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet Stylesheet bearbeiten - - Valid Style Sheet Stylesheet gültig - Invalid Style Sheet Stylesheet ungültig - Add Resource... Ressource hinzufügen... - Add Gradient... Gradient hinzufügen... - Add Color... Farbe hinzufügen... - Add Font... Font hinzufügen... @@ -6578,27 +5390,22 @@ Klasse: %2 qdesigner_internal::TabOrderEditor - Start from Here Hier neu beginnen - Restart Neu beginnen - Tab Order List... Tabulatorreihenfolge... - Tab Order List Tabulatorreihenfolge - Tab Order Tabulatorreihenfolge @@ -6606,7 +5413,6 @@ Klasse: %2 qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6614,7 +5420,6 @@ Klasse: %2 qdesigner_internal::TabOrderEditorTool - Edit Tab Order Tabulatorreihenfolge bearbeiten @@ -6622,48 +5427,38 @@ Klasse: %2 qdesigner_internal::TableWidgetEditor - New Column Neue Spalte - New Row Neue Zeile - &Columns &Spalten - &Rows &Zeilen - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - Edit Table Widget Table Widget ändern - &Items &Inhalt - Table Items Tabellenelemente @@ -6671,7 +5466,6 @@ Klasse: %2 qdesigner_internal::TableWidgetTaskMenu - Edit Items... Elemente ändern... @@ -6679,22 +5473,18 @@ Klasse: %2 qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Wählen Sie ein Verzeichnis zum Abspeichern der Vorlagen aus - Form - Additional Template Paths Zusätzliche Verzeichnisse für Vorlagen - ... ... @@ -6702,22 +5492,18 @@ Klasse: %2 qdesigner_internal::TextEditTaskMenu - Change HTML... HTML ändern... - Edit HTML HTML bearbeiten - Edit Text Text bearbeiten - Change Plain Text... Text ändern... @@ -6725,22 +5511,18 @@ Klasse: %2 qdesigner_internal::TextEditor - Choose Resource... Ressource auswählen... - Choose File... Datei auswählen... - Choose a File - ... ... @@ -6748,27 +5530,22 @@ Klasse: %2 qdesigner_internal::ToolBarEventFilter - Insert Separator Trenner einfügen - Remove action '%1' Aktion '%1' löschen - Remove Toolbar '%1' Werkzeugleiste '%1' löschen - Insert Separator before '%1' Trenner vor '%1' einfügen - Append Separator Trenner hinzufügen @@ -6776,125 +5553,98 @@ Klasse: %2 qdesigner_internal::TreeWidgetEditor - &Columns &Spalten - Per column properties Spalteneigenschaften - Common properties Gemeinsame Eigenschaften - - New Item Neues Element - Properties &<< Eigenschaften &<< - - Properties &>> Eigenschaften &>> - New Column Neue Spalte - Edit Tree Widget Tree Widget ändern - &Items &Inhalt - Tree Items Elemente - - New Subitem - New &Subitem Neues &untergeordnetes Element - Delete Item Element löschen - Move Item Left (before Parent Item) Element nach links (vor übergeordnetes Element) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Element nach rechts (als untergeordnetes Element des nächsten gleichrangigen Elements) - R R - Move Item Up Element eins nach oben - U U - Move Item Down Element eins nach unten - D D - 1 1 - &New &Neu - &Delete &Löschen @@ -6902,7 +5652,6 @@ Klasse: %2 qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Elemente ändern... @@ -6910,7 +5659,6 @@ Klasse: %2 qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Warnung: Die Erzeugung des Widgets in der Widget-Box schlug fehl. Das könnte durch fehlerhaften XML-Code benutzerdefinierter Widgets verursacht worden sein. @@ -6918,42 +5666,34 @@ Klasse: %2 qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Ablage - Custom Widgets Benutzerdefinierte Widgets - Expand all Alles aufklappen - Collapse all Alles zuklappen - List View Listenansicht - Icon View Icon-Ansicht - Remove Löschen - Edit name Namen ändern @@ -6961,7 +5701,6 @@ Klasse: %2 qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Es wurde ein Plugin gefunden, das ein benutzerdefiniertes Widget enthält, dessen Klassenname (%1) einer existierenden Klasse entspricht. @@ -6969,7 +5708,6 @@ Klasse: %2 qdesigner_internal::WidgetEditorTool - Edit Widgets Widgets bearbeiten @@ -6977,33 +5715,27 @@ Klasse: %2 qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Die Factory für benutzerdefinierte Widgets der Klasse %1 gab einen 0-Zeiger zurück. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Bei der Erzeugung von Widgets wurden widersprüchliche Klassennamen festgestellt: Die Factory für benutzerdefinierte Widgets der Klasse %1 gab ein Widget der Klasse %2 zurück. - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Der Container '%1' (%2) hat keine Seite, auf der ein Layout angelegt werden könnte. Das deutet auf eine inkonsistente ui-Datei hin; wahrscheinlich wurde ein Layout direkt auf dem Container spezifiziert. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Es wurde versucht, ein Layout auf das Widget '%1' (%2) zu setzen, welches bereits ein Layout vom Typ %3 hat. Das deutet auf eine Inkonsistenz in der ui-Datei hin. - Cannot create style '%1'. Der Stil '%1' konnte nicht erzeugt werden. - %1 Widget %1 Widget @@ -7011,12 +5743,10 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::WizardContainerWidgetTaskMenu - Next Nächste - Back Vorige @@ -7024,7 +5754,6 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7033,7 +5762,6 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Vergrößern diff --git a/translations/linguist_de.ts b/translations/linguist_de.ts index 5597458..b4e0a45 100644 --- a/translations/linguist_de.ts +++ b/translations/linguist_de.ts @@ -4,7 +4,6 @@ AboutDialog - Qt Linguist Qt Linguist @@ -12,27 +11,22 @@ BatchTranslationDialog - Batch Translation of '%1' - Qt Linguist Automatische Übersetzung von '%1' - Qt Linguist - Searching, please wait... Suche, bitte warten ... - &Cancel &Abbrechen - Linguist batch translator Automatischer Übersetzer (Linguist) - Batch translated %n entries 1 Eintrag wurde automatisch übersetzt @@ -40,62 +34,50 @@ - Qt Linguist - Batch Translation Qt Linguist - Automatische Übersetzung - Options Optionen - Set translated entries to finished Übersetzung als erledigt markieren - Retranslate entries with existing translation Einträge mit bereits existierender Übersetzung neu übersetzen - Translate also finished entries Erledigte Einträge übersetzen - Phrase book preference Wörterbücher - Move up Nach oben - Move down Nach unten - &Run &Ausführen - Cancel Abbrechen - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked Geänderte Einträge werden als unerledigt gekennzeichnet, wenn die obige Einstellung 'Übersetzung als erledigt markieren' nicht aktiviert ist - The batch translator will search through the selected phrase books in the order given above Der automatische Übersetzer wird in der angegebenen Reihenfolge durch die ausgewählten Wörterbücher gehen @@ -103,45 +85,36 @@ DataModel - <qt>Duplicate messages found in '%1': <qt>Mehrfach vorhandene Meldungen in '%1': - - <p>[more duplicates omitted] <p>[weitere mehrfach vorhandene Nachrichten weggelassen] - <p>* ID: %1 <p>* ID: %1 - <p>* Context: %1<br>* Source: %2 <p>* Kontext: %1<br>* Quelle: %2 - <br>* Comment: %3 <br>* Kommentar: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. Die Regeln zur Pluralbildung der Sprache '%1' sind in Linguist nicht definiert. Es wird mit einer einfachen Universalform gearbeitet. - Cannot create '%2': %1 '%2' kann nicht erzeugt werden: %1 - Universal Form Universalform @@ -149,37 +122,30 @@ Es wird mit einer einfachen Universalform gearbeitet. ErrorsView - Accelerator possibly superfluous in translation. Möglicherweise überflüssiger Kurzbefehl im Übersetzungstext. - Accelerator possibly missing in translation. Kurzbefehl fehlt im Übersetzungstext. - Translation does not end with the same punctuation as the source text. Interpunktion am Ende des Übersetzungstextes unterscheidet sich von Interpunktion des Ursprungstextes. - A phrase book suggestion for '%1' was ignored. Ein Vorschlag aus dem Wörterbuch für '%1' wurde nicht berücksichtigt. - Translation does not refer to the same place markers as in the source text. Platzhalter im Übersetzungstext und Ursprungstext unterscheiden sich. - Translation does not contain the necessary %n place marker. Der erforderliche Platzhalter (%n) fehlt in der Übersetzung. - Unknown error Unbekannter Fehler @@ -187,97 +153,78 @@ Es wird mit einer einfachen Universalform gearbeitet. FindDialog - This window allows you to search for some text in the translation source file. Dieses Fenster erlaubt die Suche in der Übersetzungsdatei. - Type in the text to search for. Geben Sie den Text ein, nach dem gesucht werden soll. - Options Optionen - Source texts are searched when checked. Wenn aktiviert, wird in den Ursprungstexten gesucht. - Translations are searched when checked. Wenn ausgewählt, wird in den Übersetzungen gesucht. - Texts such as 'TeX' and 'tex' are considered as different when checked. Wenn aktiviert, werden Texte wie 'TeX' und 'tex' als unterschiedlich betrachtet. - Comments and contexts are searched when checked. Wenn ausgewählt, werden Kommentare und Kontextnamen durchsucht. - Find Suchen - &Find what: &Suchmuster: - &Source texts &Ursprungstexte - &Translations &Übersetzungen - &Match case &Groß-/Kleinschreibung beachten - &Comments &Kommentare - Ignore &accelerators Tastenkürzel &ignorieren - Click here to find the next occurrence of the text you typed in. Klicken Sie hier, um zum nächsten Vorkommen des Suchtextes zu springen. - Find Next Weitersuchen - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Cancel Abbrechen - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog @@ -286,30 +233,25 @@ Es wird mit einer einfachen Universalform gearbeitet. FormMultiWidget - Alt+Delete translate, but don't change Alt+Delete - Shift+Alt+Insert translate, but don't change Shift+Alt+Insert - Alt+Insert translate, but don't change Alt+Insert - Confirmation - Qt Linguist Bestätigung - Qt Linguist - Delete non-empty length variant? Soll die ausgefüllte Längenvariante gelöscht werden? @@ -317,7 +259,6 @@ Es wird mit einer einfachen Universalform gearbeitet. LRelease - Dropped %n message(s) which had no ID. Es wurde ein Eintrag ohne Bezeichner gelöscht. @@ -325,7 +266,6 @@ Es wird mit einer einfachen Universalform gearbeitet. - Excess context/disambiguation dropped from %n message(s). Es wurde überflüssiger Kontext beziehungsweise überflüssige Infomation zur Unterscheidung bei einem Eintrag entfernt. @@ -333,10 +273,23 @@ Es wird mit einer einfachen Universalform gearbeitet. - + Generated %n translation(s) (%1 finished and %2 unfinished) + + Eine Übersetzung wurde erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) + %n Übersetzungen wurden erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) + + + + Ignored %n untranslated source text(s) + + Ein nicht übersetzter Text wurde ignoriert + %n nicht übersetzte Texte wurden ignoriert + + + Generated %n translation(s) (%1 finished and %2 unfinished) - + Eine Übersetzung wurde erzeugt (%1 abgeschlossen und %2 nicht abgeschlossen) %n Übersetzungen wurden erzeugt (%1 abgeschlossene und %2 nicht abgeschlossene) @@ -344,10 +297,9 @@ Es wird mit einer einfachen Universalform gearbeitet. - Ignored %n untranslated source text(s) - + Ein nicht übersetzter Text wurde ignoriert %n nicht übersetzte Texte wurden ignoriert @@ -358,628 +310,496 @@ Es wird mit einer einfachen Universalform gearbeitet. MainWindow - MainWindow Hauptfenster - &Phrases &Wörterbuch - &Close Phrase Book Wörterbuch &Schließen - &Edit Phrase Book Wörterbuch &bearbeiten - &Print Phrase Book Wörterbuch &drucken - V&alidation V&alidierung - &View &Ansicht - Vie&ws &Ansichten - &Toolbars &Werkzeugleisten - &Help &Hilfe - &Translation &Übersetzung - &File &Datei - &Edit &Bearbeiten - &Open... Ö&ffnen ... - Open a Qt translation source file (TS file) for editing Qt-Übersetzungsdatei (TS-Datei) zum Bearbeiten öffnen - Ctrl+O Ctrl+O - E&xit &Beenden - Close this window and exit. Dieses Fenster schließen und das Programm beenden. - Ctrl+Q Ctrl+Q - - &Save &Speichern - Save changes made to this Qt translation source file Änderungen an der Qt-Übersetzungsdatei speichern - Move to the previous unfinished item. Zum vorherigen unerledigten Eintrag gehen. - Move to the next unfinished item. Zum nächsten unerledigten Eintrag gehen. - Move to the previous item. Zum vorigen Eintrag gehen. - Move to the next item. Zum nächsten Eintrag gehen. - Mark this item as done and move to the next unfinished item. Diesen Eintrag als erledigt markieren und zum nächsten unerledigten Eintrag gehen. - Copy from source text Ursprungstext übernehmen - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. Die Prüfung der Tastenkürzel, das heißt, die Übereinstimmung der kaufmännischen Und-Zeichen in Quelle und Übersetzung ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. Die Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. Die Prüfung der Verwendung der Wörterbuchvorschläge ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. Die Prüfung der Platzhalter, das heißt, ob %1, %2 usw. in Ursprungstext und Übersetzung übereinstimmend verwendet werden, ein- bzw. ausschalten. Bei Fehlschlag wird eine Warnung im Hinweis-Fenster angezeigt. - Open Read-O&nly... Schr&eibgeschützt öffnen ... - &Save All &Alle speichern - Ctrl+S Ctrl+S - - - Save &As... Speichern &unter... - Save As... Speichern unter ... - Save changes made to this Qt translation source file into a new file. Änderungen an dieser Qt-Übersetzungsdatei in einer neuen Datei speichern. - &Release &Freigeben - Create a Qt message file suitable for released applications from the current message file. Qt-Nachrichtendatei (QM-Datei) aus der aktuellen Übersetzungsdatei erzeugen. - &Print... &Drucken ... - Ctrl+P Ctrl+P - &Undo &Rückgängig - Recently Opened &Files Zu&letzt bearbeitete Dateien - Save Speichern - Print a list of all the translation units in the current translation source file. Liste aller Übersetzungseinheiten in der aktuellen Übersetzungsdatei drucken. - Undo the last editing operation performed on the current translation. Die letzte Änderung an der Übersetzung rückgängig machen. - Ctrl+Z Ctrl+Z - &Redo &Wiederherstellen - Redo an undone editing operation performed on the translation. Die letzte rückgängig gemachte Änderung wieder herstellen. - Ctrl+Y Ctrl+Y - Cu&t &Ausschneiden - Copy the selected translation text to the clipboard and deletes it. Den ausgewählten Übersetzungstext in die Zwischenablage kopieren und löschen. - Ctrl+X Ctrl+X - &Copy &Kopieren - Copy the selected translation text to the clipboard. Den ausgewählten Übersetzungstext in die Zwischenablage kopieren. - Ctrl+C Ctrl+C - &Paste &Einfügen - Paste the clipboard text into the translation. Text aus der Zwischenablage in die Übersetzung einfügen. - Ctrl+V Ctrl+V - Select &All Alles &markieren - Select the whole translation text. Den gesamten Übersetzungstext auswählen. - Ctrl+A Ctrl+A - &Find... &Suchen ... - Search for some text in the translation source file. In der Übersetzungsdatei nach Text suchen. - Ctrl+F Ctrl+F - Find &Next &Weitersuchen - Continue the search where it was left. Die Suche fortsetzen. - F3 F3 - &Prev Unfinished &Vorheriger Unerledigter - Close Schließen - &Close All A&lle schließen - Ctrl+W Ctrl+W - Ctrl+K Ctrl+K - &Next Unfinished &Nächster Unerledigter - P&rev V&orheriger - Ctrl+Shift+K Ctrl+Shift+K - Ne&xt Nä&chster - &Done and Next &Fertig und Nächster - Copies the source text into the translation field. Kopiert den Ursprungstext in das Übersetzungsfeld. - Ctrl+B Ctrl+B - &Accelerators &Kurzbefehle - &Ending Punctuation &Punktierung am Ende - &Phrase matches &Wörterbuch - Place &Marker Matches Platz&halter - &New Phrase Book... &Neues Wörterbuch ... - Create a new phrase book. Ein neues Wörterbuch erzeugen. - Ctrl+N Ctrl+N - &Open Phrase Book... &Wörterbuch öffnen ... - Open a phrase book to assist translation. Ein Wörterbuch zur Unterstützung bei der Übersetzung öffnen. - Ctrl+H Ctrl+H - &Reset Sorting &Sortierung zurücksetzen - Sort the items back in the same order as in the message file. Die Einträge in der gleichen Reihenfolge wie in der ursprünglichen Übersetzungsdatei sortieren. - &Display guesses &Vorschläge anzeigen - Set whether or not to display translation guesses. Darstellung von Übersetzungsvorschlägen aktivieren/deaktivieren. - &Statistics S&tatistik - Display translation statistics. Zeige Übersetzungsstatistik an. - &Manual &Handbuch - F1 F1 - About Qt Linguist Über Qt Linguist - About Qt Über Qt - &What's This? &Direkthilfe - What's This? Direkthilfe - Enter What's This? mode. Direkthilfe-Modus aktivieren. - Shift+F1 Shift+F1 - &Search And Translate... Suchen und &übersetzen ... - Replace the translation on all entries that matches the search source text. Die Übersetzung aller Einträge ersetzen, die dem Suchtext entsprechen. - - &Batch Translation... &Automatische Übersetzung ... - Batch translate all entries using the information in the phrase books. Alle Einträge automatisch mit Hilfe des Wörterbuchs übersetzen. - - - Release As... Freigeben unter ... - This is the application's main window. - Source text Ursprungstext - - Index Index - - Context Kontext - Items Einträge - This panel lists the source contexts. Dieser Bereich zeigt die Kontexte an. - Strings Zeichenketten - Phrases and guesses Wörterbuch und Vorschläge - Sources and Forms Quelldateien und Formulare - Warnings Hinweise - MOD status bar: file(s) modified Geändert - Loading... Lade ... - - Loading File - Qt Linguist Laden - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -988,7 +808,6 @@ Close the open file(s) first? Sollen die bereits geöffneten Dateien vorher geschlossen werden? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -997,7 +816,6 @@ Skip loading the first named file? Soll die erstgenannte Datei übersprungen werden? - %n translation unit(s) loaded. Eine Übersetzungseinheit geladen. @@ -1005,124 +823,84 @@ Soll die erstgenannte Datei übersprungen werden? - Related files (%1);; Verwandte Dateien (%1);; - Open Translation Files Übersetzungsdateien öffnen - - File saved. Datei gespeichert. - - - Release Freigeben - Qt message files for released applications (*.qm) All files (*) Qt-Nachrichtendateien (*.qm) Alle Dateien (*) - - File created. Datei erzeugt. - - Printing... Drucke ... - Context: %1 Kontext: %1 - finished erledigt - unresolved ungelöst - obsolete veraltet - - Printing... (page %1) Drucke ... (Seite %1) - - Printing completed Drucken beendet - - Printing aborted Drucken abgebrochen - Search wrapped. Suche beginnt von oben. - - - - - - - - - - Qt Linguist Qt Linguist - - Cannot find the string '%1'. Kann Zeichenkette '%1' nicht finden. - Search And Translate in '%1' - Qt Linguist Suchen und übersetzen in '%1' - Qt Linguist - - - Translate - Qt Linguist Übersetzung - Qt Linguist - Translated %n entry(s) Ein Eintrag übersetzt @@ -1130,39 +908,32 @@ Alle Dateien (*) - No more occurrences of '%1'. Start over? Keine weiteren Vorkommen von '%1'. Von vorne beginnen? - Create New Phrase Book Erzeugen eines neuen Wörterbuchs - Qt phrase books (*.qph) All files (*) Qt-Wörterbücher (*.qph) Alle Dateien (*) - Phrase book created. Wörterbuch erzeugt. - Open Phrase Book Wörterbuch öffnen - Qt phrase books (*.qph);;All files (*) Qt-Wörterbücher (*.qph);;Alle Dateien (*) - %n phrase(s) loaded. Ein Wörterbucheintrag geladen. @@ -1170,328 +941,254 @@ Alle Dateien (*) - - - Add to phrase book Hinzufügen zum Wörterbuch - No appropriate phrasebook found. Es kann kein geeignetes Wörterbuch gefunden werden. - Adding entry to phrasebook %1 Eintrag zu Wörterbuch %1 hinzufügen - Select phrase book to add to Zu welchem Wörterbuch soll der Eintrag hinzugefügt werden? - Unable to launch Qt Assistant (%1) Qt Assistant kann nicht gestartet werden (%1) - Version %1 Version %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - Do you want to save the modified files? Möchten Sie die geänderten Dateien speichern? - Do you want to save '%1'? Möchten Sie '%1' speichern? - Qt Linguist[*] Qt Linguist[*] - %1[*] - Qt Linguist %1[*] - Qt Linguist - - No untranslated translation units left. Es wurden alle Übersetzungseinheiten abgearbeitet. - &Window &Fenster - Minimize Minimieren - Ctrl+M Ctrl+M - Display the manual for %1. Handbuch zu %1 anzeigen. - Display information about %1. Informationen über %1 anzeigen. - &Save '%1' '%1' &speichern - Save '%1' &As... '%1' speichern &unter ... - Release '%1' '%1' freigeben - Release '%1' As... '%1' freigeben unter ... - &Close '%1' '%1' &schließen - - &Close &Schließen - Save All Alles speichern - - &Release All Alles f&reigeben - Close All Alle schließen - Translation File &Settings for '%1'... Einstellungen der Übersetzungs&datei für '%1' ... - &Batch Translation of '%1'... &Automatische Übersetzung von '%1' ... - Search And &Translate in '%1'... Suchen und &übersetzen in '%1' ... - Search And &Translate... Suchen und &übersetzen ... - - File Datei - - Edit Bearbeiten - - Translation Übersetzung - - Validation Validierung - - Help Hilfe - Cannot read from phrase book '%1'. Wörterbuch '%1' kann nicht gelesen werden. - Close this phrase book. Dieses Wörterbuch schließen. - Enables you to add, modify, or delete entries in this phrase book. Erlaubt das Hinzufügen, Ändern und Entfernen von Wörterbuch-Einträgen. - Print the entries in this phrase book. Die Einträge des Wörterbuchs drucken. - Cannot create phrase book '%1'. Wörterbuch '%1' kann nicht erzeugt werden. - Do you want to save phrase book '%1'? Möchten Sie das Wörterbuch '%1' speichern? - All Alle - Open/Refresh Form &Preview &Vorschau öffnen/aktualisieren - Form Preview Tool Vorschau für Eingabemasken - F5 F5 - - Translation File &Settings... E&instellungen ... - &Add to Phrase Book Zum Wörterbuch &hinzufügen - Ctrl+T Ctrl+T - Ctrl+J Ctrl+J - Ctrl+Shift+J Ctrl+Shift+J - Previous unfinished item Vorheriger unerledigter Eintrag - Next unfinished item Nächster unerledigter Eintrag - Move to previous item Zum vorigen Eintrag gehen - Next item Nächster Eintrag - Mark item as done and move to the next unfinished item Eintrag als erledigt markieren und zum nächsten unerledigten Eintrag gehen - Copies the source text into the translation field Kopiert den Ursprungstext in das Übersetzungsfeld - Toggle the validity check of accelerators Prüfung der Tastenkürzel ein- bzw. ausschalten - Toggle the validity check of ending punctuation Prüfung der Satzendezeichen am Ende des Textes ein- bzw. ausschalten - Toggle checking that phrase suggestions are used Überprüfung, ob Wörterbucheinträge benutzt werden, aktivieren/deaktivieren - Toggle the validity check of place markers Prüfung der Platzhalter ein- bzw. ausschalten' - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. Eine Qt-Nachrichtendatei aus der aktuellen Übersetzungsdatei erzeugen. Der Dateiname wird automatisch aus dem Namen der TS-Datei abgeleitet. - Length Variants Längenvarianten - Display information about the Qt toolkit by Nokia. Zeigt Informationen über das Qt-Toolkit von Nokia an. @@ -1499,103 +1196,83 @@ Alle Dateien (*) MessageEditor - This is the right panel of the main window. - Russian Russisch - German Deutsch - Japanese Japanisch - French Französisch - Polish Polnisch - Chinese Chinesisch - This whole panel allows you to view and edit the translation of some source text. Dieser Bereich erlaubt die Darstellung und Änderung der Übersetzung eines Textes. - Source text Ursprungstext - This area shows the source text. Dieser Bereich zeigt den Ursprungstext. - Source text (Plural) Ursprungstext (Plural) - This area shows the plural form of the source text. Dieser Bereich zeigt die Pluralform des Ursprungstexts. - Developer comments Hinweise des Entwicklers - This area shows a comment that may guide you, and the context in which the text occurs. Dieser Bereich zeigt eventuelle Kommentare und den Kontext, in dem der Text auftritt. - Here you can enter comments for your own use. They have no effect on the translated applications. Hier können Sie Hinweise für den eigenen Gebrauch eintragen. Diese haben keinen Einflusse auf die Übersetzung. - %1 translation (%2) Übersetzung %1 (%2) - This is where you can enter or modify the translation of the above source text. Hier können Sie die Übersetzung des Ursprungstextes eingeben bzw. ändern. - %1 translation Übersetzung %1 - %1 translator comments %1 Hinweise des Übersetzers - '%1' Line: %2 '%1' @@ -1605,22 +1282,18 @@ Zeile: %2 MessageModel - Completion status for %1 Bearbeitungsstand von %1 - <file header> <Dateikopf> - <context comment> <Kontexthinweis> - <unnamed context> <unbenannter Kontext> @@ -1628,7 +1301,6 @@ Zeile: %2 MsgEdit - This is the right panel of the main window. @@ -1637,113 +1309,91 @@ Zeile: %2 PhraseBookBox - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - (New Entry) (Neuer Eintrag) - %1[*] - Qt Linguist %1[*] - Qt Linguist - Qt Linguist Qt Linguist - Cannot save phrase book '%1'. Wörterbuch '%1' kann nicht gespeichert werden. - Edit Phrase Book Wörterbuch bearbeiten - This window allows you to add, modify, or delete entries in a phrase book. Dieses Fenster erlaubt das Hinzufügen, Ändern und Entfernen von Wörterbuch-Einträgen. - &Translation: &Übersetzung: - This is the phrase in the target language corresponding to the source phrase. Dies ist der Text, der in der Zielsprache dem Ursprungstext entspricht. - S&ource phrase: &Ursprungstext: - This is a definition for the source phrase. Dies ist die Definition des Ursprungstextes. - This is the phrase in the source language. Dies ist der Text der Ursprungssprache. - &Definition: &Definition: - Click here to add the phrase to the phrase book. Einen neuen Eintrag ins Wörterbuch einfügen. - &New Entry &Neuer Eintrag - Click here to remove the entry from the phrase book. Den Eintrag aus dem Wörterbuch entfernen. - &Remove Entry &Eintrag entfernen - Settin&gs... &Einstellungen ... - Click here to save the changes made. Änderungen speichern. - &Save &Speichern - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Close Schließen @@ -1751,17 +1401,14 @@ Zeile: %2 PhraseModel - Source phrase Ursprungstext - Translation Übersetzung - Definition Definition @@ -1769,22 +1416,18 @@ Zeile: %2 PhraseView - Insert Einfügen - Edit Bearbeiten - Guess (%1) Vorschlag (%1) - Guess Vorschlag @@ -1792,63 +1435,46 @@ Zeile: %2 QObject - Compiled Qt translations Kompilierte Qt-Übersetzungen - Translation files (%1);; Übersetzungsdateien (%1);; - All files (*) Alle Dateien (*) - - - - - - - Qt Linguist Qt Linguist - GNU Gettext localization files GNU-Gettext-Übersetzungsdateien - GNU Gettext localization template files Vorlagen für GNU-Gettext-Übersetzungsdateien - Qt translation sources (format 1.1) Qt-Übersetzungsdateien (Formatversion 1.1) - Qt translation sources (format 2.0) Qt-Übersetzungsdateien (Formatversion 2.0) - Qt translation sources (latest format) Qt-Übersetzungsdateien (aktuelles Format) - XLIFF localization files XLIFF-Übersetzungsdateien - Qt Linguist 'Phrase Book' Qt-Linguist-Wörterbuch @@ -1856,17 +1482,14 @@ Zeile: %2 SourceCodeView - <i>Source code not available</i> <i>Quelltext nicht verfügbar</i> - <i>File %1 not available</i> <i>Datei %1 nicht vorhanden</i> - <i>File %1 not readable</i> <i>Datei %1 nicht lesbar</i> @@ -1874,42 +1497,34 @@ Zeile: %2 Statistics - Statistics Statistiken - Translation Übersetzung - Source Quelle - 0 0 - Words: Wörter: - Characters: Zeichen: - Characters (with spaces): Zeichen (mit Leerzeichen): - Close Schließen @@ -1917,72 +1532,58 @@ Zeile: %2 TranslateDialog - This window allows you to search for some text in the translation source file. Dieses Fenster erlaubt die Suche in der Übersetzungsdatei. - Type in the text to search for. Geben Sie den Text ein, nach dem gesucht werden soll. - Find &source text: &Ursprungstext: - &Translate to: &Übersetzung: - Search options Sucheinstellungen - Texts such as 'TeX' and 'tex' are considered as different when checked. Wenn aktiviert, werden Texte wie 'TeX' und 'tex' als unterschiedlich betrachtet. - Match &case &Groß-/Kleinschreibung beachten - Mark new translation as &finished Neue Übersetzung als &erledigt markieren - Click here to find the next occurrence of the text you typed in. Klicken Sie hier, um zum nächsten Vorkommen des Suchtextes zu springen. - Find Next Weitersuchen - Translate Übersetzen - Translate All Alle übersetzen - Click here to close this window. Klicken Sie hier, um das Fenster zu schließen. - Cancel Abbrechen @@ -1990,33 +1591,26 @@ Zeile: %2 TranslationSettingsDialog - Any Country Land - - Settings for '%1' - Qt Linguist Einstellungen für '%1' - Qt Linguist - Source language Ursprungssprache - Language Sprache - Country/Region Land/Region - Target language Zielsprache diff --git a/translations/qt_de.ts b/translations/qt_de.ts index 74bd048..7a062dc 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -4,7 +4,6 @@ CloseButton - Close Tab Schließen @@ -12,12 +11,10 @@ FakeReply - Fake error ! Fake error ! - Invalid URL Ungültige URL @@ -25,37 +22,30 @@ MAC_APPLICATION_MENU - Services Dienste - Hide %1 %1 ausblenden - Hide Others Andere ausblenden - Show All Alle anzeigen - Preferences... Einstellungen... - Quit %1 %1 beenden - About %1 Über %1 @@ -63,32 +53,26 @@ Phonon:: - Notifications Benachrichtigungen - Music Musik - Video Video - Communication Kommunikation - Games Spiele - Accessibility Eingabehilfen @@ -96,24 +80,18 @@ Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Das Audiogerät <b>%1</b> funktioniert nicht.<br/>Es wird stattdessen <b>%2</b> verwendet.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Das Audiogerät <b>%1</b> wurde aktiviert,<br/>da es gerade verfügbar und höher priorisiert ist.</html> - - Revert back to device '%1' Zurückschalten zum Gerät '%1' - <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> <html>Es wird zum Audiogerät <b>%1</b> geschaltet, <br/>da es höher priorisiert ist oder spezifisch für diesen Stream konfiguriert wurde.</html> @@ -121,14 +99,12 @@ Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Achtung: Das Paket gstreamer0.10-plugins-good ist nicht installiert. Einige Video-Funktionen stehen nicht zur Verfügung. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Achtung: Die grundlegenden GStreamer-Plugins sind nicht installiert. @@ -138,7 +114,6 @@ Die Audio- und Video-Unterstützung steht nicht zur Verfügung. Phonon::Gstreamer::MediaObject - Cannot start playback. Check your GStreamer installation and make sure you @@ -148,49 +123,34 @@ have libgstreamer-plugins-base installed. Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass das Paket libgstreamer-plugins-base installiert ist. - Missing codec helper script assistant. Der Skript-Hilfsassistent des Codecs fehlt. - Plugin codec installation failed for codec: %0 Die Installation des Codec-Plugins schlug fehl für: %0 - A required codec is missing. You need to install the following codec(s) to play this content: %0 Es sind nicht alle erforderlichen Codecs installiert. Um diesen Inhalt abzuspielen, muss der folgende Codec installiert werden: %0 - - - - - - - - Could not open media source. Die Medienquelle konnte nicht geöffnet werden. - Invalid source type. Ungültiger Typ der Medienquelle. - Could not locate media source. Die Medienquelle konnte nicht gefunden werden. - Could not open audio device. The device is already in use. Das Audiogerät konnte nicht geöffnet werden, da es bereits in Benutzung ist. - Could not decode media source. Die Medienquelle konnte nicht gefunden werden. @@ -198,162 +158,130 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF - Audio Output Audio-Ausgabe - The audio output device Audio-Ausgabegerät - No error Kein Fehler - Not found Nicht gefunden - Out of memory Es ist kein Speicher mehr verfügbar - Not supported Nicht unterstützt - Overflow Überlauf - Underflow Unterlauf - Already exists Existiert bereits - Path not found Pfad konnte nicht gefunden werden - In use Bereits in Verwendung - Not ready Nicht bereit - Access denied Zugriff verweigert - Could not connect Es konnte keine Verbindung hergestellt werden - Disconnected Getrennt - Permission denied Zugriff verweigert - Insufficient bandwidth Unzureichende Bandweite - Network unavailable Netzwerk nicht verfügbar - Network communication error Fehler bei der Kommunikation über das Netzwerk - Streaming not supported Streaming nicht unterstützt - Server alert Server alert - Invalid protocol Ungültiges Protokoll - Invalid URL Ungültige URL - Multicast error Multicast-Fehler - Proxy server error Fehler bei Proxy-Server-Kommunikation - Proxy server not supported Proxy-Server nicht unterstützt - Audio output error Fehler bei Audio-Ausgabe - Video output error Fehler bei Video-Ausgabe - Decoder error Fehler im Decoder - Audio or video components could not be played Audio- oder Videokomponenten konnten nicht abgespielt werden - DRM error DRM-Fehler - Unknown error (%1) Unbekannter Fehler (%1) @@ -361,33 +289,34 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AbstractMediaPlayer - Not ready to play Das Abspielen ist im Grundzustand nicht möglich - - Error opening file Die Datei konnte nicht geöffnet werden - Error opening URL Der URL konnte nicht geöffnet werden - + Error opening resource + Die Ressource konnte nicht geöffnet werden + + + Error opening source: resource not opened + Die Quelle konnte nicht geöffnet werden: Ressource nicht geöffnet + + Setting volume failed Die Lautstärke konnte nicht eingestellt werden - Loading clip failed Das Laden des Clips schlug fehl - Playback complete Abspielen beendet @@ -395,22 +324,18 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AbstractVideoPlayer - Pause failed Fehler bei Pause-Funktion - Seek failed Suchoperation fehlgeschlagen - Getting position failed Die Position konnte nicht bestimmt werden - Opening clip failed Der Clip konnte nicht geöffnet werden @@ -418,7 +343,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AudioEqualizer - %1 Hz %1 Hz @@ -426,7 +350,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::AudioPlayer - Getting position failed Die Position konnte nicht bestimmt werden @@ -434,11 +357,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::DsaVideoPlayer - - - - - Video display error Fehler bei der Video-Anzeige @@ -446,7 +364,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::EffectFactory - Enabled Aktiviert @@ -454,61 +371,51 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. Hochfrequenz-Abklingverhältnis (%) - Decay time (ms) DecayTime: Time over which reverberation is diminished. Abklingzeit (ms) - Density (%) Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. Dichte (%) - Diffusion (%) Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. Diffusion (%) - Reflections delay (ms) ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. Verzögerung des Echos (ms) - Reflections level (mB) ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. Stärke des Echos (mB) - Reverb delay (ms) ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. Verzögerung des Nachhalls (ms) - Reverb level (mB) ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Stärke des Nachhalls (mB) - Room HF level RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. Hochfrequenz-Pegel des Raums - Room level (mB) RoomLevel: Master volume control for all reflected sound. Pegel des Raums (mB) @@ -517,12 +424,18 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::MediaObject - Error opening source: type not supported Die Quelle konnte nicht geöffnet werden: Dieser Typ wird nicht unterstützt - + Error opening source: resource is compressed + Die Quelle konnte nicht geöffnet werden: Die Ressource ist komprimiert + + + Error opening source: resource not valid + Die Quelle konnte nicht geöffnet werden: Ungültige Ressource + + Error opening source: media type could not be determined Die Quelle konnte nicht geöffnet werden: Der Medientyp konnte nicht bestimmt werden @@ -530,7 +443,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::StereoWidening - Level (%) Stärke (%) @@ -538,8 +450,6 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::MMF::SurfaceVideoPlayer - - Video display error Fehler bei der Video-Anzeige @@ -547,22 +457,14 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Phonon::VolumeSlider - - - - Volume: %1% Lautstärke: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Mit diesem Regler stellen Sie die Lautstärke ein. Die Position links entspricht 0%; die Position rechts entspricht %1% - Muted Stummschaltung @@ -570,12 +472,10 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Q3Accel - %1, %2 not defined %1, %2 sind nicht definiert - Ambiguous %1 not handled Mehrdeutige %1 können nicht verarbeitet werden @@ -583,27 +483,22 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Q3DataTable - True Wahr - False Falsch - Insert Einfügen - Update Aktualisieren - Delete Löschen @@ -611,313 +506,238 @@ Bitte überprüfen Sie Ihre GStreamer-Installation und stellen Sie sicher, dass Q3FileDialog - Copy or Move a File Datei kopieren oder verschieben - Read: %1 Lesen: %1 - - Write: %1 Schreiben: %1 - - Cancel Abbrechen - - - - All Files (*) Alle Dateien (*) - Name Name - Size Größe - Type Typ - Date Datum - Attributes Attribute - - &OK &OK - Look &in: Su&chen in: - - - File &name: Datei&name: - File &type: Datei&typ: - Back Zurück - One directory up Ein Verzeichnis zurück - Create New Folder Neuen Ordner erstellen - List View Liste - Detail View Ausführlich - Preview File Info Vorschau der Datei-Informationen - Preview File Contents Vorschau des Datei-Inhalts - Read-write Lesen/Schreiben - Read-only Nur Lesen - Write-only Nur Schreiben - Inaccessible Gesperrt - Symlink to File Verknüpfung mit Datei - Symlink to Directory Verknüpfung mit Verzeichnis - Symlink to Special Verknüpfung mit Spezialdatei - File Datei - Dir Verzeichnis - Special Spezialattribut - - - Open Öffnen - - Save As Speichern unter - - - &Open &Öffnen - - &Save S&peichern - &Rename &Umbenennen - &Delete &Löschen - R&eload Erne&ut laden - Sort by &Name Nach &Namen sortieren - Sort by &Size Nach &Größe sortieren - Sort by &Date Nach &Datum sortieren - &Unsorted &Unsortiert - Sort Sortieren - Show &hidden files &Versteckte Dateien anzeigen - the file die Datei - the directory das Verzeichnis - the symlink die Verknüpfung - Delete %1 %1 löschen - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Sind Sie sicher, dass Sie %1 "%2" löschen möchten?</qt> - &Yes &Ja - &No &Nein - New Folder 1 Neues Verzeichnis 1 - New Folder Neues Verzeichnis - New Folder %1 Neues Verzeichnis %1 - Find Directory Verzeichnis suchen - - Directories Verzeichnisse - Directory: Verzeichnis: - - Error Fehler - %1 File not found. Check path and filename. @@ -926,17 +746,14 @@ Datei kann nicht gefunden werden. Überprüfen Sie Pfad und Dateinamen. - All Files (*.*) Alle Dateien (*.*) - Open Öffnen - Select a Directory Wählen Sie ein Verzeichnis @@ -944,29 +761,24 @@ Datei kann nicht gefunden werden. Q3LocalFs - - Could not read directory %1 Konnte Verzeichnis nicht lesen %1 - Could not create directory %1 Konnte Verzeichnis nicht erstellen %1 - Could not remove file or directory %1 Konnte Datei oder Verzeichnis nicht löschen %1 - Could not rename %1 to @@ -977,14 +789,12 @@ nach %2 - Could not open %1 Konnte nicht geöffnet werden: %1 - Could not write %1 Konnte nicht geschrieben werden: @@ -994,12 +804,10 @@ nach Q3MainWindow - Line up Ausrichten - Customize... Anpassen... @@ -1007,7 +815,6 @@ nach Q3NetworkProtocol - Operation stopped by the user Operation von Benutzer angehalten @@ -1015,8 +822,6 @@ nach Q3ProgressDialog - - Cancel Abbrechen @@ -1024,28 +829,22 @@ nach Q3TabDialog - - OK OK - Apply Anwenden - Help Hilfe - Defaults Voreinstellungen - Cancel Abbrechen @@ -1053,38 +852,30 @@ nach Q3TextEdit - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - &Paste Einf&ügen - Clear Löschen - - Select All Alles auswählen @@ -1092,67 +883,54 @@ nach Q3TitleBar - System System - Restore up Wiederherstellen - Minimize Minimieren - Restore down Wiederherstellen - Maximize Maximieren - Close Schließen - Contains commands to manipulate the window Enthält Befehle zum Ändern der Fenstergröße - Puts a minimized window back to normal Stellt ein minimiertes Fenster wieder her - Moves the window out of the way Minimiert das Fenster - Puts a maximized window back to normal Stellt ein maximiertes Fenster wieder her - Makes the window full screen Vollbildmodus - Closes the window Schließt das Fenster - Displays the name of the window and contains controls to manipulate it Zeigt den Namen des Fensters und enthält Befehle zum Ändern @@ -1160,7 +938,6 @@ nach Q3ToolBar - More... Mehr... @@ -1168,51 +945,38 @@ nach Q3UrlOperator - - - The protocol `%1' is not supported Das Protokoll `%1' wird nicht unterstützt - The protocol `%1' does not support listing directories Das Protokoll `%1' unterstützt nicht das Auflisten von Verzeichnissen - The protocol `%1' does not support creating new directories Das Protokoll `%1' unterstützt nicht das Anlegen neuer Verzeichnisse - The protocol `%1' does not support removing files or directories Das Protokoll `%1' unterstützt nicht das Löschen von Dateien oder Verzeichnissen - The protocol `%1' does not support renaming files or directories Das Protokoll `%1' unterstützt nicht das Umbenennen von Dateien oder Verzeichnissen - The protocol `%1' does not support getting files Das Protokoll `%1' unterstützt nicht das Laden von Dateien - The protocol `%1' does not support putting files Das Protokoll `%1' unterstützt nicht das Speichern von Dateien - - The protocol `%1' does not support copying or moving files or directories Das Protokoll `%1' unterstützt nicht das Kopieren oder Verschieben von Dateien oder Verzeichnissen - - (unknown) (unbekannt) @@ -1220,27 +984,22 @@ nach Q3Wizard - &Cancel &Abbrechen - < &Back < &Zurück - &Next > &Weiter > - &Finish Ab&schließen - &Help &Hilfe @@ -1248,45 +1007,30 @@ nach QAbstractSocket - - - - Host not found Rechner konnte nicht gefunden werden - - - Connection refused Verbindung verweigert - Connection timed out Das Zeitlimit für die Verbindung wurde überschritten - - - Operation on socket is not supported Diese Socket-Operation wird nicht unterstützt - - Socket operation timed out Das Zeitlimit für die Operation wurde überschritten - Socket is not connected Nicht verbunden - Network unreachable Das Netzwerk ist nicht erreichbar @@ -1294,17 +1038,14 @@ nach QAbstractSpinBox - &Step up &Inkrementieren - Step &down &Dekrementieren - &Select All &Alles auswählen @@ -1312,7 +1053,6 @@ nach QAccessibleButton - Press Drücken @@ -1320,28 +1060,23 @@ nach QApplication - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - Executable '%1' requires Qt %2, found Qt %3. Die Anwendung '%1' benötigt Qt %2; es wurde aber Qt %3 gefunden. - Incompatible Qt Library Error Die Qt-Bibliothek ist inkompatibel - Activate Aktivieren - Activates the program's main window Aktiviert das Hauptfenster der Anwendung @@ -1349,22 +1084,18 @@ nach QAxSelect - Select ActiveX Control ActiveX-Element auswählen - OK OK - &Cancel &Abbrechen - COM &Object: COM-&Objekt: @@ -1372,17 +1103,14 @@ nach QCheckBox - Uncheck Löschen - Check Ankreuzen - Toggle Umschalten @@ -1390,57 +1118,46 @@ nach QColorDialog - Hu&e: Farb&ton: - &Sat: &Sättigung: - &Val: &Helligkeit: - &Red: &Rot: - &Green: &Grün: - Bl&ue: Bla&u: - A&lpha channel: A&lphakanal: - Select Color Farbauswahl - &Basic colors Grundfar&ben - &Custom colors &Benutzerdefinierte Farben - &Add to Custom Colors Zu benutzerdefinierten Farben &hinzufügen @@ -1448,23 +1165,18 @@ nach QComboBox - - Open Öffnen - False Falsch - True Wahr - Close Schließen @@ -1472,43 +1184,36 @@ nach QCoreApplication - %1: key is empty QSystemSemaphore %1: Ungültige Schlüsselangabe (leer) - %1: unable to make key QSystemSemaphore %1: Es kann kein Schlüssel erzeugt werden - %1: ftok failed QSystemSemaphore %1: ftok-Aufruf schlug fehl - %1: already exists QSystemSemaphore %1: existiert bereits - %1: does not exist QSystemSemaphore %1: Nicht existent - %1: out of resources QSystemSemaphore %1: Keine Ressourcen mehr verfügbar - %1: unknown error %2 QSystemSemaphore %1: Unbekannter Fehler %2 @@ -1517,22 +1222,18 @@ nach QDB2Driver - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to commit transaction Die Transaktion kann nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to set autocommit 'autocommit' kann nicht aktiviert werden @@ -1540,33 +1241,26 @@ nach QDB2Result - - Unable to execute statement Der Befehl kann nicht ausgeführt werden - Unable to prepare statement Der Befehl kann nicht initialisiert werden - Unable to bind variable Die Variable kann nicht gebunden werden - Unable to fetch record %1 Der Datensatz %1 kann nicht abgeholt werden - Unable to fetch next Der nächste Datensatz kann nicht abgeholt werden - Unable to fetch first Der erste Datensatz kann nicht abgeholt werden @@ -1574,22 +1268,18 @@ nach QDateTimeEdit - AM AM - am am - PM PM - pm pm @@ -1597,17 +1287,14 @@ nach QDeclarativeAbstractAnimation - Cannot animate non-existent property "%1" Die Eigenschaft '%1" existiert nicht und kann daher nicht animiert werden - Cannot animate read-only property "%1" Die Eigenschaft '%1" ist schreibgeschützt und kann daher nicht animiert werden - Animation is an abstract class Die Klasse Animation ist abstrakt @@ -1615,7 +1302,6 @@ nach QDeclarativeAnchorAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden @@ -1623,67 +1309,50 @@ nach QDeclarativeAnchors - Possible anchor loop detected on fill. Bei der Fülloperation wurde eine potentielle Endlosschleife der Anker festgestellt. - Possible anchor loop detected on centerIn. Bei der Operation 'centerIn' wurde eine potentielle Endlosschleife der Anker festgestellt. - - - - Cannot anchor to an item that isn't a parent or sibling. Das Ziel eines Anker muss ein Elternelement oder Element der gleichen Ebene sein. - Possible anchor loop detected on vertical anchor. Bei einem vertikalen Anker wurde eine potentielle Endlosschleife der Anker festgestellt. - Possible anchor loop detected on horizontal anchor. Bei einem horizontalen Anker wurde eine potentielle Endlosschleife der Anker festgestellt. - Cannot specify left, right, and hcenter anchors. Ankerangaben für links, rechts und horizontal zentriert dürfen nicht zusammen auftreten. - - Cannot anchor to a null item. Es kann kein Anker zu einem Null-Element angegeben werden. - Cannot anchor a horizontal edge to a vertical edge. Es kann kein Anker zu einer horizontalen oder vertikalen Kante angegeben werden. - - Cannot anchor item to self. Ein Element kann keinen Anker zu sich selbst haben. - Cannot specify top, bottom, and vcenter anchors. Ankerangaben für oben, unten und vertikal zentriert dürfen nicht zusammen auftreten. - Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. Ein Baseline-Anker darf nicht mit zusammen mit weiteren Ankerangaben für oben, unten und vertikal zentriert verwendet werden. - Cannot anchor a vertical edge to a horizontal edge. Vertikale und horizontale Kanten können nicht mit Ankern verbunden werden. @@ -1691,7 +1360,6 @@ nach QDeclarativeAnimatedImage - Qt was built without support for QMovie Diese Version der Qt-Bibliothek wurde ohne Unterstützung für die Klasse QMovie erstellt @@ -1699,7 +1367,6 @@ nach QDeclarativeBehavior - Cannot change the animation assigned to a Behavior. Die zu einem Behavior-Element gehörende Animation kann nicht geändert werden. @@ -1707,7 +1374,6 @@ nach QDeclarativeBinding - Binding loop detected for property "%1" Bei der für die Eigenschaft "%1" angegebenen Bindung wurde eine Endlosschleife festgestellt @@ -1715,7 +1381,6 @@ nach QDeclarativeCompiledBindings - Binding loop detected for property "%1" Bei der für die Eigenschaft "%1" angegebenen Bindung wurde eine Endlosschleife festgestellt @@ -1723,390 +1388,310 @@ nach QDeclarativeCompiler - - - - - - Invalid property assignment: "%1" is a read-only property Ungültige Zuweisung bei Eigenschaft: "%1" ist schreibgeschützt - Invalid property assignment: unknown enumeration Ungültige Zuweisung bei Eigenschaft: Ungültiger Aufzählungswert - Invalid property assignment: string expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeichenkette erwartet - Invalid property assignment: url expected Ungültige Zuweisung bei Eigenschaft: Es wird eine URL erwartet - Invalid property assignment: unsigned int expected Ungültige Zuweisung bei Eigenschaft: Es wird eine vorzeichenloser Ganzzahlwert erwartet - Invalid property assignment: int expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Ganzzahlwert erwartet - Invalid property assignment: float expected - Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl erwartet + Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl erwartet - Invalid property assignment: double expected - Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl (double) erwartet + Ungültige Zuweisung bei Eigenschaft: Es wird eine Gleitkommazahl (double) erwartet - Invalid property assignment: color expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Farbspezifikation erwartet - Invalid property assignment: date expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Datumsangabe erwartet - Invalid property assignment: time expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Zeitangabe erwartet - Invalid property assignment: datetime expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Datumsangabe erwartet - Invalid property assignment: point expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Koordinatenangabe für einen Punkt erwartet - Invalid property assignment: size expected Ungültige Zuweisung bei Eigenschaft: Es wird eine Größenangabe erwartet - Invalid property assignment: rect expected Ungültige Zuweisung bei Eigenschaft: Es werden Parameter für ein Rechteck erwartet - Invalid property assignment: boolean expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Boolescher Wert erwartet - Invalid property assignment: 3D vector expected Ungültige Zuweisung bei Eigenschaft: Es wird ein dreidimensionaler Vektor erwartet - Invalid property assignment: unsupported type "%1" Ungültige Zuweisung bei Eigenschaft: Der Typ "%1" ist nicht unterstützt - Element is not creatable. Das Element kann nicht erzeugt werden. - Component elements may not contain properties other than id Komponenten dürfen außer id keine weiteren Eigenschaften enthalten. - Invalid component id specification Ungültige Komponentenspezifikation - - id is not unique ID-Wert nicht eindeutig - Invalid component body specification Inhalt der Komponente ungültig - Cannot create empty component specification Es kann keine leere Komponentenangabe erzeugt werden - Empty signal assignment Leere Signalzuweisung - Empty property assignment Leere Eigenschaftszuweisung - Attached properties cannot be used here An dieser Stelle können keine Eigenschaften des Typs 'attached' verwendet werden - - Non-existent attached object Es existiert kein Bezugselement für die Eigenschaft - - Invalid attached object assignment Ungültige Zuweisung des Bezugselements - Cannot assign to non-existent default property Es kann keine Zuweisung erfolgen, da keine Vorgabe-Eigenschaft existiert - - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Invalid use of namespace Ungültige Verwendung eines Namensraums - Not an attached property name Kein gültiger Name einer Eigenschaft des Typs 'attached' - Invalid use of id property Ungültige Verwendung einer Eigenschaft des Typs 'Id' - Incorrectly specified signal assignment - + Invalid property assignment: number expected + Ungültige Zuweisung bei Eigenschaft: Es wird eine Zahl erwartet + + Component objects cannot declare new properties. Komponentenobjekte können keine neuen Eigenschaften deklarieren. - Component objects cannot declare new signals. Komponentenobjekte können keine neuen Signale deklarieren. - Component objects cannot declare new functions. Komponentenobjekte können keine neuen Funktionen deklarieren. - Cannot assign a value to a signal (expecting a script to be run) Einem Signal können keine Werte zugewiesen werden (es wird ein Skript erwartet) - - Property has already been assigned a value Der Eigenschaft wurde bereits ein Wert zugewiesen - - Invalid grouped property access Falsche Gruppierung bei Zugriff auf Eigenschaft - Cannot assign a value directly to a grouped property Bei einer Eigenschaft, die Teil einer Gruppierung ist, ist keine direkte Wertzuweisung zulässig - Invalid property use Ungültige Verwendung von Eigenschaften - Property assignment expected Zuweisung an Eigenschaft erwartet - Single property assignment expected Einzelne Zuweisung an Eigenschaft erwartet - Unexpected object assignment Zuweisung des Objekts nicht zulässig - Cannot assign object to list Zuweisung eines Objekts an eine Liste nicht zulässig - Can only assign one binding to lists Listen kann nur eine einzige Bindung zugewiesen werden - Cannot assign primitives to lists Zuweisung eines einfachen Werts (primitive) an eine Liste nicht zulässig - Cannot assign multiple values to a script property Eine Zuweisung mehrerer Werte an eine Skript-Eigenschaft ist nicht zulässig - Invalid property assignment: script expected Ungültige Zuweisung bei Eigenschaft: Es wird ein Skript erwartet - Cannot assign object to property Zuweisung eines Objekts an eine Eigenschaft nicht zulässig - "%1" cannot operate on "%2" "%1" kann nicht auf "%2" angewandt werden - Duplicate default property Mehrfaches Auftreten der Vorgabe-Eigenschaft - Duplicate property name Mehrfaches Auftreten eines Eigenschaftsnamens - Property names cannot begin with an upper case letter Eigenschaftsnamen dürfen nicht mit einem Großbuchstaben beginnen - + Illegal property name + Ungültiger Name der Eigenschaft + + Duplicate signal name Mehrfaches Auftreten eines Signalnamens - Signal names cannot begin with an upper case letter Signalnamen dürfen nicht mit einem Großbuchstaben beginnen - Illegal signal name Ungültiger Name für Signal - Duplicate method name Mehrfaches Auftreten eines Methodennamens - Method names cannot begin with an upper case letter Methodennamen dürfen nicht mit einem Großbuchstaben beginnen - Illegal method name Ungültiger Name für Methode - Property value set multiple times Mehrfache Zuweisung eines Wertes an eine Eigenschaft - Invalid property nesting Ungültige Schachtelung von Eigenschaften - Cannot override FINAL property Eine als 'FINAL' ausgewiesene Eigenschaft kann nicht überschrieben werden - Invalid property type Ungültiger Typ der Eigenschaft - Invalid empty ID Ungültiger (leerer) Id-Wert - IDs cannot start with an uppercase letter Id-Werte dürfen nicht mit einem Großbuchstaben beginnen - IDs must start with a letter or underscore Id-Werte müssen mit einem Buchstaben oder dem Zeichen '_' beginnen - IDs must contain only letters, numbers, and underscores Id-Werte dürfen nur Buchstaben oder Unterstriche enthalten - ID illegally masks global JavaScript property Der Id-Wert überdeckt eine globale Eigenschaft aus JavaScript - - No property alias location Alias-Eigenschaft ohne Quellangabe - - Invalid alias location Ungültige Quellangabe bei Alias-Eigenschaft - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> Ungültige Referenzierung einer Alias-Eigenschaft. Die Referenz muss in der Form <id> oder <id>.<property> angegeben werden - Invalid alias reference. Unable to find id "%1" Ungültige Referenzierung einer Alias-Eigenschaft. Der Id-Wert "%1" konnte nicht gefunden werden @@ -2114,7 +1699,6 @@ nach QDeclarativeComponent - Invalid empty URL Ungültige (leere) URL @@ -2122,23 +1706,18 @@ nach QDeclarativeCompositeTypeManager - - Resource %1 unavailable Auf die Ressource %1 konnte nicht zugegriffen werden - Namespace %1 cannot be used as a type Der Namensraum %1 kann nicht als Typangabe verwendet werden - %1 %2 %1 %2 - Type %1 unavailable Der Typ %1 ist nicht verfügbar @@ -2146,23 +1725,18 @@ nach QDeclarativeConnections - - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Connections: nested objects not allowed Verbindungen: Verschachtelte Objekte sind nicht zulässig - Connections: syntax error Verbindungen: Syntaxfehler - Connections: script expected Verbindungen: Skript erwartet @@ -2170,33 +1744,26 @@ nach QDeclarativeEngine - executeSql called outside transaction() 'executeSql' wurde außerhalb von 'transaction()' aufgerufen - Read-only Transaction Schreibgeschützte Transaktion - Version mismatch: expected %1, found %2 Die Version %2 kann nicht verwendet werden; es wird %1 benötigt - SQL transaction failed Die SQL-Transaktion schlug fehl - transaction: missing callback callback fehlt bei Transaktion - - SQL: database version mismatch SQL: Die Version der Datenbank entspricht nicht der erwarteten Version @@ -2204,12 +1771,10 @@ nach QDeclarativeFlipable - front is a write-once property 'front' kann nur einmal zugewiesen werden - back is a write-once property 'back' kann nur einmal zugewiesen werden @@ -2217,75 +1782,58 @@ nach QDeclarativeImportDatabase - module "%1" definition "%2" not readable Modul "%1" Definition "%2" kann nicht gelesen werden - plugin cannot be loaded for module "%1": %2 Das Plugin des Moduls "%1" konnte nicht geladen werden: %2 - module "%1" plugin "%2" not found Modul "%1" Plugin "%2" konnte nicht gefunden werden - - module "%1" version %2.%3 is not installed Modul "%1" Version %2.%3 ist nicht installiert - module "%1" is not installed Modul "%1" ist nicht installiert - - "%1": no such directory Das Verzeichnis "%1" existiert nicht - import "%1" has no qmldir and no namespace "qmldir" und Namensraum fehlen bei dem Import "%1" - - %1 is not a namespace - %1 ist kein gültiger Namensraum - - nested namespaces not allowed - geschachtelte Namensräume sind nicht zulässig - - local directory Lokales Verzeichnis' - is ambiguous. Found in %1 and in %2 ist mehrdeutig. Es kommt in %1 und in %2 vor - is ambiguous. Found in %1 in version %2.%3 and %4.%5 ist mehrdeutig. Es kommt in %1 in den Version %2.%3 und %4.%5 vor - is instantiated recursively wird rekursiv instanziiert - is not a type ist kein Typ @@ -2293,7 +1841,6 @@ nach QDeclarativeKeyNavigationAttached - KeyNavigation is only available via attached properties Tastennavigation ist nur über Eigenschaften des Typs 'attached' verfügbar @@ -2301,7 +1848,6 @@ nach QDeclarativeKeysAttached - Keys is only available via attached properties Die Unterstützung für Tasten ist nur über Eigenschaften des Typs 'attached' verfügbar @@ -2309,59 +1855,46 @@ nach QDeclarativeListModel - remove: index %1 out of range remove: Der Index %1 ist außerhalb des gültigen Bereichs - insert: value is not an object insert: Der Wert ist kein Objekt - insert: index %1 out of range insert: Der Index %1 ist außerhalb des gültigen Bereichs - move: out of range move: Außerhalb des gültigen Bereichs - append: value is not an object append: Der Wert ist kein Objekt - set: value is not an object set: Der Wert ist kein Objekt - - set: index %1 out of range set: Der Index %1 ist außerhalb des gültigen Bereichs - - ListElement: cannot contain nested elements ListElement kann keine geschachtelten Elemente enthalten - ListElement: cannot use reserved "id" property ListElement: Die "id"-Eigenschaft kann nicht verwendet werden - ListElement: cannot use script for property value ListElement: Es kann kein Skript für den Wert der Eigenschaft verwendet werden - ListModel: undefined property '%1' ListModel: Die Eigenschaft '%1' ist nicht definiert @@ -2369,7 +1902,6 @@ nach QDeclarativeLoader - Loader does not support loading non-visual elements. Das Laden nicht-visueller Elemente ist nicht unterstützt. @@ -2377,18 +1909,14 @@ nach QDeclarativeParentAnimation - Unable to preserve appearance under complex transform Das Erscheinungsbild kann bei einer komplexen Transformation nicht beibehalten werden - - Unable to preserve appearance under non-uniform scale Das Erscheinungsbild kann bei einer nicht-uniformen Skalierung nicht beibehalten werden - Unable to preserve appearance under scale of 0 Das Erscheinungsbild kann bei einer Skalierung mit 0 nicht beibehalten werden @@ -2396,18 +1924,14 @@ nach QDeclarativeParentChange - Unable to preserve appearance under complex transform Das Erscheinungsbild kann bei einer komplexen Transformation nicht beibehalten werden - - Unable to preserve appearance under non-uniform scale Das Erscheinungsbild kann bei einer nicht-uniformen Skalierung nicht beibehalten werden - Unable to preserve appearance under scale of 0 Das Erscheinungsbild kann bei einer Skalierung mit 0 nicht beibehalten werden @@ -2415,144 +1939,110 @@ nach QDeclarativeParser - Illegal character Ungültiges Zeichen - Unclosed string at end of line Zeichenkette am Zeilenende nicht abgeschlossen - Illegal escape squence Ungültiges Escape-Sequenz - - - Illegal unicode escape sequence Ungültige Unicode-Escape-Sequenz - Unclosed comment at end of file Kommentar am Dateiende nicht abgeschlossen - Illegal syntax for exponential number Ungültige Syntax des Exponenten - Identifier cannot start with numeric literal Ein Bezeichner darf nicht mit einem numerischen Literal beginnen - Unterminated regular expression literal Regulärer Ausdruck nicht abgeschlossen - Invalid regular expression flag '%0' Ungültiger Modifikator '%0' bei regulärem Ausdruck - - Unterminated regular expression backslash sequence Regulärer Ausdruck nicht abgeschlossen - Unterminated regular expression class Klasse im regulären Ausdruck nicht abgeschlossen - - Syntax error Syntaxfehler - Unexpected token `%1' Unerwartetes Element '%1' - - Expected token `%1' Es wird das Element '%1' erwartet - - - Property value set multiple times Mehrfache Zuweisung eines Wertes an eine Eigenschaft - Expected type name Es wird ein Typname erwartet - Invalid import qualifier ID Ungültige Id-Angabe bei Import - Reserved name "Qt" cannot be used as an qualifier Der reservierte Name "Qt" kann nicht als Bezeichner verwendet werden - Script import qualifiers must be unique. Der für den Skript-Import angegebene Qualifizierer muss eindeutig sein. - Script import requires a qualifier Der Skript-Import erfordert die Angabe eines Qualifizierers. - Library import requires a version Der Import einer Bibliothek erfordert eine Versionsangabe - Expected parameter type Es wird eine Typangabe für den Parameter erwartet - Invalid property type modifier Ungültiger Modifikator für den Typ der Eigenschaft - Unexpected property type modifier Modifikator für den Typ der Eigenschaft an dieser Stelle nicht zulässig - Expected property type Typangabe für Eigenschaft erwartet - Readonly not yet supported 'read-only' wird an dieser Stelle noch nicht unterstützt - JavaScript declaration outside Script element Eine JavaScript-Deklaration ist außerhalb eines Skriptelementes nicht zulässig @@ -2560,39 +2050,47 @@ nach QDeclarativePauseAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden - QDeclarativePixmapCache + QDeclarativePixmap - Error decoding: %1: %2 Fehler beim Decodieren: %1: %2 - Failed to get image from provider: %1 Bilddaten konnten nicht erhalten werden: %1 - - Cannot open: %1 Fehlschlag beim Öffnen: %1 + + + QDeclarativePixmapCache + + Error decoding: %1: %2 + Fehler beim Decodieren: %1: %2 + + + Failed to get image from provider: %1 + Bilddaten konnten nicht erhalten werden: %1 + + + Cannot open: %1 + Fehlschlag beim Öffnen: %1 + - Unknown Error loading %1 - Unbekannter Fehler beim Laden von %1 + Unbekannter Fehler beim Laden von %1 QDeclarativePropertyAnimation - Cannot set a duration of < 0 Es kann keine Zeitdauer <0 gesetzt werden @@ -2600,17 +2098,14 @@ nach QDeclarativePropertyChanges - PropertyChanges does not support creating state-specific objects. Die Erzeugung von Objekten, die einem Zustand zugeordnet sind, wird von PropertyChanges nicht unterstützt. - Cannot assign to non-existent property "%1" Es kann keine Zuweisung erfolgen, da keine Eigenschaft des Namens '%1" existiert - Cannot assign to read-only property "%1" Die Eigenschaft '%1" ist schreibgeschützt und kann daher nicht zugewiesen werden @@ -2618,13 +2113,10 @@ nach QDeclarativeTextInput - - Could not load cursor delegate Cursor-Delegate konnte nicht geladen werden - Could not instantiate cursor delegate Cursor-Delegate konnte angelegt werden @@ -2632,47 +2124,38 @@ nach QDeclarativeVME - Unable to create object of type %1 Es konnte kein Objekt des Typs %1 erzeugt werden - Cannot assign value %1 to property %2 Der Wert '%1' kann nicht der Eigenschaft %2 zugewiesen werden - Cannot assign object type %1 with no default method Der Objekttyp %1 kann nicht zugewiesen werden, da keine Vorgabe-Methode existiert - Cannot connect mismatched signal/slot %1 %vs. %2 Es kann keine Verbindung zwischen dem Signal %1 und dem Slot %2 hergestellt werden, da sie nicht zusammenpassen - Cannot assign an object to signal property %1 Der Signal-Eigenschaft %1 kann kein Objekt zugewiesen werden - Cannot assign object to list Zuweisung eines Objekts an eine Liste nicht zulässig - Cannot assign object to interface property Der Eigenschaft der Schnittstelle kann kein Objekt zugewiesen werden - Unable to create attached object Es konnte kein 'attached'-Objekt erzeugt werden - Cannot set properties on %1 as it is null Es können keine Eigenschaften auf %1 gesetzt werden, da es 'null' ist @@ -2680,7 +2163,6 @@ nach QDeclarativeVisualDataModel - Delegate component must be Item type. Delegate-Komponente muss vom Typ 'Item' sein @@ -2688,8 +2170,6 @@ nach QDeclarativeXmlListModel - - Qt was built without support for xmlpatterns Diese Version der Qt-Bibliothek wurde ohne Unterstützung für xmlpatterns erstellt @@ -2697,7 +2177,6 @@ nach QDeclarativeXmlListModelRole - An XmlRole query must not start with '/' Eine XmlRole-Abfrage darf nicht mit '/' beginnen @@ -2705,7 +2184,6 @@ nach QDeclarativeXmlRoleList - An XmlListModel query must start with '/' or "//" Eine XmlListModel-Abfrage muss mit '/' oder "//" beginnen @@ -2713,17 +2191,14 @@ nach QDial - QDial QDial - SpeedoMeter Tachometer - SliderHandle Schieberegler @@ -2731,12 +2206,10 @@ nach QDialog - What's This? Direkthilfe - Done Fertig @@ -2744,124 +2217,98 @@ nach QDialogButtonBox - - - OK OK - Save Speichern - &Save S&peichern - Open Öffnen - Cancel Abbrechen - &Cancel &Abbrechen - Close Schließen - &Close Schl&ießen - Apply Anwenden - Reset Zurücksetzen - Help Hilfe - Don't Save Nicht speichern - Discard Verwerfen - &Yes &Ja - Yes to &All Ja, &alle - &No &Nein - N&o to All N&ein, keine - Save All Alles speichern - Abort Abbrechen - Retry Wiederholen - Ignore Ignorieren - Restore Defaults Voreinstellungen - Close without Saving Schließen ohne Speichern - &OK &OK @@ -2869,29 +2316,24 @@ nach QDirModel - Name Name - Size Größe - Kind Match OS X Finder Art - Type All other platforms Typ - Date Modified Änderungsdatum @@ -2899,17 +2341,14 @@ nach QDockWidget - Close Schließen - Dock Andocken - Float Herauslösen @@ -2917,12 +2356,10 @@ nach QDoubleSpinBox - More Mehr - Less Weniger @@ -2930,27 +2367,22 @@ nach QErrorMessage - &Show this message again Diese Meldung wieder an&zeigen - &OK &OK - Debug Message: Debug-Ausgabe: - Warning: Achtung: - Fatal Error: Fehler: @@ -2958,38 +2390,30 @@ nach QFile - - Destination file exists Die Zieldatei existiert bereits - Will not rename sequential file using block copy Eine sequentielle Datei kann nicht durch blockweises Kopieren umbenannt werden - Cannot remove source file Die Quelldatei kann nicht entfernt werden - Cannot open %1 for input %1 kann nicht zum Lesen geöffnet werden - Cannot open for output Das Öffnen zum Schreiben ist fehlgeschlagen - Failure to write block Der Datenblock konnte nicht geschrieben werden - Cannot create %1 for output %1 kann nicht erstellt werden @@ -2997,113 +2421,84 @@ nach QFileDialog - - All Files (*) Alle Dateien (*) - - Back Zurück - - List View Liste - - Detail View Details - - File Datei - Open Öffnen - Save As Speichern unter - - - &Open &Öffnen - - &Save S&peichern - Recent Places Zuletzt besucht - &Rename &Umbenennen - &Delete &Löschen - Show &hidden files &Versteckte Dateien anzeigen - New Folder Neues Verzeichnis - Find Directory Verzeichnis suchen - Directories Verzeichnisse - All Files (*.*) Alle Dateien (*.*) - - Directory: Verzeichnis: - %1 already exists. Do you want to replace it? Die Datei %1 existiert bereits. Soll sie überschrieben werden? - %1 File not found. Please verify the correct file name was given. @@ -3112,25 +2507,18 @@ Die Datei konnte nicht gefunden werden. Stellen Sie sicher, dass der Dateiname richtig ist. - My Computer Mein Computer - - Parent Directory Übergeordnetes Verzeichnis - - Files of type: Dateien des Typs: - - %1 Directory not found. Please verify the correct directory name was given. @@ -3139,128 +2527,100 @@ Das Verzeichnis konnte nicht gefunden werden. Stellen Sie sicher, dass der Verzeichnisname richtig ist. - '%1' is write protected. Do you want to delete it anyway? '%1' ist schreibgeschützt. Möchten Sie die Datei trotzdem löschen? - Are sure you want to delete '%1'? Sind Sie sicher, dass Sie '%1' löschen möchten? - Could not delete directory. Konnte Verzeichnis nicht löschen. - Drive Laufwerk - File Folder Match Windows Explorer Ordner - Folder All other platforms Order - Alias Mac OS X Finder Alias - Shortcut All other platforms Symbolischer Link - Unknown Unbekannt - Show Anzeigen - - Forward Vorwärts - &New Folder &Neues Verzeichnis - - &Choose &Auswählen - Remove Löschen - - File &name: Datei&name: - - Look in: Suchen in: - - Create New Folder Neuen Ordner erstellen - Go back Zurück - Go forward Vor - Go to the parent directory Gehe zum übergeordneten Verzeichnis - Create a New Folder Neuen Ordner erstellen - Change to list view mode Wechsle zu Listenansicht - Change to detail view mode Wechsle zu Detailansicht @@ -3268,83 +2628,64 @@ Möchten Sie die Datei trotzdem löschen? QFileSystemModel - - %1 TB %1 TB - - %1 GB %1 GB - - %1 MB %1 MB - - %1 KB %1 KB - %1 bytes %1 Byte - Invalid filename Ungültiger Dateiname - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Der Name "%1" kann nicht verwendet werden.</b><p>Versuchen Sie, die Sonderzeichen zu entfernen oder einen kürzeren Namen zu verwenden. - Name Name - Size Größe - Kind Match OS X Finder Art - Type All other platforms Typ - Date Modified Änderungsdatum - My Computer Mein Computer - Computer Computer - %1 byte(s) %1 byte @@ -3352,221 +2693,170 @@ Möchten Sie die Datei trotzdem löschen? QFontDatabase - - Normal Normal - - - Bold Fett - - Demi Bold Halbfett - - - Black Schwarz - Demi Semi - - Light Leicht - - Italic Kursiv - - Oblique Schräggestellt - Any Alle - Latin Lateinisch - Greek Griechisch - Cyrillic Kyrillisch - Armenian Armenisch - Hebrew Hebräisch - Arabic Arabisch - Syriac Syrisch - Thaana Thaana - Devanagari Devanagari - Bengali Bengalisch - Gurmukhi Gurmukhi - Gujarati Gujarati - Oriya Oriya - Tamil Tamilisch - Telugu Telugu - Kannada Kannada - Malayalam Malayalam - Sinhala Sinhala - Thai Thailändisch - Lao Laotisch - Tibetan Tibetisch - Myanmar Myanmar - Georgian Georgisch - Khmer Khmer - Simplified Chinese Chinesisch (Kurzzeichen) - Traditional Chinese Chinesisch (Langzeichen) - Japanese Japanisch - Korean Koreanisch - Vietnamese Vietnamesisch - Symbol Symbol - Ogham Ogham - Runic Runen - N'Ko N'Ko @@ -3574,47 +2864,38 @@ Möchten Sie die Datei trotzdem löschen? QFontDialog - &Font &Schriftart - Font st&yle Schrifts&til - &Size &Größe - Effects Effekte - Stri&keout Durch&gestrichen - &Underline &Unterstrichen - Sample Beispiel - Select Font Schriftart auswählen - Wr&iting System &Schriftsystem @@ -3622,145 +2903,104 @@ Möchten Sie die Datei trotzdem löschen? QFtp - Host %1 found Rechner %1 gefunden - Host found Rechner gefunden - - - Connected to host %1 Verbunden mit Rechner %1 - Connected to host Verbindung mit Rechner besteht - Connection to %1 closed Verbindung mit %1 beendet - - - Connection closed Verbindung beendet - - Host %1 not found Rechner %1 konnte nicht gefunden werden - - Connection refused to host %1 Verbindung mit %1 verweigert - Connection timed out to host %1 Das Zeitlimit für die Verbindung zu '%1' wurde überschritten - - - - Unknown error Unbekannter Fehler - - Connecting to host failed: %1 Verbindung mit Rechner schlug fehl: %1 - - Login failed: %1 Anmeldung schlug fehl: %1 - - Listing directory failed: %1 Der Inhalt des Verzeichnisses kann nicht angezeigt werden: %1 - - Changing directory failed: %1 Ändern des Verzeichnisses schlug fehl: %1 - - Downloading file failed: %1 Herunterladen der Datei schlug fehl: %1 - - Uploading file failed: %1 Hochladen der Datei schlug fehl: %1 - - Removing file failed: %1 Löschen der Datei schlug fehl: %1 - - Creating directory failed: %1 Erstellen des Verzeichnisses schlug fehl: %1 - - Removing directory failed: %1 Löschen des Verzeichnisses schlug fehl: %1 - - Not connected Keine Verbindung - - Connection refused for data connection Verbindung für die Daten Verbindung verweigert @@ -3768,12 +3008,10 @@ Möchten Sie die Datei trotzdem löschen? QHostInfo - Unknown error Unbekannter Fehler - No host name given Es wurde kein Hostname angegeben @@ -3781,37 +3019,22 @@ Möchten Sie die Datei trotzdem löschen? QHostInfoAgent - - - - Host not found Rechner konnte nicht gefunden werden - - - - Unknown address type Unbekannter Adresstyp - - - Unknown error Unbekannter Fehler - - No host name given Es wurde kein Hostname angegeben - - Invalid hostname Ungültiger Rechnername @@ -3819,153 +3042,110 @@ Möchten Sie die Datei trotzdem löschen? QHttp - - Connection refused Verbindung verweigert - - - Host %1 not found Rechner %1 konnte nicht gefunden werden - - Wrong content length Ungültige Längenangabe - - HTTP request failed HTTP-Anfrage fehlgeschlagen - Host %1 found Rechner %1 gefunden - Host found Rechner gefunden - Connected to host %1 Verbunden mit Rechner %1 - Connected to host Verbindung mit Rechner besteht - Connection to %1 closed Verbindung mit %1 beendet - - Connection closed Verbindung beendet - - - - Unknown error Unbekannter Fehler - - Request aborted Anfrage wurde abgebrochen - - No server set to connect to Für die Verbindung wurde kein Server-Rechner angegeben - - Server closed connection unexpectedly Der Server hat die Verbindung unerwartet geschlossen - - Invalid HTTP response header Der Kopfteil der HTTP-Antwort ist ungültig - Unknown authentication method Unbekannte Authentifizierungsmethode - - - - Invalid HTTP chunked body Der Inhalt (chunked body) der HTTP-Antwort ist ungültig - Error writing response to device Beim Schreiben der Antwort auf das Ausgabegerät ist ein Fehler aufgetreten - Proxy authentication required Proxy-Authentifizierung erforderlich - Authentication required Authentifizierung erforderlich - Proxy requires authentication Der Proxy-Server verlangt eine Authentifizierung - Host requires authentication Der Hostrechner verlangt eine Authentifizierung - Data corrupted Die Daten sind verfälscht - SSL handshake failed Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten. - Unknown protocol specified Es wurde ein unbekanntes Protokoll angegeben - Connection refused (or timed out) Verbindung verweigert oder Zeitlimit überschritten - HTTPS connection requested but SSL support not compiled in Die angeforderte HTTPS-Verbindung kann nicht aufgebaut werden, da keine SSL-Unterstützung vorhanden ist @@ -3973,47 +3153,38 @@ Möchten Sie die Datei trotzdem löschen? QHttpSocketEngine - Did not receive HTTP response from proxy Keine HTTP-Antwort vom Proxy-Server - Error parsing authentication request from proxy Fehler beim Auswerten der Authentifizierungsanforderung des Proxy-Servers - Authentication required Authentifizierung erforderlich - Proxy denied connection Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Error communicating with HTTP proxy Fehler bei der Kommunikation mit dem Proxy-Server - Proxy server not found Es konnte kein Proxy-Server gefunden werden - Proxy connection refused Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Proxy server connection timed out Bei der Verbindung mit dem Proxy-Server wurde ein Zeitlimit überschritten - Proxy connection closed prematurely Der Proxy-Server hat die Verbindung vorzeitig beendet @@ -4021,22 +3192,18 @@ Möchten Sie die Datei trotzdem löschen? QIBaseDriver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Could not start transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -4044,89 +3211,70 @@ Möchten Sie die Datei trotzdem löschen? QIBaseResult - Unable to create BLOB Es konnte kein BLOB erzeugt werden - Unable to write BLOB Der BLOB konnte nicht geschrieben werden - Unable to open BLOB Der BLOB konnte nicht geöffnet werden - Unable to read BLOB Der BLOB konnte nicht gelesen werden - - Could not find array Das Feld konnte nicht gefunden werden - Could not get array data Die Daten des Feldes konnten nicht gelesen werden - Could not get query info Die erforderlichen Informationen zur Abfrage sind nicht verfügbar - Could not start transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Could not allocate statement Die Allokation des Befehls schlug fehl - Could not prepare statement Der Befehl konnte nicht initialisiert werden - - Could not describe input statement Es konnte keine Beschreibung des Eingabebefehls erhalten werden - Could not describe statement Es konnte keine Beschreibung des Befehls erhalten werden - Unable to close statement Der Befehl konnte nicht geschlossen werden - Unable to execute query Der Befehl konnte nicht ausgeführt werden - Could not fetch next item Das nächste Element konnte nicht abgeholt werden - Could not get statement info Es ist keine Information zum Befehl verfügbar @@ -4134,27 +3282,22 @@ Möchten Sie die Datei trotzdem löschen? QIODevice - Permission denied Zugriff verweigert - Too many open files Zu viele Dateien geöffnet - No such file or directory Die Datei oder das Verzeichnis konnte nicht gefunden werden - No space left on device Kein freier Speicherplatz auf dem Gerät vorhanden - Unknown error Unbekannter Fehler @@ -4162,32 +3305,26 @@ Möchten Sie die Datei trotzdem löschen? QInputContext - XIM XIM - FEP FEP - XIM input method XIM-Eingabemethode - Windows input method Windows-Eingabemethode - Mac OS X input method Mac OS X-Eingabemethode - S60 FEP input method S60-FEP-Eingabemethode @@ -4195,7 +3332,6 @@ Möchten Sie die Datei trotzdem löschen? QInputDialog - Enter a value: Geben Sie einen Wert ein: @@ -4203,67 +3339,50 @@ Möchten Sie die Datei trotzdem löschen? QLibrary - Could not mmap '%1': %2 Operation mmap fehlgeschlagen für '%1': %2 - Plugin verification data mismatch in '%1' Die Prüfdaten des Plugins '%1' stimmen nicht überein - Could not unmap '%1': %2 Operation unmap fehlgeschlagen für '%1': %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. Erforderlicher build-spezifischer Schlüssel "%2", erhalten "%3" - Unknown error Unbekannter Fehler - - - The shared library was not found. Die dynamische Bibliothek konnte nicht gefunden werden. - The file '%1' is not a valid Qt plugin. Die Datei '%1' ist kein gültiges Qt-Plugin. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Das Plugin '%1' verwendet eine inkompatible Qt-Bibliothek. (Im Debug- bzw. Release-Modus erstellte Bibliotheken können nicht zusammen verwendet werden.) - - Cannot load library %1: %2 Die Bibliothek %1 kann nicht geladen werden: %2 - - Cannot unload library %1: %2 Die Bibliothek %1 kann nicht entladen werden: %2 - - Cannot resolve symbol "%1" in %2: %3 Das Symbol "%1" kann in %2 nicht aufgelöst werden: %3 @@ -4271,37 +3390,30 @@ Möchten Sie die Datei trotzdem löschen? QLineEdit - Select All Alles auswählen - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - &Paste Einf&ügen - Delete Löschen @@ -4309,23 +3421,18 @@ Möchten Sie die Datei trotzdem löschen? QLocalServer - - %1: Name error %1: Fehlerhafter Name - %1: Permission denied %1: Zugriff verweigert - %1: Address in use %1: Die Adresse wird bereits verwendet - %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -4333,70 +3440,46 @@ Möchten Sie die Datei trotzdem löschen? QLocalSocket - - %1: Connection refused %1: Der Verbindungsaufbau wurde verweigert - - %1: Remote closed %1: Die Verbindung wurde von der Gegenseite geschlossen - - - - %1: Invalid name %1: Ungültiger Name - - %1: Socket access error %1: Fehler beim Zugriff auf den Socket - - %1: Socket resource error %1: Socket-Fehler (Ressourcenproblem) - - %1: Socket operation timed out %1: Zeitüberschreitung bei Socket-Operation - - %1: Datagram too large %1: Das Datagramm ist zu groß - - - %1: Connection error %1: Verbindungsfehler - - %1: The socket operation is not supported %1: Diese Socket-Operation wird nicht unterstützt - %1: Unknown error %1: Unbekannter Fehler - - %1: Unknown error %2 %1: Unbekannter Fehler %2 @@ -4404,27 +3487,22 @@ Möchten Sie die Datei trotzdem löschen? QMYSQLDriver - Unable to open database ' Die Datenbankverbindung kann nicht geöffnet werden ' - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to begin transaction Es kann keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion kann nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -4432,60 +3510,46 @@ Möchten Sie die Datei trotzdem löschen? QMYSQLResult - - Unable to fetch data Es konnten keine Daten abgeholt werden - Unable to execute query Die Abfrage konnte nicht ausgeführt werden - Unable to store result Das Ergebnis konnte nicht gespeichert werden - - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to reset statement Der Befehl konnte nicht zurückgesetzt werden - Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - - Unable to bind outvalues Die Ausgabewerte konnten nicht gebunden werden - Unable to store statement results Die Ergebnisse des Befehls konnten nicht gespeichert werden - Unable to execute next query Die folgende Abfrage kann nicht ausgeführt werden - Unable to store next result Das folgende Ergebnis kann nicht gespeichert werden @@ -4493,7 +3557,6 @@ Möchten Sie die Datei trotzdem löschen? QMdiArea - (Untitled) (Unbenannt) @@ -4501,92 +3564,74 @@ Möchten Sie die Datei trotzdem löschen? QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Schließen - Minimize Minimieren - Restore Down Wiederherstellen - &Restore Wieder&herstellen - &Move Ver&schieben - &Size Größe ä&ndern - Mi&nimize M&inimieren - Ma&ximize Ma&ximieren - Stay on &Top Im &Vordergrund bleiben - &Close Schl&ießen - Maximize Maximieren - Unshade Herabrollen - Shade Aufrollen - Restore Wiederherstellen - Help Hilfe - Menu Menü - - [%1] - [%1] @@ -4594,21 +3639,14 @@ Möchten Sie die Datei trotzdem löschen? QMenu - - Close Schließen - - Open Öffnen - - - Execute Ausführen @@ -4616,7 +3654,6 @@ Möchten Sie die Datei trotzdem löschen? QMenuBar - Actions Optionen @@ -4624,40 +3661,30 @@ Möchten Sie die Datei trotzdem löschen? QMessageBox - - - - OK OK - <h3>About Qt</h3><p>This program uses 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> - About Qt Über Qt - Help Hilfe - Show Details... Details einblenden... - Hide Details... Details ausblenden... @@ -4665,7 +3692,6 @@ Möchten Sie die Datei trotzdem löschen? QMultiInputContext - Select IM Eingabemethode auswählen @@ -4673,12 +3699,10 @@ Möchten Sie die Datei trotzdem löschen? QMultiInputContextPlugin - Multiple input method switcher Umschalter für Eingabemethoden - Multiple input method switcher that uses the context menu of the text widgets Mehrfachumschalter für Eingabemethoden, der das Kontextmenü des Text-Widgets verwendet @@ -4686,132 +3710,106 @@ Möchten Sie die Datei trotzdem löschen? QNativeSocketEngine - The remote host closed the connection Der entfernte Rechner hat die Verbindung geschlossen - Network operation timed out Das Zeitlimit für die Operation wurde überschritten - Out of resources Keine Ressourcen verfügbar - Unsupported socket operation Socket-Kommando nicht unterstützt - Protocol type not supported Das Protokoll wird nicht unterstützt - Invalid socket descriptor Ungültiger Socket-Deskriptor - Network unreachable Das Netzwerk ist nicht erreichbar - Permission denied Zugriff verweigert - Connection timed out Das Zeitlimit für die Verbindung wurde überschritten - Connection refused Verbindung verweigert - The bound address is already in use Die angegebene Adresse ist bereits in Gebrauch - The address is not available Die Adresse ist nicht verfügbar - The address is protected Die Adresse ist geschützt - Unable to send a message Die Nachricht konnte nicht gesendet werden - Unable to receive a message Die Nachricht konnte nicht empfangen werden - Unable to write Der Schreibvorgang konnte nicht ausgeführt werden - Network error Netzwerkfehler - Another socket is already listening on the same port Auf diesem Port hört bereits ein anderer Socket - Unable to initialize non-blocking socket Der nichtblockierende Socket konnte nicht initialisiert werden - Unable to initialize broadcast socket Der Broadcast-Socket konnte nicht initialisiert werden - Attempt to use IPv6 socket on a platform with no IPv6 support Es wurde versucht, einen IPv6-Socket auf einem System ohne IPv6-Unterstützung zu verwenden - Host unreachable Der Zielrechner kann nicht erreicht werden - Datagram was too large to send Das Datagram konnte nicht gesendet werden, weil es zu groß ist - Operation on non-socket Operation kann nur auf einen Socket angewandt werden - Unknown error Unbekannter Fehler - The proxy type is invalid for this operation Die Operation kann mit dem Proxy-Typ nicht durchgeführt werden @@ -4819,7 +3817,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessCacheBackend - Error opening %1 %1 konnte nicht geöffnet werden @@ -4827,12 +3824,10 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessDataBackend - Operation not supported on %1 Diese Operation wird von %1 nicht unterstützt - Invalid URI: %1 Ungültiger URI: %1 @@ -4840,17 +3835,14 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Fehler beim Schreiben zu %1: %2 - Socket error on %1: %2 Socket-Fehler bei %1: %2 - Remote host closed the connection prematurely on %1 Der entfernte Rechner hat die Verbindung zu %1 vorzeitig beendet @@ -4858,30 +3850,22 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessFileBackend - - Request for opening non-local file %1 Anforderung zum Öffnen einer Datei über Netzwerk %1 - - Error opening %1: %2 %1 konnte nicht geöffnet werden: %2 - Write error writing to %1: %2 Fehler beim Schreiben zur Datei %1: %2 - - Cannot open %1: Path is a directory %1 kann nicht geöffnet werden: Der Pfad spezifiziert ein Verzeichnis - Read error reading from %1: %2 Beim Lesen von der Datei %1 trat ein Fehler auf: %2 @@ -4889,27 +3873,22 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessFtpBackend - No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden - Cannot open %1: is a directory %1 kann nicht geöffnet werden: Es handelt sich um ein Verzeichnis - Logging in to %1 failed: authentication required Die Anmeldung bei %1 schlug fehl: Es ist eine Authentifizierung erforderlich - Error while downloading %1: %2 Beim Herunterladen von %1 trat ein Fehler auf: %2 - Error while uploading %1: %2 Beim Hochladen von %1 trat ein Fehler auf: %2 @@ -4917,7 +3896,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessHttpBackend - No suitable proxy found Es konnte kein geeigneter Proxy-Server gefunden werden @@ -4925,7 +3903,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkAccessManager - Network access is disabled. Der Zugriff auf das Netzwerk ist nicht gestattet. @@ -4933,22 +3910,18 @@ Möchten Sie die Datei trotzdem löschen? QNetworkReply - Error downloading %1 - server replied: %2 Beim Herunterladen von %1 trat ein Fehler auf - Die Antwort des Servers ist: %2 - Protocol "%1" is unknown Das Protokoll "%1" ist unbekannt - Network session error. Fehler bei Netzwerkverbindung. - Temporary network failure. Das Netzwerk ist zur Zeit ausgefallen. @@ -4956,8 +3929,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkReplyImpl - - Operation canceled Operation abgebrochen @@ -4965,7 +3936,6 @@ Möchten Sie die Datei trotzdem löschen? QNetworkSession - Invalid configuration. Ungültige Konfiguration. @@ -4973,47 +3943,34 @@ Möchten Sie die Datei trotzdem löschen? QNetworkSessionPrivateImpl - - Unknown session error. Unbekannter Fehler bei Netzwerkverbindung. - - The session was aborted by the user or system. Die Verbindung wurde vom Nutzer oder vom Betriebssystem unterbrochen. - - The requested operation is not supported by the system. Die angeforderte Operation wird vom System nicht unterstützt. - - The specified configuration cannot be used. Die angegebene Konfiguration kann nicht verwendet werden. - - Roaming was aborted or is not possible. Das Roaming wurde abgebrochen oder ist hier nicht möglich. - Roaming error Fehler beim Roaming - Session aborted by user or system Die Verbindung wurde vom Nutzer oder vom Betriebssystem unterbrochen - Unidentified Error Unbekannter Fehler @@ -5021,28 +3978,23 @@ Möchten Sie die Datei trotzdem löschen? QOCIDriver - Unable to logon Logon-Vorgang fehlgeschlagen - Unable to initialize QOCIDriver Initialisierung fehlgeschlagen - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -5050,44 +4002,34 @@ Möchten Sie die Datei trotzdem löschen? QOCIResult - - - Unable to bind column for batch execute Die Spalte konnte nicht für den Stapelverarbeitungs-Befehl gebunden werden - Unable to execute batch statement Der Stapelverarbeitungs-Befehl konnte nicht ausgeführt werden - Unable to goto next Kann nicht zum nächsten Element gehen - Unable to alloc statement Die Allokation des Befehls schlug fehl - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to get statement type Der Anweisungstyp kann nicht bestimmt werden - Unable to bind value Der Wert konnte nicht gebunden werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -5095,32 +4037,26 @@ Möchten Sie die Datei trotzdem löschen? QODBCDriver - Unable to connect Es kann keine Verbindung aufgebaut werden - Unable to disable autocommit 'autocommit' konnte nicht deaktiviert werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to enable autocommit 'autocommit' konnte nicht aktiviert werden - Unable to connect - Driver doesn't support all functionality required Es kann keine Verbindung aufgebaut werden weil der Treiber die benötigte Funktionalität nicht vollständig unterstützt @@ -5128,51 +4064,38 @@ Möchten Sie die Datei trotzdem löschen? QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: 'SQL_CURSOR_STATIC' konnte nicht als Attribut des Befehls gesetzt werden. Bitte prüfen Sie die Konfiguration Ihres ODBC-Treibers - - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - Unable to fetch next Der nächste Datensatz konnte nicht abgeholt werden - Unable to prepare statement Der Befehl konnte nicht initialisiert werden - Unable to bind variable Die Variable konnte nicht gebunden werden - - - Unable to fetch last Der letzte Datensatz konnte nicht abgeholt werden - Unable to fetch Es konnten keine Daten abgeholt werden - Unable to fetch first Der erste Datensatz konnte nicht abgeholt werden - Unable to fetch previous Der vorangegangene Datensatz kann nicht abgeholt werden @@ -5180,19 +4103,14 @@ Möchten Sie die Datei trotzdem löschen? QObject - "%1" duplicates a previous role name and will be disabled. "%1" ist bereits als Name einer Rolle vergeben und wird daher deaktiviert. - - invalid query: "%1" Ungültige Abfrage: "%1" - - PulseAudio Sound Server PulseAudio Sound Server @@ -5200,12 +4118,10 @@ Möchten Sie die Datei trotzdem löschen? QPPDOptionsModel - Name Name - Value Wert @@ -5213,32 +4129,26 @@ Möchten Sie die Datei trotzdem löschen? QPSQLDriver - Unable to connect Es kann keine Verbindung aufgebaut werden - Could not begin transaction Es konnte keine Transaktion gestartet werden - Could not commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Could not rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) - Unable to subscribe Die Registrierung schlug fehl - Unable to unsubscribe Die Registrierung konnte nicht aufgehoben werden @@ -5246,12 +4156,10 @@ Möchten Sie die Datei trotzdem löschen? QPSQLResult - Unable to create query Es konnte keine Abfrage erzeugt werden - Unable to prepare statement Der Befehl konnte nicht initialisiert werden @@ -5259,102 +4167,82 @@ Möchten Sie die Datei trotzdem löschen? QPageSetupWidget - Centimeters (cm) Zentimeter (cm) - Millimeters (mm) Millimeter (mm) - Inches (in) Zoll (in) - Points (pt) Punkte (pt) - Form Formular - Paper Papier - Page size: Seitengröße: - Width: Breite: - Height: Höhe: - Paper source: Papierquelle: - Orientation Ausrichtung - Portrait Hochformat - Landscape Querformat - Reverse landscape Umgekehrtes Querformat - Reverse portrait Umgekehrtes Hochformat - Margins Ränder - top margin Oberer Rand - left margin Linker Rand - right margin Rechter Rand - bottom margin Unterer Rand @@ -5362,12 +4250,10 @@ Möchten Sie die Datei trotzdem löschen? QPluginLoader - Unknown error Unbekannter Fehler - The plugin was not loaded. Das Plugin wurde nicht geladen. @@ -5375,433 +4261,344 @@ Möchten Sie die Datei trotzdem löschen? QPrintDialog - locally connected direkt verbunden - - Aliases: %1 Alias: %1 - - unknown unbekannt - OK OK - Print all Alles drucken - Print range Bereich drucken - A0 (841 x 1189 mm) A0 (841 x 1189 mm) - A1 (594 x 841 mm) A1 (594 x 841 mm) - A2 (420 x 594 mm) A2 (420 x 594 mm) - A3 (297 x 420 mm) A3 (297 x 420 mm) - A5 (148 x 210 mm) A5 (148 x 210 mm) - A6 (105 x 148 mm) A6 (105 x 148 mm) - A7 (74 x 105 mm) A7 (74 x 105 mm) - A8 (52 x 74 mm) A8 (52 x 74 mm) - A9 (37 x 52 mm) A9 (37 x 52 mm) - B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) - B1 (707 x 1000 mm) B1 (707 x 1000 mm) - B2 (500 x 707 mm) B2 (500 x 707 mm) - B3 (353 x 500 mm) B3 (353 x 500 mm) - B4 (250 x 353 mm) B4 (250 x 353 mm) - B6 (125 x 176 mm) B6 (125 x 176 mm) - B7 (88 x 125 mm) B7 (88 x 125 mm) - B8 (62 x 88 mm) B8 (62 x 88 mm) - B9 (44 x 62 mm) B9 (44 x 62 mm) - B10 (31 x 44 mm) B10 (31 x 44 mm) - C5E (163 x 229 mm) C5E (163 x 229 mm) - DLE (110 x 220 mm) DLE (110 x 220 mm) - Folio (210 x 330 mm) Folio (210 x 330 mm) - Ledger (432 x 279 mm) Ledger (432 x 279 mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241 mm) - Print current page Diese Seite drucken - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7,5 x 10 Zoll, 191 x 254 mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8,5 x 14 Zoll, 216 x 356 mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8,5 x 11 Zoll, 216 x 279 mm) - Print selection Auswahl drucken - - - Print Drucken - Print To File ... In Datei drucken ... - File %1 is not writable. Please choose a different file name. Die Datei %1 ist schreibgeschützt. Bitte wählen Sie einen anderen Dateinamen. - %1 already exists. Do you want to overwrite it? Die Datei %1 existiert bereits. Soll sie überschrieben werden? - File exists Die Datei existiert bereits - <qt>Do you want to overwrite it?</qt> <qt>Soll sie überschrieben werden?</qt> - %1 is a directory. Please choose a different file name. %1 ist ein Verzeichnis. Bitte wählen Sie einen anderen Dateinamen. - The 'From' value cannot be greater than the 'To' value. Die Angabe für die erste Seite darf nicht größer sein als die für die letzte Seite. - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Benutzerdefiniert - - &Options >> &Einstellungen >> - &Options << &Einstellungen << - Print to File (PDF) In PDF-Datei drucken - Print to File (Postscript) In Postscript-Datei drucken - Local file Lokale Datei - Write %1 file Schreiben der Datei %1 - &Print &Drucken @@ -5809,108 +4606,86 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintPreviewDialog - %1% %1% - Print Preview Druckvorschau - Next page Nächste Seite - Previous page Vorige Seite - First page Erste Seite - Last page Letzte Seite - Fit width Breite anpassen - Fit page Seite anpassen - Zoom in Vergrößern - Zoom out Verkleinern - Portrait Hochformat - Landscape Querformat - Show single page Einzelne Seite anzeigen - Show facing pages Gegenüberliegende Seiten anzeigen - Show overview of all pages Übersicht aller Seiten - Print Drucken - Page setup Seite einrichten - Close Schließen - Export to PDF PDF exportieren - Export to PostScript PostScript exportieren - - Page Setup Seite einrichten @@ -5918,17 +4693,14 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintPropertiesWidget - Form Formular - Page Seite - Advanced Erweitert @@ -5936,102 +4708,82 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintSettingsOutput - Form Formular - Copies Anzahl Exemplare - Print range Bereich drucken - Print all Alles drucken - Pages from Seiten von - to bis - Selection Auswahl - Output Settings Ausgabeeinstellungen - Copies: Anzahl Exemplare: - Collate Sortieren - Reverse Umgekehrt - Options Optionen - Color Mode Farbmodus - Color Farbe - Grayscale Graustufen - Duplex Printing Duplexdruck - None Kein - Long side Lange Seite - Short side Kurze Seite - Current Page @@ -6039,47 +4791,38 @@ Bitte wählen Sie einen anderen Dateinamen. QPrintWidget - Form Formular - Printer Drucker - &Name: &Name: - P&roperties &Eigenschaften - Location: Standort: - Preview Vorschau - Type: Typ: - Output &file: Ausgabe&datei: - ... ... @@ -6087,62 +4830,38 @@ Bitte wählen Sie einen anderen Dateinamen. QProcess - - Could not open input redirection for reading Die Eingabeumleitung konnte nicht zum Lesen geöffnet werden - - Could not open output redirection for writing Die Ausgabeumleitung konnte nicht zum Lesen geöffnet werden - Resource error (fork failure): %1 Ressourcenproblem ("fork failure"): %1 - - - - - - - - - Process operation timed out Zeitüberschreitung - - - - Error reading from process Das Lesen vom Prozess schlug fehl - - - Error writing to process Das Schreiben zum Prozess schlug fehl - Process crashed Der Prozess ist abgestürzt - No program defined Es wurde kein Programm angegeben - Process failed to start: %1 Das Starten des Prozesses schlug fehl: %1 @@ -6150,7 +4869,6 @@ Bitte wählen Sie einen anderen Dateinamen. QProgressDialog - Cancel Abbrechen @@ -6158,7 +4876,6 @@ Bitte wählen Sie einen anderen Dateinamen. QPushButton - Open Öffnen @@ -6166,7 +4883,6 @@ Bitte wählen Sie einen anderen Dateinamen. QRadioButton - Check Ankreuzen @@ -6174,57 +4890,46 @@ Bitte wählen Sie einen anderen Dateinamen. QRegExp - no error occurred kein Fehler - disabled feature used deaktivierte Eigenschaft wurde benutzt - bad char class syntax falsche Syntax für Zeichenklasse - bad lookahead syntax falsche Syntax für Lookahead - bad repetition syntax falsche Syntax für Wiederholungen - invalid octal value ungültiger Oktal-Wert - missing left delim fehlende linke Begrenzung - unexpected end unerwartetes Ende - met internal limit internes Limit erreicht - invalid interval ungültiges Intervall - invalid category ungültige Kategorie @@ -6232,22 +4937,18 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Driver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion kann nicht rückgängig gemacht werden @@ -6255,12 +4956,10 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLite2Result - Unable to fetch results Das Ergebnis konnte nicht abgeholt werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden @@ -6268,27 +4967,22 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLiteDriver - Error opening database Die Datenbankverbindung konnte nicht geöffnet werden - Error closing database Die Datenbankverbindung konnte nicht geschlossen werden - Unable to begin transaction Es konnte keine Transaktion gestartet werden - Unable to commit transaction Die Transaktion konnte nicht durchgeführt werden (Operation 'commit' fehlgeschlagen) - Unable to rollback transaction Die Transaktion konnte nicht rückgängig gemacht werden (Operation 'rollback' fehlgeschlagen) @@ -6296,34 +4990,26 @@ Bitte wählen Sie einen anderen Dateinamen. QSQLiteResult - - - Unable to fetch row Der Datensatz konnte nicht abgeholt werden - Unable to execute statement Der Befehl konnte nicht ausgeführt werden - Unable to reset statement Der Befehl konnte nicht zurückgesetzt werden - Unable to bind parameters Die Parameter konnte nicht gebunden werden - Parameter count mismatch Die Anzahl der Parameter ist falsch - No query Kein Abfrage @@ -6331,32 +5017,26 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptBreakpointsModel - ID ID - Location Stelle - Condition Bedingung - Ignore-count Auslösen nach - Single-shot Einmal auslösen - Hit-count Ausgelöst @@ -6364,12 +5044,10 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptBreakpointsWidget - New Neu - Delete Löschen @@ -6377,143 +5055,114 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebugger - - Go to Line Gehe zu Zeile - Line: Zeile: - Interrupt Unterbrechen - Shift+F5 Shift+F5 - Continue Weiter - F5 F5 - Step Into Einzelschritt herein - F11 F11 - Step Over Einzelschritt über - F10 F10 - Step Out Einzelschritt heraus - Shift+F11 Shift+F11 - Run to Cursor Bis Cursor ausführen - Ctrl+F10 Ctrl+F10 - Run to New Script Bis zu neuem Skript ausführen - Toggle Breakpoint Haltepunkt umschalten - F9 F9 - Clear Debug Output Debug-Ausgabe löschen - Clear Error Log Fehlerausgabe löschen - Clear Console Konsole löschen - &Find in Script... &Suche im Skript... - Ctrl+F Ctrl+F - Find &Next &Nächste Fundstelle - F3 F3 - Find &Previous Vorhergehende Fundstelle - Shift+F3 Shift+F3 - Ctrl+G Ctrl+G - Debug Debuggen @@ -6521,32 +5170,26 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebuggerCodeFinderWidget - Close Schließen - Previous Vorige - Next Nächste - Case Sensitive Groß/Kleinschreibung beachten - Whole words Ganze Worte - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Die Suche hat das Ende erreicht @@ -6554,12 +5197,10 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebuggerLocalsModel - Name Name - Value Wert @@ -6567,17 +5208,14 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptDebuggerStackModel - Level Ebene - Name Name - Location Stelle @@ -6585,22 +5223,18 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptEdit - Toggle Breakpoint Haltepunkt umschalten - Disable Breakpoint Haltepunkt deaktivieren - Enable Breakpoint Haltepunkt aktivieren - Breakpoint Condition: Bedingung: @@ -6608,52 +5242,42 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptEngineDebugger - Loaded Scripts Geladene Skripte - Breakpoints Haltepunkte - Stack Stapel - Locals Lokale Variablen - Console Konsole - Debug Output Debug-Ausgabe - Error Log Fehlerausgabe - Search Suche - View Ansicht - Qt Script Debugger Qt Script Debugger @@ -6661,7 +5285,6 @@ Bitte wählen Sie einen anderen Dateinamen. QScriptNewBreakpointWidget - Close Schließen @@ -6669,84 +5292,66 @@ Bitte wählen Sie einen anderen Dateinamen. QScrollBar - Scroll here Hierher scrollen - Left edge Linker Rand - Top Anfang - Right edge Rechter Rand - Bottom Ende - Page left Eine Seite nach links - - Page up Eine Seite nach oben - Page right Eine Seite nach rechts - - Page down Eine Seite nach unten - Scroll left Nach links scrollen - Scroll up Nach oben scrollen - Scroll right Nach rechts scrollen - Scroll down Nach unten scrollen - Line up Ausrichten - Position Position - Line down Eine Zeile nach unten @@ -6754,111 +5359,78 @@ Bitte wählen Sie einen anderen Dateinamen. QSharedMemory - %1: create size is less then 0 %1: Die Größenangabe für die Erzeugung ist kleiner als Null - - %1: unable to lock %1: Sperrung fehlgeschlagen - %1: unable to unlock %1: Die Sperrung konnte nicht aufgehoben werden - - - %1: permission denied %1: Zugriff verweigert - - - %1: already exists %1: existiert bereits - %1: doesn't exists %1: existiert nicht - - - %1: out of resources %1: Keine Ressourcen mehr verfügbar - - - %1: unknown error %2 %1: Unbekannter Fehler %2 - %1: key is empty %1: Ungültige Schlüsselangabe (leer) - %1: ftok failed %1: ftok-Aufruf schlug fehl - - - %1: unable to make key %1: Es kann kein Schlüssel erzeugt werden - - %1: doesn't exist %1: existiert nicht - %1: UNIX key file doesn't exist %1: Die Unix-Schlüsseldatei existiert nicht - %1: system-imposed size restrictions %1: Ein systembedingtes Limit der Größe wurde erreicht - %1: not attached %1: nicht verbunden - - %1: invalid size %1: Ungültige Größe - - %1: key error %1: Fehlerhafter Schlüssel - %1: size query failed %1: Die Abfrage der Größe schlug fehl - %1: unable to set key on lock %1: Es kann kein Schlüssel für die Sperrung gesetzt werden @@ -6866,1095 +5438,884 @@ Bitte wählen Sie einen anderen Dateinamen. QShortcut - Space This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Leertaste - Esc Esc - Tab Tab - Backtab Rück-Tab - Backspace Rücktaste - Return Return - Enter Enter - Ins Einfg - Del Entf - Pause Pause - Print Druck - SysReq SysReq - Home Pos1 - End Ende - Left Links - Up Hoch - Right Rechts - Down Runter - PgUp Bild aufwärts - PgDown Bild abwärts - CapsLock Feststelltaste - NumLock Zahlen-Feststelltaste - ScrollLock Rollen-Feststelltaste - Menu Menü - Help Hilfe - Back Zurück - Forward Vorwärts - Stop Abbrechen - Refresh Aktualisieren - Volume Down Lautstärke - - Volume Mute Ton aus - Volume Up Lautstärke + - Bass Boost Bass-Boost - Bass Up Bass + - Bass Down Bass - - Treble Up Höhen + - Treble Down Höhen - - Media Play Wiedergabe - Media Stop Stopp - Media Previous Vorheriger - Media Next Nächster - Media Record Aufzeichnen - + Media Pause + Media player pause button + Pause + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Pause + + Favorites Favoriten - Search Suchen - Standby Standby - Open URL URL öffnen - Launch Mail Mail starten - Launch Media Medienspieler starten - Launch (0) (0) starten - Launch (1) (1) starten - Launch (2) (2) starten - Launch (3) (3) starten - Launch (4) (4) starten - Launch (5) (5) starten - Launch (6) (6) starten - Launch (7) (7) starten - Launch (8) (8) starten - Launch (9) (9) starten - Launch (A) (A) starten - Launch (B) (B) starten - Launch (C) (C) starten - Launch (D) (D) starten - Launch (E) (E) starten - Launch (F) (F) starten - Monitor Brightness Up Monitor heller - Monitor Brightness Down Monitor dunkler - Keyboard Light On/Off Tastaturbeleuchtung Ein/Aus - Keyboard Brightness Up Tastaturbeleuchtung heller - Keyboard Brightness Down Tastaturbeleuchtung dunkler - Power Off Ausschalten - Wake Up Aufwecken - Eject Auswerfen - Screensaver Bildschirmschoner - WWW Internet - Sleep Schlafmodus - LightBulb Beleuchtung - Shop Shop - History Verlauf - Add Favorite Lesezeichen hinzufügen - Hot Links Empfohlene Verweise - Adjust Brightness Helligkeit einstellen - Finance Finanzen - Community Community - Audio Rewind Audio rückspulen - Back Forward Hinterstes nach vorn - Application Left Anwendung links - Application Right Anwendung rechts - Book Buch - CD CD - Calculator Rechner - Clear Löschen - Clear Grab Zugriff löschen - Close Schließen - Copy Kopieren - Cut Ausschneiden - Display Anzeigen - DOS DOS - Documents Dokumente - Spreadsheet Spreadsheet - Browser Browser - Game Spiel - Go Los - iTouch iTouch - Logoff Logoff - Market Markt - Meeting Versammlung - Keyboard Menu Tastaturmenü - Menu PB Menü PB - My Sites Meine Orte - News Nachrichten - Home Office Home Office - Option Option - Paste Einfügen - Phone Telefon - Reply Antworten - Reload Neu laden - Rotate Windows Fenster rotieren - Rotation PB Rotation PB - Rotation KB Rotation KB - Save Speichern - Send Senden - Spellchecker Rechtschreibprüfung - Split Screen Bildschirm teilen - Support Hilfe - Task Panel Task-Leiste - Terminal Terminal - Tools Werkzeuge - Travel Reise - Video Video - Word Processor Textverarbeitung - XFer XFer - Zoom In Vergrößern - Zoom Out Verkleinern - Away Abwesend - Messenger Messenger - WebCam WebCam - Mail Forward Weiterleitung - Pictures Bilder - Music Musik - Battery Batterie - Bluetooth Bluetooth - Wireless Drahtlos - Ultra Wide Band Ultra Wide Band - Audio Forward Audio vorspulen - Audio Repeat Audio wiederholen - Audio Random Play Audio zufällige Auswahl spielen - Subtitle Untertitel - Audio Cycle Track Audiospur wechseln - Time Zeit - View Ansicht - Top Menu Hauptmenü - Suspend Pause - Hibernate Hibernate - Print Screen Bildschirm drucken - Page Up Bild aufwärts - Page Down Bild abwärts - Caps Lock Feststelltaste - Num Lock Zahlen-Feststelltaste - Number Lock Zahlen-Feststelltaste - Scroll Lock Rollen-Feststelltaste - Insert Einfügen - Delete Löschen - Escape Escape - System Request System Request - - Select Auswählen - Yes Ja - No Nein - Context1 Kontext1 - Context2 Kontext2 - Context3 Kontext3 - Context4 Kontext4 - Call Button to start a call (note: a separate button is used to end the call) Anruf - Hangup Button to end a call (note: a separate button is used to start the call) Auflegen - Toggle Call/Hangup Button that will hang up if we're in call, or make a call if we're not. Anrufen/Aufhängen - Flip Umdrehen - Voice Dial Button to trigger voice dialling Sprachwahl - Last Number Redial Button to redial the last number called Wahlwiederholung - Camera Shutter Button to trigger the camera shutter (take a picture) Auslöser - Camera Focus Button to focus the camera Scharfstellen - Kanji Kanji - Muhenkan Muhenkan - Henkan Henkan - Romaji Romaji - Hiragana Hiragana - Katakana Katakana - Hiragana Katakana Hiragana Katakana - Zenkaku Zenkaku - Hankaku Hankaku - Zenkaku Hankaku Zenkaku Hankaku - Touroku Touroku - Massyo Massyo - Kana Lock Kana Lock - Kana Shift Kana Shift - Eisu Shift Eisu Shift - Eisu toggle Eisu toggle - Code input Code-Eingabe - Multiple Candidate Mehrere Vorschläge - Previous Candidate Vorangegangener Vorschlag - Hangul Hangul - Hangul Start Hangul Anfang - Hangul End Hangul Ende - Hangul Hanja Hangul Hanja - Hangul Jamo Hangul Jamo - Hangul Romaja Hangul Romaja - Hangul Jeonja Hangul Jeonja - Hangul Banja Hangul Banja - Hangul PreHanja Hangul PreHanja - Hangul PostHanja Hangul PostHanja - Hangul Special Hangul Special - - Ctrl Strg - - Shift Umschalt - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Startseite @@ -7962,27 +6323,22 @@ Bitte wählen Sie einen anderen Dateinamen. QSlider - Page left Eine Seite nach links - Page up Eine Seite nach oben - Position Position - Page right Eine Seite nach rechts - Page down Eine Seite nach unten @@ -7990,72 +6346,58 @@ Bitte wählen Sie einen anderen Dateinamen. QSocks5SocketEngine - Connection to proxy refused Der Proxy-Server hat den Aufbau einer Verbindung verweigert - Connection to proxy closed prematurely Der Proxy-Server hat die Verbindung vorzeitig beendet - Proxy host not found Der Proxy-Server konnte nicht gefunden werden - Connection to proxy timed out Bei der Verbindung mit dem Proxy-Server wurde ein Zeitlimit überschritten - Proxy authentication failed Die Authentifizierung beim Proxy-Server schlug fehl - Proxy authentication failed: %1 Die Authentifizierung beim Proxy-Server schlug fehl: %1 - SOCKS version 5 protocol error Protokoll-Fehler (SOCKS version 5) - General SOCKSv5 server failure Allgemeiner Fehler bei der Kommunikation mit dem SOCKSv5-Server - Connection not allowed by SOCKSv5 server Der SOCKSv5-Server hat die Verbindung verweigert - TTL expired TTL verstrichen - SOCKSv5 command not supported Dieses SOCKSv5-Kommando wird nicht unterstützt - Address type not supported Dieser Adresstyp wird nicht unterstützt - Unknown SOCKSv5 proxy error code 0x%1 Unbekannten Fehlercode vom SOCKSv5-Proxy-Server erhalten: 0x%1 - Network operation timed out Das Zeitlimit für die Operation wurde überschritten @@ -8063,32 +6405,26 @@ Bitte wählen Sie einen anderen Dateinamen. QSoftKeyManager - Ok Ok - Select Auswählen - Done Fertig - Options Optionen - Cancel Abbrechen - Exit Beenden @@ -8096,12 +6432,10 @@ Bitte wählen Sie einen anderen Dateinamen. QSpinBox - More Mehr - Less Weniger @@ -8109,56 +6443,42 @@ Bitte wählen Sie einen anderen Dateinamen. QSql - Delete Löschen - Delete this record? Diesen Datensatz löschen? - - - Yes Ja - - - No Nein - Insert Einfügen - Update Aktualisieren - Save edits? Änderungen speichern? - Cancel Abbrechen - Confirm Bestätigen - Cancel your edits? Änderungen verwerfen? @@ -8166,177 +6486,142 @@ Bitte wählen Sie einen anderen Dateinamen. QSslSocket - Unable to write data: %1 Die Daten konnten nicht geschrieben werden: %1 - Unable to decrypt data: %1 Die Daten konnten nicht entschlüsselt werden: %1 - Error while reading: %1 Beim Lesen ist ein Fehler aufgetreten: %1 - Error during SSL handshake: %1 Im Ablauf des SSL-Protokolls ist ein Fehler aufgetreten: %1 - Error creating SSL context (%1) Es konnte keine SSL-Kontextstruktur erzeugt werden (%1) - Invalid or empty cipher list (%1) Ungültige oder leere Schlüsselliste (%1) - Private key does not certify public key, %1 Der private Schlüssel passt nicht zum öffentlichen Schlüssel, %1 - Error creating SSL session, %1 Es konnte keine SSL-Sitzung erzeugt werden, %1 - Error creating SSL session: %1 Es konnte keine SSL-Sitzung erzeugt werden: %1 - Cannot provide a certificate with no key, %1 Ohne Schlüssel kann kein Zertifikat zur Verfügung gestellt werden, %1 - Error loading local certificate, %1 Das lokale Zertifikat konnte nicht geladen werden, %1 - Error loading private key, %1 Der private Schlüssel konnte nicht geladen werden, %1 - No error Kein Fehler - The issuer certificate could not be found Das Zertifikat des Ausstellers konnte nicht gefunden werden - The certificate signature could not be decrypted Die Signatur des Zertifikats konnte nicht entschlüsselt werden - The public key in the certificate could not be read Der öffentliche Schlüssel konnte nicht gelesen werden - The signature of the certificate is invalid Die Signatur des Zertifikats ist ungültig - The certificate is not yet valid Das Zertifikat ist noch nicht gültig - The certificate has expired Die Gültigkeit des Zertifikats ist abgelaufen - The certificate's notBefore field contains an invalid time Das Feld 'notBefore' des Zertifikats enthält eine ungültige Zeit - The certificate's notAfter field contains an invalid time Das Feld 'notAfter' des Zertifikats enthält eine ungültige Zeit - The certificate is self-signed, and untrusted Das Zertifikat ist selbstsigniert und daher nicht vertrauenswürdig - The root certificate of the certificate chain is self-signed, and untrusted Das oberste Zertifikat der Kette ist selbstsigniert und daher nicht vertrauenswürdig - The issuer certificate of a locally looked up certificate could not be found Das Zertifikat des Ausstellers eines lokal gefundenen Zertifikats konnte nicht gefunden werden - No certificates could be verified Keines der Zertifikate konnte verifiziert werden - One of the CA certificates is invalid Eines der Zertifikate der Zertifizierungsstelle ist ungültig - The basicConstraints path length parameter has been exceeded Die Länge des basicConstraints-Pfades wurde überschritten - The supplied certificate is unsuitable for this purpose Das angegebene Zertifikat kann in diesem Fall nicht verwendet werden - The root CA certificate is not trusted for this purpose Das oberste Zertifikat der Zertifizierungsstelle ist für diesen Fall nicht vertrauenswürdig - The root CA certificate is marked to reject the specified purpose Das oberste Zertifikat der Zertifizierungsstelle weist diesen Fall auf Grund einer speziellen Kennzeichnung zurück - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate Das Zertifikat des betrachteten Ausstellers wurde zurückgewiesen da sein Subjektname nicht dem Namen des Austellers des aktuellen Zertifikats entspricht - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate Das Zertifikat des betrachteten Ausstellers wurde zurückgewiesen da Ausstellername und Seriennummer vorhanden sind und nicht dem Bezeichner der Zertifizierungsstelle des aktuellen Zertifikats entsprechen - The peer did not present any certificate Die Gegenstelle hat kein Zertifikat angegeben - The host name did not match any of the valid hosts for this certificate Der Name des Hosts ist keiner aus der Liste der für dieses Zertifikat gültigen Hosts - Unknown error Unbekannter Fehler @@ -8344,22 +6629,18 @@ Bitte wählen Sie einen anderen Dateinamen. QStateMachine - Missing initial state in compound state '%1' Der Anfangszustand des zusammengesetzten Zustands '%1' fehlt - Missing default state in history state '%1' Der Anfangszustand im Verlauf bei Zustand '%1' fehlt - No common ancestor for targets and source of transition from state '%1' Die Ziele und die Quelle des Übergangs vom Zustand '%1' haben keinen gemeinsamen Ursprung - Unknown error Unbekannter Fehler @@ -8367,30 +6648,22 @@ Bitte wählen Sie einen anderen Dateinamen. QSystemSemaphore - %1: does not exist %1: Nicht existent - - %1: out of resources %1: Keine Ressourcen mehr verfügbar - - %1: permission denied %1: Zugriff verweigert - %1: already exists %1: Existiert bereits - - %1: unknown error %2 %1: Unbekannter Fehler %2 @@ -8398,12 +6671,10 @@ Bitte wählen Sie einen anderen Dateinamen. QTDSDriver - Unable to open connection Die Datenbankverbindung kann nicht geöffnet werden - Unable to use database Die Datenbank kann nicht verwendet werden @@ -8411,12 +6682,10 @@ Bitte wählen Sie einen anderen Dateinamen. QTabBar - Scroll Left Nach links scrollen - Scroll Right Nach rechts scrollen @@ -8424,7 +6693,6 @@ Bitte wählen Sie einen anderen Dateinamen. QTcpServer - Operation on socket is not supported Diese Socket-Operation wird nicht unterstützt @@ -8432,42 +6700,34 @@ Bitte wählen Sie einen anderen Dateinamen. QTextControl - &Undo &Rückgängig - &Redo Wieder&herstellen - Cu&t &Ausschneiden - &Copy &Kopieren - Copy &Link Location &Link-Adresse kopieren - &Paste Einf&ügen - Delete Löschen - Select All Alles auswählen @@ -8475,14 +6735,10 @@ Bitte wählen Sie einen anderen Dateinamen. QToolButton - - Press Drücken - - Open Öffnen @@ -8490,7 +6746,6 @@ Bitte wählen Sie einen anderen Dateinamen. QUdpSocket - This platform does not support IPv6 Diese Plattform unterstützt kein IPv6 @@ -8498,12 +6753,10 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoGroup - Undo Rückgängig - Redo Wiederherstellen @@ -8511,7 +6764,6 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoModel - <empty> <leer> @@ -8519,12 +6771,10 @@ Bitte wählen Sie einen anderen Dateinamen. QUndoStack - Undo Rückgängig - Redo Wiederherstellen @@ -8532,57 +6782,46 @@ Bitte wählen Sie einen anderen Dateinamen. QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM Left-to-right mark - RLM Right-to-left mark RLM Right-to-left mark - ZWJ Zero width joiner ZWJ Zero width joiner - ZWNJ Zero width non-joiner ZWNJ Zero width non-joiner - ZWSP Zero width space ZWSP Zero width space - LRE Start of left-to-right embedding LRE Start of left-to-right embedding - RLE Start of right-to-left embedding RLE Start of right-to-left embedding - LRO Start of left-to-right override LRO Start of left-to-right override - RLO Start of right-to-left override RLO Start of right-to-left override - PDF Pop directional formatting PDF Pop directional formatting - Insert Unicode control character Unicode-Kontrollzeichen einfügen @@ -8590,32 +6829,26 @@ Bitte wählen Sie einen anderen Dateinamen. QWebFrame - Request cancelled Anfrage wurde abgebrochen - Request blocked Anfrage wurde abgewiesen - Cannot show URL Der URL kann nicht angezeigt werden - Frame load interrupted by policy change Das Laden des Rahmens wurde durch eine Änderung der Richtlinien unterbrochen - Cannot show mimetype Dieser Mime-Typ kann nicht angezeigt werden - File does not exist Die Datei existiert nicht @@ -8623,621 +6856,515 @@ Bitte wählen Sie einen anderen Dateinamen. QWebPage - Submit default label for Submit buttons in forms on web pages Senden - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Senden - Reset default label for Reset buttons in forms on web pages Rücksetzen - Choose File title for file button used in HTML forms Durchsuchen - No file selected text to display in file button used in HTML forms when no file is selected Es ist keine Datei ausgewählt - Open in New Window Open in New Window context menu item In neuem Fenster öffnen - Save Link... Download Linked File context menu item Ziel speichern unter... - Copy Link Copy Link context menu item Link-Adresse kopieren - Open Image Open Image in New Window context menu item Grafik in neuem Fenster öffnen - Save Image Download Image context menu item Grafik speichern unter - Copy Image Copy Link context menu item Grafik kopieren - Open Frame Open Frame in New Window context menu item Frame öffnen - Copy Copy context menu item Kopieren - Go Back Back context menu item Zurück - Go Forward Forward context menu item Vor - Stop Stop context menu item Abbrechen - Reload Reload context menu item Neu laden - Cut Cut context menu item Ausschneiden - Paste Paste context menu item Einfügen - No Guesses Found No Guesses Found context menu item Keine Vorschläge gefunden - Ignore Ignore Spelling context menu item Ignorieren - Add To Dictionary Learn Spelling context menu item In Wörterbuch aufnehmen - Search The Web Search The Web context menu item Im Web suchen - Look Up In Dictionary Look Up in Dictionary context menu item Im Wörterbuch nachschauen - Open Link Open Link context menu item Adresse öffnen - Ignore Ignore Grammar context menu item Ignorieren - Spelling Spelling and Grammar context sub-menu item Rechtschreibung - Show Spelling and Grammar menu item title Rechtschreibung und Grammatik anzeigen - Hide Spelling and Grammar menu item title Rechtschreibung und Grammatik nicht anzeigen - Check Spelling Check spelling context menu item Rechtschreibung prüfen - Check Spelling While Typing Check spelling while typing context menu item Rechtschreibung während des Schreibens überprüfen - Check Grammar With Spelling Check grammar with spelling context menu item Grammatik mit Rechtschreibung zusammen überprüfen - Fonts Font context sub-menu item Fonts - Bold Bold context menu item Fett - Italic Italic context menu item Kursiv - Underline Underline context menu item Unterstrichen - Outline Outline context menu item Umriss - Direction Writing direction context sub-menu item Schreibrichtung - Text Direction Text direction context sub-menu item Schreibrichtung - Default Default writing direction context menu item Vorgabe - Left to Right Left to Right context menu item Von links nach rechts - Right to Left Right to Left context menu item Von rechts nach links - Missing Plug-in Label text to be used when a plug-in is missing Fehlendes Plugin - Loading... Media controller status message when the media is loading Lädt... - Live Broadcast Media controller status message when watching a live broadcast Live-Übertragung - Audio Element Media controller element Audio-Element - Video Element Media controller element Video-Element - Mute Button Media controller element Stummschalttaste - Unmute Button Media controller element Abstelltaste für Stummschaltung - Play Button Media controller element Abspielknopf - Pause Button Media controller element Pause-Knopf - Slider Media controller element Schieberegler - Slider Thumb Media controller element Schieberegler-Griff - Rewind Button Media controller element Rückspultaste - Return to Real-time Button Media controller element Kehre zu Echtzeit zurück - Elapsed Time Media controller element Spielzeit - Remaining Time Media controller element Verbleibende Zeit - Status Display Media controller element Statusanzeige - Fullscreen Button Media controller element Vollbild-Taste - Seek Forward Button Media controller element Vorlauftaste - Seek Back Button Media controller element Rücklauftaste - Audio element playback controls and status display Media controller element Audio-Steuerung und Statusanzeige - Video element playback controls and status display Media controller element Video-Steuerung und Statusanzeige - Mute audio tracks Media controller element Schalte Tonspuren stumm - Unmute audio tracks Media controller element Stummschaltung der Tonspuren aufheben - Begin playback Media controller element Abspielen - Pause playback Media controller element Pause - Movie time scrubber Media controller element Abspielzeit - Movie time scrubber thumb Media controller element Griff zur Einstellung der Abspielzeit - Rewind movie Media controller element Film zurückspulen - Return streaming movie to real-time Media controller element Setze Film auf Echtzeit zurück - Current movie time Media controller element Abspielzeit des Films - Remaining movie time Media controller element Verbleibende Zeit des Films - Current movie status Media controller element Status des Films - Play movie in full-screen mode Media controller element Film im Vollbildmodus abspielen - Seek quickly back Media controller element Schnelles Rückwärtssuchen - Seek quickly forward Media controller element Schnelles Vorwärtssuchen - Indefinite time Media time description Unbegrenzte Zeit - %1 days %2 hours %3 minutes %4 seconds Media time description %1 Tage %2 Stunden %3 Minuten %4 Sekunden - %1 hours %2 minutes %3 seconds Media time description %1 Stunden %2 Minuten %3 Sekunden - %1 minutes %2 seconds Media time description %1 Minuten %2 Sekunden - %1 seconds Media time description %1 Sekunden - Inspect Inspect Element context menu item Prüfen - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Es existieren noch keine Suchanfragen - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Bisherige Suchanfragen - Clear recent searches menu item in Recent Searches menu that empties menu's contents Gespeicherte Suchanfragen löschen - Unknown Unknown filesize FTP directory listing item Unbekannt - Web Inspector - %2 Web Inspector - %2 - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 Pixel) - Redirection limit reached Maximal Anzahl von Weiterleitungen wurde erreicht - Bad HTTP request Ungültige HTTP-Anforderung - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' Dieser Index verfügt über eine Suchfunktion. Geben Sie einen Suchbegriff ein: - Scroll here Hierher scrollen - Left edge Linker Rand - Top Anfang - Right edge Rechter Rand - Bottom Ende - Page left Eine Seite nach links - Page up Eine Seite nach oben - Page right Eine Seite nach rechts - Page down Eine Seite nach unten - Scroll left Nach links scrollen - Scroll up Nach oben scrollen - Scroll right Nach rechts scrollen - Scroll down Nach unten scrollen - %n file(s) number of chosen file @@ -9246,237 +7373,190 @@ Bitte wählen Sie einen anderen Dateinamen. - JavaScript Alert - %1 JavaScript-Hinweis - %1 - JavaScript Confirm - %1 JavaScript-Bestätigung - %1 - JavaScript Prompt - %1 JavaScript-Eingabeaufforderung - %1 - JavaScript Problem - %1 JavaScript-Problem - %1 - The script on this page appears to have a problem. Do you want to stop the script? Das Skript dieser Webseite ist fehlerhaft. Möchten Sie es anhalten? - Move the cursor to the next character Positionsmarke auf folgendes Zeichen setzen - Move the cursor to the previous character Positionsmarke auf vorangehendes Zeichen setzen - Move the cursor to the next word Positionsmarke auf folgendes Wort setzen - Move the cursor to the previous word Positionsmarke auf vorangehendes Wort setzen - Move the cursor to the next line Positionsmarke auf folgende Zeile setzen - Move the cursor to the previous line Positionsmarke auf vorangehende Zeile setzen - Move the cursor to the start of the line Positionsmarke auf Zeilenanfang setzen - Move the cursor to the end of the line Positionsmarke auf Zeilenende setzen - Move the cursor to the start of the block Positionsmarke auf Anfang des Blocks setzen - Move the cursor to the end of the block Positionsmarke auf Ende des Blocks setzen - Move the cursor to the start of the document Positionsmarke auf Anfang des Dokumentes setzen - Move the cursor to the end of the document Positionsmarke auf Ende des Dokumentes setzen - Select all Alles auswählen - Select to the next character Bis zum nächsten Zeichen markieren - Select to the previous character Bis zum vorherigen Zeichen markieren - Select to the next word Bis zum nächsten Wort markieren - Select to the previous word Bis zum vorherigen Wort markieren - Select to the next line Bis zur nächsten Zeile markieren - Select to the previous line Bis zur vorherigen Zeile markieren - Select to the start of the line Bis zum Zeilenanfang markieren - Select to the end of the line Bis zum Zeilenende markieren - Select to the start of the block Bis zum Anfang des Blocks markieren - Select to the end of the block Bis zum Ende des Blocks markieren - Select to the start of the document Bis zum Anfang des Dokuments markieren - Select to the end of the document Bis zum Ende des Dokuments markieren - Delete to the start of the word Bis zum Anfang des Wortes löschen - Delete to the end of the word Bis zum Ende des Wortes löschen - Insert a new paragraph Neuen Abschnitt einfügen - Insert a new line Neue Zeile einfügen - Paste and Match Style Einfügen und dem Stil anpassen - Remove formatting Formatierung entfernen - Strikethrough Durchgestrichen - Subscript Tiefstellung - Superscript Hochstellung - Insert Bulleted List Liste mit Punkten einfügen - Insert Numbered List Nummerierte Liste einfügen - Indent Einrücken - Outdent Einrückung aufheben - Center Zentrieren - Justify Ausrichten - Align Left Linksbündig ausrichten - Align Right Rechtsbündig ausrichten @@ -9484,7 +7564,6 @@ Bitte wählen Sie einen anderen Dateinamen. QWhatsThisAction - What's This? Direkthilfe @@ -9492,7 +7571,6 @@ Bitte wählen Sie einen anderen Dateinamen. QWidget - * * @@ -9500,57 +7578,46 @@ Bitte wählen Sie einen anderen Dateinamen. QWizard - Cancel Abbrechen - Help Hilfe - < &Back < &Zurück - &Finish Ab&schließen - &Help &Hilfe - Go Back Zurück - Continue Weiter - Commit Anwenden - Done Fertig - &Next &Weiter - &Next > &Weiter > @@ -9558,69 +7625,54 @@ Bitte wählen Sie einen anderen Dateinamen. QWorkspace - &Restore Wieder&herstellen - &Move Ver&schieben - &Size &Größe ändern - Mi&nimize M&inimieren - Ma&ximize Ma&ximieren - &Close Schl&ießen - Stay on &Top Im &Vordergrund bleiben - Minimize Minimieren - Restore Down Wiederherstellen - Close Schließen - - Sh&ade &Aufrollen - - %1 - [%2] %1 - [%2] - &Unshade &Herabrollen @@ -9628,117 +7680,94 @@ Bitte wählen Sie einen anderen Dateinamen. QXml - no error occurred kein Fehler - error triggered by consumer Konsument löste Fehler aus - unexpected end of file unerwartetes Ende der Datei - more than one document type definition mehrere Dokumenttypdefinitionen - error occurred while parsing element Fehler beim Parsen eines Elements - tag mismatch Element-Tags sind nicht richtig geschachtelt - error occurred while parsing content Fehler beim Parsen des Inhalts eines Elements - unexpected character unerwartetes Zeichen - invalid name for processing instruction kein gültiger Name für eine Processing-Instruktion - version expected while reading the XML declaration fehlende Version beim Parsen der XML-Deklaration - wrong value for standalone declaration falscher Wert für die Standalone-Deklaration - error occurred while parsing document type definition Fehler beim Parsen der Dokumenttypdefinition - letter is expected ein Buchstabe ist an dieser Stelle erforderlich - error occurred while parsing comment Fehler beim Parsen eines Kommentars - error occurred while parsing reference Fehler beim Parsen einer Referenz - internal general entity reference not allowed in DTD in einer DTD ist keine interne allgemeine Entity-Referenz erlaubt - external parsed general entity reference not allowed in attribute value in einem Attribut-Wert sind keine externen Entity-Referenzen erlaubt - external parsed general entity reference not allowed in DTD in der DTD sind keine externen Entity-Referenzen erlaubt - unparsed entity reference in wrong context nicht-analysierte Entity-Referenz im falschen Kontext verwendet - recursive entities rekursive Entity - error in the text declaration of an external entity Fehler in der Text-Deklaration einer externen Entity - encoding declaration or standalone declaration expected while reading the XML declaration fehlende Encoding-Deklaration oder Standalone-Deklaration beim Parsen der XML-Deklaration - standalone declaration expected while reading the XML declaration fehlende Standalone-Deklaration beim Parsen der XML Deklaration @@ -9746,27 +7775,22 @@ Bitte wählen Sie einen anderen Dateinamen. QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 Warnung in %1, bei Zeile %2, Spalte %3: %4 - Warning in %1: %2 Warnung in %1: %2 - Unknown location unbekannt - Error %1 in %2, at line %3, column %4: %5 Fehler %1 in %2, bei Zeile %3, Spalte %4: %5 - Error %1 in %2: %3 Fehler %1 in %2: %3 @@ -9774,184 +7798,142 @@ Bitte wählen Sie einen anderen Dateinamen. QXmlStream - - Extra content at end of document. Überzähliger Inhalt nach Ende des Dokumentes. - Invalid entity value. Ungültiger Entity-Wert. - Invalid XML character. Ungültiges XML-Zeichen. - Sequence ']]>' not allowed in content. Im Inhalt ist die Zeichenfolge ']]>' nicht erlaubt. - Namespace prefix '%1' not declared Der Namensraum-Präfix '%1' wurde nicht deklariert - Attribute redefined. Redefinition eines Attributes. - Unexpected character '%1' in public id literal. '%1' ist kein gültiges Zeichen in einer public-id-Angabe. - Invalid XML version string. Ungültige XML-Versionsangabe. - Unsupported XML version. Diese XML-Version wird nicht unterstützt. - %1 is an invalid encoding name. %1 ist kein gültiger Name für das Encoding. - Encoding %1 is unsupported Das Encoding %1 wird nicht unterstützt - Standalone accepts only yes or no. Der Wert für das 'Standalone'-Attribut kann nur 'yes' oder 'no' sein. - Invalid attribute in XML declaration. Die XML-Deklaration enthält ein ungültiges Attribut. - Premature end of document. Vorzeitiges Ende des Dokuments. - Invalid document. Ungültiges Dokument. - Expected Es wurde - , but got ' erwartet, stattdessen erhalten ' - Unexpected ' Ungültig an dieser Stelle ' - Expected character data. Es wurden Zeichendaten erwartet. - Recursive entity detected. Es wurde eine rekursive Entity festgestellt. - Start tag expected. Öffnendes Element erwartet. - XML declaration not at start of document. Die XML-Deklaration befindet sich nicht am Anfang des Dokuments. - NDATA in parameter entity declaration. Eine Parameter-Entity-Deklaration darf kein NDATA enthalten. - %1 is an invalid processing instruction name. %1 ist kein gültiger Name für eine Prozessing-Instruktion. - Invalid processing instruction name. Der Name der Prozessing-Instruktion ist ungültig. - - - - Illegal namespace declaration. Ungültige Namensraum-Deklaration. - Invalid XML name. Ungültiger XML-Name. - Opening and ending tag mismatch. Die Anzahl der öffnenden Elemente stimmt nicht mit der Anzahl der schließenden Elemente überein. - Reference to unparsed entity '%1'. Es wurde die ungeparste Entity '%1' referenziert. - - - Entity '%1' not declared. Die Entity '%1' ist nicht deklariert. - Reference to external entity '%1' in attribute value. Im Attributwert wurde die externe Entity '%1' referenziert. - Invalid character reference. Ungültige Zeichenreferenz. - - Encountered incorrectly encoded content. Es wurde Inhalt mit einer ungültigen Kodierung gefunden. - The standalone pseudo attribute must appear after the encoding. Das Standalone-Pseudoattribut muss dem Encoding unmittelbar folgen. - %1 is an invalid PUBLIC identifier. %1 ist keine gültige Angabe für eine PUBLIC-Id. @@ -9959,702 +7941,558 @@ Bitte wählen Sie einen anderen Dateinamen. QtXmlPatterns - - At least one component must be present. Es muss mindestens eine Komponente vorhanden sein. - %1 is not a valid value of type %2. %1 ist kein gültiger Wert des Typs %2. - When casting to %1 from %2, the source value cannot be %3. Bei einer "cast"-Operation von %1 zu %2 darf der Wert nicht %3 sein. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Der effektive Boolesche Wert einer Sequenz aus zwei oder mehreren atomaren Werten kann nicht berechnet werden. - The data of a processing instruction cannot contain the string %1 Die Daten einer Processing-Anweisung dürfen nicht die Zeichenkette %1 enthalten - - %1 is an invalid %2 %1 ist kein gültiges %2 - %1 is not a valid XML 1.0 character. %1 ist kein gültiges XML 1.0 Zeichen. - %1 was called. %1 wurde gerufen. - In the replacement string, %1 must be followed by at least one digit when not escaped. In der Ersetzung muss auf %1 eine Ziffer folgen, wenn es nicht durch ein Escape-Zeichen geschützt ist. - In the replacement string, %1 can only be used to escape itself or %2, not %3 In der Ersetzung kann %1 nur verwendet werden, um sich selbst oder %2 schützen, nicht jedoch für %3 - %1 matches newline characters Der Ausdruck '%1' schließt Zeilenvorschübe ein - Matches are case insensitive Groß/Kleinschreibung wird nicht beachtet - %1 is an invalid regular expression pattern: %2 %1 ist kein gültiger regulärer Ausdruck: %2 - It will not be possible to retrieve %1. %1 kann nicht bestimmt werden. - The default collection is undefined Für eine Kollektion ist keine Vorgabe definiert - %1 cannot be retrieved %1 kann nicht bestimmt werden - The item %1 did not match the required type %2. Das Element %1 entspricht nicht dem erforderlichen Typ %2. - - %1 is an unknown schema type. %1 ist ein unbekannter Schema-Typ. - A template with name %1 has already been declared. Eine Vorlage des Namens %1 existiert bereits. - Only one %1 declaration can occur in the query prolog. Der Anfrage-Prolog darf nur eine %1-Deklaration enthalten. - The initialization of variable %1 depends on itself Die Initialisierung der Variable %1 hängt von ihrem eigenem Wert ab - The variable %1 is unused Die Variable %1 wird nicht verwendet - Version %1 is not supported. The supported XQuery version is 1.0. Die Version %1 wird nicht unterstützt. Die unterstützte Version von XQuery ist 1.0. - No function with signature %1 is available Es existiert keine Funktion mit der Signatur %1 - It is not possible to redeclare prefix %1. Der Präfix %1 kann nicht redeklariert werden. - Prefix %1 is already declared in the prolog. Der Präfix %1 wurde bereits im Prolog deklariert. - The name of an option must have a prefix. There is no default namespace for options. Der Name einer Option muss einen Präfix haben. Es gibt keine Namensraum-Vorgabe für Optionen. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. Die Deklaration %1 ist unzulässig, da Schema-Import nicht unterstützt wird. - The target namespace of a %1 cannot be empty. Der Ziel-Namensraum von %1 darf nicht leer sein. - The module import feature is not supported Modul-Import wird nicht unterstützt - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Der Namensraum einer nutzerdefinierten Funktion aus einem Bibliotheksmodul muss dem Namensraum des Moduls entsprechen (%1 anstatt %2) - A function already exists with the signature %1. Es existiert bereits eine Funktion mit der Signatur %1. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Externe Funktionen werden nicht unterstützt. Alle unterstützten Funktionen können direkt verwendet werden, ohne sie als extern zu deklarieren - The %1-axis is unsupported in XQuery Die %1-Achse wird in XQuery nicht unterstützt - The namespace URI cannot be the empty string when binding to a prefix, %1. Der Namensraum-URI darf nicht leer sein, wenn er an den Präfix %1 gebunden ist. - %1 is an invalid namespace URI. %1 ist kein gültiger Namensraum-URI. - It is not possible to bind to the prefix %1 Der Präfix %1 kann nicht gebunden werden - Two namespace declaration attributes have the same name: %1. Es wurden zwei Namensraum-Deklarationsattribute gleichen Namens (%1) gefunden. - The namespace URI must be a constant and cannot use enclosed expressions. Ein Namensraum-URI muss eine Konstante sein und darf keine eingebetteten Ausdrücke verwenden. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 befindet sich nicht unter den Attributdeklarationen im Bereich. Schema-Import wird nicht unterstützt. - empty leer - zero or one kein oder ein - exactly one genau ein - one or more ein oder mehrere - zero or more kein oder mehrere - The focus is undefined. Es ist kein Fokus definiert. - An attribute by name %1 has already been created. Es wurde bereits ein Attribut mit dem Namen %1 erzeugt. - Network timeout. Das Zeitlimit der Netzwerkoperation wurde überschritten. - Element %1 can't be serialized because it appears outside the document element. Das Element %1 kann nicht serialisiert werden, da es außerhalb des Dokumentenelements erscheint. - Year %1 is invalid because it begins with %2. %1 ist keine gültige Jahresangabe, da es mit %2 beginnt. - Day %1 is outside the range %2..%3. Die Tagesangabe %1 ist außerhalb des Bereiches %2..%3. - Month %1 is outside the range %2..%3. Die Monatsangabe %1 ist außerhalb des Bereiches %2..%3. - Overflow: Can't represent date %1. Das Datum %1 kann nicht dargestellt werden (Überlauf). - Day %1 is invalid for month %2. Die Tagesangabe %1 ist für den Monat %2 ungültig. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Die Zeitangabe 24:%1:%2.%3 ist ungültig. Bei der Stundenangabe 24 müssen Minuten, Sekunden und Millisekunden 0 sein. - Time %1:%2:%3.%4 is invalid. Die Zeitangabe %1:%2:%3.%4 ist ungültig. - Overflow: Date can't be represented. Das Datum kann nicht dargestellt werden (Überlauf). - At least one time component must appear after the %1-delimiter. Bei Vorhandensein eines %1-Begrenzers muss mindestens eine Komponente vorhanden sein. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Die Division eines Werts des Typs %1 durch %2 (kein numerischer Wert) ist nicht zulässig. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Die Division eines Werts des Typs %1 durch %2 oder %3 (positiv oder negativ Null) ist nicht zulässig. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Die Multiplikation eines Werts des Typs %1 mit %2 oder %3 (positiv oder negativ unendlich) ist nicht zulässig. - A value of type %1 cannot have an Effective Boolean Value. Ein Wert des Typs %1 kann keinen effektiven Booleschen Wert haben. - Value %1 of type %2 exceeds maximum (%3). Der Wert %1 des Typs %2 überschreitet das Maximum (%3). - Value %1 of type %2 is below minimum (%3). Der Wert %1 des Typs %2 unterschreitet das Minimum (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Die Stellenzahl eines Wertes des Typs %1 muss geradzahlig sein. Das ist bei %2 nicht der Fall. - %1 is not valid as a value of type %2. %1 ist kein gültiger Wert des Typs %2. - Operator %1 cannot be used on type %2. Der Operator %1 kann nicht auf den Typ %2 angewandt werden. - Operator %1 cannot be used on atomic values of type %2 and %3. Der Operator %1 kann nicht auf atomare Werte der Typen %2 und %3 angewandt werden. - The namespace URI in the name for a computed attribute cannot be %1. Der Namensraum-URI im Namen eines berechneten Attributes darf nicht %1 sein. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Der Name eines berechneten Attributes darf keinen Namensraum-URI %1 mit dem lokalen Namen %2 haben. - Type error in cast, expected %1, received %2. Typfehler bei "cast"-Operation; es wurde %1 erwartet, aber %2 empfangen. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. Bei einer "cast"-Operation zum Typ %1 oder abgeleitetenTypen muss der Quellwert ein Zeichenketten-Literal oder ein Wert gleichen Typs sein. Der Typ %2 ist ungültig. - A comment cannot contain %1 Ein Kommentar darf nicht'%1 enthalten - A comment cannot end with a %1. Ein Kommentar darf nicht auf %1 enden. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Ein Attributknoten darf nicht als Kind eines Dokumentknotens erscheinen. Es erschien ein Attributknoten mit dem Namen %1. - A library module cannot be evaluated directly. It must be imported from a main module. Ein Bibliotheksmodul kann nicht direkt ausgewertet werden, er muss von einem Hauptmodul importiert werden. - No template by name %1 exists. Es existiert keine Vorlage mit dem Namen %1. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Werte des Typs %1 dürfen keine Prädikate sein. Für Prädikate sind nur numerische oder effektiv Boolesche Typen zulässig. - A positional predicate must evaluate to a single numeric value. Ein positionales Prädikat muss sich als einfacher, numerischer Wert auswerten lassen. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. Der Zielname einer Processing-Anweisung kann nicht %1 (unabhängig von Groß/Kleinschreibung sein). %2 ist daher ungültig. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 ist kein gültiger Zielname einer Processing-Anweisung, es muss ein %2 Wert wie zum Beispiel %3 sein. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Der letzte Schritt eines Pfades kann entweder nur Knoten oder nur atomare Werte enthalten. Sie dürfen nicht zusammen auftreten. - No namespace binding exists for the prefix %1 Es existiert keine Namensraum-Bindung für den Präfix %1 - No namespace binding exists for the prefix %1 in %2 Es existiert keine Namensraum-Bindung für den Präfix %1 in %2 - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Das erste Argument von %1 darf nicht vom Typ %2 sein; es muss numerisch, xs:yearMonthDuration oder xs:dayTimeDuration sein. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Das erste Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Das zweite Argument von %1 kann nicht vom Typ %2 sein, es muss einer der Typen %3, %4 oder %5 sein. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Wenn beide Werte mit Zeitzonen angegeben werden, müssen diese übereinstimmen. %1 und %2 sind daher unzulässig. - %1 must be followed by %2 or %3, not at the end of the replacement string. Auf %1 muss %2 oder %3 folgen; es kann nicht am Ende der Ersetzung erscheinen. - %1 and %2 match the start and end of a line. Die Ausdrücke %1 und %2 passen jeweils auf den Anfang oder das Ende einer beliebigen Zeile. - Whitespace characters are removed, except when they appear in character classes Leerzeichen werden entfernt, sofern sie nicht in Zeichenklassen erscheinen - %1 is an invalid flag for regular expressions. Valid flags are: %1 ist kein gültiger Modifikator für reguläre Ausdrücke. Gültige Modifikatoren sind: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Es kann kein Präfix angegeben werden, wenn das erste Argument leer oder eine leere Zeichenkette (kein Namensraum) ist. Es wurde der Präfix %1 angegeben. - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Die Normalisierungsform %1 wird nicht unterstützt. Die unterstützten Normalisierungsformen sind %2, %3, %4 and %5, und "kein" (eine leere Zeichenkette steht für "keine Normalisierung"). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Eine Zeitzonen-Differenz muss im Bereich %1..%2 (einschließlich) liegen. %3 liegt außerhalb des Bereiches. - Required cardinality is %1; got cardinality %2. Die erforderliche Kardinalität ist %1 (gegenwärtig %2). - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Die Kodierung %1 ist ungültig; sie darf nur aus lateinischen Buchstaben bestehen und muss dem regulären Ausdruck %2 entsprechen. - The keyword %1 cannot occur with any other mode name. Das Schlüsselwort %1 kann nicht mit einem anderen Modusnamen zusammen verwendet werden. - No variable with name %1 exists Es existiert keine Variable des Namens %1 - The value of attribute %1 must be of type %2, which %3 isn't. Der Wert des Attributs %1 muss vom Typ %2 sein, was bei %3 nicht der Fall ist. - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. Der Präfix %1 kann nicht gebunden werden. Er ist bereits per Vorgabe an den Namensraum %2 gebunden. - A variable with name %1 has already been declared. Eine Variable des Namens %1 wurde bereits deklariert. - No value is available for the external variable with name %1. Es ist kein Wert für die externe Variable des Namens %1 verfügbar. - A stylesheet function must have a prefixed name. Der Name einer Stylesheet-Funktion muss einen Präfix haben. - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Der Namensraum %1 ist reserviert und kann daher von nutzerdefinierten Funktionen nicht verwendet werden (für diesen Zweck gibt es den vordefinierten Präfix %2). - An argument with name %1 has already been declared. Every argument name must be unique. Es wurde bereits ein Argument des Namens %1 deklariert. Argumentnamen müssen eindeutig sein. - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. Bei der Verwendung der Funktion %1 zur Auswertung innerhalb eines Suchmusters muss das Argument eine Variablenreferenz oder ein Zeichenketten-Literal sein. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. Bei einem XSL-T-Suchmuster muss das erste Argument zur Funktion %1 bei der Verwendung zur Suche ein Zeichenketten-Literal sein. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. Bei einem XSL-T-Suchmuster muss das erste Argument zur Funktion %1 bei der Verwendung zur Suche ein Literal oder eine Variablenreferenz sein. - In an XSL-T pattern, function %1 cannot have a third argument. Bei einem XSL-T-Suchmuster darf die Funktion %1 kein drittes Argument haben. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. Bei einem XSL-T-Suchmuster dürfen nur die Funktionen %1 und %2, nicht jedoch %3 zur Suche verwendet werden. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. Bei einem XSL-T-Suchmuster dürfen nur die Achsen %2 oder %3 verwendet werden, nicht jedoch %1. - %1 is an invalid template mode name. %1 ist kein gültiger Name für einen Vorlagenmodus. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Der Name der gebundenen Variablen eines for-Ausdrucks muss sich von dem der Positionsvariable unterscheiden. Die zwei Variablen mit dem Namen %1 stehen im Konflikt. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. %1-Ausdrücke können nicht verwendet werden, da Schemavalidierung nicht unterstützt wird. - None of the pragma expressions are supported. Therefore, a fallback expression must be present Es muss ein fallback-Ausdruck vorhanden sein, da keine pragma-Ausdrücke unterstützt werden - Each name of a template parameter must be unique; %1 is duplicated. Die Namen von Vorlagenparametern müssen eindeutig sein, %1 existiert bereits. - No function with name %1 is available. Es ist keine Funktion des Namens %1 verfügbar. - %1 is not a valid numeric literal. %1 ist kein gültiger numerischer Literal. - W3C XML Schema identity constraint selector W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). Es wurde ein Sprachkonstrukt angetroffen, was in der aktuellen Sprache (%1) nicht erlaubt ist. - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Der Namensraum %1 kann nur an %2 gebunden werden. Dies ist bereits vordeklariert. - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Der Präfix %1 kann nur an %2 gebunden werden. Dies ist bereits vordeklariert. - An attribute with name %1 has already appeared on this element. Das Element hat bereits ein Attribut des Namens %1. - A direct element constructor is not well-formed. %1 is ended with %2. Es wurde ein fehlerhafter direkter Element-Konstruktor gefunden. %1 endet mit %2. - The name %1 does not refer to any schema type. Der Name %1 hat keinen Bezug zu einem Schematyp. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 ist ein komplexer Typ. Eine "cast"-Operation zu komplexen Typen ist nicht möglich. Es können allerdings "cast"-Operationen zu atomare Typen wie %2 durchgeführt werden. - %1 is not an atomic type. Casting is only possible to atomic types. %1 ist kein atomarer Typ. "cast"-Operation können nur zu atomaren Typen durchgeführt werden. - %1 is not a valid name for a processing-instruction. %1 ist kein gültiger Name für eine Processing-Instruktion. - The name of an extension expression must be in a namespace. Der Name eines Erweiterungsausdrucks muss sich in einem Namensraum befinden. - Required type is %1, but %2 was found. Der erforderliche Typ ist %1, es wurde aber %2 angegeben. - Promoting %1 to %2 may cause loss of precision. Die Wandlung von %1 zu %2 kann zu einem Verlust an Genauigkeit führen. - It's not possible to add attributes after any other kind of node. Attribute dürfen nicht auf andere Knoten folgen. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Es wird nur Unicode Codepoint Collation unterstützt (%1). %2 wird nicht unterstützt. - Integer division (%1) by zero (%2) is undefined. Die Ganzzahldivision (%1) durch Null (%2) ist nicht definiert. - Division (%1) by zero (%2) is undefined. Die Division (%1) durch Null (%2) ist nicht definiert. - Modulus division (%1) by zero (%2) is undefined. Die Modulo-Division (%1) durch Null (%2) ist nicht definiert. - %1 takes at most %n argument(s). %2 is therefore invalid. %1 hat nur %n Argument; die Angabe %2 ist daher ungültig. @@ -10662,7 +8500,6 @@ Bitte wählen Sie einen anderen Dateinamen. - %1 requires at least %n argument(s). %2 is therefore invalid. %1 erfordert mindestens ein Argument; die Angabe %3 ist daher ungültig. @@ -10670,1655 +8507,1258 @@ Bitte wählen Sie einen anderen Dateinamen. - The root node of the second argument to function %1 must be a document node. %2 is not a document node. Der übergeordnete Knoten des zweiten Arguments der Funktion %1 muss ein Dokumentknoten sein, was bei %2 nicht der Fall ist. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Der Namensraum einer benutzerdefinierten Funktion darf nicht leer sein (für diesen Zweck gibt es den vordefinierten Präfix %1) - - A default namespace declaration must occur before function, variable, and option declarations. Die Deklaration des Default-Namensraums muss vor Funktions-, Variablen- oder Optionsdeklaration erfolgen. - Namespace declarations must occur before function, variable, and option declarations. Namensraums-Deklarationen müssen vor Funktions- Variablen- oder Optionsdeklarationen stehen. - Module imports must occur before function, variable, and option declarations. Modul-Importe müssen vor Funktions-, Variablen- oder Optionsdeklarationen stehen. - %1 is not a whole number of minutes. %1 ist keine ganzzahlige Minutenangabe. - Attribute %1 can't be serialized because it appears at the top level. Das Attributelement %1 kann nicht serialisiert werden, da es auf der höchsten Ebene erscheint. - %1 is an unsupported encoding. Das Encoding %1 wird nicht unterstützt. - %1 contains octets which are disallowed in the requested encoding %2. %1 enthält Oktette, die im Encoding %2 nicht zulässig sind. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. Der Code-Punkt %1 aus %2 mit Encoding %3 ist kein gültiges XML-Zeichen. - Ambiguous rule match. Mehrdeutige Regel. - In a namespace constructor, the value for a namespace cannot be an empty string. Im Konstruktor eines Namensraums darf der Wert des Namensraumes keine leere Zeichenkette sein. - The prefix must be a valid %1, which %2 is not. Der Präfix muss ein gültiger %1 sein. Das ist bei %2 nicht der Fall. - The prefix %1 cannot be bound. Der Präfix %1 kann nicht gebunden werden - Only the prefix %1 can be bound to %2 and vice versa. An %2 kann nur der Präfix %1 gebunden werden (und umgekehrt). - The parameter %1 is required, but no corresponding %2 is supplied. Es wurde kein entsprechendes %2 für den erforderlichen Parameter %1 angegeben. - The parameter %1 is passed, but no corresponding %2 exists. Es existiert kein entsprechendes %2 für den übergebenen Parameter %1. - The URI cannot have a fragment Der URI darf kein Fragment enthalten. - Element %1 is not allowed at this location. Das Element %1 darf nicht an dieser Stelle stehen. - Text nodes are not allowed at this location. An dieser Stelle dürfen keine Textknoten stehen. - Parse error: %1 Parse-Fehler: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Der Wert eines XSL-T-Versionsattributes muss vom Typ %1 sein, was bei %2 nicht der Fall ist. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. Es wird ein XSL-T-1.0-Stylesheet mit einem Prozessor der Version 2.0 verarbeitet. - Unknown XSL-T attribute %1. Unbekanntes XSL-T-Attribut: %1. - Attribute %1 and %2 are mutually exclusive. Die Attribute %1 und %2 schließen sich gegenseitig aus. - In a simplified stylesheet module, attribute %1 must be present. In einem vereinfachten Stylesheet-Modul muss das Attribut %1 vorhanden sein. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Das Element %1 darf keines der Attribute %3 oder %4 haben, solange es nicht das Attribut %2 hat. - Element %1 must have at least one of the attributes %2 or %3. Das Element %1 muss mindestens eines der Attribute %2 oder %3 haben. - At least one mode must be specified in the %1-attribute on element %2. Im %1-Attribut des Elements %2 muss mindestens ein Modus angegeben werden. - Element %1 must come last. Das Element %1 muss zuletzt stehen. - At least one %1-element must occur before %2. Vor %2 muss mindestens ein %1-Element stehen. - Only one %1-element can appear. Es darf nur ein einziges %1-Element stehen. - At least one %1-element must occur inside %2. In %2 muss mindestens ein %1-Element stehen. - When attribute %1 is present on %2, a sequence constructor cannot be used. Es kann kein Sequenzkonstruktor verwendet werden, wenn %2 ein Attribut %1 hat. - Element %1 must have either a %2-attribute or a sequence constructor. Das Element %1 muss entweder ein %2-Attribut haben oder es muss ein Sequenzkonstruktor verwendet werden. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. Der Defaultwert eines erforderlichen Parameters kann weder durch ein %1-Attribut noch durch einen Sequenzkonstruktor angegeben werden. - Element %1 cannot have children. Das Element %1 kann keine Kindelemente haben. - Element %1 cannot have a sequence constructor. Das Element %1 kann keinen Sequenzkonstruktor haben. - - The attribute %1 cannot appear on %2, when it is a child of %3. %2 darf nicht das Attribut %1 haben, wenn es ein Kindelement von %3 ist. - A parameter in a function cannot be declared to be a tunnel. Der Parameter einer Funktion kann nicht als Tunnel deklariert werden. - This processor is not Schema-aware and therefore %1 cannot be used. %1 kann nicht verwendet werden, da dieser Prozessor keine Schemas unterstützt. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. Die zuoberst stehenden Elemente eines Stylesheets dürfen sich nicht im Null-Namensraum befinden, was bei %1 der Fall ist. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Der Wert des Attributs %1 des Elements %2 kann nur %3 oder %4 sein, nicht jedoch %5. - Attribute %1 cannot have the value %2. Das Attribut %1 darf nicht den Wert %2 haben. - The attribute %1 can only appear on the first %2 element. Nur das erste %2-Element darf das Attribut %1 haben. - At least one %1 element must appear as child of %2. %2 muss mindestens ein %1-Kindelement haben. - %1 has inheritance loop in its base type %2. %1 hat eine zirkuläre Vererbung im Basistyp %2. - - Circular inheritance of base type %1. Zirkuläre Vererbung im Basistyp %1. - Circular inheritance of union %1. Zirkuläre Vererbung bei der Vereinigung %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. %1 darf nicht durch Einschränkung von %2 abgeleitet werden, da letzterer sie als final deklariert. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. %1 darf nicht durch Erweiterung von %2 abgeleitet werden, da letzterer sie als final deklariert. - Base type of simple type %1 cannot be complex type %2. Der komplexe Typ %2 kann nicht Basisklasse des einfachen Typs %1 sein. - Simple type %1 cannot have direct base type %2. Der einfache Typ %1 kann nicht den unmittelbaren Basistyp %2 haben. - - Simple type %1 is not allowed to have base type %2. Der einfache Typ %1 darf nicht den Basistyp %2 haben. - Simple type %1 can only have simple atomic type as base type. Der einfache Typ %1 kann nur einen einfachen. atomaren Basistyp haben. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. %1 darf nicht von %2 abgeleitet werden, da letzterer die Einschränkung als final deklariert. - - Variety of item type of %1 must be either atomic or union. Die Varietät der Typen von %1 muss entweder atomar oder eine Vereinigung sein. - - Variety of member types of %1 must be atomic. Die Varietät der Typen von %1 muss atomar sein. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. %1 darf nicht durch Listen von %2 abgeleitet werden, da letzterer sie als final deklariert. - Simple type %1 is only allowed to have %2 facet. Der einfache Typ %1 darf nur die Facette %2 haben. - Base type of simple type %1 must have variety of type list. Der Basistyp des einfachen Typs %1 muss eine Varietät des Typs Liste haben. - Base type of simple type %1 has defined derivation by restriction as final. Der Basistyp des einfachen Typs %1 definiert Vererbung durch Einschränkung als final. - Item type of base type does not match item type of %1. Der Elementtyp des Basistyps entspricht nicht dem Elementtyp von %1. - - Simple type %1 contains not allowed facet type %2. Der einfache Typ %1 enthält einen nicht erlaubten Facettentyp %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. %1 darf nicht durch Vereinigung von %2 abgeleitet werden, da sie letzterer sie als final deklariert. - %1 is not allowed to have any facets. %1 darf keine Facetten haben. - Base type %1 of simple type %2 must have variety of union. Der Basistyp %1 des einfachen Typs %2 muss eine Varietät des Typs Vereinigung haben. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. Der Basistyp %1 des einfachen Typs %2 darf keine Einschränkung im %3 Attribut haben. - Member type %1 cannot be derived from member type %2 of %3's base type %4. Der Typ %1 des Mitglieds darf nicht vom Typ %2 des Mitglieds vom Basistyp %4 von %3 sein. - Derivation method of %1 must be extension because the base type %2 is a simple type. Erweiterung muss als Vererbungsmethode für %1 verwendet werden, da der Basistyp %2 ein einfacher Typ ist. - Complex type %1 has duplicated element %2 in its content model. Der komplexe Typ %1 hat ein dupliziertes Element %2 in seinem Inhaltsmodell. - Complex type %1 has non-deterministic content. Der komplexe Typ %1 hat nicht-deterministischen Inhalt. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. Die Attribute des komplexen Typs %1 sind keine gültige Erweiterung der Attribute des Basistyps %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. Das Inhaltsmodell des komplexen Typs %1 ist keine gültige Erweiterung des Inhaltsmodells von %2. - Complex type %1 must have simple content. Der komplexe Typ %1 kann nur einfachen Inhalt haben. - Complex type %1 must have the same simple type as its base class %2. Der komplexe Typ %1 kann nur einen einfachen Typ als Basisklasse %2 haben. - Complex type %1 cannot be derived from base type %2%3. Der komplexe Typ %1 kann nicht vom Basistyp %2 abgeleitet werden%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. Die Attribute des komplexen Typs %1 sind keine gültige Einschränkung der Attribute des Basistyps %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. Der komplexe Typ %1 einfachen Inhalts darf nicht vom komplexen Basistyp %2 abgeleitet werden. - Item type of simple type %1 cannot be a complex type. Der Elementtyp des einfachen Typs %1 kann kein komplexer Typ sein. - Member type of simple type %1 cannot be a complex type. Der Typ eines Mitglieds des einfachen Typs %1 kann kein komplexer Typ sein. - %1 is not allowed to have a member type with the same name as itself. %1 darf keinen Typ eines Mitglieds desselben Namens haben. - - - %1 facet collides with %2 facet. Die Facette %1 steht im Widerspruch zu der Facette %2. - %1 facet must have the same value as %2 facet of base type. Die Facette %1 muss denselben Wert wie die Facette %2 des Basistyps haben. - %1 facet must be equal or greater than %2 facet of base type. Die Facette %1 muss größer oder gleich der Facette %2 des Basistyps sein. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. Die Facette %1 muss kleiner oder gleich der Facette %2 des Basistyps sein. - %1 facet contains invalid regular expression Die Facette %1 enthält einen ungültigen regulären Ausdruck - Unknown notation %1 used in %2 facet. Die Facette %2 enthält eine ungültige Notation %1. - %1 facet contains invalid value %2: %3. Die Facette %1 enthält einen ungültigen Wert %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. Die Facette %1 kann nicht %2 oder %3 sein, wenn die Facette %4 des Basistyps %5 ist. - %1 facet cannot be %2 if %3 facet of base type is %4. Die Facette %1 kann nicht %2 sein, wenn die Facette %3 des Basistyps %4 ist. - - - %1 facet must be less than or equal to %2 facet. Die Facette %1 muss kleiner oder gleich der Facette %2 sein. - - - %1 facet must be less than %2 facet of base type. Die Facette %1 muss kleiner der Facette %2 des Basistyps sein. - - %1 facet and %2 facet cannot appear together. Die Facetten %1 und %2 können nicht zusammen erscheinen. - - - %1 facet must be greater than %2 facet of base type. Die Facette %1 muss größer als die Facette %2 des Basistyps sein. - - %1 facet must be less than %2 facet. Die Facette %1 muss kleiner als die Facette %2 sein. - - %1 facet must be greater than or equal to %2 facet of base type. Die Facette %1 muss größer oder gleich der Facette %2 des Basistyps sein. - Simple type contains not allowed facet %1. Der einfache Typ enthält eine unzulässige Facette %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. Die Facetten %1, %2, %3, %4, %5 und %6 sind bei Vererbung durch Listen nicht zulässig. - Only %1 and %2 facets are allowed when derived by union. Bei Vererbung durch Vereinigung sind nur die Facetten %1 und %2 zulässig. - - %1 contains %2 facet with invalid data: %3. %1 enthält eine Facette %2 mit ungültigen Daten: %3. - Attribute group %1 contains attribute %2 twice. Die Attributgruppe %1 enthält das Attribut %2 zweimal. - Attribute group %1 contains two different attributes that both have types derived from %2. Die Attributgruppe %1 enthält zwei verschiedene Attribute mit Typen, die von %2 abgeleitet sind. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. Die Attributgruppe %1 enthält ein Attribut %2 mit einer Einschränkung des Werts, dessen Typ aber von %3 abgeleitet ist. - Complex type %1 contains attribute %2 twice. Der komplexe Typ %1 enthält das Attribut %2 doppelt. - Complex type %1 contains two different attributes that both have types derived from %2. Die Attributgruppe %1 enthält zwei verschiedene Attribute mit Typen, die beide von %2 abgeleitet sind. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. Der komplexe Typ %1 enthält ein Attribut %2 mit einer Einschränkung des Werts, dessen Typ aber von %3 abgeleitet ist. - Element %1 is not allowed to have a value constraint if its base type is complex. Das Element %1 darf keine Einschränkung des Werts haben, wenn der Basistyp komplex ist. - Element %1 is not allowed to have a value constraint if its type is derived from %2. Das Element %1 darf keine Einschränkung des Werts haben, wenn sein Typ von %2 abgeleitet ist. - - Value constraint of element %1 is not of elements type: %2. Die Einschränkung des Werts des Elements %1 ist nicht vom Typ des Elements: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. Das Element %1 kann nicht zu einer Substitutionsgruppe gehören, da es kein globales Element ist. - Type of element %1 cannot be derived from type of substitution group affiliation. Der Typ des Elements %1 kann nicht vom Typ der zugehörigen Substitutionsgruppe abgeleitet werden. - Value constraint of attribute %1 is not of attributes type: %2. Die Einschränkung des Werts des Attributs %1 ist nicht vom Typ des Attributs: %2. - Attribute %1 has value constraint but has type derived from %2. Das Attribut %1 hat eine Einschränkung des Werts, während sein Typ von %2 abgeleitet ist. - %1 attribute in derived complex type must be %2 like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss wie im Basistyp '%2' sein. - Attribute %1 in derived complex type must have %2 value constraint like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss wie der Basistyp eine Einschränkung des Werts (%2) haben. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. Das Attribut %1 in einem abgeleiteten komplexen Typ muss die gleiche Einschränkung des Werts (%2) wie der Basistyp haben. - Attribute %1 in derived complex type must have %2 value constraint. Das Attribut %1 in einem abgeleiteten komplexen Typ muss die Einschränkung des Werts '%2' haben. - processContent of base wildcard must be weaker than derived wildcard. Das 'processContent'-Attribut des Basissuchmusters muss schwächer sein als das des abgeleiteten Suchmusters. - - Element %1 exists twice with different types. Es existieren zwei Vorkommen verschiedenen Typs des Elements %1. - Particle contains non-deterministic wildcards. Der Partikel enthält nicht-deterministische Suchmuster. - - Base attribute %1 is required but derived attribute is not. Das Basisattribut %1 ist erforderlich, nicht jedoch das abgeleitete Attribut. - Type of derived attribute %1 cannot be validly derived from type of base attribute. Der Typ des abgeleiteten Attributs %1 kann nicht aus Typ des Basisattributs bestimmt werden. - Value constraint of derived attribute %1 does not match value constraint of base attribute. Die Einschränkung des Werts des abgeleiteten Attributs %1 entspricht nicht der Einschränkung des Werts des Basisattributs. - Derived attribute %1 does not exist in the base definition. Das abgeleitete Attribut %1 existiert in der Basisdefinition nicht. - Derived attribute %1 does not match the wildcard in the base definition. Das abgeleitete Attribut %1 entspricht nicht dem Suchmuster in der Basisdefinition. - Base attribute %1 is required but missing in derived definition. Das erforderliche Basisattribut %1 fehlt in der abgeleiteten Definition. - Derived definition contains an %1 element that does not exists in the base definition Die abgeleitete Definition enthält ein Element %1, was in der Basisdefinition nicht existiert - Derived wildcard is not a subset of the base wildcard. Das abgeleitete Suchmuster ist keine Untermenge des Basissuchmusters. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard Das Attribut %1 des abgeleiteten Suchmusters ist keine gültige Einschränkung des Attributs '%2' des Basissuchmusters - Attribute %1 from base type is missing in derived type. Das Attribut %1 des Basistyps fehlt im abgeleiteten Typ. - Type of derived attribute %1 differs from type of base attribute. Der Typ des abgeleiteten Attributs %1 unterscheidet sich vom Basistyp. - Base definition contains an %1 element that is missing in the derived definition Das Element %1 des Basistyps fehlt in der abgeleiteten Definition - %1 references unknown %2 or %3 element %4. %1 verweist auf ein unbekanntes Element %4 ('%2' oder '%3'). - %1 references identity constraint %2 that is no %3 or %4 element. %1 verweist auf eine Identitätseinschränkung %2, die weder ein '%3' noch ein '%4' Element ist. - %1 has a different number of fields from the identity constraint %2 that it references. Bei %1 unterscheidet sich die Anzahl der Felder von der der Identitätseinschränkung %2, auf die es verweist. - Base type %1 of %2 element cannot be resolved. Der Basistyp %1 des Elements %2 kann nicht aufgelöst werden. - Item type %1 of %2 element cannot be resolved. Der Subtyp %1 des Elements %2 kann nicht aufgelöst werden. - Member type %1 of %2 element cannot be resolved. Der Subtyp %1 des Elements %2 kann nicht aufgelöst werden. - - - Type %1 of %2 element cannot be resolved. Der Typ %1 des Elements %2 kann nicht aufgelöst werden. - Base type %1 of complex type cannot be resolved. Der Basistyp %1 des komplexen Typs kann nicht aufgelöst werden. - %1 cannot have complex base type that has a %2. %1 kann keinen komplexen Basistyp haben, der '%2' spezifiziert. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. Das Inhaltsmodell des komplexen Typs %1enthält ein Element '%2'; es kann daher nicht durch Erweiterung von einem Typ abgeleitet werden, der nicht leer ist. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. Der komplexe Typ %1 kann nicht durch Erweiterung von %2 abgeleitet werden, da letzterer ein '%3'-Element in seinem Inhaltsmodell hat. - Type of %1 element must be a simple type, %2 is not. Der Typ des Elements %1 muss ein einfacher Typ sein, was %2 nicht ist. - Substitution group %1 of %2 element cannot be resolved. Die Substitutionsgruppe %1 des Elements %2 kann nicht aufgelöst werden. - Substitution group %1 has circular definition. Die Substitutionsgruppe %1 hat eine zirkuläre Definition. - - Duplicated element names %1 in %2 element. Der Elementname %1 kommt im Element %2 mehrfach vor. - - - - Reference %1 of %2 element cannot be resolved. Der Verweis %1 des Elements %2 kann nicht aufgelöst werden. - Circular group reference for %1. Zirkulärer Verweis bei %1. - %1 element is not allowed in this scope Das Element %1 ist in diesem Bereich nicht zulässig - %1 element cannot have %2 attribute with value other than %3. Der Wert des Attributs %2 des Elements %1 kann nur %3 sein. - %1 element cannot have %2 attribute with value other than %3 or %4. Der Wert des Attributs %2 des Elements %1 kann nur %3 oder %4 sein. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. Das Attribut %1 oder %2 des Verweises %3 entspricht nicht der Attributsdeklaration %4. - Attribute group %1 has circular reference. Die Attributgruppe %1 hat einen zirkulären Verweis. - %1 attribute in %2 must have %3 use like in base type %4. Das Attribut %1 aus %2 muss die Verwendung '%3' spezifizieren, wie im Basistyp %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. Das Attributssuchmuster %1 ist keine gültige Einschränkung des Attributssuchmuster des Basistyps %2. - %1 has attribute wildcard but its base type %2 has not. %1 hat ein Attributssuchmuster, nicht jedoch sein Basistyp %2. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. Die Vereinigung der Attributssuchmuster des Typs %1 und seines Basistyps %2 ergibt keinen gültigen Ausdruck. - Enumeration facet contains invalid content: {%1} is not a value of type %2. Ungültiger Inhalt einer Aufzählungsfacette: {%1} ist kein Wert des Typs %2. - Namespace prefix of qualified name %1 is not defined. Der Namensraum-Präfix des qualifizierten Namens %1 ist nicht definiert. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. Das Element %2 (%1) ist keine gültige Einschränkung des überschriebenen Elements (%3): %4. - Empty particle cannot be derived from non-empty particle. Es kann kein leerer Partikel von einem Partikel abgeleitet werden, der nicht leer ist. - Derived particle is missing element %1. Das Element %1 fehlt im abgeleiteten Partikel. - Derived element %1 is missing value constraint as defined in base particle. Im abgeleiteten Element %1 fehlt Einschränkung des Wertes, wie sie im Basispartikel definiert ist. - Derived element %1 has weaker value constraint than base particle. Das abgeleitete Element %1 hat eine schwächere Einschränkung des Wertes als der Basispartikel. - Fixed value constraint of element %1 differs from value constraint in base particle. Die feste Einschränkung des Wertes des Elements %1 unterscheidet sich von der Einschränkung des Wertes des Basispartikels. - Derived element %1 cannot be nillable as base element is not nillable. Das abgeleitete Element %1 kann kein 'nillable'-Attribut haben, da das Basiselement keines spezifiziert. - Block constraints of derived element %1 must not be more weaker than in the base element. Die Blockeinschränkung des abgeleiteten Elements %1 darf nicht schwächer sein als im Basiselement. - Simple type of derived element %1 cannot be validly derived from base element. Der einfache Typ des abgeleiteten Elements %1 kann nicht vom Basiselement abgeleitet werden. - Complex type of derived element %1 cannot be validly derived from base element. Der komplexe Typ des abgeleiteten Elements %1 kann nicht vom Basiselement abgeleitet werden. - Element %1 is missing in derived particle. Das Element %1 fehlt im abgeleiteten Partikel. - Element %1 does not match namespace constraint of wildcard in base particle. Das Element %1 entspricht nicht der Namensraumeinschränkung des Basispartikels. - Wildcard in derived particle is not a valid subset of wildcard in base particle. Das Suchmuster im abgeleiteten Partikel ist keine gültige Untermenge des Suchmusters des Basispartikels. - processContent of wildcard in derived particle is weaker than wildcard in base particle. Das processContent-Attribut des Suchmusters des abgeleiteten Partikels ist schwächer als das Suchmuster des Basispartikels. - Derived particle allows content that is not allowed in the base particle. Der abgeleitete Partikel gestattet Inhalt, der für den Basispartikel nicht zulässig ist. - Can not process unknown element %1, expected elements are: %2. Das unbekannte Element %1 kann nicht verarbeitet werden; zulässig wären: %2. - Element %1 is not allowed in this scope, possible elements are: %2. Das Element %1 ist in diesem Bereich nicht zulässig; möglich wären: %2. - Child element is missing in that scope, possible child elements are: %1. Das Unterelement fehlt im Bereich; mögliche Unterelemente wären: %1. - Document is not a XML schema. Das Dokument ist kein XML-Schema. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. Das Attribut %1 des Elements %2 enthält ungültigen Inhalt: {%3} ist kein Wert des Typs %4. - %1 attribute of %2 element contains invalid content: {%3}. Das Attribut %1 des Elements %2 enthält ungültigen Inhalt: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. Der Zielnamensraum %1 des eingebundenen Schemas unterscheidet sich vom dem von ihm definierten Zielnamensraum %2. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. Der Zielnamensraum %1 des importierten Schemas unterscheidet sich vom dem von ihm definierten Zielnamensraum %2. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. Das Element %1 kann nicht den Zielnamensraum %3 als Wert des Attributs '%2' spezifizieren. - %1 element without %2 attribute is not allowed inside schema without target namespace. In einem Schema ohne Namensraum muss das Element %1 ein Attribut %2 haben. - - %1 element is not allowed inside %2 element if %3 attribute is present. Wenn das Attribut %3 vorhanden ist, darf das Element %1 nicht im Element %2 vorkommen. - - - %1 element has neither %2 attribute nor %3 child element. Das Element %1 hat weder das Attribut %2 noch ein Unterelement %3. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. Das Element %1 darf kein Attribut %3 haben, wenn das Unterelement %2 vorhanden ist. - %1 attribute of %2 element must be %3 or %4. Das Attribut %1 des Elements %2 kann nur %3 oder %4 sein. - %1 attribute of %2 element must have a value of %3. Das Attribut %1 des Elements %2 muss den Wert %3 haben. - - %1 attribute of %2 element must have a value of %3 or %4. Das Attribut %1 des Elements %2 kann nur einen der Werte %3 oder %4 haben. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. Die Attribute %2 und %3 können nicht zusammen im Element %1 erscheinen. - - Content of %1 attribute of %2 element must not be from namespace %3. Der Inhalt des Attributs %1 des Elements %2 kann nicht vom Namensraum %3 stammen. - - %1 attribute of %2 element must not be %3. Das Attribut %1 des Elements %2 kann nicht %3 sein. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. Das Attribut %1 des Elements %2 muss den Wert %3 haben, da das Attribut %4 gesetzt ist. - Specifying use='prohibited' inside an attribute group has no effect. Die Angabe von use='prohibited' in einer Attributgruppe hat keinerlei Auswirkungen. - %1 element must have either %2 or %3 attribute. Das Element %1 muss eines der Attribute %2 oder %3 spezifizieren. - %1 element must have either %2 attribute or %3 or %4 as child element. Das Element %1 muss entweder das Attribut %2 spezifizieren oder über eines der Unterelemente %3 oder %4 verfügen. - %1 element requires either %2 or %3 attribute. Das Element %1 erfordert eines der Attribute %2 oder %3. - Text or entity references not allowed inside %1 element Text- oder Entitätsreferenzen sind innerhalb eines %1-Elements nicht zulässig. - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. Das Attribut %1 des Elements %2 muss %3, %4 oder eine Liste der URIs enthalten. - %1 element is not allowed in this context. Das Element %1 ist in diesem Kontext nicht zulässig. - %1 attribute of %2 element has larger value than %3 attribute. Der Wert des Attributs %1 des Elements %2 ist größer als der des Attributs %3. - Prefix of qualified name %1 is not defined. Der Präfix des qualifizierten Namens %1 ist nicht definiert. - - %1 attribute of %2 element must either contain %3 or the other values. Der Wert des Attributs %1 des Elements %2 muss entweder %3 oder die anderen Werte enthalten. - Component with ID %1 has been defined previously. Es wurde bereits eine Komponente mit der ID %1 definiert. - Element %1 already defined. Das Element %1 ist bereits definiert. - Attribute %1 already defined. Das Attribut %1 ist bereits definiert. - Type %1 already defined. Der Typ %1 ist bereits definiert. - Attribute group %1 already defined. Die Attributgruppe %1 ist bereits definiert. - Element group %1 already defined. Die Elementgruppe %1 ist bereits definiert. - Notation %1 already defined. Die Notation %1 ist bereits definiert. - Identity constraint %1 already defined. Die Identitätseinschränkung %1 ist bereits definiert. - Duplicated facets in simple type %1. Im einfachen Typ %1 kommen Facetten mehrfach vor. - - - %1 is not valid according to %2. %1 ist nach %2 ungültig. - String content does not match the length facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette. - String content does not match the minLength facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette (Minimumangabe). - String content does not match the maxLength facet. Der Zeichenketteninhalt entspricht nicht der Längenfacette (Maximumangabe). - String content does not match pattern facet. Der Zeichenketteninhalt entspricht nicht der Suchmusterfacette. - String content is not listed in the enumeration facet. Der Zeichenketteninhalt ist nicht in der Aufzählungsfacette enthalten. - Signed integer content does not match the maxInclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'maxInclusive'. - Signed integer content does not match the maxExclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'maxExclusive'. - Signed integer content does not match the minInclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'minInclusive'. - Signed integer content does not match the minExclusive facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'minExclusive'. - Signed integer content is not listed in the enumeration facet. Der vorzeichenbehaftete Ganzzahlwert ist nicht in der Aufzählungsfacette enthalten. - Signed integer content does not match pattern facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Suchmusterfacette. - Signed integer content does not match in the totalDigits facet. Der vorzeichenbehaftete Ganzzahlwert entspricht nicht der Facette 'totalDigits'. - Unsigned integer content does not match the maxInclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'maxInclusive'. - Unsigned integer content does not match the maxExclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'maxExclusive'. - Unsigned integer content does not match the minInclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'minInclusive'. - Unsigned integer content does not match the minExclusive facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'minExclusive'. - Unsigned integer content is not listed in the enumeration facet. Der vorzeichenlose Ganzzahlwert ist nicht in der Aufzählungsfacette enthalten. - Unsigned integer content does not match pattern facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Suchmusterfacette. - Unsigned integer content does not match in the totalDigits facet. Der vorzeichenlose Ganzzahlwert entspricht nicht der Facette 'totalDigits'. - Double content does not match the maxInclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'maxInclusive'. - Double content does not match the maxExclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'maxExclusive'. - Double content does not match the minInclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'minInclusive'. - Double content does not match the minExclusive facet. Die Gleitkommazahl entspricht nicht der Facette 'minExclusive'. - Double content is not listed in the enumeration facet. Die Gleitkommazahl ist nicht in der Aufzählungsfacette enthalten. - Double content does not match pattern facet. Die Gleitkommazahl entspricht nicht der Suchmusterfacette. - Decimal content does not match in the fractionDigits facet. Die Dezimalzahl entspricht nicht der Facette 'fractionDigit'. - Decimal content does not match in the totalDigits facet. Die Dezimalzahl entspricht nicht der Facette 'totalDigits'. - Date time content does not match the maxInclusive facet. Die Datumsangabe entspricht nicht der Facette 'maxInclusive'. - Date time content does not match the maxExclusive facet. Die Datumsangabe entspricht nicht der Facette 'maxExclusive'. - Date time content does not match the minInclusive facet. Die Datumsangabe entspricht nicht der Facette 'minInclusive'. - Date time content does not match the minExclusive facet. Die Datumsangabe entspricht nicht der Facette 'minExclusive'. - Date time content is not listed in the enumeration facet. Die Datumsangabe ist nicht in der Aufzählungsfacette enthalten. - Date time content does not match pattern facet. Die Datumsangabe entspricht nicht der Suchmusterfacette. - Duration content does not match the maxInclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'maxInclusive'. - Duration content does not match the maxExclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'maxExclusive'. - Duration content does not match the minInclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'minInclusive'. - Duration content does not match the minExclusive facet. Die Angabe der Zeitdauer entspricht nicht der Facette 'minExclusive'. - Duration content is not listed in the enumeration facet. Die Angabe der Zeitdauer ist nicht in der Aufzählungsfacette enthalten. - Duration content does not match pattern facet. Die Angabe der Zeitdauer entspricht nicht der Suchmusterfacette. - Boolean content does not match pattern facet. Der Boolesche Wert entspricht nicht der Suchmusterfacette. - Binary content does not match the length facet. Der binäre Inhalt entspricht nicht der Längenfacette. - Binary content does not match the minLength facet. Der binäre Inhalt entspricht nicht der Facette 'minLength'. - Binary content does not match the maxLength facet. Der binäre Inhalt entspricht nicht der Facette 'maxLength'. - Binary content is not listed in the enumeration facet. Der binäre Inhalt ist nicht in der Aufzählungsfacette enthalten. - Invalid QName content: %1. Der Inhalt des qualifizierten Namens ist ungültig: %1. - QName content is not listed in the enumeration facet. Der Inhalt des qualifizierten Namens ist nicht in der Aufzählungsfacette enthalten. - QName content does not match pattern facet. Der Inhalt des qualifizierten Namens entspricht nicht der Suchmusterfacette. - Notation content is not listed in the enumeration facet. Der Inhalt der Notation ist nicht in der Aufzählungsfacette enthalten. - List content does not match length facet. Der Listeninhalt entspricht nicht der Längenfacette. - List content does not match minLength facet. Der Listeninhalt entspricht nicht der Facette 'minLength'. - List content does not match maxLength facet. Der Listeninhalt entspricht nicht der Facette 'maxLength'. - List content is not listed in the enumeration facet. Der Listeninhalt ist nicht in der Aufzählungsfacette enthalten. - List content does not match pattern facet. Der Listeninhalt entspricht nicht der Suchmusterfacette. - Union content is not listed in the enumeration facet. Der Inhalt der Vereinigung ist nicht in der Aufzählungsfacette enthalten. - Union content does not match pattern facet. Der Inhalt der Vereinigung entspricht nicht der Suchmusterfacette. - Data of type %1 are not allowed to be empty. Daten vom Typ %1 können nicht leer sein. - Element %1 is missing child element. Beim Element %1 fehlt ein Unterelement. - There is one IDREF value with no corresponding ID: %1. Es existiert ein IDREF-Wert, für den keine zugehörige ID vorhanden ist: %1. - Loaded schema file is invalid. Das geladene Schema ist ungültig. - %1 contains invalid data. %1 enthält ungültige Daten. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. xsi:schemaLocation namespace %1 wurde im Instanzdokument bereits spezifiziert. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. xsi:noNamespaceSchemaLocation kann nicht nach dem ersten Element oder Attribut ohne Namensraum erscheinen. - No schema defined for validation. Es ist kein Schema für die Validierung definiert. - No definition for element %1 available. Für das Element %1 ist keine Definition verfügbar. - - - Specified type %1 is not known to the schema. Der angegebene Typ %1 ist im Schema nicht spezifiziert. - Element %1 is not defined in this scope. Das Element %1 ist in diesem Bereich nicht definiert. - Declaration for element %1 does not exist. Für das Element %1 ist keine Deklaration verfügbar. - Element %1 contains invalid content. Das Element %1 enthält ungültigen Inhalt. - Element %1 is declared as abstract. Das Element %1 ist als abstrakt deklariert. - Element %1 is not nillable. Das Element %1 hat das Attribut 'nillable' nicht spezifiziert. - Attribute %1 contains invalid data: %2 Das Attribut %1 enthält ungültige Daten: %2 - Element contains content although it is nillable. Das Element hat Inhalt, obwohl es 'nillable' spezifiziert. - Fixed value constraint not allowed if element is nillable. Eine Beschränkung auf einen festen Wert ist nicht zulässig, wenn das Element 'nillable' spezifiziert. - Element %1 cannot contain other elements, as it has a fixed content. Das Element %1 kann keine anderen Element enthalten, da sein Inhalt festgelegt ist. - Specified type %1 is not validly substitutable with element type %2. Der angebenene Typ %1 kann nicht durch den Elementtyp %2 substituiert werden. - Complex type %1 is not allowed to be abstract. Der komplexe Typ %1 kann nicht abstrakt sein. - Element %1 contains not allowed attributes. Das Element %1 enthält unzulässige Attribute. - - Element %1 contains not allowed child element. Das Element %1 enthält ein unzulässiges Unterelement. - - Content of element %1 does not match its type definition: %2. Der Inhalt des Elements %1 entspricht nicht seiner Typdefinition: %2. - - - Content of element %1 does not match defined value constraint. Der Inhalt des Elements %1 entspricht nicht der definierten Einschränkung des Werts. - Element %1 contains not allowed child content. Das Element %1 enthält unzulässigen Unterinhalt. - Element %1 contains not allowed text content. Das Element %1 enthält unzulässigen Textinhalt. - Element %1 is missing required attribute %2. Bei dem Element %1 fehlt ein erforderliches Attribut %2. - Attribute %1 does not match the attribute wildcard. Das Attribut %1 entspricht nicht dem Attributssuchmuster. - Declaration for attribute %1 does not exist. Für das Attribut %1 ist keine Deklaration verfügbar. - Element %1 contains two attributes of type %2. Das Element %1 enthält zwei Attribute des Typs %2. - Attribute %1 contains invalid content. Das Attribut %1 enthält ungültigen Inhalt. - Element %1 contains unknown attribute %2. Das Element %1 enthält ein unbekanntes Attribut %2. - - Content of attribute %1 does not match its type definition: %2. Der Inhalt des Attributs %1 entspricht nicht seiner Typdefinition: %2. - - Content of attribute %1 does not match defined value constraint. Der Inhalt des Attributs %1 entspricht nicht der definierten Einschränkung des Werts. - Non-unique value found for constraint %1. Für die Einschränkung %1 wurde ein nicht eindeutiger Wert gefunden. - Key constraint %1 contains absent fields. Die Einschränkung des Schlüssels %1 enthält nicht vorhandene Felder. - Key constraint %1 contains references nillable element %2. Die Einschränkung des Schlüssels %1 verweist auf das Element %2, was 'nillable' spezifiziert. - No referenced value found for key reference %1. Der referenzierte Wert der Schlüsselreferenz %1 konnte nicht gefunden werden. - More than one value found for field %1. Für das Feld %1 wurden mehrere Werte gefunden. - Field %1 has no simple type. Das Feld %1 hat keinen einfachen Typ. - ID value '%1' is not unique. Der ID-Wert '%1' ist nicht eindeutig. - '%1' attribute contains invalid QName content: %2. Das Attribut '%1' enthält einen ungültigen qualifizierten Namen: %2. diff --git a/translations/qt_help_de.ts b/translations/qt_help_de.ts index c7a8103..1f0cf32 100644 --- a/translations/qt_help_de.ts +++ b/translations/qt_help_de.ts @@ -4,106 +4,92 @@ QCLuceneResultWidget - Search Results Suchergebnisse - Note: Achtung: - The search results may not be complete since the documentation is still being indexed! Es können nicht alle möglichen Ergebnisse angezeigt werden, da die Dokumentation noch indiziert wird. - Your search did not match any documents. Es wurden keine mit Ihrer Suche übereinstimmenden Dokumente gefunden. - (The reason for this might be that the documentation is still being indexed.) (Ein Grund dafür könnte sein, das die Dokumentation noch nicht vollständig indiziert ist.) + QHelp + + Untitled + + + + QHelpCollectionHandler - The collection file '%1' is not set up yet! Die Katalogdatei '%1' ist noch nicht eingerichtet. - Cannot load sqlite database driver! Der Datenbanktreiber für SQLite kann nicht geladen werden. - - Cannot open collection file: %1 Katalogdatei kann nicht geöffnet werden: %1 - Cannot create tables in file %1! In Datei %1 können keine Tabellen angelegt werden. - The collection file '%1' already exists! Die Katalogdatei '%1' existiert bereits. - Unknown filter '%1'! Unbekannter Filter '%1'. - Invalid documentation file '%1'! Ungültige Dokumentationsdatei '%1'. - Cannot register namespace '%1'! Der Namensraum '%1' kann nicht registriert werden. - Cannot open database '%1' to optimize! Die Datenbank '%1' kann nicht zur Optimierung geöffnet werden. - Cannot create directory: %1 Das Verzeichnis kann nicht angelegt werden: %1 - Cannot copy collection file: %1 Die Katalogdatei kann nicht kopiert werden: %1 - Cannot register filter %1! Der Filter kann nicht registriert werden: %1 - Cannot open documentation file %1! Die Dokumentationsdatei kann nicht geöffnet werden: %1 - The namespace %1 was not registered! Der Namensraum %1 wurde nicht registriert. - Namespace %1 already exists! Der Namensraum %1 existiert bereits. @@ -111,7 +97,6 @@ QHelpDBReader - Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Kann Datenbank nicht öffnen: '%1' '%2': %3 @@ -120,12 +105,10 @@ QHelpEngineCore - Cannot open documentation file %1: %2! Die Dokumentationsdatei %1 kann nicht geöffnet werden: %2! - The specified namespace does not exist! Der angegebene Namensraum existiert nicht. @@ -133,132 +116,106 @@ QHelpGenerator - Invalid help data! Ungültige Hilfe-Daten. - No output file name specified! Für die Ausgabe-Datei wurde kein Name angegeben. - Building up file structure... Dateistruktur wird erzeugt... - The file %1 cannot be overwritten! Die Datei %1 kann nicht überschrieben werden. - Cannot open data base file %1! Die Datenbank-Datei %1 kann nicht geöffnet werden. - Cannot register namespace %1! Der Namensraum %1 kann nicht registriert werden. - Insert custom filters... Benutzerdefinierte Filter einfügen... - Insert help data for filter section (%1 of %2)... Hilfe-Daten für Filter-Sektion (%1 von %2) einfügen... - Documentation successfully generated. Dokumentation erfolgreich generiert. - Some tables already exist! Einige Tabellen existieren bereits. - Cannot create tables! Tabellen können nicht erstellt werden. - Cannot register virtual folder! Virtuelles Verzeichnis nicht registriert werden. - Insert files... Dateien einfügen... - The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Die referenzierte Datei %1 muss sich im Verzeichnis %2 oder in einem Unterverzeichnis davon befinden. Sie wird übersprungen. - The file %1 does not exist! Skipping it. Die Datei %1 existiert nicht. Wird übersprungen. - Cannot open file %1! Skipping it. Die Datei %1 kann nicht geöffnet werden. Wird übersprungen. - The filter %1 is already registered! Der Filter %1 ist bereits registriert. - Cannot register filter %1! Der Filter %1 kann nicht registriert werden. - Insert indices... Indizes einfügen... - Insert contents... Inhalt einfügen... - Cannot insert contents! Inhalt kann nicht eingefügt werden. - Cannot register contents! Inhalt kann nicht registriert werden. - File '%1' does not exist. Die Datei '%1' existiert nicht. - File '%1' cannot be opened. Die Datei '%1' kann nicht geöffnet werden. - File '%1' contains an invalid link to file '%2' Die Datei '%1' enthält einen ungültigen Verweis auf die Datei '%2' - Invalid links in HTML files. Es wurden ungültige Verweise in HTML-Dateien gefunden. @@ -266,47 +223,38 @@ QHelpProject - Unknown token. Unbekanntes Token. - Unknown token. Expected "QtHelpProject"! Unbekanntes Token. "QtHelpProject" erwartet. - Error in line %1: %2 Fehler in Zeile %1: %2 - Virtual folder has invalid syntax. Ungültige Syntax bei Angabe des virtuellen Verzeichnisses. - Namespace has invalid syntax. Ungültige Syntax der Namensraum-Angabe. - Missing namespace in QtHelpProject. Fehlender Namensraum in QtHelpProject. - Missing virtual folder in QtHelpProject Fehlendes virtuelles Verzeichnis in QtHelpProject. - Missing attribute in keyword at line %1. Fehlendes Attribut in Schlagwort in Zeile %1. - The input file %1 could not be opened! Die Eingabe-Datei %1 kann nicht geöffnet werden. @@ -314,52 +262,42 @@ QHelpSearchQueryWidget - Search for: Suche nach: - Previous search Vorige Suche - Next search Nächste Suche - Search Suche - Advanced search Erweiterte Suche - words <B>similar</B> to: Worte <B>ähnlich</B> zu: - <B>without</B> the words: <B>ohne</B> die Wörter: - with <B>exact phrase</B>: mit der <B>genauen Wortgruppe</B>: - with <B>all</B> of the words: mit <B>allen</B> Wörtern: - with <B>at least one</B> of the words: mit <B>irgendeinem</B> der Wörter: @@ -367,7 +305,6 @@ QHelpSearchResultWidget - %1 - %2 of %n Hits %1 - %2 - Ein Treffer @@ -375,7 +312,6 @@ - 0 - 0 of 0 Hits 0 - 0 von 0 Treffern -- cgit v0.12 From 689d8f81cdb9beff8974c7672708e0d3dd61302d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 09:29:03 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/getting-started/gettingstartedqml.qdoc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 93f6f88..6c85776 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -308,7 +308,7 @@ with a header that displays a row of menu names. The list of menus are declared inside a \c VisualItemModel. The \l{VisualItemModel}{\c VisualItemModel} element contains items that already have views such as \c Rectangle elements - and imported UI elements. Other model types such as the \l{ListModel}{\c ListModel} + and imported UI elements. Other model types such as the \l {ListModel}{\c ListModel} element need a delegate to display their data. We declare two visual items in the \c menuListModel, the \c FileMenu and the @@ -361,7 +361,7 @@ } \endcode - Additionally, \c ListView inherits from \l{Flickable}{\c Flickable}, making + Additionally, \c ListView inherits from \l {Flickable}{\c Flickable}, making the list respond to mouse drags and other gestures. The last portion of the code above sets \c Flickable properties to create the desired flicking movement to our view. In particular,the property \c highlightMoveDuration changes the @@ -585,7 +585,7 @@ that the targets' properties will animate for a certain duration of time and using a certain easing curve. An easing curve controls the animation rates and interpolation behavior during state transitions. The easing curve we chose is - \l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near + \l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near the end of the animation. Pleae read \l {qdeclarativeanimation.html}{QML's Animation} article. @@ -737,7 +737,12 @@ }; \endcode - Our plugin class, \c DialogPlugin is a subclass of \l {QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We need to implement the inherited function, \l {QDeclarativeExtensionPlugin::registerTypes}{registerTypes}. The \c dialogPlugin.cpp file looks like this: + + Our plugin class, \c DialogPlugin is a subclass of \l + {QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We + need to implement the inherited function, \l + {QDeclarativeExtensionPlugin::registerTypes()}{registerTypes}. The + \c dialogPlugin.cpp file looks like this: \code DialogPlugin.cpp: @@ -756,7 +761,7 @@ Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin); \endcode - The \l {QDeclarativeExtensionPlugin::registerTypes}{registerTypes} + The \l {QDeclarativeExtensionPlugin::registerTypes()}{registerTypes} function registers our File and Directory classes into QML. This function needs the class name for its template, a major version number, a minor version number, and a name for our classes. @@ -816,7 +821,7 @@ The \c files list property is a list of all the filtered files in a directory. The \c Directory class is implemented to filter out invalid text files; only - files with a \c .txt extension are valid. Further, \l {QLists}{QLists} can be + files with a \c .txt extension are valid. Further, \l {QList}{QLists} can be used in QML files by declaring them as a \c QDeclarativeListProperty in C++. The templated object needs to inherit from a \l {QObject}{QObject}, therefore, the \c File class must also inherit from \c QObject. In the \c Directory class, -- cgit v0.12 From 8b0761d942ced89e34a8ee99de10f2f106f19396 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 09:43:49 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/modules.qdoc | 64 +--------------------------------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index a81bfb2..c35d71c 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -40,7 +40,7 @@ \header \o {2,1} \bold{Modules for general software development} \row \o \l{QtCore} \o Core non-graphical classes used by other modules \row \o \l{QtGui} \o Graphical user interface (GUI) components - \row \o \l{QtMultimedia} \o Classes for low-level multimedia functionality + \row \o \l{qtmultimedia-module.html}{QtMultimedia} \o Classes for low-level multimedia functionality \row \o \l{QtNetwork} \o Classes for network programming \row \o \l{QtOpenGL} \o OpenGL support classes \row \o \l{QtOpenVG} \o OpenVG support classes @@ -82,9 +82,6 @@ /*! \module QtCore \title QtCore Module - \contentspage All Modules - \previouspage All Modules - \nextpage QtGui \ingroup modules \keyword QtCore @@ -101,9 +98,6 @@ /*! \module QtGui \title QtGui Module - \contentspage All Modules - \previouspage QtCore - \nextpage QtNetwork \ingroup modules \brief The QtGui module extends QtCore with GUI functionality. @@ -118,9 +112,6 @@ \module QtMultimedia \page qtmultimedia-module.html \title QtMultimedia Module - \contentspage All Modules - \previouspage QtCore - \nextpage QtNetwork \ingroup modules \brief The QtMultimedia module provides low-level multimedia functionality. @@ -142,9 +133,6 @@ /*! \module QtNetwork \title QtNetwork Module - \contentspage All Modules - \previouspage QtMultimedia - \nextpage QtOpenGL \ingroup modules \brief The QtNetwork module provides classes to make network programming @@ -164,9 +152,6 @@ /*! \module QtOpenGL \title QtOpenGL Module - \contentspage All Modules - \previouspage QtNetwork - \nextpage QtOpenVG \ingroup modules \brief The QtOpenGL module offers classes that make it easy to @@ -217,9 +202,6 @@ \module QtOpenVG \title QtOpenVG Module \since 4.6 - \contentspage All Modules - \previouspage QtOpenGL - \nextpage QtScript \ingroup modules \brief The QtOpenVG module is a plugin that provides support for @@ -272,9 +254,6 @@ \module QtScript \title QtScript Module \since 4.3 - \contentspage All Modules - \previouspage QtOpenVG - \nextpage QtScriptTools \ingroup modules \brief The QtScript module provides classes for making Qt applications scriptable. @@ -332,9 +311,6 @@ \module QtScriptTools \title QtScriptTools Module \since 4.5 - \contentspage All Modules - \previouspage QtScript - \nextpage QtSql \ingroup modules \brief The QtScriptTools module provides additional components for applications that use Qt Script. @@ -356,9 +332,6 @@ /*! \module QtSql \title QtSql Module - \contentspage All Modules - \previouspage QtScript - \nextpage QtSvg \ingroup modules To include the definitions of the module's classes, use the @@ -379,9 +352,6 @@ \module QtSvg \title QtSvg Module \since 4.1 - \contentspage All Modules - \previouspage QtSql - \nextpage QtWebKit \ingroup modules \brief The QtSvg module provides classes for displaying and creating SVG files. @@ -430,9 +400,6 @@ /*! \module QtXml \title QtXml Module - \contentspage All Modules - \previouspage QtSvg - \nextpage QtXmlPatterns \ingroup modules \brief The QtXml module provides a stream reader and writer for @@ -457,9 +424,6 @@ \module QtXmlPatterns \title QtXmlPatterns Module \since 4.4 - \contentspage All Modules - \previouspage QtXml - \nextpage Phonon Module \ingroup modules \brief The QtXmlPatterns module provides support for XPath, @@ -537,9 +501,6 @@ \page phonon-module.html \module Phonon \title Phonon Module - \contentspage All Modules - \previouspage QtXmlPatterns - \nextpage Qt3Support \ingroup modules \brief The Phonon module contains namespaces and classes for multimedia functionality. @@ -607,9 +568,6 @@ /*! \module Qt3Support \title Qt3Support Module - \contentspage All Modules - \previouspage Phonon Module - \nextpage QtDesigner \ingroup modules \keyword Qt3Support @@ -640,9 +598,6 @@ /*! \module QtDesigner \title QtDesigner Module - \contentspage All Modules - \previouspage Qt3Support - \nextpage QtUiTools \ingroup modules \brief The QtDesigner module provides classes that allow you to @@ -667,9 +622,6 @@ \module QtUiTools \title QtUiTools Module \since 4.1 - \contentspage All Modules - \previouspage QtDesigner - \nextpage QtHelp \ingroup modules \brief The QtUiTools module provides classes to handle forms created @@ -703,9 +655,6 @@ /*! \module QtHelp \title QtHelp Module - \contentspage All Modules - \previouspage QtUiTools - \nextpage QtTest \ingroup modules \brief The QtHelp module provides classes for integrating @@ -762,9 +711,6 @@ /*! \module QtTest \title QtTest Module - \contentspage All Modules - \previouspage QtHelp - \nextpage QAxContainer \ingroup modules \keyword QtTest @@ -792,9 +738,6 @@ /*! \module QAxContainer \title QAxContainer Module - \contentspage All Modules - \previouspage QtTest - \nextpage QAxServer \ingroup modules \brief The QAxContainer module is a Windows-only extension for @@ -844,9 +787,6 @@ /*! \module QAxServer \title QAxServer Module - \contentspage All Modules - \previouspage QAxContainer - \nextpage QtDBus module \ingroup modules \brief The QAxServer module is a Windows-only static library that @@ -896,8 +836,6 @@ /*! \module QtDBus \title QtDBus module - \contentspage All Modules - \previouspage QAxServer \ingroup modules \keyword QtDBus -- cgit v0.12 From ac355872573c7131e4b783cabe00c5656dc668af Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 9 Aug 2010 10:14:27 +0200 Subject: Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750 --- doc/src/declarative/declarativeui.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 1fc9d69..b25d000 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -43,7 +43,7 @@ C++ module, you can load and interact with QML files from your Qt application. QML provides mechanisms to declaratively build an object tree using \l {QML Elements}{QML elements}. QML improves the integration between -{http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} +\l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} and Qt's existing QObject based type system, adds support for automatic \l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} -- cgit v0.12 From 94244ea3c5edf57d4dc258381d37bc99fc23ed0d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 10:43:46 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/declarative/example-slideswitch.qdoc | 2 +- doc/src/tutorials/modelview.qdoc | 4 ++-- src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 +- src/declarative/qml/qdeclarativeimageprovider.cpp | 2 +- src/declarative/util/qdeclarativestate.cpp | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc index f056892..1a40f14 100644 --- a/doc/src/declarative/example-slideswitch.qdoc +++ b/doc/src/declarative/example-slideswitch.qdoc @@ -115,7 +115,7 @@ For more information on scripts see \l{Integrating JavaScript}. At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78. In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms. -For more information on transitions see \l{state-transitions}{QML Transitions}. +For more information on transitions see \l{qdeclarativeanimation.html#transitions}{QML Transitions}. \section1 Usage The switch can be used in a QML file, like this: diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc index 98096a0..b39a01c 100755 --- a/doc/src/tutorials/modelview.qdoc +++ b/doc/src/tutorials/modelview.qdoc @@ -80,8 +80,8 @@ /*! \page modelview-part1.html - \contentspage {modelview-index.html}{Model/View Contents} - \previouspage {modelview-index.html}{Model/View Contents} + \contentspage {modelview.html}{Model/View Contents} + \previouspage {modelview.html}{Model/View Contents} \nextpage {modelview-part2.html}{Developing a Simple Model/View Application} \title An Introduction to Model/View Programming diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index ff05997..5872585 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2454,7 +2454,7 @@ QDeclarativeListProperty QDeclarativeItemPrivate::states() } \endqml - \sa {state-transitions}{Transitions} + \sa {qdeclarativeanimation.html#transitions}{QML Transitions} */ diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 241df87..da5b65e 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -59,7 +59,7 @@ public: \list \o Loaded using QPixmaps rather than actual image files - \o Loaded asynchronously in a separate thread, if imageType() is \l ImageType::Image + \o Loaded asynchronously in a separate thread, if imageType() is \l Image \endlist To specify that an image should be loaded by an image provider, use the diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 7a78a2b..028bacb 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -160,7 +160,8 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje \note Setting the state of an object from within another state of the same object is not allowed. - \sa {declarative/animation/states}{states example}, {qmlstates}{States}, {state-transitions}{Transitions}, QtDeclarative + \sa {declarative/animation/states}{states example}, {qmlstates}{States}, + {qdeclarativeanimation.html#transitions}{QML Transitions}, QtDeclarative */ /*! -- cgit v0.12 From 362641ec2bdf5e05b4adfc54275c1c4869759d56 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Aug 2010 11:01:45 +0200 Subject: Doc: typo fixed in qlibraryinfo.cpp Reviewed-by: TrustMe --- src/corelib/global/qlibraryinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a9ea44a..4b56efc 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -467,7 +467,7 @@ QLibraryInfo::location(LibraryLocation loc) \value PrefixPath The default prefix for all paths. \value DocumentationPath The location for documentation upon install. \value HeadersPath The location for all headers. - \value LibrariesPath The location of installed librarires. + \value LibrariesPath The location of installed libraries. \value BinariesPath The location of installed Qt binaries (tools and applications). \value PluginsPath The location of installed Qt plugins. \value DataPath The location of general Qt data. -- cgit v0.12 From 3ed0f33f7a8a5697d55faf8e4ce8fb003d4f8b93 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Mon, 9 Aug 2010 11:16:40 +0200 Subject: Doc: removing reduntant text from the index page --- doc/src/index.qdoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index f890aa6..ded57f5 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -94,14 +94,14 @@
-- cgit v0.12 From 66a6183dc30ca1d572274695707f16b84325b459 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 11:23:35 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/widgets-and-layouts/layout.qdoc | 4 ++-- doc/src/widgets-and-layouts/styles.qdoc | 2 +- doc/src/widgets-and-layouts/stylesheet.qdoc | 2 +- doc/src/widgets-and-layouts/widgets.qdoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc index 798a7a1..d2687ea 100644 --- a/doc/src/widgets-and-layouts/layout.qdoc +++ b/doc/src/widgets-and-layouts/layout.qdoc @@ -37,9 +37,9 @@ \brief A tour of the standard layout managers and an introduction to custom layouts. - \previouspage Widget Classes + \previouspage Widgets and Layouts \contentspage Widgets and Layouts - \nextpage {Implementing Styles and Style Aware Widgets}{Styles} + \nextpage {Styles and Style Aware Widgets}{Styles} \ingroup frameworks-technologies diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc index eab7014..180260b 100644 --- a/doc/src/widgets-and-layouts/styles.qdoc +++ b/doc/src/widgets-and-layouts/styles.qdoc @@ -33,7 +33,7 @@ /*! \page style-reference.html - \title Styles & Style Aware Widgets + \title Styles and Style Aware Widgets \ingroup qt-gui-concepts \brief Styles and the styling of widgets. diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index 1390376..475de3d 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -32,7 +32,7 @@ \ingroup frameworks-technologies - \previouspage {Implementing Styles and Style Aware Widgets}{Styles} + \previouspage {Styles and Style Aware Widgets}{Styles} \contentspage Widgets and Layouts \nextpage The Style Sheet Syntax diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index f2475c2..baf3dce 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -68,7 +68,7 @@ \section1 Widget Styles - \l{Styles & Style Aware Widgets}{Styles} draw on behalf of + \l{Styles and Style Aware Widgets}{Styles} draw on behalf of widgets and encapsulate the look and feel of a GUI. Qt's built-in widgets use the QStyle class to perform nearly all of their drawing, ensuring that they look exactly like the equivalent native widgets. -- cgit v0.12 From f45c6c61a0967468b1b80375d8c72db4f4fec438 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 12:18:53 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/examples/qml-examples.qdoc | 2 +- doc/src/examples/simpletreemodel.qdoc | 16 +++++++++------- doc/src/examples/spinboxdelegate.qdoc | 5 +++-- doc/src/objectmodel/metaobjects.qdoc | 3 ++- doc/src/objectmodel/properties.qdoc | 3 ++- doc/src/painting-and-printing/paintsystem.qdoc | 6 +++--- doc/src/windows-and-dialogs/dialogs.qdoc | 2 +- src/gui/styles/qstyle.cpp | 2 +- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc index 8d3aa25..0d191c9 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/doc/src/examples/qml-examples.qdoc @@ -562,7 +562,7 @@ \example declarative/ui-components/dialcontrol This example shows how to create a dial-type control. It combines - \l Image elements with \l Rotation transforms and \l SpringAnimatino behaviors + \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors to produce an interactive speedometer-type dial. \image qml-dialcontrol-example.png diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc index c34f4af..16cf8b7 100644 --- a/doc/src/examples/simpletreemodel.qdoc +++ b/doc/src/examples/simpletreemodel.qdoc @@ -36,13 +36,15 @@ \image simpletreemodel-example.png - Qt's model/view architecture provides a standard way for views to manipulate - information in a data source, using an abstract model of the data to - simplify and standardize the way it is accessed. Simple models represent - data as a table of items, and allow views to access this data via an - \l{model-view-model.html}{index-based} system. More generally, models can - be used to represent data in the form of a tree structure by allowing each - item to act as a parent to a table of child items. + Qt's model/view architecture provides a standard way for views to + manipulate information in a data source, using an abstract model + of the data to simplify and standardize the way it is accessed. + Simple models represent data as a table of items, and allow views + to access this data via an + \l{model-view-programming.html#model-indexes} {index-based} + system. More generally, models can be used to represent data in + the form of a tree structure by allowing each item to act as a + parent to a table of child items. Before attempting to implement a tree model, it is worth considering whether the data is supplied by an external source, or whether it is going to be diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc index 49e3295..da65831 100644 --- a/doc/src/examples/spinboxdelegate.qdoc +++ b/doc/src/examples/spinboxdelegate.qdoc @@ -42,8 +42,9 @@ \image spinboxdelegate-example.png This concepts behind this example are covered in the - \l{model-view-delegate.html}{Delegate Classes} chapter of the - \l{model-view-programming.html}{Model/View Programming} overview. + \l{model-view-programming.html#delegate-classes}{Delegate Classes} + chapter of the \l{model-view-programming.html}{Model/View + Programming} overview. \section1 SpinBoxDelegate Class Definition diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc index dd00c5e..0597cd6 100644 --- a/doc/src/objectmodel/metaobjects.qdoc +++ b/doc/src/objectmodel/metaobjects.qdoc @@ -28,8 +28,9 @@ /*! \page metaobjects.html \title The Meta-Object System - \ingroup qt-basic-concepts \brief An overview of Qt's meta-object system and introspection capabilities. + + \ingroup qt-basic-concepts \keyword meta-object \target Meta-Object System diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc index 356aaaf..dca332e 100644 --- a/doc/src/objectmodel/properties.qdoc +++ b/doc/src/objectmodel/properties.qdoc @@ -28,8 +28,9 @@ /*! \page properties.html \title The Property System - \ingroup qt-basic-concepts \brief An overview of Qt's property system. + + \ingroup qt-basic-concepts \target Qt's Property System Qt provides a sophisticated property system similar to the ones diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc index e5eb75d..4c6fd91 100644 --- a/doc/src/painting-and-printing/paintsystem.qdoc +++ b/doc/src/painting-and-printing/paintsystem.qdoc @@ -273,7 +273,7 @@ \previouspage Paint Devices and Backends \contentspage The Paint System - \nextpage The Coordinate System + \nextpage Coordinate System \section1 Drawing @@ -395,7 +395,7 @@ \page paintsystem-images.html \title Reading and Writing Image Files - \previouspage The Coordinate System + \previouspage Coordinate System \contentspage The Paint System \nextpage Styling @@ -554,5 +554,5 @@ \endtable For more information about widget styling and appearance, see the - \l{Styles & Style Aware Widgets}. + \l{Styles and Style Aware Widgets}. */ diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 74df2aa..f6649fd 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -43,7 +43,7 @@ \ingroup qt-gui-concepts \brief An overview over dialog windows. - \previouspage The Application Main Window + \previouspage Application Main Window \contentspage Application Windows and Dialogs \nextpage Desktop Integration diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp index 687e587..0a75492 100644 --- a/src/gui/styles/qstyle.cpp +++ b/src/gui/styles/qstyle.cpp @@ -325,7 +325,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C control over size of header items and row and column sizes. \sa QStyleOption, QStylePainter, {Styles Example}, - {Styles & Style Aware Widgets}, QStyledItemDelegate + {Styles and Style Aware Widgets}, QStyledItemDelegate */ /*! -- cgit v0.12 From 58d78590fc29fd6695d60eaf50af604bd1f75588 Mon Sep 17 00:00:00 2001 From: Victor Ostashevsky Date: Mon, 9 Aug 2010 12:49:09 +0200 Subject: Add Ukrainian translation. Merge-request: 761 Reviewed-by: Oswald Buddenhagen --- translations/assistant_uk.ts | 969 +++++++ translations/designer_uk.ts | 5783 ++++++++++++++++++++++++++++++++++++++++++ translations/linguist_uk.ts | 1602 ++++++++++++ translations/qt_help_uk.ts | 320 +++ translations/qtconfig_uk.ts | 717 ++++++ translations/qvfb_uk.ts | 276 ++ 6 files changed, 9667 insertions(+) create mode 100644 translations/assistant_uk.ts create mode 100644 translations/designer_uk.ts create mode 100644 translations/linguist_uk.ts create mode 100644 translations/qt_help_uk.ts create mode 100644 translations/qtconfig_uk.ts create mode 100644 translations/qvfb_uk.ts diff --git a/translations/assistant_uk.ts b/translations/assistant_uk.ts new file mode 100644 index 0000000..78fd59d --- /dev/null +++ b/translations/assistant_uk.ts @@ -0,0 +1,969 @@ + + + + + AboutDialog + + &Close + &Закрити + + + + AboutLabel + + Warning + Попередження + + + Unable to launch external application. + + Неможливо запустити зовнішню програму. + + + + OK + OK + + + + Assistant + + Error registering documentation file '%1': %2 + Помилка реєстрації файлу документації '%1': %2 + + + Error: %1 + Помилка: %1 + + + Could not register documentation file +%1 + +Reason: +%2 + Не можу зареєструвати файл документації +%1 + +Причина: +%2 + + + Documentation successfully registered. + Документацію успішно зареєстровано. + + + Could not unregister documentation file +%1 + +Reason: +%2 + Не можу скасувати реєстрацію файлу документації +%1 + +Причина: +%2 + + + Documentation successfully unregistered. + Реєстрацію документації успішно скасовано. + + + Error reading collection file '%1': %2. + Помилка читання файлу колекції '%1': %2. + + + Error creating collection file '%1': %2. + Помилка створення файлу колекції '%1': %2. + + + Error reading collection file '%1': %2 + Помилка читання файлу колекції '%1': %2 + + + Cannot load sqlite database driver! + Не можу завантажити драйвер бази даний SQLite! + + + + BookmarkDialog + + Add Bookmark + Додати закладку + + + Bookmark: + Закладка: + + + Add in Folder: + Додати в теку: + + + + + + + + + New Folder + Нова тека + + + Rename Folder + Перейменувати теку + + + + BookmarkManager + + Untitled + Без назви + + + Remove + Видалити + + + You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? + Ви збираєтесь видалити теку, що призведе до видалення її змісту.<br>Ви впевнені, що хочете продовжити? + + + Manage Bookmarks... + Керування закладками... + + + Add Bookmark... + Додати закладку... + + + Ctrl+D + + + + Delete Folder + Видалити теку + + + Rename Folder + Перейменувати теку + + + Show Bookmark + Показати закладку + + + Show Bookmark in New Tab + Показати закладку в новій вкладці + + + Delete Bookmark + Видалити закладку + + + Rename Bookmark + Перейменувати закладку + + + + BookmarkManagerWidget + + Manage Bookmarks + Керування закладками + + + Search: + Пошук: + + + Remove + Видалити + + + Import and Backup + Імпорт та резервування + + + OK + OK + + + Import... + Імпортувати... + + + Export... + Експортувати... + + + Open File + Відкрити файл + + + Files (*.xbel) + Файли (*.xbel) + + + Save File + Зберегти файл + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Не можу зберегти закладки. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Ви збираєтесь видалити теку, що призведе до видалення її змісту.<br>Ви впевнені, що хочете продовжити? + + + Delete Folder + Видалити теку + + + Rename Folder + Перейменувати теку + + + Show Bookmark + Показати закладку + + + Show Bookmark in New Tab + Показати закладку в новій вкладці + + + Delete Bookmark + Видалити закладку + + + Rename Bookmark + Перейменувати закладку + + + + BookmarkModel + + Name + Ім'я + + + Address + Адреса + + + Bookmarks Menu + Меню закладок + + + + BookmarkWidget + + Bookmarks + Закладки + + + Filter: + Фільтр: + + + Add + Додати + + + Remove + Видалити + + + + CentralWidget + + Add new page + Додати нову сторінку + + + Close current page + Закрити поточну сторінку + + + Print Document + Друкувати документ + + + unknown + невідомо + + + Add New Page + Додати нову сторінку + + + Close This Page + Закрити цю сторінку + + + Close Other Pages + Закрити інші сторінки + + + Add Bookmark for this Page... + Додати закладку для цієї сторінки... + + + Search + Пошук + + + + CmdLineParser + + Unknown option: %1 + Невідома опція: %1 + + + The collection file '%1' does not exist. + Файл колекції '%1' не існує. + + + Missing collection file. + Відсутній файл колекції. + + + Invalid URL '%1'. + Неправильний URL '%1'. + + + Missing URL. + URL відсутній. + + + Unknown widget: %1 + Невідомий віджет: %1 + + + Missing widget. + Відсутній віджет. + + + The Qt help file '%1' does not exist. + Файл довідки Qt '%1' не існує. + + + Missing help file. + Відсутній файл довідки. + + + Missing filter argument. + Відсутній аргумент фільтру. + + + Error + Помилка + + + Notice + Примітка + + + + ContentWindow + + Open Link + Відкрити посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + FilterNameDialogClass + + Add Filter Name + Додати назву фільтру + + + Filter Name: + Назва фільтру: + + + + FindWidget + + Previous + Попередній + + + Next + Наступний + + + Case Sensitive + Враховувати регістр + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Пошук з початку + + + + FontPanel + + Font + Шрифт + + + &Writing system + Система &письма + + + &Family + &Шрифт + + + &Style + &Стиль + + + &Point size + &Розмір + + + + HelpViewer + + <title>about:blank</title> + <title>about:blank</title> + + + <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> + <title>Помилка 404...</title><div align="center"><br><br><h1>Неможливо знайти сторінку</h1><br><h3>'%1'</h3></div> + + + Copy &Link Location + Копіювати &адресу посилання + + + Open Link in New Tab Ctrl+LMB + Відкрити посилання в новій вкладці Ctrl+LMB + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + IndexWindow + + &Look for: + + + + Open Link + Відкрити посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + + InstallDialog + + Install Documentation + Встановити документацію + + + Available Documentation: + Доступна документація: + + + Install + Встановити + + + Cancel + Скасувати + + + Close + Закрити + + + Installation Path: + Шлях встановлення: + + + ... + ... + + + Downloading documentation info... + Завантажую інформацію про документацію... + + + Download canceled. + Завантаження скасоване. + + + Done. + Виконано. + + + The file %1 already exists. Do you want to overwrite it? + Файл %1 вже існує. Бажаєте перезаписати? + + + Unable to save the file %1: %2. + Не можу зберегти файл %1: %2. + + + Downloading %1... + Завантажую %1... + + + Download failed: %1. + Завантаження провалилось: %1. + + + Documentation info file is corrupt! + Файл інформації про документації пошкоджений! + + + Download failed: Downloaded file is corrupted. + Завантаження провалилось: Завантажений файл пошкоджений. + + + Installing documentation %1... + Встановлюю документацію %1... + + + Error while installing documentation: +%1 + Помилка під час встановлення документації: +%1 + + + + MainWindow + + Index + Індекс + + + Contents + Зміст + + + Bookmarks + Закладки + + + Qt Assistant + Qt Assistant + + + Looking for Qt Documentation... + + + + &File + &Файл + + + New &Tab + &Нова вкладка + + + Page Set&up... + Параметри &сторінки... + + + Print Preview... + Попередній перегляд... + + + &Print... + &Друк... + + + &Close Tab + &Закрити вкладку + + + &Quit + Ви&йти + + + CTRL+Q + + + + &Edit + &Правка + + + &Copy selected Text + &Копіювати виділений текст + + + &Find in Text... + Пошук в &тексті... + + + &Find + По&шук + + + Find &Next + Знайти &наступне + + + Find &Previous + Знайти &попереднє + + + Preferences... + Налаштування... + + + &View + &Вид + + + Zoom &in + З&більшити + + + Zoom &out + З&меншити + + + Normal &Size + &Нормальний розмір + + + Ctrl+0 + + + + ALT+C + + + + ALT+I + + + + ALT+O + + + + Search + Пошук + + + ALT+S + + + + &Go + П&ерейти + + + &Home + &Додому + + + ALT+Home + + + + &Back + &Назад + + + &Forward + &Вперед + + + Sync with Table of Contents + Синхронізувати зі змістом + + + Sync + Синхронізувати + + + Next Page + Наступна сторінка + + + Ctrl+Alt+Right + + + + Previous Page + Попередня сторінка + + + Ctrl+Alt+Left + + + + &Bookmarks + &Закладки + + + &Help + &Довідка + + + About... + Про... + + + Navigation Toolbar + Панель навігації + + + &Window + В&ікно + + + Zoom + Масштабувати + + + Minimize + Мінімізувати + + + Ctrl+M + + + + Toolbars + Панелі + + + Filter Toolbar + Панель фільтру + + + Filtered by: + Фільтрувати по: + + + Address Toolbar + Панель адреси + + + Address: + Адреса: + + + Could not find the associated content item. + Не вдалось знайти елемент, пов'язаний зі змістом. + + + About %1 + Про %1 + + + Updating search index + Оновлюється індекс пошуку + + + Could not register file '%1': %2 + Не можу зареєструвати файл '%1': %2 + + + + PreferencesDialog + + Add Documentation + Додати документацію + + + Qt Compressed Help Files (*.qch) + Стиснені файли довідки Qt (*.qch) + + + The namespace %1 is already registered! + Простір імен %1 вже зареєстровано! + + + The specified file is not a valid Qt Help File! + Вказаний файл не є коректним файлом довідки Qt! + + + Remove Documentation + Видалити документацію + + + Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. + Деякі документи, що зараз відкриті в Assistant пов'язані з документацією, яку ви намагаєтесь видалити. Видалення документації призведе до закриття цих документів. + + + Cancel + Скасувати + + + OK + OK + + + Use custom settings + Використовувати налаштування користувача + + + + PreferencesDialogClass + + Preferences + Налаштування + + + Fonts + Шрифти + + + Font settings: + Параметри шрифту: + + + Browser + Навігатор + + + Application + Додаток + + + Filters + Фільтри + + + Filter: + Фільтр: + + + Attributes: + Атрибути: + + + 1 + 1 + + + Add + Додати + + + Remove + Видалити + + + Documentation + Документація + + + Registered Documentation: + Зареєстрована документація: + + + Add... + Додати... + + + Options + Опції + + + On help start: + При запуску довідки: + + + Show my home page + Показувати мою домашню сторінку + + + Show a blank page + Показувати пусту сторінку + + + Show my tabs from last session + Показувати вкладку з минулого сеансу + + + Homepage + Домашня сторінка + + + Current Page + Поточна сторінка + + + Blank Page + Пуста сторінка + + + Restore to default + Відновити типово + + + + RemoteControl + + Debugging Remote Control + Зневадження віддаленого управління + + + Received Command: %1 %2 + Отримано команду: %1 %2 + + + + SearchWidget + + &Copy + &Копіювати + + + Copy &Link Location + Копіювати &адресу посилання + + + Open Link in New Tab + Відкрити посилання в новій вкладці + + + Select All + Виділити все + + + + TopicChooser + + Choose Topic + Оберіть тему + + + &Topics + &Теми + + + &Display + &Показати + + + &Close + &Закрити + + + Choose a topic for <b>%1</b>: + Оберіть тему для <b>%1</b>: + + + diff --git a/translations/designer_uk.ts b/translations/designer_uk.ts new file mode 100644 index 0000000..24b2a44 --- /dev/null +++ b/translations/designer_uk.ts @@ -0,0 +1,5783 @@ + + + + + AbstractFindWidget + + &Previous + &Попередній + + + &Next + &Наступний + + + &Case sensitive + Враховувати &регістр + + + Whole &words + Цілі &слова + + + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/shared/images/wrap.png">&nbsp;Пошук з початку + + + + AddLinkDialog + + Insert Link + Вставити посилання + + + Title: + Заголовок: + + + URL: + URL: + + + + AppFontDialog + + Additional Fonts + Додаткові шрифти + + + + AppFontManager + + '%1' is not a file. + '%1' не є файлом. + + + The font file '%1' does not have read permissions. + Файл шрифту '%1' не доступний для читання. + + + The font file '%1' is already loaded. + Файл шрифти '%1' вже завантажено. + + + The font file '%1' could not be loaded. + Неможливо завантажити файл шрифт '%1'. + + + '%1' is not a valid font id. + '%1' не є правильним ідентифікатором шрифт. + + + There is no loaded font matching the id '%1'. + Відсутній завантажений шрифт, що відповідає ідентифікатору '%1'. + + + The font '%1' (%2) could not be unloaded. + Неможливо вивантажити шрифт '%1' (%2). + + + + AppFontWidget + + Fonts + Шрифти + + + Add font files + Додати файли шрифтів + + + Remove current font file + Видалити поточний файл шрифт + + + Remove all font files + Видалити усі файли шрифтів + + + Add Font Files + Додати файли шрифтів + + + Font files (*.ttf) + Файли шрифтів (*.ttf) + + + Error Adding Fonts + Помилка додавання шрифтів + + + Error Removing Fonts + Помилка видалення шрифтів + + + Remove Fonts + Видалити шрифти + + + Would you like to remove all fonts? + Бажаєте видалити усі шрифти? + + + + AppearanceOptionsWidget + + Form + Форма + + + User Interface Mode + Режим інтерфейсу користувача + + + + AssistantClient + + Unable to send request: Assistant is not responding. + Неможливо надіслати запит. Assistant не відповідає. + + + The binary '%1' does not exist. + Виконуваний файл '%1' не існує. + + + Unable to launch assistant (%1). + Неможливо запустити Assistant (%1). + + + + BrushPropertyManager + + No brush + Без пензля + + + Solid + Суцільна + + + Dense 1 + Густина 1 + + + Dense 2 + Густина 2 + + + Dense 3 + Густина 3 + + + Dense 4 + Густина 4 + + + Dense 5 + Густина 5 + + + Dense 6 + Густина 6 + + + Dense 7 + Густина 7 + + + Horizontal + Горизонтальний + + + Vertical + Вертикальний + + + Cross + Хрестоподібний + + + Backward diagonal + Зворотня діагональ + + + Forward diagonal + Пряма діагональ + + + Crossing diagonal + Діагоналі, що перетинаються + + + Style + Стиль + + + Color + Колір + + + [%1, %2] + [%1, %2] + + + + Command + + Add connection + Додати з'єднання + + + Adjust connection + Налаштувати з'єднання + + + Delete connections + Видалити з'єднання + + + Change source + Змінити джерело + + + Change target + Зміни ціль + + + Add '%1' to '%2' + Command description for adding buttons to a QButtonGroup + Додати '%1' до '%2' + + + Morph %1/'%2' into %3 + MorphWidgetCommand description + Перетворити %1/%2 в %3 + + + Insert '%1' + Вставити '%1' + + + Change Z-order of '%1' + Змінити порядок глибина для '%1' + + + Raise '%1' + Підняти '%1' + + + Lower '%1' + Опустити '%1' + + + Delete '%1' + Видалити '%1' + + + Reparent '%1' + Змінити власника '%1' + + + Promote to custom widget + Перетворити на користувацький віджет + + + Demote from custom widget + Перетворити з користувацького віджета + + + Lay out using grid + Розташувати, використовуючи сітку + + + Lay out vertically + Розташувати вертикально + + + Lay out horizontally + Розташувати горизонтально + + + Break layout + Розбити розташування + + + Simplify Grid Layout + Спрощене розташування по сітці + + + Move Page + Пересунути сторінку + + + Delete Page + Видалити сторінку + + + Page + Сторінка + + + Insert Page + Вставити сторінку + + + Change Tab order + Змінити порядок обходу + + + Create Menu Bar + Створити панель меню + + + Delete Menu Bar + Видалити панель меню + + + Create Status Bar + Створити рядок статусу + + + Delete Status Bar + Видалити рядок статусу + + + Add Tool Bar + Додати панель інструментів + + + Add Dock Window + Додати прикріплене вікно + + + Adjust Size of '%1' + Підігнати розмір '%1' + + + Change Form Layout Item Geometry + Змінити геометрію елемента розташування формою + + + Change Layout Item Geometry + Змінити геометрію елемента розташування + + + Delete Subwindow + Видалити підвікно + + + page + сторінка + + + Insert Subwindow + Вставити підвікно + + + subwindow + підвікно + + + Subwindow + Підвікно + + + Change Table Contents + Змінити зміст таблиці + + + Change Tree Contents + Змінити зміст дерева + + + Add action + Додати дію + + + Remove action + Видалити дію + + + Add menu + Додати меню + + + Remove menu + Видалити меню + + + Create submenu + Створити підменю + + + Delete Tool Bar + Видалити панель інструментів + + + Change layout of '%1' from %2 to %3 + Змінити розташування '%1' з %2 на %3 + + + Set action text + Встановити текст дії + + + Insert action + Вставити дію + + + Move action + Пересунути дію + + + Change Title + Змінити заголовок + + + Insert Menu + Вставити меню + + + Changed '%1' of '%2' + Змінено '%1' з '%2' + + + Changed '%1' of %n objects + + Змінено '%1' з '%n' oб'єкта + Змінено '%1' з '%n' oб'єктів + Змінено '%1' з '%n' oб'єктів + + + + Reset '%1' of '%2' + Відновлено '%1' з '%2' + + + Reset '%1' of %n objects + + Відновлено '%1' з %n об'єкта + Відновлено '%1' з %n об'єктів + Відновлено '%1' з %n об'єктів + + + + Add dynamic property '%1' to '%2' + Додати динамічну властивість '%1' до '%2' + + + Add dynamic property '%1' to %n objects + + Додати динамічну властивість '%1' до '%n' об'єкта + Додати динамічну властивість '%1' до '%n' об'єктів + Додати динамічну властивість '%1' до '%n' об'єктів + + + + Remove dynamic property '%1' from '%2' + Видалити динамічну властивість '%1' у '%2' + + + Remove dynamic property '%1' from %n objects + + Видалити динамічну властивість '%1' у '%n' об'єкта + Видалити динамічну властивість '%1' у '%n' об'єктів + Видалити динамічну властивість '%1' у '%n' об'єктів + + + + Change script + Змінити скрипт + + + Change signals/slots + Змінити сигнали/слоти + + + Change signal + Змінити сигнал + + + Change slot + Змінити слот + + + Change signal-slot connection + Змінити з'єднання сигнал-слот + + + Change sender + Змінити відправника + + + Change receiver + Змінити отримувача + + + Create button group + Створити групу кнопок + + + Break button group + Розбити групу кнопок + + + Break button group '%1' + Розбити групу кнопок '%1' + + + Add buttons to group + Додати кнопки до групи + + + Remove buttons from group + Видалити кнопки з групи + + + Remove '%1' from '%2' + Command description for removing buttons from a QButtonGroup + Видалити '%1' з '%2' + + + + ConnectDialog + + Configure Connection + Налаштування з'єднання + + + GroupBox + + + + Edit... + Редагувати... + + + Show signals and slots inherited from QWidget + Показувати сигнали та слоти успадковані від QWidget + + + + ConnectionDelegate + + <object> + <об'єкт> + + + <signal> + <сигнал> + + + <slot> + <слот> + + + + DPI_Chooser + + Standard (96 x 96) + Embedded device standard screen resolution + Стандартна (96 x 96) + + + Greenphone (179 x 185) + Embedded device screen resolution + Greenphone (179 x 185) + + + High (192 x 192) + Embedded device high definition screen resolution + Висока (192 x 192) + + + + Designer + + Unable to launch %1. + Неможливо запустити %1. + + + %1 timed out. + Час очікування %1 вичерпано. + + + Custom Widgets + Віджети користувача + + + Promoted Widgets + Перетворені віджети + + + Qt Designer + Qt Designer + + + This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. + Цей файл містить роздільники верхнього рівня.<br>Вони <b>НЕ</b> будуть збережені в формі. + + + Perhaps you forgot to create a layout? + Можливо, ви забули створити розташування? + + + Invalid UI file: The root element <ui> is missing. + Неправильний файл UI: Кореневий елемент <ui> відсутній. + + + An error has occurred while reading the UI file at line %1, column %2: %3 + Під час читання файлу UI сталася помилка в рядку %1, позиція %2: %3 + + + This file cannot be read because it was created using %1. + Неможливо прочитати файл, бо його було створено з використанням %1. + + + This file was created using Designer from Qt-%1 and cannot be read. + Неможливо прочитати файл, бо його було створено з використанням Designer з Qt-%1. + + + The converted file could not be read. + Неможливо прочитати конвертований файл. + + + This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. + Цей файл було створено з використанням Designer з Qt-%1.і його буде сконвертовано до нової форми. + + + The old form has not been touched, but you will have to save the form under a new name. + Стара форма не змінилася, але ви маєте зберегти форму під новим іменем. + + + This file was created using Designer from Qt-%1 and could not be read: +%2 + Неможливо прочитати файл, бо його було створено з використанням Designer з Qt-%1: +%2 + + + Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. + Будь-ласка, пропустіть його через <b>uic3&nbsp;-convert</b>, щоб сконвертувати до формату Qt-4. + + + This file cannot be read because the extra info extension failed to load. + Неможливо прочитати цей файл, бо трапився збій при завантаженні розширення додаткової інформації. + + + + DesignerMetaEnum + + %1 is not a valid enumeration value of '%2'. + %1 не є правильним значення для переліку '%2'. + + + '%1' could not be converted to an enumeration value of type '%2'. + Неможливо сконвертувати '%1'до типу значень переліку '%2'. + + + + DesignerMetaFlags + + '%1' could not be converted to a flag value of type '%2'. + '%1' не можу бути сконвертовано до прапорця типу '%2'. + + + + DeviceProfile + + '%1' is not a number. + Reading a number for an embedded device profile + '%1' не є числом. + + + An invalid tag <%1> was encountered. + Знайдено неправильний тег <%1>. + + + + DeviceProfileDialog + + &Family + &Сім'я + + + &Point Size + &Розмір точки + + + Style + Стиль + + + Device DPI + DPI пристрою + + + Name + Назва + + + + DeviceSkin + + The image file '%1' could not be loaded. + Неможливо завантажити файл зображення '%1'. + + + The skin directory '%1' does not contain a configuration file. + Тека обкладинки '%1' не містить конфігураційного файлу. + + + The skin configuration file '%1' could not be opened. + Неможливо відкрити конфігураційний файл '%1'. + + + The skin configuration file '%1' could not be read: %2 + Неможливо прочитати конфігураційний файл '%1': %2 + + + Syntax error: %1 + Синтаксична помилка: %1 + + + The skin "up" image file '%1' does not exist. + Зображення обкладинки "вгору" '%1' не існує. + + + The skin "down" image file '%1' does not exist. + Зображення обкладинки "вниз" '%1' не існує. + + + The skin "closed" image file '%1' does not exist. + Зображення обкладинки "закрито" '%1' не існує. + + + The skin cursor image file '%1' does not exist. + Зображення обкладинки для курсору '%1' не існує. + + + Syntax error in area definition: %1 + Синтаксична помилка в описі області: %1 + + + Mismatch in number of areas, expected %1, got %2. + Не співпадає кількість областей, очікувалось %1, отримано %2. + + + + EmbeddedOptionsControl + + <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> + Format embedded device profile description + <html><table><tr><td><b>Шрифт</b></td><td>%1, %2</td></tr><tr><td><b>Стиль</b></td><td>%3</td></tr><tr><td><b>Роздільна здатність</b></td><td>%4 x %5</td></tr></table></html> + + + + EmbeddedOptionsPage + + Embedded Design + Tab in preferences dialog + Дизайн для портативних пристроїв + + + Device Profiles + EmbeddedOptionsControl group box" + Профілі пристроїв + + + + FontPanel + + Font + Шрифт + + + &Writing system + Система &письма + + + &Family + &Сім'я + + + &Style + Сти&ль + + + &Point size + &Розмір точки + + + + FontPropertyManager + + PreferDefault + Надавати перевагу типовому + + + NoAntialias + Без згладжування + + + PreferAntialias + Надавати перевагу згладжування + + + Antialiasing + Згладжування + + + + FormBuilder + + Invalid stretch value for '%1': '%2' + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values + Неправильне значення розтягування для '%1': '%2' + + + Invalid minimum size for '%1': '%2' + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values + Неправильне значення мінімального розміру для '%1': '%2' + + + + FormEditorOptionsPage + + %1 % + %1 % + + + Preview Zoom + Масштаб попереднього перегляду + + + Default Zoom + Типовий масштаб + + + Forms + Tab in preferences dialog + Форми + + + Default Grid + Типова сітка + + + + FormLayoutRowDialog + + Add Form Layout Row + Додати рядок до розташування формою + + + &Label text: + Текст &мітки: + + + Field &type: + &Тип поля: + + + &Field name: + Назва &поля: + + + &Buddy: + Прив'&язка: + + + &Row: + &Рядок: + + + Label &name: + &Назва мітки: + + + + FormWindow + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + Error while pasting clipboard contents at line %1, column %2: %3 + Помилка під час вставки змісту буферу обміну в рядку %1, позиція %2: %3 + + + + FormWindowSettings + + Form Settings + Налаштування форми + + + Layout &Default + &Типове розташування + + + &Spacing: + &Відступ: + + + &Margin: + &Границя: + + + &Layout Function + Функція р&озташування + + + Ma&rgin: + Г&раниця: + + + Spa&cing: + В&ідступ: + + + &Pixmap Function + Функція растрового &зображення + + + &Include Hints + Включити під&казки + + + Grid + Сітка + + + Embedded Design + Дизайн для портативних пристроїв + + + &Author + &Автор + + + + IconSelector + + All Pixmaps ( + Усі растрові зображення ( + + + + ItemPropertyBrowser + + XX Icon Selected off + Sample string to determinate the width for the first column of the list item property browser + XX Значок Виділено вимк + + + + MainWindowBase + + Main + Not currently used (main tool bar) + Головна + + + File + Файл + + + Edit + Правка + + + Tools + Інструменти + + + Form + Форма + + + Qt Designer + Qt Designer + + + + NewForm + + Show this Dialog on Startup + Показувати цей діалог під час запуску + + + C&reate + &Створити + + + Recent + Нещодавні + + + New Form + Нова форма + + + &Close + З&акрити + + + &Open... + &Відкрити... + + + &Recent Forms + Нещодавні &форми + + + Read error + Помилка читання + + + A temporary form file could not be created in %1. + Неможливо створити тимчасовий файл форми в %1. + + + The temporary form file %1 could not be written. + Неможливо записати тимчасовий файл форми %1. + + + + ObjectInspectorModel + + Object + Об'єкт + + + Class + Клас + + + separator + розділювач + + + <noname> + <без назви> + + + + ObjectNameDialog + + Change Object Name + Змінити назву об'єкта + + + Object Name + Назва об'єкта + + + + PluginDialog + + Plugin Information + Інформація про додатки + + + 1 + 1 + + + + PreferencesDialog + + Preferences + Налаштування + + + + PreviewConfigurationWidget + + Form + Форма + + + Print/Preview Configuration + Налаштування друку/попереднього перегляду + + + Style + Стиль + + + Style sheet + Таблиця стилів + + + ... + ... + + + Device skin + Обкладинка пристрою + + + + PromotionModel + + Not used + Usage of promoted widgets + Не використовується + + + + Q3WizardContainer + + Page + Сторінка + + + + QAbstractFormBuilder + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + An error has occurred while reading the UI file at line %1, column %2: %3 + Під час читання файлу UI '%1' сталася помилка в рядку %2, позиція %3 + + + Invalid UI file: The root element <ui> is missing. + Неправильний файл UI: Кореневий елемент <ui> відсутній. + + + The creation of a widget of the class '%1' failed. + Збій створення віджета класу '%1'. + + + Attempt to add child that is not of class QWizardPage to QWizard. + Спроба додати до QWizard нащадка, який не є класом QWizardPage. + + + Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. +This indicates an inconsistency in the ui-file. + Спроба додати розташування для віджета '%1' (%2), який вже має розташування %3. +Це вказує на некоректність в файлі UI. + + + Empty widget item in %1 '%2'. + Пустий елемент віджета в %1 '%2'. + + + Flags property are not supported yet. + Властивості-прапорці ще не підтримуються. + + + While applying tab stops: The widget '%1' could not be found. + Під час застосування позицій табуляції: Неможливо знайти віджет '%1'. + + + Invalid QButtonGroup reference '%1' referenced by '%2'. + '%2' містить неправильне посилання на QButtonGroup '%1'. + + + This version of the uitools library is linked without script support. + Ця версія бібліотеки uitools зібрана без підтримки скриптів. + + + + QAxWidgetPlugin + + ActiveX control + Елемент керування ActiveX + + + ActiveX control widget + Віджет елемента керування ActiveX + + + + QAxWidgetTaskMenu + + Set Control + Встановити елемент керування + + + Reset Control + Скинути елемент керування + + + Licensed Control + Ліцензований елемент керування + + + The control requires a design-time license + Цей елемент управління вимагає ліцензії для розробки + + + + QCoreApplication + + Exception at line %1: %2 + Виключна ситуація в рядку %1: %2 + + + Unknown error + Невідома помилка + + + An error occurred while running the script for %1: %2 +Script: %3 + Під час виконання скрипту для %1 сталася помилка: %2 +Скрипт: %3 + + + %1 is not a promoted class. + %1 не є перетвореним класом. + + + The base class %1 is invalid. + Неправильний базовий клас %1. + + + The class %1 already exists. + Клас %1 вже існує. + + + Promoted Widgets + Перетворені віджети + + + The class %1 cannot be removed + Неможливо видалити клас %1 + + + The class %1 cannot be removed because it is still referenced. + Неможливо видалити клас %1, оскільки на нього досі є посилання. + + + The class %1 cannot be renamed + Неможливо перейменувати клас %1 + + + The class %1 cannot be renamed to an empty name. + Неможливо дати класу %1 пусте ім'я. + + + There is already a class named %1. + Вже існує клас з іменем %1. + + + Cannot set an empty include file. + Неможливо встановити порожнє ім'я файлу заголовків. + + + + QDesigner + + %1 - warning + %1 - попередження + + + Qt Designer + Qt Designer + + + This application cannot be used for the Console edition of Qt + Ця програма не може бути використана консольною редакцією Qt + + + + QDesignerActions + + Saved %1. + Збережено %1. + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте замінити його? + + + Edit Widgets + Редагувати віджети + + + &New... + &Новий... + + + &Open... + &Відкрити... + + + &Save + &Зберегти + + + Save &As... + Зберегти &як... + + + Save A&ll + Зберегти &усе + + + Save As &Template... + Зберегти як &шаблон... + + + &Close + З&акрити + + + Save &Image... + Зберегти з&ображення... + + + &Print... + &Друк... + + + &Quit + Ви&йти + + + View &Code... + Переглянути &код... + + + &Minimize + &Мінімізувати + + + Bring All to Front + Усе на передній план + + + Preferences... + Налаштування... + + + Additional Fonts... + Додаткові шрифти... + + + ALT+CTRL+S + + + + CTRL+SHIFT+S + + + + CTRL+R + + + + CTRL+M + + + + Qt Designer &Help + &Довідка по Qt Designer + + + Current Widget Help + Довідка по поточному віджету + + + What's New in Qt Designer? + Що нового в Qt Designer? + + + About Plugins + Про додатки + + + About Qt Designer + Про Qt Designer + + + About Qt + Про Qt + + + Clear &Menu + Очистити &меню + + + &Recent Forms + Нещодавні &форми + + + Open Form + Відкрити форму + + + Designer UI files (*.%1);;All Files (*) + UI файли Designer (*.%1);;Всі файли (*) + + + Save Form As + Зберегти форму як + + + Designer + Designer + + + Feature not implemented yet! + Можливість ще не реалізована! + + + Code generation failed + Збій генерації коду + + + Read error + Помилка читання + + + %1 +Do you want to update the file location or generate a new form? + %1 +Бажаєте оновити розташування файлу чи згенерувати нову форму? + + + &Update + &Оновити + + + &New Form + &Нова форма + + + Save Form? + Зберегти форму? + + + Could not open file + Неможливо відкрити файл + + + The file %1 could not be opened. +Reason: %2 +Would you like to retry or select a different file? + Неможливо відкрити файл %1. +Причина: %2 +Чи не хотіли б ви спробувати ще раз чи вибрати інший файл? + + + Select New File + Оберіть новий файл + + + Could not write file + Неможливо записати файл + + + It was not possible to write the entire file %1 to disk. +Reason:%2 +Would you like to retry? + Не вдалось записати цілий файл %1 на диск. +Причина:%2 +Бажаєте спробувати ще раз? + + + Assistant + Assistant + + + &Close Preview + З&акрити попередній перегляд + + + The backup file %1 could not be written. + Неможливо записати файл резервної копії %1. + + + The backup directory %1 could not be created. + Неможливо створити теку резервних копій %1. + + + The temporary backup directory %1 could not be created. + Неможливо створити тимчасову теку резервних копій %1. + + + Preview failed + Збій попереднього перегляду + + + Image files (*.%1) + Файли зображень (*.%1) + + + Save Image + Зберегти зображення + + + Saved image %1. + Збережено зображення %1. + + + The file %1 could not be written. + Неможливо записати файл %1. + + + Please close all forms to enable the loading of additional fonts. + Будь-ласка, закрийте усі форми, щоб дозволити завантаження додаткових шрифтів. + + + Printed %1. + Надруковано %1. + + + + QDesignerAppearanceOptionsPage + + Appearance + Tab in preferences dialog + + + + + QDesignerAppearanceOptionsWidget + + Docked Window + Прикріплені вікна + + + Multiple Top-Level Windows + Декілька вікон верхнього рівня + + + Toolwindow Font + Шрифт інструментальних вікон + + + + QDesignerAxWidget + + Reset control + Скинути елемент керування + + + Set control + Встановити елемент керування + + + Control loaded + Елемент керування завантажено + + + A COM exception occurred when executing a meta call of type %1, index %2 of "%3". + Виникла виключна ситуація COM під час здійснення мета-виклику типу %1, індекс %2 з "%3". + + + + QDesignerFormBuilder + + Script errors occurred: + Трапились помилки скрипту: + + + The preview failed to build. + Збій побудови попереднього перегляду. + + + Designer + Designer + + + + QDesignerFormWindow + + %1 - %2[*] + %1 - %2[*] + + + Save Form? + Зберегти форму? + + + Do you want to save the changes to this document before closing? + Бажаєте зберегти зміни до цього документи перед тим як закрити? + + + If you don't save, your changes will be lost. + Якщо ви не збережете, ваші зміни будуть втрачені. + + + + QDesignerMenu + + Type Here + Набирайте тут + + + Add Separator + Додати розділювач + + + Insert separator + Вставити розділювач + + + Remove separator + Видалити розділювач + + + Remove action '%1' + Видалити дію '%1' + + + Add separator + Додати розділювач + + + Insert action + Вставити дію + + + + QDesignerMenuBar + + Type Here + Набирайте тут + + + Remove Menu '%1' + Видалити меню '%1' + + + Remove Menu Bar + Видалити панель меню + + + Menu + Меню + + + + QDesignerPluginManager + + An XML error was encountered when parsing the XML of the custom widget %1: %2 + Під час розбору XML користувацького віджета %1 сталась помилка XML: %2 + + + A required attribute ('%1') is missing. + Обов'язковий атрибут ('%1') відсутній. + + + An invalid property specification ('%1') was encountered. Supported types: %2 + Знайдено неправильну специфікацію властивості ('%1'). Підтримувані типи: %2 + + + '%1' is not a valid string property specification. + '%1' не є правильною специфікацією рядкової властивості. + + + The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. + XML користувацького віджета %1 не містить жодного з елементів <widget> або <ui>. + + + The class attribute for the class %1 is missing. + Відсутній атрибут для класу %1. + + + The class attribute for the class %1 does not match the class name %2. + Атрибут "клас" для класу %1 не співпадає з іменем класу %2. + + + + QDesignerPropertySheet + + Dynamic Properties + Динамічні властивості + + + + QDesignerResource + + The layout type '%1' is not supported, defaulting to grid. + Тип розташування '%1' не підтримується, використовуємо сітку. + + + The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. +Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. + Контейнерне розширення '%1' (%2) повернуло віджет, який не може бути керований за допомогою Qt Designer '%3' (%4) під час запиту сторінки №%5. +Сторінки контейнера повинні додаватись лише за допомогою вказування їх в XML, що повертається методом domXml() віджета користувача. + + + Unexpected element <%1> + Parsing clipboard contents + Неочікуваний елемент <%1> + + + Error while pasting clipboard contents at line %1, column %2: %3 + Parsing clipboard contents + Помилка під час вставки змісту буферу обміну в рядку %1, позиція %2: %3 + + + Error while pasting clipboard contents: The root element <ui> is missing. + Parsing clipboard contents + Помилка під час вставки змісту буферу обміну. Кореневий елемент <ui> відсутній. + + + + QDesignerSharedSettings + + The template path %1 could not be created. + Неможливо створити шлях до шаблону %1. + + + An error has been encountered while parsing device profile XML: %1 + Трапилась помилка під час розбору XML профілю пристрою: %1 + + + + QDesignerToolWindow + + Property Editor + Редактор властивостей + + + Action Editor + Редактор дій + + + Object Inspector + Інспектор об'єктів + + + Resource Browser + Оглядач ресурсів + + + Signal/Slot Editor + Редактор сигналів/слотів + + + Widget Box + Панель віджетів + + + + QDesignerWorkbench + + &File + &Файл + + + Edit + Правка + + + F&orm + Ф&орма + + + Preview in + Попередній перегляд в + + + &View + &Вид + + + &Settings + &Налаштування + + + &Window + В&ікно + + + &Help + &Довідка + + + Toolbars + Панелі інструментів + + + Widget Box + Панель віджетів + + + Save Forms? + Зберегти форми? + + + There are %n forms with unsaved changes. Do you want to review these changes before quitting? + + Є %n форма з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + Є %n форми з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + Є %n форм з незбереженими змінами. Бажаєте переглянути ці зміни перед виходом? + + + + If you do not review your documents, all your changes will be lost. + Якщо ви не переглянете ваші документи, усі ваші зміну будуть втрачені. + + + Discard Changes + Відхилити зміни + + + Review Changes + Переглянути зміни + + + Backup Information + Інформація про резервні копії + + + The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? + Останній сеанс Qt Designer не був правильно завершений. Залишились резервні копії файлів. Бажаєте їх завантажити? + + + The file <b>%1</b> could not be opened. + Неможливо відкрити файл <b>%1</b>. + + + The file <b>%1</b> is not a valid Designer UI file. + Файл <b>%1</b> не є правильним файлом UI Qt Designer. + + + + QFormBuilder + + An empty class name was passed on to %1 (object name: '%2'). + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method + До %1 було передане пусте ім'я класу (ім'я об'єкта: '%2'). + + + QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. + QFormBuilder не зміг створити користувацький віджет класу '%1'; було створено базовий клас '%2'. + + + QFormBuilder was unable to create a widget of the class '%1'. + QFormBuilder не зміг створити віджет класу '%1'. + + + The layout type `%1' is not supported. + Тип розташування '%1' не підтримується. + + + The set-type property %1 could not be read. + Неможливо прочитати властивість %1 типу "множина". + + + The enumeration-type property %1 could not be read. + Неможливо прочитати властивість %1 типу "перелік". + + + Reading properties of the type %1 is not supported yet. + Читання властивостей типу %1 ще не підтримується. + + + The property %1 could not be written. The type %2 is not supported yet. + Неможливо записати властивість %1. Тип %2 ще не підтримується. + + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + Неправильне значення '%1' для переліку. Натомість, буде використано типове значення '%2'. + + + The flag-value '%1' is invalid. Zero will be used instead. + Неправильне значення '%1' для прапорців. Натомість, буде використано нуль. + + + + QStackedWidgetEventFilter + + Previous Page + Попередня сторінка + + + Next Page + Наступна сторінка + + + Delete + Видалити + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточною сторінкою + + + Change Page Order... + Змінити порядок сторінок... + + + Change Page Order + Змінити порядок сторінок + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QStackedWidgetPreviewEventFilter + + Go to previous page of %1 '%2' (%3/%4). + Перейти до попередньої сторінки з %1 '%2' (%3/%4). + + + Go to next page of %1 '%2' (%3/%4). + Перейти до наступної сторінки з %1 '%2' (%3/%4). + + + + QTabWidgetEventFilter + + Delete + Видалити + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточної сторінки + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QToolBoxHelper + + Delete Page + Видалити сторінку + + + Before Current Page + Перед поточною сторінкою + + + After Current Page + Після поточної сторінки + + + Change Page Order... + Змінити порядок сторінок... + + + Change Page Order + Змінити порядок сторінок + + + Page %1 of %2 + Сторінка %1 з %2 + + + Insert Page + Вставити сторінку + + + + QtBoolEdit + + True + Істинно + + + False + Хибно + + + + QtBoolPropertyManager + + True + Істинно + + + False + Хибно + + + + QtCharEdit + + Clear Char + Стерти символ + + + + QtColorEditWidget + + ... + ... + + + + QtColorPropertyManager + + Red + Червоний + + + Green + Зелений + + + Blue + Блакитний + + + Alpha + Альфа + + + + QtCursorDatabase + + Arrow + Стрілка + + + Up Arrow + Стрілка вгору + + + Cross + Хрест + + + Wait + Очікування + + + IBeam + Текстовий + + + Size Vertical + Вертикальний розмір + + + Size Horizontal + Горизонтальний розмір + + + Size Backslash + Зворотній слеш + + + Size Slash + Слеш + + + Size All + В усі сторони + + + Blank + Пусто + + + Split Vertical + Розділити вертикально + + + Split Horizontal + Розділити вертикально + + + Pointing Hand + Вказівний перст + + + Forbidden + Заборонено + + + Open Hand + Відкрита рука + + + Closed Hand + Закрита рука + + + What's This + Що це + + + Busy + Зайнятий + + + + QtFontEditWidget + + ... + ... + + + Select Font + Оберіть шрифт + + + + QtFontPropertyManager + + Family + Сім'я + + + Point Size + Розмір точки + + + Bold + Жирний + + + Italic + Курсив + + + Underline + Підкреслений + + + Strikeout + Перекреслений + + + Kerning + Кернінг + + + + QtGradientDialog + + Edit Gradient + Редагувати градієнт + + + + QtGradientEditor + + Form + Форма + + + Gradient Editor + Редактор градієнту + + + This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. + В цій області відображається попередній перегляд градієнту, що редагується. Вона також дозволяє за допомогою "drag & drop" редагувати специфічні до типу градієнта параметри, такі як: початкова та кінцева точки, радіус та ін. + + + 1 + 1 + + + 2 + 2 + + + 3 + 3 + + + 4 + 4 + + + 5 + 5 + + + Gradient Stops Editor + Редактор точок градієнту + + + This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. + Ця область дозволяє вам редагувати точки градієнту. Подвійне клацання на існуючій точці створює її дублікат. Подвійне клацання поза межами існуючої точки створює нову точку. Перетягніть точку мишею, щоб змінити її позицію. Використовуйте праву кнопку миші, щоб отримати контекстне меню з додатковими діями. + + + Zoom + Масштаб + + + Reset Zoom + Скинути + + + Position + Положення + + + Hue + Відтінок + + + H + H + + + Saturation + Насиченість + + + S + S + + + Sat + Насиченість + + + Value + Значення + + + V + V + + + Val + Значення + + + Alpha + Альфа + + + A + A + + + Type + Тип + + + Spread + Заливка + + + Color + Колір + + + Current stop's color + Колір поточної точки + + + Show HSV specification + Показати у вигляді HSV + + + HSV + HSV + + + Show RGB specification + Показати у вигляді RGB + + + RGB + RGB + + + Current stop's position + Позиція поточної точки + + + % + % + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Toggle details extension + Показати/приховати деталі + + + > + > + + + Linear Type + Лінійний тип + + + ... + ... + + + Radial Type + Радіальний тип + + + Conical Type + Конічний тип + + + Pad Spread + Рівномірна заливка + + + Repeat Spread + Повторна заливка + + + Reflect Spread + Дзеркальна заливка + + + Start X + X початку + + + Start Y + Y початку + + + Final X + X кінця + + + Final Y + Y кінця + + + Central X + X центру + + + Central Y + Y центру + + + Focal X + X фокусу + + + Focal Y + Y фокусу + + + Radius + Радіус + + + Angle + Кут + + + Linear + Лінійний + + + Radial + Радіальний + + + Conical + Конічний + + + Pad + Рівномірна + + + Repeat + Повторна + + + Reflect + Дзеркальна + + + + QtGradientStopsWidget + + New Stop + Нова точка + + + Delete + Видалити + + + Flip All + Відобразити дзеркально + + + Select All + Виділити все + + + Zoom In + Збільшити + + + Zoom Out + Зменшити + + + Reset Zoom + Скинути + + + + QtGradientView + + Gradient View + Перегляд градієнту + + + New... + Новий... + + + Edit... + Редагувати... + + + Rename + Перейменувати + + + Remove + Видалити + + + Grad + Градієнт + + + Remove Gradient + Видалити градієнт + + + Are you sure you want to remove the selected gradient? + Ви впевнені, що бажаєте видалити виділений градієнт? + + + + QtGradientViewDialog + + Select Gradient + Обрати градієнт + + + + QtKeySequenceEdit + + Clear Shortcut + Видалити поєднання клавіш + + + + QtLocalePropertyManager + + %1, %2 + %1, %2 + + + Language + Мова + + + Country + Країна + + + + QtPointFPropertyManager + + (%1, %2) + (%1, %2) + + + X + X + + + Y + Y + + + + QtPointPropertyManager + + (%1, %2) + (%1, %2) + + + X + X + + + Y + Y + + + + QtPropertyBrowserUtils + + [%1, %2, %3] (%4) + [%1, %2, %3] (%4) + + + [%1, %2] + [%1, %2] + + + + QtRectFPropertyManager + + [(%1, %2), %3 x %4] + [(%1, %2), %3 x %4] + + + X + X + + + Y + Y + + + Width + Ширина + + + Height + Висота + + + + QtRectPropertyManager + + [(%1, %2), %3 x %4] + [(%1, %2), %3 x %4] + + + X + X + + + Y + Y + + + Width + Ширина + + + Height + Висота + + + + QtResourceEditorDialog + + Dialog + Діалог + + + New File + Новий файл + + + N + Н + + + Remove File + Видалити файл + + + R + В + + + I + Ф + + + New Resource + Новий ресурс + + + A + Д + + + Remove Resource or File + Видалити ресурс або файл + + + %1 already exists. +Do you want to replace it? + %1 вже існує. +Бажаєте замінити його? + + + The file does not appear to be a resource file; element '%1' was found where '%2' was expected. + Не схоже, що файл є файлом ресурсів, елемент '%1' було знайдено, замість '%2'. + + + %1 [read-only] + %1 [лише для читання] + + + %1 [missing] + %1 [відсутній] + + + <no prefix> + <без префіксу> + + + New Resource File + Новий файл ресурсів + + + Resource files (*.qrc) + Файли ресурсів (*.qrc) + + + Import Resource File + Імпортувати файл ресурсів + + + newPrefix + + + + <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> + <p><b>Попередження:</b> Файл</p><p>%1</p><p>знаходиться поза межами батьківської теки поточного файлу ресурсів.</p> + + + <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> + <p>Щоб вирішити цю проблему, натисніть:</p><table><tr><th align="left">Копіювати</th><td>, щоб скопіювати файл до батьківської теки файлу ресурсів.</td></tr><tr><th align="left">Копіювати як...</th><td>, щоб скопіювати файл в підтеку батьківської теки файлу ресурсів.</td></tr><tr><th align="left">Залишити</th><td>, щоб використовувати поточне розміщення.</td></tr></table> + + + Add Files + Додати файли + + + Incorrect Path + Неправильний шлях + + + Copy + Копіювати + + + Copy As... + Копіювати як... + + + Keep + Залишити + + + Skip + Пропустити + + + Clone Prefix + Префікс клонування + + + Enter the suffix which you want to add to the names of the cloned files. +This could for example be a language extension like "_de". + Введіть суфікс, який ви хочете додавати до імен клонованих файлів. +Це може бути, наприклад, мовне розширення, як "_uk". + + + Copy As + Копіювати як + + + <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> + <p>Обраний файл</p><p>%1</p><p>знаходиться поза межами батьківської теки поточного файлу ресурсів.</p><p>%2</p>Будь-ласка, оберіть інший шлях всередині цієї теки.<p><p> + + + Could not overwrite %1. + Неможливо перезаписати %1. + + + Could not copy +%1 +to +%2 + Неможливо копіювати +%1 +до +%2 + + + A parse error occurred at line %1, column %2 of %3: +%4 + Сталась помилка розбору в рядку %1, позиція %2 з %3 +%4 + + + Save Resource File + Зберегти файл ресурсів + + + Could not write %1: %2 + Неможливо записати %1: %2 + + + Edit Resources + Редагування ресурсів + + + New... + Новий... + + + Open... + Відкрити... + + + Open Resource File + Відкрити файл ресурсів + + + Remove + Видалити + + + Move Up + Пересунути вгору + + + Move Down + Пересунути вниз + + + Add Prefix + Додати префікс + + + Add Files... + Додати файли... + + + Change Prefix + Змінити префікс + + + Change Language + Змінити мову + + + Change Alias + Додати псевдонім + + + Clone Prefix... + Префікс клонування... + + + Prefix / Path + Префікс / Шлях + + + Language / Alias + Мова / Псевдонім + + + <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> + <html><p><b>Попередження:</b> Під час перезавантаження ресурсів виникли проблеми:</p><pre>%1</pre></html> + + + Resource Warning + Попередження про ресурси + + + + QtResourceView + + Size: %1 x %2 +%3 + Розмір: %1 x %2 +%3 + + + Edit Resources... + Редагувати ресурси... + + + Reload + Перезавантажити + + + Copy Path + Копіювати шлях + + + + QtResourceViewDialog + + Select Resource + Оберіть ресурс + + + + QtSizeFPropertyManager + + %1 x %2 + %1 x %2 + + + Width + Ширина + + + Height + Висота + + + + QtSizePolicyPropertyManager + + <Invalid> + <Неправильний> + + + [%1, %2, %3, %4] + [%1, %2, %3, %4] + + + Horizontal Policy + Горизонтальна політика + + + Vertical Policy + Вертикальна політика + + + Horizontal Stretch + Горизонтальне розтягування + + + Vertical Stretch + Вертикальне розтягування + + + + QtSizePropertyManager + + %1 x %2 + %1 x %2 + + + Width + Ширина + + + Height + Висота + + + + QtToolBarDialog + + Customize Toolbars + Налаштувати панелі інструментів + + + 1 + 1 + + + Actions + Дії + + + Toolbars + Панелі інструментів + + + Add new toolbar + Додати нову панель інструментів + + + New + Нова + + + Remove selected toolbar + Видалити виділену панель інструментів + + + Remove + Видалити + + + Rename toolbar + Перейменувати панель інструментів + + + Rename + Перейменувати + + + Move action up + Пересунути дію вгору + + + Up + Вгору + + + Remove action from toolbar + Видалити дію з панелі інструментів + + + <- + <- + + + Add action to toolbar + Додати дію до панелі інструментів + + + -> + -> + + + Move action down + Пересунути дію вниз + + + Down + Вниз + + + Current Toolbar Actions + Поточні дії панелі інструментів + + + Custom Toolbar + Користувацька панель інструментів + + + < S E P A R A T O R > + < Р О З Д І Л Ю В А Ч > + + + + QtTreePropertyBrowser + + Property + Властивість + + + Value + Значення + + + + SaveFormAsTemplate + + Save Form As Template + Зберегти форму як шаблон + + + &Name: + &Назва: + + + &Category: + &Категорія: + + + Add path... + Додати шлях... + + + Template Exists + Шаблон існує + + + A template with the name %1 already exists. +Do you want overwrite the template? + Шаблон з іменем %1 вже існує. +Бажаєте перезаписати його? + + + Overwrite Template + Перезаписати шаблон + + + Open Error + Помилка відкриття + + + There was an error opening template %1 for writing. Reason: %2 + Під час відкриття шаблону %1 для запису сталася помилка. Причина: %2 + + + Write Error + Помилка запису + + + There was an error writing the template %1 to disk. Reason: %2 + Під час запису шаблону %1 на диск сталася помилка. Причина: %2 + + + Pick a directory to save templates in + Виберіть теку для збереження шаблонів + + + + ScriptErrorDialog + + An error occurred while running the scripts for "%1": + + Під час виконання скриптів для "%1" сталася помилка: + + + + + SelectSignalDialog + + Go to slot + Перейти до слота + + + Select signal + Оберіть сигнал + + + signal + сигнал + + + class + клас + + + + SignalSlotConnection + + SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) + НАДСИЛАЧ(%1), СИГНАЛ(%2), ОТРИМУВАЧ(%3), СЛОТ(%4) + + + + SignalSlotDialogClass + + Signals and slots + Сигнали та слоти + + + Slots + Слоти + + + Add + Додати + + + ... + ... + + + Delete + Видалити + + + Signals + Сигнали + + + + Spacer + + Horizontal Spacer '%1', %2 x %3 + Горизонтальний роздільник '%1', %2 x %3 + + + Vertical Spacer '%1', %2 x %3 + Вертикальний роздільник '%1', %2 x %3 + + + + TemplateOptionsPage + + Template Paths + Tab in preferences dialog + Шляхи до шаблонів + + + + ToolBarManager + + Configure Toolbars... + Налаштувати панелі інструментів... + + + Window + Вікно + + + Help + Довідка + + + Style + Стиль + + + Dock views + Прикріплюванні панелі + + + File + Файл + + + Edit + Правка + + + Tools + Інструменти + + + Form + Форма + + + Toolbars + Панелі інструментів + + + + VersionDialog + + <h3>%1</h3><br/><br/>Version %2 + <h3>%1</h3><br/><br/>Версія %2 + + + Qt Designer + Qt Designer + + + <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> + <br/>Qt Designer - це дизайнер графічного інтерфейсу користувача для програм Qt.<br/> + + + %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + %1<br/>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії. + + + + VideoPlayerTaskMenu + + Available Mime Types + Доступні типи MIME + + + Display supported mime types... + Показати підтримувані типи MIME... + + + Load... + Завантажити... + + + Play + Грати + + + Pause + Пауза + + + Stop + Зупинити + + + Choose Video Player Media Source + Оберіть джерело медіа для відеопрогравача + + + An error has occurred in '%1': %2 + Сталась помилка в '%1': %2 + + + Video Player Error + Помилка відеопрогравача + + + + WidgetDataBase + + The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. + Цей файл містить користувацький віджет '%1', чий базовий клас (%2) відрізняється від поточного елементу в базі даних віджетів (%3). Базу даних віджетів залишено без змін. + + + + qdesigner_internal::ActionEditor + + New... + Новий... + + + Edit... + Редагувати... + + + Go to slot... + Перейти до слота... + + + Copy + Копіювати + + + Cut + Вирізати + + + Paste + Вставити + + + Select all + Виділити все + + + Delete + Видалити + + + Actions + Дії + + + Configure Action Editor + Налаштувати редактор дій + + + Icon View + Значками + + + Detailed View + Детально + + + New action + Нова дія + + + Edit action + Редагувати дію + + + Remove action '%1' + Видалити дію '%1' + + + Remove actions + Видалити дії + + + Used In + Використовується в + + + + qdesigner_internal::ActionModel + + Name + Назва + + + Used + Використовується + + + Text + Текст + + + Shortcut + Поєднання клавіш + + + Checkable + Прапорець + + + ToolTip + Спливаюча підказка + + + + qdesigner_internal::BrushManagerProxy + + The element '%1' is missing the required attribute '%2'. + У елемента '%1' відсутній обов'язковий атрибут '%2'. + + + Empty brush name encountered. + Знайдено порожня назва пензля. + + + An unexpected element '%1' was encountered. + Знайдено неочікуваний елемент '%1'. + + + An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 + Під час читання файлу опису пензля '%1' сталася помилка в рядку %2, позиція %3: %4 + + + An error occurred when reading the resource file '%1' at line %2, column %3: %4 + Під час читання файлу ресурсів '%1' сталася помилка в рядку %2, позиція %3: %4 + + + + qdesigner_internal::BuddyEditor + + Add buddy + Додати прив'язку + + + Remove buddies + Видалити прив'язки + + + Remove %n buddies + + Видалити %n прив'язку + Видалити %n прив'язки + Видалити %n прив'язок + + + + Add %n buddies + + Додати %n прив'язку + Додати %n прив'язки + Додати %n прив'язок + + + + Set automatically + Встановити автоматично + + + + qdesigner_internal::BuddyEditorPlugin + + Edit Buddies + Редагувати прив'язки + + + + qdesigner_internal::BuddyEditorTool + + Edit Buddies + Редагувати прив'язки + + + + qdesigner_internal::ButtonGroupMenu + + Select members + Обрати членів + + + Break + Розбити + + + + qdesigner_internal::ButtonTaskMenu + + Assign to button group + Призначити до групи кнопок + + + Button group + Група кнопок + + + New button group + Нова група кнопок + + + Change text... + Змінити текст... + + + None + Немає + + + Button group '%1' + Група кнопок '%1' + + + + qdesigner_internal::CodeDialog + + Save... + Зберегти... + + + Copy All + Копіювати все + + + &Find in Text... + &Знайти в тексті... + + + A temporary form file could not be created in %1. + Неможливо створити тимчасовий файл форми в %1. + + + The temporary form file %1 could not be written. + Неможливо записати тимчасовий файл форми %1. + + + %1 - [Code] + %1 - [код] + + + Save Code + Зберегти код + + + Header Files (*.%1) + Файли заголовків (*.%1) + + + The file %1 could not be opened: %2 + Неможливо відкрити файл %1: %2 + + + The file %1 could not be written: %2 + Неможливо записати файл %1: %2 + + + %1 - Error + %1 - Помилка + + + + qdesigner_internal::ColorAction + + Text Color + Колір тексту + + + + qdesigner_internal::ComboBoxTaskMenu + + Edit Items... + Редагувати елементи... + + + Change Combobox Contents + Змінити зміст випадаючого списку + + + + qdesigner_internal::CommandLinkButtonTaskMenu + + Change description... + Змінити опис... + + + + qdesigner_internal::ConnectionEdit + + Select All + Виділити все + + + Deselect All + Зняти виділення + + + Delete + Видалити + + + + qdesigner_internal::ConnectionModel + + Sender + Надсилач + + + Signal + Сигнал + + + Receiver + Отримувач + + + Slot + Слот + + + <sender> + <надсилач> + + + <signal> + <сигнал> + + + <receiver> + <отримувач> + + + <slot> + <слот> + + + The connection already exists!<br>%1 + З'єднання вже існує!<br>%1 + + + Signal and Slot Editor + Редактор сигналів та слотів + + + + qdesigner_internal::ContainerWidgetTaskMenu + + Delete + Видалити + + + Insert + Вставити + + + Insert Page Before Current Page + Вставити сторінку перед поточною сторінкою + + + Insert Page After Current Page + Вставити сторінку після поточної сторінки + + + Add Subwindow + Додати підвікно + + + Subwindow + Підвікно + + + Page + Сторінка + + + Page %1 of %2 + Сторінка %1 з %2 + + + + qdesigner_internal::DPI_Chooser + + System (%1 x %2) + System resolution + Системна (%1 x %2) + + + User defined + Визначена користувачем + + + x + DPI X/Y separator + x + + + + qdesigner_internal::DesignerPropertyManager + + AlignLeft + Вліво + + + AlignHCenter + По центру + + + AlignRight + Вправо + + + AlignJustify + По ширині + + + AlignTop + Догори + + + AlignVCenter + По центру + + + AlignBottom + Донизу + + + %1, %2 + %1, %2 + + + Customized (%n roles) + + Користувацька (%n роль) + Користувацька (%n ролі) + Користувацька (%n ролей) + + + + Inherited + Успадкована + + + Horizontal + Горизонтальне + + + Vertical + Вертикальне + + + Normal Off + Нормальний, вимк + + + Normal On + Нормальний, увімк + + + Disabled Off + Вимкнений, вимк + + + Disabled On + Вимкнений, увімк + + + Active Off + Активний, вимк + + + Active On + Активний, увімк + + + Selected Off + Обраний, вимк + + + Selected On + Обраний, увімк + + + translatable + перекладати + + + disambiguation + уточнення + + + comment + коментар + + + + qdesigner_internal::DeviceProfileDialog + + Device Profiles (*.%1) + Профілі пристроїв (*.%1) + + + Default + Типовий + + + Save Profile + Зберегти профіль + + + Save Profile - Error + Збереження профілю - Помилка + + + Unable to open the file '%1' for writing: %2 + Неможливо відкрити файл '%1' для запису: %2 + + + Open profile + Відкрити профіль + + + Open Profile - Error + Відкриття профілю - Помилка + + + Unable to open the file '%1' for reading: %2 + Неможливо відкрити файл '%1' для читання: %2 + + + '%1' is not a valid profile: %2 + '%1' не є правильним профілем: %2 + + + + qdesigner_internal::Dialog + + Dialog + Діалог + + + StringList + Список рядків + + + New String + Новий рядок + + + &New + &Новий + + + Delete String + Видалити рядок + + + &Delete + Ви&далити + + + &Value: + &Значення: + + + Move String Up + Пересунути рядок вгору + + + Up + Вгору + + + Move String Down + Пересунути рядок донизу + + + Down + Вниз + + + + qdesigner_internal::EmbeddedOptionsControl + + None + Немає + + + Add a profile + Додати профіль + + + Edit the selected profile + Редагувати виділений профіль + + + Delete the selected profile + Видалити виділений профіль + + + Add Profile + Додати профіль + + + New profile + Новий профіль + + + Edit Profile + Редагувати профіль + + + Delete Profile + Видалити профіль + + + Would you like to delete the profile '%1'? + Бажаєте видалити профіль '%1'? + + + Default + Типовий + + + + qdesigner_internal::FilterWidget + + Filter + Фільтр + + + Clear text + Очистити текст + + + + qdesigner_internal::FormEditor + + Resource File Changed + Файли ресурсів було змінено + + + The file "%1" has changed outside Designer. Do you want to reload it? + Файл "%1" було змінено поза Qt Designer. Бажаєте перезавантажити його? + + + + qdesigner_internal::FormLayoutMenu + + Add form layout row... + Додати рядок до розташування формою... + + + + qdesigner_internal::FormWindow + + Edit contents + Редагувати зміст + + + F2 + + + + Insert widget '%1' + Вставити віджет '%1' + + + Resize + Змінити розмір + + + Key Resize + Зміна розміру клавішею + + + Key Move + Переміщення клавішею + + + Paste %n action(s) + + Вставити %n дію + Вставити %n дії + Вставити %n дій + + + + Paste %n widget(s) + + Вставити %n віджет + Вставити %n віджети + Вставити %n віджетів + + + + Paste (%1 widgets, %2 actions) + Вставити (%1 віджетів, %2 дії) + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. + Неможливо вставити віджети. Qt Designer не зміг знайти контейнер без розташування для вставки. + + + Break the layout of the container you want to paste into, select this container and then paste again. + Розбийте розташування контейнеру, в який ви бажаєте вставити, виділіть цей контейнер та вставте знову. + + + Paste error + Помилка вставки + + + Raise widgets + Підняти віджети + + + Lower widgets + Опустити віджети + + + Select Ancestor + Обрати предка + + + Lay out + Розташування + + + Drop widget + Кинути віджет + + + A QMainWindow-based form does not contain a central widget. + Форма, що базується на QMainWindow не містить центрального віджета. + + + + qdesigner_internal::FormWindowBase + + Delete '%1' + Видалити '%1' + + + Delete + Видалити + + + + qdesigner_internal::FormWindowManager + + Cu&t + Вирі&зати + + + Cuts the selected widgets and puts them on the clipboard + Вирізає виділені віджети та розміщує їх в буфері обміну + + + &Copy + &Копіювати + + + Copies the selected widgets to the clipboard + Копіює виділені віджети до буферу обміну + + + &Paste + &Вставити + + + Pastes the clipboard's contents + Вставляє зміст буферу обміну + + + &Delete + Ви&далити + + + Deletes the selected widgets + Видаляє виділені віджети + + + Select &All + Виділити в&се + + + Selects all widgets + Виділяє усі віджети + + + Bring to &Front + На &передній план + + + Raises the selected widgets + Піднімає виділені віджети + + + Send to &Back + На зад&ній план + + + Lowers the selected widgets + Опускає виділені віджети + + + Adjust &Size + Підігнати &розмір + + + Adjusts the size of the selected widget + Підганяє розмір виділених віджетів + + + Lay Out &Horizontally + Розташувати &горизонтально + + + Lays out the selected widgets horizontally + Розташовує виділені віджети горизонтально + + + Lay Out &Vertically + Розташувати &вертикально + + + Lays out the selected widgets vertically + Розташовує виділені віджети вертикально + + + Lay Out in a &Form Layout + Розташувати по &формі + + + Lays out the selected widgets in a form layout + Розташовує виділені віджети по формі + + + Lay Out in a &Grid + Розташувати, використовуючи &сітку + + + Lays out the selected widgets in a grid + Розташовує виділені віджети по сітці + + + Lay Out Horizontally in S&plitter + Розташувати г&оризонтально з розділювачем + + + Lays out the selected widgets horizontally in a splitter + Розташовує виділені віджети горизонтально з розділювачем + + + Lay Out Vertically in Sp&litter + Розташувати в&ертикально з розділювачем + + + Lays out the selected widgets vertically in a splitter + Розташовує виділені віджети вертикально з розділювачем + + + &Break Layout + Розби&ти розташування + + + Breaks the selected layout + Розбиває виділено розташування + + + Si&mplify Grid Layout + Спро&щене розташування по сітці + + + Removes empty columns and rows + Видаляє пусті рядки та колонки + + + &Preview... + Попередній перегля&д... + + + Preview current form + Попередній перегляд поточної форми + + + Form &Settings... + Нала&штування форми... + + + Break Layout + Розбити розташування + + + Adjust Size + Підігнати розмір + + + Could not create form preview + Title of warning message box + Неможливо створити попередній перегляд форми + + + Form Settings - %1 + Налаштування форми - %1 + + + + qdesigner_internal::FormWindowSettings + + None + Немає + + + Device Profile: %1 + Профіль пристрою: %1 + + + + qdesigner_internal::GridPanel + + Form + Форма + + + Grid + Сітка + + + Visible + Видима + + + Grid &X + Сітка &X + + + Snap + Прив'язка + + + Reset + Скинути + + + Grid &Y + Сітка &Y + + + + qdesigner_internal::GroupBoxTaskMenu + + Change title... + Змінити заголовок... + + + + qdesigner_internal::HtmlTextEdit + + Insert HTML entity + Вставити елемент HTML + + + + qdesigner_internal::IconSelector + + The pixmap file '%1' cannot be read. + Неможливо прочитати файл растрового зображення '%1'. + + + The file '%1' does not appear to be a valid pixmap file: %2 + Файл '%1' не схожий на правильний файл растрового зображення: %2 + + + The file '%1' could not be read: %2 + Неможливо прочитати файл '%1': %2 + + + Choose a Pixmap + Оберіть растрове зображення + + + Pixmap Read Error + Помилка читання растрового зображення + + + ... + ... + + + Normal Off + Нормальний, вимк + + + Normal On + Нормальний, увімк + + + Disabled Off + Вимкнений, вимк + + + Disabled On + Вимкнений, увімк + + + Active Off + Активний, вимк + + + Active On + Активний, увімк + + + Selected Off + Обраний, вимк + + + Selected On + Обраний, увімк + + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + Reset + Скинути + + + Reset All + Скинути все + + + + qdesigner_internal::ItemListEditor + + Items List + Список елементів + + + New Item + Новий елемент + + + &New + &Новий + + + Delete Item + Видалити елемент + + + &Delete + Ви&далити + + + Move Item Up + Пересунути елемент вгору + + + U + В + + + Move Item Down + Пересунути елемент вниз + + + D + Н + + + Properties &>> + Властивост&і >> + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::LabelTaskMenu + + Change rich text... + Змінити форматований текст... + + + Change plain text... + Змінити простий текст... + + + + qdesigner_internal::LanguageResourceDialog + + Choose Resource + Оберіть ресурс + + + + qdesigner_internal::LineEditTaskMenu + + Change text... + Змінити текст... + + + + qdesigner_internal::ListWidgetEditor + + New Item + Новий елемент + + + Edit List Widget + Редагування віджета "Список" + + + Edit Combobox + Редагування віджета "Випадаючий список" + + + + qdesigner_internal::ListWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + Change List Contents + Змінити зміст списку + + + + qdesigner_internal::MdiContainerWidgetTaskMenu + + Next Subwindow + Наступне підвікно + + + Previous Subwindow + Попереднє підвікно + + + Tile + Плиткою + + + Cascade + Каскадом + + + + qdesigner_internal::MenuTaskMenu + + Remove + Видалити + + + + qdesigner_internal::MorphMenu + + Morph into + Перетворити на + + + + qdesigner_internal::NewActionDialog + + New Action... + Нова дія... + + + &Text: + &Текст: + + + Object &name: + &Ім'я об'єкта: + + + &Icon: + &Значок: + + + Shortcut: + Поєднання клавіш: + + + Checkable: + Прапорець: + + + ToolTip: + Спливаюча підказка: + + + ... + ... + + + + qdesigner_internal::NewDynamicPropertyDialog + + Create Dynamic Property + Створити динамічну властивість + + + Property Name + Ім'я властивості + + + horizontalSpacer + + + + Property Type + Тип властивості + + + Set Property Name + Встановіть ім'я властивості + + + The current object already has a property named '%1'. +Please select another, unique one. + Поточний об'єкт вже має властивість з іменем '%1'. +Будь-ласка, оберіть інше, унікальне ім'я. + + + The '_q_' prefix is reserved for the Qt library. +Please select another name. + Префікс '_q_' зарезервовано для бібліотеки Qt. +Будь-ласка, оберіть інше ім'я. + + + + qdesigner_internal::NewFormWidget + + 0 + 0 + + + Choose a template for a preview + Оберіть шаблон для попереднього перегляду + + + Embedded Design + Дизайн для портативних пристроїв + + + Device: + Пристрій: + + + Screen Size: + Розмір екрану: + + + Default size + Типовий розмір + + + QVGA portrait (240x320) + QVGA книжкою (240x320) + + + QVGA landscape (320x240) + QVGA альбомом (320x240) + + + VGA portrait (480x640) + VGA книжкою (480x640) + + + VGA landscape (640x480) + VGA альбомом (640x480) + + + Widgets + New Form Dialog Categories + Віджети + + + Custom Widgets + Віджети користувача + + + None + Немає + + + Error loading form + Помилка завантаження форми + + + Unable to open the form template file '%1': %2 + Неможливо відкрити файл шаблону форми '%1': %2 + + + Internal error: No template selected. + Внутрішня помилка. Не обрано шаблон. + + + + qdesigner_internal::NewPromotedClassPanel + + Add + Додати + + + New Promoted Class + Новий перетворений клас + + + Base class name: + Ім'я базового класу: + + + Promoted class name: + Ім'я перетвореного класу: + + + Header file: + Файл заголовків: + + + Global include + Глобальне включення + + + Reset + Скинути + + + + qdesigner_internal::ObjectInspector + + Change Current Page + Змінити поточну сторінку + + + &Find in Text... + &Знайти в тексті... + + + + qdesigner_internal::OrderDialog + + Change Page Order + Змінити порядок сторінок + + + Page Order + Порядок сторінок + + + Move page up + Пересунути сторінку вгору + + + Move page down + Пересунути сторінку вниз + + + Index %1 (%2) + Індекс %1 (%2) + + + %1 %2 + %1 %2 + + + + qdesigner_internal::PaletteEditor + + Edit Palette + Редагувати палітру + + + Tune Palette + Налаштувати палітру + + + Show Details + Показати деталі + + + Compute Details + Розраховувати деталі + + + Quick + Швидко + + + Preview + Попередній перегляд + + + Disabled + Вимкнений + + + Inactive + Неактивний + + + Active + Активний + + + + qdesigner_internal::PaletteEditorButton + + Change Palette + Змінити палітру + + + + qdesigner_internal::PaletteModel + + Color Role + Кольорова роль + + + Active + Активна + + + Inactive + Неактивний + + + Disabled + Вимкнений + + + + qdesigner_internal::PixmapEditor + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + Copy Path + Копіювати шлях + + + Paste Path + Вставити шлях + + + ... + ... + + + + qdesigner_internal::PlainTextEditorDialog + + Edit text + Редагувати текст + + + + qdesigner_internal::PluginDialog + + Components + Компоненти + + + Plugin Information + Інформація про додаток + + + Refresh + Оновити + + + Scan for newly installed custom widget plugins. + Шукати нові встановлені додатки користувацьких віджетів. + + + Qt Designer couldn't find any plugins + Qt Designer не зміг знайти жодного додатку + + + Qt Designer found the following plugins + Qt Designer знайшов наступні додатки + + + New custom widget plugins have been found. + Були знайдені нові додатки користувацьких віджетів. + + + + qdesigner_internal::PreviewActionGroup + + %1 Style + Стиль %1 + + + + qdesigner_internal::PreviewConfigurationWidget + + Default + Типово + + + None + Немає + + + Browse... + Огляд... + + + Load Custom Device Skin + Завантажити користувацьку обкладинку пристрою + + + All QVFB Skins (*.%1) + Усі обкладинки QVFB (*.%1) + + + %1 - Duplicate Skin + %1 - Обкладинка-дублікат + + + The skin '%1' already exists. + Обкладинка '%1' вже існує. + + + %1 - Error + %1 - Помилка + + + %1 is not a valid skin directory: +%2 + %1 не є правильною текою обкладинки: +%2 + + + + qdesigner_internal::PreviewDeviceSkin + + &Portrait + Книжка + + + Landscape (&CCW) + Rotate form preview counter-clockwise + Альбом (проти ГС) + + + &Landscape (CW) + Rotate form preview clockwise + Альбом (за ГС) + + + &Close + Закрити + + + + qdesigner_internal::PreviewManager + + %1 - [Preview] + %1 - [Перегляд] + + + + qdesigner_internal::PreviewMdiArea + + The moose in the noose +ate the goose who was loose. + Palette editor background + Кричав Архип, Архип охрип, +Не треба Архипу кричати до хрипу. + + + + qdesigner_internal::PreviewWidget + + Preview Window + Вікно попереднього перегляду + + + LineEdit + Поле введення + + + ComboBox + Випадаючий список + + + PushButton + Кнопка + + + ButtonGroup2 + Група кнопок 2 + + + CheckBox1 + Прапорець 1 + + + CheckBox2 + Прапорець 2 + + + ButtonGroup + Група кнопок + + + RadioButton1 + Перемикач 1 + + + RadioButton2 + Перемикач 2 + + + RadioButton3 + Перемикач 3 + + + + qdesigner_internal::PromotionModel + + Name + Назва + + + Header file + Файл заголовків + + + Global include + Глобальне включення + + + Usage + Використання + + + + qdesigner_internal::PromotionTaskMenu + + Promoted widgets... + Перетворені віджети... + + + Promote to ... + Перетворити на... + + + Change signals/slots... + Змінити сигнали/слоти... + + + Promote to + Перетворити на + + + Demote to %1 + Перетворити на %1 + + + + qdesigner_internal::PropertyEditor + + Add Dynamic Property... + Додати динамічну властивість... + + + Remove Dynamic Property + Видалити динамічну властивість + + + Sorting + Сортування + + + Color Groups + Групи кольорів + + + Tree View + Деревом + + + Drop Down Button View + Випадаючим списком + + + String... + Рядки... + + + Bool... + Булева... + + + Other... + Інше... + + + Configure Property Editor + Налаштувати редактор властивостей + + + Object: %1 +Class: %2 + Об'єкт: %1 +Клас: %2 + + + + qdesigner_internal::PropertyLineEdit + + Insert line break + Insert розрив рядка + + + + qdesigner_internal::QDesignerPromotionDialog + + Promoted Widgets + Перетворені віджети + + + Promoted Classes + Перетворені класи + + + Promote + Перетворити + + + Change signals/slots... + Змінити сигнали/слоти... + + + %1 - Error + %1 - Помилка + + + + qdesigner_internal::QDesignerResource + + Loading qrc file + Завантаження файлу qrc + + + The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> + Неможливо знайти вказаний файл qrc <p><b>%1</b></p><p>. Бажаєте оновити розташування файлу?</p> + + + New location for %1 + Нове розташування для %1 + + + Resource files (*.qrc) + Файли ресурсів (*.qrc) + + + + qdesigner_internal::QDesignerTaskMenu + + Change objectName... + Змінити objectName... + + + Change toolTip... + Змінити toolTip... + + + Change whatsThis... + Змінити whatsThis... + + + Change styleSheet... + Змінити styleSheet... + + + Create Menu Bar + Створити панель меню + + + Add Tool Bar + Додати панель інструментів + + + Create Status Bar + Створити рядок статусу + + + Remove Status Bar + Видалити рядок статусу + + + Change script... + Змінити скрипт... + + + Change signals/slots... + Змінити сигнали/слоти... + + + Go to slot... + Перейти до слота... + + + Size Constraints + Обмеження розміру + + + Set Minimum Width + Встановити мінімальну ширину + + + Set Minimum Height + Встановити мінімальну висоту + + + Set Minimum Size + Встановити мінімальний розмір + + + Set Maximum Width + Встановити максимальну ширину + + + Set Maximum Height + Встановити максимальну висоту + + + Set Maximum Size + Встановити максимальний розмір + + + Edit ToolTip + Редагувати спливаючу підказку + + + Edit WhatsThis + Редагування підказки "Що це?" + + + no signals available + немає доступних сигналів + + + Set size constraint on %n widget(s) + + Встановити обмеження розміру для %n віджета + Встановити обмеження розміру для %n віджетів + Встановити обмеження розміру для %n віджетів + + + + + qdesigner_internal::QDesignerWidgetBox + + Unexpected element <%1> + Неочікуваний елемент <%1> + + + A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 +%5 + Під час розбору XML коду, вказаного для віджета %3, сталась помилка в рядку %1, позиція %2: %4 +%5 + + + The XML code specified for the widget %1 does not contain any widget elements. +%2 + XML код, вказаний для віджета %1, не містить жодного елемента віджета. +%2 + + + An error has been encountered at line %1 of %2: %3 + Сталась помилка в рядку %1 з %2: %3 + + + Unexpected element <%1> encountered when parsing for <widget> or <ui> + Під час розбору <widget> або <ui> було знайдено неочікуваний елемент <%1> + + + Unexpected end of file encountered when parsing widgets. + Під час розбору віджетів несподівано закінчився файл. + + + A widget element could not be found. + Неможливо знайти елемент віджета. + + + + qdesigner_internal::QtGradientStopsController + + H + H + + + S + S + + + V + V + + + Hue + Відтінок + + + Sat + Насиченість + + + Val + Значення + + + Saturation + Насиченість + + + Value + Значення + + + R + R + + + G + G + + + B + B + + + Red + Червоний + + + Green + Зелений + + + Blue + Блакитний + + + + qdesigner_internal::RichTextEditorDialog + + Edit text + Редагувати текст + + + Rich Text + Форматований текст + + + Source + Код + + + &OK + &OK + + + &Cancel + &Скасувати + + + + qdesigner_internal::RichTextEditorToolBar + + Bold + Жирний + + + CTRL+B + + + + Italic + Курсив + + + CTRL+I + + + + Underline + Підкреслений + + + CTRL+U + + + + Left Align + Вліво + + + Center + По центру + + + Right Align + Вправо + + + Justify + По ширині + + + Superscript + Верхній індекс + + + Subscript + Нижній індекс + + + Insert &Link + Вставити &посилання + + + Insert &Image + Вставити &зображення + + + + qdesigner_internal::ScriptDialog + + Edit script + Редагування скрипту + + + <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. + <html>Введіть фрагмент коду Qt Script, що має виконуватись під час завантаження форми.<br>Віджет та його діти доступні через змінні <i>widget</i> та <i>childWidgets</i>, відповідно. + + + Syntax error + Синтаксична помилка + + + + qdesigner_internal::ScriptErrorDialog + + Script errors + Помилки скрипту + + + + qdesigner_internal::SignalSlotDialog + + There is already a slot with the signature '%1'. + Вже існує слот з сигнатурою '%1'. + + + There is already a signal with the signature '%1'. + Вже існує сигнал з сигнатурою '%1'. + + + %1 - Duplicate Signature + %1 - Повторна сигнатура + + + Signals/Slots of %1 + Сигнали/слоти %1 + + + + qdesigner_internal::SignalSlotEditorPlugin + + Edit Signals/Slots + Редагувати сигнали/слоти + + + F4 + F4 + + + + qdesigner_internal::SignalSlotEditorTool + + Edit Signals/Slots + Редагувати сигнали/слоти + + + + qdesigner_internal::StatusBarTaskMenu + + Remove + Видалити + + + + qdesigner_internal::StringListEditorButton + + Change String List + Змінити список рядків + + + + qdesigner_internal::StyleSheetEditorDialog + + Valid Style Sheet + Коректна таблиця стилів + + + Add Resource... + Додати ресурс... + + + Add Gradient... + Додати градієнт... + + + Add Color... + Додати колір... + + + Add Font... + Додати шрифт... + + + Edit Style Sheet + Редагувати таблицю стилів + + + Invalid Style Sheet + Неправильна таблиця стилів + + + + qdesigner_internal::TabOrderEditor + + Start from Here + Почати звідси + + + Restart + Почати спочатку + + + Tab Order List... + Список порядку обходу... + + + Tab Order List + Список порядку обходу + + + Tab Order + Порядок обходу + + + + qdesigner_internal::TabOrderEditorPlugin + + Edit Tab Order + Редагувати порядок обходу + + + + qdesigner_internal::TabOrderEditorTool + + Edit Tab Order + Редагувати порядок обходу + + + + qdesigner_internal::TableWidgetEditor + + Edit Table Widget + Редагування віджета "Таблиця" + + + &Items + &Елементи + + + Table Items + Елементи таблиці + + + Properties &>> + Властивост&і >> + + + New Column + Новий стовпчик + + + New Row + Новий рядок + + + &Columns + &Стовпці + + + &Rows + &Рядки + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::TableWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + + qdesigner_internal::TemplateOptionsWidget + + Form + Форма + + + Additional Template Paths + Додаткові шляхи до шаблонів + + + ... + ... + + + Pick a directory to save templates in + Виберіть теку для збереження шаблонів + + + + qdesigner_internal::TextEditTaskMenu + + Edit HTML + Редагувати HTML + + + Change HTML... + Змінити HTML... + + + Edit Text + Редагувати текст + + + Change Plain Text... + Змінити простий текст... + + + + qdesigner_internal::TextEditor + + Choose Resource... + Оберіть ресурс... + + + Choose File... + Оберіть файл... + + + ... + ... + + + Choose a File + Оберіть файл + + + + qdesigner_internal::ToolBarEventFilter + + Insert Separator before '%1' + Вставити розділювач перед %1 + + + Append Separator + Приєднати розділювач + + + Remove action '%1' + Видалити дію '%1' + + + Remove Toolbar '%1' + Видалити панель інструментів '%1' + + + Insert Separator + Вставити розділювач + + + + qdesigner_internal::TreeWidgetEditor + + Edit Tree Widget + Редагування віджета "Дерево" + + + &Items + &Елементи + + + Tree Items + Елементи дерева + + + 1 + 1 + + + New Item + Новий елемент + + + &New + &Новий + + + New Subitem + Новий піделемент + + + New &Subitem + Новий &піделемент + + + Delete Item + Видалити елемент + + + &Delete + Ви&далити + + + Move Item Left (before Parent Item) + Пересунути елемент вліво (перед батьківським) + + + L + Л + + + Move Item Right (as a First Subitem of the Next Sibling Item) + Пересунути елемент вправо (як перший піделемент наступного сусіда) + + + R + П + + + Move Item Up + Пересунути елемент вгору + + + U + В + + + Move Item Down + Пересунути елемент вниз + + + D + Н + + + Properties &>> + Властивост&і >> + + + New Column + Новий стовпчик + + + &Columns + &Стовпці + + + Per column properties + Властивості стовпця + + + Common properties + Загальні властивості + + + Properties &<< + Властивост&і << + + + + qdesigner_internal::TreeWidgetTaskMenu + + Edit Items... + Редагувати елементи... + + + + qdesigner_internal::WidgetBox + + Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. + Попередження: Збій створення віджета в панелі віджетів. Причиною цього може бути неправильний XML користувацького віджета. + + + + qdesigner_internal::WidgetBoxTreeWidget + + Scratchpad + Нотатник + + + Custom Widgets + Віджети користувача + + + Expand all + Розгорнути все + + + Collapse all + Згорнути все + + + List View + Списком + + + Icon View + Значками + + + Remove + Видалити + + + Edit name + Редагувати ім'я + + + + qdesigner_internal::WidgetDataBase + + A custom widget plugin whose class name (%1) matches that of an existing class has been found. + Користувацький додаток віджета з іменем класу (%1) співпадає з існуючим класом. + + + + qdesigner_internal::WidgetEditorTool + + Edit Widgets + Редагувати віджети + + + + qdesigner_internal::WidgetFactory + + The custom widget factory registered for widgets of class %1 returned 0. + Користувацька фабрика віджетів, що зареєстрована для класу %1, повернула 0. + + + A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. + Сталося неспівпадіння імені класу під час створення віджета, використовуючи користувацьку фабрику віджетів, що зареєстрована для класу %1. Вона повернула віджет класу %2. + + + %1 Widget + Віджет %1 + + + The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. + Неможливо визначити поточну сторінку контейнера '%1' (%2) під час створення розташування. Це вказує на некоректність файлу UI, можливо, розташування було створене на контейнерному віджеті. + + + Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. +This indicates an inconsistency in the ui-file. + Спроба додати розташування для віджета '%1' (%2), який вже має некероване розташування %3. +Це вказує на некоректність в файлі UI. + + + Cannot create style '%1'. + Неможливо створити стиль '%1'. + + + + qdesigner_internal::WizardContainerWidgetTaskMenu + + Next + Далі + + + Back + Назад + + + + qdesigner_internal::ZoomMenu + + %1 % + Zoom factor + %1 % + + + + qdesigner_internal::ZoomablePreviewDeviceSkin + + &Zoom + Масштаб + + + diff --git a/translations/linguist_uk.ts b/translations/linguist_uk.ts new file mode 100644 index 0000000..92d16dd --- /dev/null +++ b/translations/linguist_uk.ts @@ -0,0 +1,1602 @@ + + + + + AboutDialog + + Qt Linguist + Qt Linguist + + + + BatchTranslationDialog + + Qt Linguist - Batch Translation + Qt Linguist - Пакетний переклад + + + Options + Опції + + + Set translated entries to finished + Помічати перекладені елементи як завершені + + + Retranslate entries with existing translation + Повторно перекласти елементи, що вже мають переклад + + + Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked + Майте на увазі, що модифіковані елементи будуть помічені як незавершені, якщо параметр 'Помічати перекладені елементи як завершені' вимкнено + + + Translate also finished entries + Перекладати також завершені елементи + + + Phrase book preference + Використання глосарію + + + Move up + Вгору + + + Move down + Вниз + + + The batch translator will search through the selected phrase books in the order given above + Пакетний перекладач буде шукати серед обраних глосаріїв у вказаному вище порядку + + + &Run + &Запустити + + + Cancel + Скасувати + + + Batch Translation of '%1' - Qt Linguist + Пакетний переклад '%1' - Qt Linguist + + + Searching, please wait... + Здійснюється пошук, будь-ласка, зачекайте... + + + &Cancel + &Скасувати + + + Linguist batch translator + Пакетний переклад Linguist'а + + + Batch translated %n entries + + Пакетно перекладено %n елемент + Пакетно перекладено %n елементи + Пакетно перекладено %n елементів + + + + + DataModel + + <qt>Duplicate messages found in '%1': + <qt>Повідомлення-дублікати знайдено в '%1': + + + <p>[more duplicates omitted] + <p>[решта дублікатів пропущено] + + + <p>* ID: %1 + <p>* ID: %1 + + + <p>* Context: %1<br>* Source: %2 + <p>* Контекст: %1<br>* Оригінал: %2 + + + <br>* Comment: %3 + <br>* Коментар: %3 + + + Linguist does not know the plural rules for '%1'. +Will assume a single universal form. + Linguist не знає правил множини для '%1'. +Буде застосована універсальна форма однини. + + + Cannot create '%2': %1 + Не можу створити '%2': %1 + + + Universal Form + Універсальна форма + + + + ErrorsView + + Accelerator possibly superfluous in translation. + В перекладі, можливо, пропущено акселератор. + + + Accelerator possibly missing in translation. + В перекладі, можливо, пропущено акселератор. + + + Translation does not end with the same punctuation as the source text. + Переклад не закінчується тим самим знаком пунктуації, що й оригінал. + + + A phrase book suggestion for '%1' was ignored. + Пропозицію глосарію для '%1' було проігноровано. + + + Translation does not refer to the same place markers as in the source text. + Переклад не містить тих самих маркерів позиції, що й оригінал. + + + Translation does not contain the necessary %n place marker. + Переклад не містить необхідних маркерів позиції %n. + + + Unknown error + Невідома помилка + + + + FindDialog + + Find + Знайти + + + This window allows you to search for some text in the translation source file. + Це вікно дозволяє вам шукати текст в файлі перекладу. + + + &Find what: + &Шукати: + + + Type in the text to search for. + Введіть текст для пошуку. + + + Options + Опції + + + Source texts are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед оригінальних текстів. + + + &Source texts + &Оригінальні тексти + + + Translations are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед перекладів. + + + &Translations + &Переклади + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Якщо відмічено, то рядки 'приклад' та 'прИкЛад' будуть вважатись різними. + + + &Match case + Враховувати &регістр + + + Comments and contexts are searched when checked. + Якщо відмічено, то пошук здійснюватиметься серед коментарів та контекстів. + + + &Comments + &Коментарі + + + Ignore &accelerators + Ігнорувати &акселератори + + + Click here to find the next occurrence of the text you typed in. + Клацніть тут, щоб знайти наступне співпадіння для введеного вами тексту. + + + Find Next + Знайти наступний + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Cancel + Скасувати + + + + Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog + Виберіть Правка|Пошук з головного меню чи натисніть Ctrl+F, щоб відкрити діалог пошуку + + + + + FormMultiWidget + + Alt+Delete + translate, but don't change + + + + Shift+Alt+Insert + translate, but don't change + + + + Alt+Insert + translate, but don't change + + + + Confirmation - Qt Linguist + Підтвердження - Qt Linguist + + + Delete non-empty length variant? + Видалити непустий варіант перекладу? + + + + LRelease + + Dropped %n message(s) which had no ID. + + Видалено %n повідомлення, яке не має ID. + Видалено %n повідомлення, які не мають ID. + Видалено %n повідомлень, які не мають ID. + + + + Excess context/disambiguation dropped from %n message(s). + + Видалено зайвий контекст/неоднозначність з %n повідомлення. + Видалено зайвий контекст/неоднозначність з %n повідомлень. + Видалено зайвий контекст/неоднозначність з %n повідомлень. + + + + Generated %n translation(s) (%1 finished and %2 unfinished) + + Згенеровано %n переклад (%1 завершено та %2 незавершено) + Згенеровано %n переклади (%1 завершено та %2 незавершено) + Згенеровано %n перекладів (%1 завершено та %2 незавершено) + + + + Ignored %n untranslated source text(s) + + Зігноровано %n неперекладений оригінальний текст + Зігноровано %n неперекладені оригінальні тексти + Зігноровано %n неперекладених оригінальних текстів + + + + + MainWindow + + MainWindow + Головне вікно + + + &Phrases + Фра&зи + + + &Close Phrase Book + &Закрити глосарій + + + &Edit Phrase Book + &Редагувати глосарій + + + &Print Phrase Book + &Друк глосарію + + + V&alidation + Перев&ірка + + + &View + &Вид + + + Vie&ws + &Види + + + &Toolbars + Панелі &інструментів + + + &Help + &Довідка + + + &Translation + Пере&клад + + + &File + &Файл + + + Recently Opened &Files + &Нещодавно відкриті файли + + + &Edit + &Правка + + + &Open... + &Відкрити... + + + Open a Qt translation source file (TS file) for editing + Відкрити файл перекладу Qt (файл TS) для редагування + + + Ctrl+O + + + + E&xit + Ви&йти + + + Close this window and exit. + Закрити вікно та вийти. + + + Ctrl+Q + + + + Save + Зберегти + + + Save changes made to this Qt translation source file + Зберегти зміни зроблені до цього файлу перекладу Qt + + + Save &As... + Зберегти &як... + + + Save As... + Зберегти як... + + + Save changes made to this Qt translation source file into a new file. + Зберегти зміни зроблені до цього файлу перекладу Qt до нового файлу. + + + Release + Скомпілювати + + + Create a Qt message file suitable for released applications from the current message file. + Створити файл повідомлень Qt придатний для використання програмами з поточного файлу повідомлень. + + + &Print... + &Друк... + + + Print a list of all the translation units in the current translation source file. + Друкувати список усіх елементів перекладу з поточного файлу перекладу. + + + Ctrl+P + + + + &Undo + &Повернути + + + Undo the last editing operation performed on the current translation. + Скасувати останню операцію редагування здійснену над поточним перекладом. + + + Ctrl+Z + + + + &Redo + П&овторити + + + Redo an undone editing operation performed on the translation. + Повторити скасовану операцію редагування здійснену над поточним перекладом. + + + Ctrl+Y + + + + Cu&t + Ви&різати + + + Copy the selected translation text to the clipboard and deletes it. + Копіювати виділений текст перекладу в буфер обміну та видалити його. + + + Ctrl+X + + + + &Copy + &Копіювати + + + Copy the selected translation text to the clipboard. + Копіювати виділений текст перекладу до буферу обміну. + + + Ctrl+C + + + + &Paste + &Вставити + + + Paste the clipboard text into the translation. + Вставити текст з буферу обміну до перекладу. + + + Ctrl+V + + + + Select &All + Виділити в&се + + + Select the whole translation text. + Виділити все текст перекладу. + + + Ctrl+A + + + + &Find... + &Знайти... + + + Search for some text in the translation source file. + Шукати деякий текст в файлі перекладу. + + + Ctrl+F + + + + Find &Next + Знайти &наступне + + + Continue the search where it was left. + Продовжити пошук з місця, де він був зупинений. + + + F3 + + + + &Prev Unfinished + &Попередній незавершений + + + Previous unfinished item + Попередній незавершений елемент + + + Move to the previous unfinished item. + Перейти до попереднього незавершеного елементу. + + + Ctrl+K + + + + &Next Unfinished + &Наступний незавершений + + + Next unfinished item + Наступний незавершений елемент + + + Move to the next unfinished item. + Перейти до наступного незавершеного елементу. + + + Ctrl+J + + + + P&rev + П&опередній + + + Move to previous item + Перейти до попереднього елементу + + + Move to the previous item. + Перейти до попереднього елементу. + + + Ctrl+Shift+K + + + + Ne&xt + Н&аступний + + + Next item + Наступний елемент + + + Move to the next item. + Перейти до наступного елементу. + + + Ctrl+Shift+J + + + + &Done and Next + &Готово і наступний + + + Mark item as done and move to the next unfinished item + Помітити елемент як завершений та перейти до наступного незавершеного елементу + + + Mark this item as done and move to the next unfinished item. + Помітити цей елемент як завершений та перейти до наступного незавершеного елементу. + + + Copy from source text + Копіювати з оригінального тексту + + + Copies the source text into the translation field + Копіює оригінальний текст в поле перекладу + + + Copies the source text into the translation field. + Копіює оригінальний текст в поле перекладу. + + + Ctrl+B + + + + &Accelerators + &Акселератори + + + Toggle the validity check of accelerators + Перемикання перевірки правильності акселераторів + + + Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. + Перемикання перевірки акселераторів, тобто чи співпадає кількість амперсандів в оригінальному та перекладеному тексті. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + &Ending Punctuation + &Кінцева пунктуація + + + Toggle the validity check of ending punctuation + Перемикання перевірки правильності кінцевої пунктуації + + + Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. + Перемикання перевірки кінцевої пунктуації. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + &Phrase matches + Співпадіння &фраз + + + Toggle checking that phrase suggestions are used + Перемикання перевірки, що пропозиції фраз були застосовані + + + Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. + Перемикання перевірки про використання запропонованих фраз. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + Place &Marker Matches + Співпадіння &маркерів положення + + + Toggle the validity check of place markers + Перемикання перевірки правильності маркерів розташування + + + Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. + Перемикання перевірки правильності маркерів розташування, тобто чи усі %1, %2, ... співпадають в оригінальному та перекладеному тексті. Якщо виявлено неспівпадіння, то у вікні попереджень буде показано повідомлення. + + + &New Phrase Book... + &Новий глосарій... + + + Create a new phrase book. + Створити новий глосарій. + + + Ctrl+N + + + + &Open Phrase Book... + &Відкрити глосарій... + + + Open a phrase book to assist translation. + Відкрити глосарій для допомоги в перекладі. + + + Ctrl+H + + + + &Reset Sorting + С&кинути сортування + + + Sort the items back in the same order as in the message file. + Сортувати елементи в тому ж порядку, що й в файлі повідомлень. + + + &Display guesses + &Показувати підказки + + + Set whether or not to display translation guesses. + Встановлює показувати чи ні підказки перекладу. + + + &Statistics + &Статистика + + + Display translation statistics. + Показати статистку перекладу. + + + &Manual + &Посібник + + + F1 + + + + About Qt Linguist + Про Qt Linguist + + + About Qt + Про Qt + + + Display information about the Qt toolkit by Nokia. + Показати інформацію про інструментарій Qt від Nokia. + + + &What's This? + &Що це? + + + What's This? + Що це? + + + Enter What's This? mode. + Перехід в режим "Що це?". + + + Shift+F1 + Shift+F1 + + + &Search And Translate... + Знайти &та перекласти... + + + Replace the translation on all entries that matches the search source text. + Замінити переклад усіх елементів, що співпадають з оригінальним текстом, що шукається. + + + &Batch Translation... + Пакетний перекла&д... + + + Batch translate all entries using the information in the phrase books. + Пакетно перекласти усі елементи використовуючи інформацію з глосаріїв. + + + Release As... + Скомпілювати як... + + + Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. + Створення файла повідомлень Qt придатного для використання програмами з поточного файлу повідомлень. Ім'я файла буде автоматично визначено з імені файлу TS. + + + File + Файл + + + Edit + Правка + + + Translation + Переклад + + + Validation + Перевірка + + + Help + Довідка + + + Open/Refresh Form &Preview + &Відкрити/оновити попередній перегляд форм + + + Form Preview Tool + Засіб попереднього перегляду форм + + + F5 + + + + Translation File &Settings... + Налаштування &файлу перекладу... + + + &Add to Phrase Book + Дод&ати до глосарію + + + Ctrl+T + + + + Open Read-O&nly... + Відкрити лише для &читання... + + + &Save All + &Зберегти усе + + + Ctrl+S + + + + &Release All + &Скомпілювати все + + + Close + Закрити + + + &Close All + З&акрити усе + + + Ctrl+W + + + + Length Variants + Варіанти перекладу + + + + This is the application's main window. + Це головне вікно програми. + + + + Source text + Оригінальний текст + + + Index + Індекс + + + Context + Контекст + + + Items + Елементи + + + This panel lists the source contexts. + В цій панелі перераховані оригінальні контексти. + + + Strings + Рядки + + + Phrases and guesses + Фрази та підказки + + + Sources and Forms + Коди та форми + + + Warnings + Попередження + + + MOD + status bar: file(s) modified + ЗМІ + + + Loading... + Завантажується... + + + Loading File - Qt Linguist + Завантаження файлу - Qt Linguist + + + The file '%1' does not seem to be related to the currently open file(s) '%2'. + +Close the open file(s) first? + Не схоже, що файл '%1' пов'язаний з жодним з відкритим зараз файлом '%2'. + +Закрити спочатку відкриті файли? + + + The file '%1' does not seem to be related to the file '%2' which is being loaded as well. + +Skip loading the first named file? + Не схоже, що файл '%1' пов'язаний з файлом '%2', що також завантажується. + +Пропустити завантаження першого вказаного файлу? + + + %n translation unit(s) loaded. + + %n одиниця перекладу завантажена. + %n одиниці перекладу завантажені. + %n одиниць перекладу завантажено. + + + + Related files (%1);; + Пов'язані файли (%1);; + + + Open Translation Files + Відкрити файли перекладу + + + File saved. + Файл збережено. + + + Qt message files for released applications (*.qm) +All files (*) + Файли повідомлень Qt для готовий програм (*.qm) +Всі файли (*) + + + File created. + Файл створено. + + + Printing... + Друкується... + + + Context: %1 + Контекст: %1 + + + finished + завершено + + + unresolved + нерозв'язаний + + + obsolete + застарілий + + + Printing... (page %1) + Друк... (сторінка %1) + + + Printing completed + Друк завершено + + + Printing aborted + Друк перервано + + + Search wrapped. + Пошук з початку. + + + Qt Linguist + Qt Linguist + + + Cannot find the string '%1'. + Неможливо знайти рядок '%1. + + + Search And Translate in '%1' - Qt Linguist + Пошук та переклад і '%1' - Qt Linguist + + + Translate - Qt Linguist + Переклад - Qt Linguist + + + Translated %n entry(s) + + Перекладено %n елемент + Перекладено %n елементи + Перекладено %n елементів + + + + No more occurrences of '%1'. Start over? + Більше співпадінь '%1' немає. Почати спочатку? + + + Create New Phrase Book + Створити новий глосарій + + + Qt phrase books (*.qph) +All files (*) + Глосарії Q (*.qph) +Всі файли (*) + + + Phrase book created. + Глосарій створено. + + + Open Phrase Book + Відкрити глосарій + + + Qt phrase books (*.qph);;All files (*) + Глосарії Q (*.qph);;Всі файли (*) + + + %n phrase(s) loaded. + + %n фразу завантажено. + %n фрази завантажено. + %n фраз завантажено. + + + + Add to phrase book + Додати до глосарію + + + No appropriate phrasebook found. + Не знайдено відповідного глосарію. + + + Adding entry to phrasebook %1 + Додавання елементу до глосарію %1 + + + Select phrase book to add to + Оберіть глосарій, в який бажаєте додати + + + Unable to launch Qt Assistant (%1) + Неможливо запустити Qt Assistant (%1) + + + Version %1 + Версія %1 + + + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist - це засіб для додавання перекладів до програм на Qt.</p><p>Copyright (C) 2010 Корпорація Nokia та/або її дочірні компанії. + + + Do you want to save the modified files? + Бажаєте зберегти модифіковані файли? + + + Do you want to save '%1'? + Бажаєте зберегти '%1'? + + + Qt Linguist[*] + Qt Linguist[*] + + + %1[*] - Qt Linguist + %1[*] - Qt Linguist + + + No untranslated translation units left. + Неперекладених одиниць не залишилось. + + + &Window + Вікн&о + + + Minimize + Мінімізувати + + + Ctrl+M + + + + Display the manual for %1. + Показати посібник для %1. + + + Display information about %1. + Показати інформацію про %1. + + + &Save '%1' + &Зберегти '%1' + + + Save '%1' &As... + Зберегти '%1' &як... + + + Release '%1' + Скомпілювати '%1' + + + Release '%1' As... + Скомпілювати '%1' як... + + + &Close '%1' + З&акрити '%1' + + + &Save + &Зберегти + + + &Close + З&акрити + + + Save All + Зберегти усе + + + Close All + Закрити усе + + + &Release + &Скомпілювати + + + Translation File &Settings for '%1'... + Налаштування &файлу перекладу для '%1'... + + + &Batch Translation of '%1'... + Пакетний перекла&д '%1'... + + + Search And &Translate in '%1'... + Знайти &та переклад '%1'... + + + Search And &Translate... + Знайти &та перекласти... + + + Cannot read from phrase book '%1'. + Неможливо прочитати з глосарію '%1'. + + + Close this phrase book. + Закрити цей глосарій. + + + Enables you to add, modify, or delete entries in this phrase book. + Дозволяє вам додавати, модифікувати та видаляти елементи глосарію. + + + Print the entries in this phrase book. + Друку елементів цього глосарію. + + + Cannot create phrase book '%1'. + Неможливо створити глосарій '%1'. + + + Do you want to save phrase book '%1'? + Бажаєте зберегти глосарій '%1'? + + + All + Усе + + + + MessageEditor + + + This is the right panel of the main window. + Це права панель основного вікна. + + + + Russian + Російська + + + German + Німецька + + + Japanese + Японська + + + French + Французька + + + Polish + Польська + + + Chinese + Китайська + + + This whole panel allows you to view and edit the translation of some source text. + Ця панель дозволяє вам переглядати та редагувати переклад деякого оригінального тексту. + + + Source text + Оригінальний текст + + + This area shows the source text. + В цій області відображається оригінальний текст. + + + Source text (Plural) + Оригінальний текст (множина) + + + This area shows the plural form of the source text. + В цій області відображається множина оригінального тексту. + + + Developer comments + Коментарі розробника + + + This area shows a comment that may guide you, and the context in which the text occurs. + В цій області відображається коментар, який може допомогти вам та контекст, в якому зустрічається текст. + + + Here you can enter comments for your own use. They have no effect on the translated applications. + Тут ви можете вводити коментарі для власного вжитку. Вони не впливають на перекладені програми. + + + %1 translation (%2) + %1 переклад (%2) + + + This is where you can enter or modify the translation of the above source text. + Тут ви можете чи змінювати переклад оригінального тексту, наведеного вище. + + + %1 translation + %1 переклад + + + %1 translator comments + %1 коментар перекладача + + + '%1' +Line: %2 + '%1' +Рядок: %2 + + + + MessageModel + + Completion status for %1 + Статус завершеності для %1 + + + <file header> + <заголовок файлу> + + + <context comment> + <контекстний коментар> + + + <unnamed context> + <контекст без назви> + + + + PhraseBookBox + + Edit Phrase Book + Редагування глосарію + + + This window allows you to add, modify, or delete entries in a phrase book. + Це вікно дозволяє вам додавати, модифікувати та видаляти елементи глосарію. + + + &Translation: + &Переклад: + + + This is the phrase in the target language corresponding to the source phrase. + Це фраза на мові перекладу, що відповідає оригінальній фразі. + + + S&ource phrase: + &Оригінальна фраза: + + + This is a definition for the source phrase. + Це визначення оригінальної фрази. + + + This is the phrase in the source language. + Це фраза мовою оригіналу. + + + &Definition: + &Визначення: + + + Click here to add the phrase to the phrase book. + Клацніть тут, щоб додати фразу до глосарію. + + + &New Entry + &Новий запис + + + Click here to remove the entry from the phrase book. + Клацніть тут, щоб видалити фразу з глосарію. + + + &Remove Entry + Ви&далити запис + + + Settin&gs... + Нала&штування... + + + Click here to save the changes made. + Клацніть тут, щоб зберегти зроблені зміни. + + + &Save + &Зберегти + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Close + Закрити + + + + Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. + Йдіть в Фрази > Редагувати глосарій... З'явиться діалог PhraseBookBox. + + + + (New Entry) + (Новий запис) + + + %1[*] - Qt Linguist + %1[*] - Qt Linguist + + + Qt Linguist + Qt Linguist + + + Cannot save phrase book '%1'. + Неможливо зберегти глосарій '%1'. + + + + PhraseModel + + Source phrase + Оригінальна фраза + + + Translation + Переклад + + + Definition + Визначення + + + + PhraseView + + Insert + Вставити + + + Edit + Редагувати + + + Guess (%1) + Підказка (%1) + + + Guess + Підказка + + + + QObject + + Translation files (%1);; + Файли перекладу (%1);; + + + All files (*) + Всі файли (*) + + + Qt Linguist + Qt Linguist + + + GNU Gettext localization files + Файли локалізації GNU Gettext + + + GNU Gettext localization template files + Файли шаблонів локалізації GNU Gettext + + + Compiled Qt translations + Скомпільовані переклади Qt + + + Qt Linguist 'Phrase Book' + 'Глосарій' Qt Linguist + + + Qt translation sources (format 1.1) + Файли перекладу Qt (формат 1.1) + + + Qt translation sources (format 2.0) + Файли перекладу Qt (формат 2.0) + + + Qt translation sources (latest format) + Файли перекладу Qt (останній формат) + + + XLIFF localization files + Файли локалізації XLIFF + + + + SourceCodeView + + <i>Source code not available</i> + <i>Код недоступний</i> + + + <i>File %1 not available</i> + <i>Файл %1 не доступний</i> + + + <i>File %1 not readable</i> + <i>Неможливо прочитати файл %1</i> + + + + Statistics + + Statistics + Статистика + + + Close + Закрити + + + Translation + Переклад + + + Source + Оригінал + + + 0 + 0 + + + Words: + Слів: + + + Characters: + Символів: + + + Characters (with spaces): + Символів (з пропусками): + + + + TranslateDialog + + This window allows you to search for some text in the translation source file. + Це вікно дозволяє вам шукати текст в файлі перекладу. + + + Type in the text to search for. + Введіть текст для пошуку. + + + Find &source text: + &Знайти оригінальний текст: + + + &Translate to: + &Перекласти як: + + + Search options + Опції пошуку + + + Texts such as 'TeX' and 'tex' are considered as different when checked. + Якщо відмічено, то рядки 'приклад' та 'прИкЛад' будуть вважатись різними. + + + Match &case + Враховувати &регістр + + + Mark new translation as &finished + Позначати нові переклади &як завершені + + + Click here to find the next occurrence of the text you typed in. + Клацніть тут, щоб знайти наступне співпадіння для введеного вами тексту. + + + Find Next + Знайти наступний + + + Translate + Перекласти + + + Translate All + Перекласти усе + + + Click here to close this window. + Клацніть тут щоб закрити вікно. + + + Cancel + Скасувати + + + + TranslationSettingsDialog + + Source language + Мова оригіналу + + + Language + Мова + + + Country/Region + Країна/регіон + + + Target language + Мова перекладу + + + Settings for '%1' - Qt Linguist + Налаштування для '%1' - Qt Linguist + + + Any Country + Будь-яка країна + + + diff --git a/translations/qt_help_uk.ts b/translations/qt_help_uk.ts new file mode 100644 index 0000000..1687959 --- /dev/null +++ b/translations/qt_help_uk.ts @@ -0,0 +1,320 @@ + + + + + QCLuceneResultWidget + + Search Results + Результати пошуку + + + Note: + Примітка: + + + The search results may not be complete since the documentation is still being indexed! + Результати пошуку можуть бути не повні, оскільки документація досі індексується! + + + Your search did not match any documents. + Ваш пошук не повернув результатів. + + + (The reason for this might be that the documentation is still being indexed.) + (Причиною цього може бути те, що документація досі індексується.) + + + + QHelp + + Untitled + Без назви + + + + QHelpCollectionHandler + + The collection file '%1' is not set up yet! + Файл колекції '%1' ще не встановлено! + + + Cannot load sqlite database driver! + Неможливо завантажити драйвер бази даних sqlite! + + + Cannot open collection file: %1 + Неможливо відкрити файл колекції: %1 + + + Cannot create tables in file %1! + Неможливо створити таблиці в файлі %1! + + + The collection file '%1' already exists! + Файл колекції '%1' вже існує! + + + Cannot create directory: %1 + Неможливо створити теку: %1 + + + Cannot copy collection file: %1 + Неможливо скопіювати файл колекції: %1 + + + Unknown filter '%1'! + Невідомий фільтр '%1'! + + + Cannot register filter %1! + Неможливо зареєструвати фільтр %1! + + + Cannot open documentation file %1! + Неможливо відкрити файл документації %1! + + + Invalid documentation file '%1'! + Неправильний файл документації '%1'! + + + The namespace %1 was not registered! + Простір імен %1 не зареєстровано! + + + Namespace %1 already exists! + Простір імен %1 вже існує! + + + Cannot register namespace '%1'! + Неможливо зареєструвати простір імен '%1'! + + + Cannot open database '%1' to optimize! + Неможливо відкрити базу даних '%1' для оптимізації! + + + + QHelpDBReader + + Cannot open database '%1' '%2': %3 + The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string + Не можу відкрити базу даних '%1' '%2': %3 + + + + QHelpEngineCore + + Cannot open documentation file %1: %2! + Не можу відкрити файл документації %1: %2! + + + The specified namespace does not exist! + Вказаний простір імен не існує! + + + + QHelpGenerator + + Invalid help data! + Неправильні дані довідки! + + + No output file name specified! + Не вказане ім'я вихідного файлу! + + + The file %1 cannot be overwritten! + Неможливо перезаписати файл %1! + + + Building up file structure... + Побудова структури файлу.... + + + Cannot open data base file %1! + Неможливо відкрити файл бази даних %1! + + + Cannot register namespace %1! + Неможливо зареєструвати простір імен %1! + + + Insert custom filters... + Вставка фільтрів користувача... + + + Insert help data for filter section (%1 of %2)... + Вставка даних довідки для розділу фільтра (%1 з %2)... + + + Documentation successfully generated. + Документацію успішно згенеровано. + + + Some tables already exist! + Деякі таблиці вже існують! + + + Cannot create tables! + Неможливо створити таблиці! + + + Cannot register virtual folder! + Неможливо зареєструвати віртуальну теку! + + + Insert files... + Вставка файлів... + + + The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. + Файл %1 має бути всередині підтеки (%2). Пропускаємо його. + + + The file %1 does not exist! Skipping it. + Файл %1 не існує! Пропускаємо його. + + + Cannot open file %1! Skipping it. + Неможливо відкрити файл %1! Пропускаємо його. + + + The filter %1 is already registered! + Фільтр %1 вже зареєстровано! + + + Cannot register filter %1! + Неможливо зареєструвати фільтр %1! + + + Insert indices... + Вставка індексів... + + + Insert contents... + Вставка змісту... + + + Cannot insert contents! + Неможливо вставити зміст! + + + Cannot register contents! + Неможливо зареєструвати зміст! + + + File '%1' does not exist. + Файл '%1' не існує. + + + File '%1' cannot be opened. + Неможливо відкрити файл '%1'. + + + File '%1' contains an invalid link to file '%2' + Файл '%1' містить неправильне посилання до файлу '%2' + + + Invalid links in HTML files. + Неправильні посилання в файлах HTML. + + + + QHelpProject + + Unknown token. + Невідомий токен. + + + Unknown token. Expected "QtHelpProject"! + Невідомий токен. Очікувався "QtHelpProject"! + + + Error in line %1: %2 + Помилка в рядку %1: %2 + + + Virtual folder has invalid syntax. + Віртуальна тека має неправильний синтаксис. + + + Namespace has invalid syntax. + Простір імен має неправильний синтаксис. + + + Missing namespace in QtHelpProject. + Відсутній простір імен в QtHelpProject. + + + Missing virtual folder in QtHelpProject + Відсутня віртуальна тека в QtHelpProject + + + Missing attribute in keyword at line %1. + Відсутній атрибут в ключовому слові на рядку %1. + + + The input file %1 could not be opened! + Неможливо відкрити вхідний файл %1! + + + + QHelpSearchQueryWidget + + Search for: + Шукати: + + + Previous search + Попередній пошук + + + Next search + Наступний пошук + + + Search + Шукати + + + Advanced search + Розширений пошук + + + words <B>similar</B> to: + слова <B>схожі</B> на: + + + <B>without</B> the words: + <B>без</B> слів: + + + with <B>exact phrase</B>: + з <B>точною фразою</B>: + + + with <B>all</B> of the words: + з <B>усіма</B> словами: + + + with <B>at least one</B> of the words: + з <B>щонайменше одним</B> зі слів: + + + + QHelpSearchResultWidget + + %1 - %2 of %n Hits + + %1 - %2 з %n співпадіння + %1 - %2 з %n співпадінь + %1 - %2 з %n співпадінь + + + + 0 - 0 of 0 Hits + 0 - 0 з 0 співпадінь + + + diff --git a/translations/qtconfig_uk.ts b/translations/qtconfig_uk.ts new file mode 100644 index 0000000..9d5b0a7 --- /dev/null +++ b/translations/qtconfig_uk.ts @@ -0,0 +1,717 @@ + + + + + MainWindow + + Desktop Settings (Default) + Налаштування стільниці (Типово) + + + Choose style and palette based on your desktop settings. + Оберіть стиль та палітру відповідно до ваших налаштувань стільниці. + + + On The Spot + У вікні документу + + + Auto (default) + Автоматично (типово) + + + Choose audio output automatically. + Вибрати аудіо вихід автоматично. + + + aRts + aRts + + + Experimental aRts support for GStreamer. + Експериментальна підтримка aRts для GStreamer. + + + Phonon GStreamer backend not available. + Підтримка GStreamer для Phonon не доступна. + + + Choose render method automatically + Обрати метод вімальовки автоматично + + + X11 + X11 + + + Use X11 Overlays + Використовувати оверлеї X11 + + + OpenGL + OpenGL + + + Use OpenGL if available + Використовувати OpenGL, якщо доступно + + + Software + Програмно + + + Use simple software rendering + Використовувати простий програмний рендеринг + + + No changes to be saved. + Немає змін для збереження. + + + Saving changes... + Збереження змін... + + + Over The Spot + Над вікном документу + + + Off The Spot + В рядку стану + + + Root + В додатковому вікні + + + Select a Directory + Оберіть теку + + + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + + + Qt Configuration + Конфігурація Qt + + + Save Changes + Зберегти зміни + + + Save changes to settings? + Зберегти зміни до налаштувань? + + + &Yes + &Так + + + &No + &Ні + + + &Cancel + &Скасувати + + + + MainWindowBase + + Qt Configuration + Конфігурація Qt + + + Appearance + Вигляд + + + GUI Style + Стиль GUI + + + Select GUI &Style: + Оберіть &стиль GUI: + + + Preview + Попередній перегляд + + + Select &Palette: + Виберіть &палітру: + + + Active Palette + Активна палітра + + + Inactive Palette + Неактивна палітра + + + Disabled Palette + Вимкнена палітра + + + Build Palette + Створити палітру + + + &3-D Effects: + &3-D ефекти: + + + Window Back&ground: + Фон &вікна: + + + &Tune Palette... + &Налаштувати палітру... + + + Please use the KDE Control Center to set the palette. + Будь-ласка, використовуйте Системні параметри KDE, щоб встановити палітру. + + + Fonts + Шрифти + + + Default Font + Типовий шрифт + + + &Style: + &Стиль: + + + &Point Size: + &Розмір: + + + F&amily: + &Шрифт: + + + Sample Text + Зразок тексту + + + Font Substitution + Заміна шрифтів + + + S&elect or Enter a Family: + &Виберіть чи введіть шрифт: + + + Current Substitutions: + Поточні заміни: + + + Up + Вгору + + + Down + Вниз + + + Remove + Видалити + + + Select s&ubstitute Family: + &Оберіть шрифт, яким заміняти: + + + Add + Додати + + + Interface + Інтерфейс + + + Feel Settings + Поведінка миші + + + ms + мс + + + &Double Click Interval: + &Інтервал подвійного клацання: + + + No blinking + Без блимання + + + &Cursor Flash Time: + &Час блимання курсору: + + + lines + рядків + + + Wheel &Scroll Lines: + &Коліщатко прокручує: + + + Resolve symlinks in URLs + Вирішувати символьні посилання в URL + + + GUI Effects + Ефекти GUI + + + &Enable + &Увімкнути + + + Alt+E + + + + &Menu Effect: + Ефект &меню: + + + C&omboBox Effect: + Ефект випадаючого &списку: + + + &ToolTip Effect: + Ефект &підказки: + + + Tool&Box Effect: + Ефект панелі &інструментів: + + + Disable + Вимкнуто + + + Animate + Анімація + + + Fade + Згасання + + + Global Strut + Мінімальний розмір віджетів + + + Minimum &Width: + Мінімальна &ширина: + + + Minimum Hei&ght: + Мінімальна &висота: + + + pixels + пікселів + + + Enhanced support for languages written right-to-left + Розширена підтримка для, що пишуться справа наліво + + + XIM Input Style: + Стиль введення XIM: + + + On The Spot + У вікні документу + + + Over The Spot + Над вікном документу + + + Off The Spot + В рядку стану + + + Root + В додатковому вікні + + + Default Input Method: + Типовий метод введення: + + + Printer + Принтер + + + Enable Font embedding + Увімкнути вживлення шрифтів + + + Font Paths + Шляхи до шрифтів + + + Browse... + Огляд... + + + Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. + Натисніть кнопку <b>Огляд</b> чи введіть теку та натисніть Enter, щоб додати її до списку. + + + Phonon + Phonon + + + About Phonon + Про Phonon + + + Current Version: + Поточна версія: + + + Not available + Не доступна + + + Website: + Веб-сайт: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> + + + + About GStreamer + Про GStreamer + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> + + + + GStreamer backend settings + Налаштування модуля GStreamer + + + Preferred audio sink: + Бажаний аудіо вихід: + + + Preferred render method: + Бажаний метод рендерингу: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Примітка: зміни до цих налаштувань можуть заважати правильному запуску програм.</span></p></body></html> + + + &File + &Файл + + + &Help + &Довідка + + + &Save + &Зберегти + + + Save + Зберегти + + + Ctrl+S + Ctrl+S + + + E&xit + Ви&йти + + + Exit + Вийти + + + &About + &Про + + + About + Про + + + About &Qt + Про &Qt + + + About Qt + Про Qt + + + + PaletteEditorAdvancedBase + + Tune Palette + Налаштувати палітру + + + <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> + <b>Редагування палітри</b><p>Змінити палітру поточного віджета чи форми.</p><p>Використовуйте згенеровану палітру чи оберіть кольори для кожної групи кольорів та кожної кольорової ролі.</p><p>Палітру можна протестувати з різними розміщеннями віджетів в секції попереднього перегляду.</p> + + + Select &Palette: + Виберіть &палітру: + + + Active Palette + Активна палітра + + + Inactive Palette + Неактивна палітра + + + Disabled Palette + Вимкнена палітра + + + Auto + Автоматично + + + Build inactive palette from active + Будувати неактивну палітру з активної + + + Build disabled palette from active + Будувати вимкнену палітру з активної + + + Central color &roles + Головні кольорові &ролі + + + Choose central color role + Оберіть головну кольорову роль + + + <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> + <b>Вибір кольорової ролі.</b><p>Доступні наступні головні ролі: <ul> <li>Вікно - загальний колір фону.</li> <li>Текст вікна - загальний колір переднього плану. </li> <li>Базовий - використовується як колір фону, наприклад, для віджетів для введення тексту, зазвичай білий або інший світлий колір. </li> <li>Текст - колір переднього плану, що використовується разом з базовим. Зазвичай співпадає з "Текст вікна", і в цьому випадку має забезпечувати гарний контраст і з "Вікном", і з "Базовим". </li> <li>Кнопка - загальний колір фону кнопки, там де кнопки потребуються інший від "Вікна" фон, як в стилі Macintosh. </li> <li>Текст кнопки - колір переднього плану, що застосовується разом з кольором "Кнопки". </li> <li>Підсвічений - колір для індикації виділеного чи підсвіченого елементу. </li> <li>Підсвічений текст - колір тексту, що контрастує з "Підсвіченим". </li> <li>Яскравий текст - колір тексту, що суттєво відрізняється від "Тексту вікна" та добре контрастує з чорним, наприклад. </li> </ul> </p> + + + Window + Вікно + + + WindowText + Текст вікна + + + Button + Кнопка + + + Base + Базовий + + + Text + Текст + + + BrightText + Яскравий текст + + + ButtonText + Текст кнопки + + + Highlight + Підсвічений + + + HighlightedText + Підсвічений текст + + + &Select Color: + &Оберіть колір: + + + Choose a color + Оберіть колір + + + Choose a color for the selected central color role. + Виберіть колір для вказаної головної кольорової ролі. + + + 3-D shadow &effects + 3-D &ефекти тіні + + + Build &from button color + Будувати &з кольору кнопки + + + Generate shadings + Генерувати тіні + + + Check to let 3D-effect colors be calculated from button-color. + Увімкніть, щоб кольори 3D-ефектів розраховувались з кольору кнопки. + + + Choose 3D-effect color role + Оберіть роль для 3D-ефектів + + + <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> + <b>Оберіть кольорову роль.</b><p>Доступні наступні ролі ефектів: <ul> <li>Світлий - світліше ніж колір кнопки. </li> <li>Напівсвітлий - між "Кнопкою" та "Світлим". </li> <li>Напівтемний - між "Кнопкою" та "Темним". </li> <li>Темний - темніший ніж "Кнопка". </li> <li>Тінь - дуже темний колір. </li> </ul> + + + Light + Світлий + + + Midlight + Напівсвітлий + + + Mid + Напівтемний + + + Dark + Темний + + + Shadow + Тінь + + + Select Co&lor: + Оберіть &колір: + + + Choose a color for the selected effect color role. + Оберіть колір для вказаної кольорової ролі ефектів. + + + OK + OK + + + Close dialog and apply all changes. + Закрити діалог та застосувати усі зміни. + + + Cancel + Скасувати + + + Close dialog and discard all changes. + Закрити діалог та відкинути усі зміни. + + + + PreviewFrame + + Desktop settings will only take effect after an application restart. + Налаштування стільниці будуть застосовані лише після перезапуску програми. + + + + PreviewWidgetBase + + Preview Window + Вікно попереднього перегляду + + + ButtonGroup + Група кнопок + + + RadioButton1 + Перемикач 1 + + + RadioButton2 + Перемикач 2 + + + RadioButton3 + Перемикач 3 + + + ButtonGroup2 + Група кнопок 2 + + + CheckBox1 + Прапорець 1 + + + CheckBox2 + Прапорець 2 + + + LineEdit + Поле введення + + + ComboBox + Випадаючий список + + + PushButton + Кнопка + + + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + <p> +<a href="http://qt.nokia.com">http://qt.nokia.com</a> +</p> +<p> +<a href="http://www.kde.org">http://www.kde.org</a> +</p> + + + diff --git a/translations/qvfb_uk.ts b/translations/qvfb_uk.ts new file mode 100644 index 0000000..142863b --- /dev/null +++ b/translations/qvfb_uk.ts @@ -0,0 +1,276 @@ + + + + + AnimationSaveWidget + + Record + Записати + + + Reset + Відновити + + + Save + Зберегти + + + Save in MPEG format (requires netpbm package installed) + Зберегти в форматі MPEG (необхідний встановлений пакунок netpbm) + + + Click record to begin recording. + Клацніть "Записати", щоб розпочати запис. + + + Finished saving. + Збереження завершено. + + + Paused. Click record to resume, or save if done. + Зупинено. Клацніть "Записати", щоб продовжити, або "Зберегти" якщо готово. + + + Pause + Пауза + + + Recording... + Записую... + + + Saving... + Зберігаю... + + + Save animation... + Зберегти анімацію... + + + Save canceled. + Збереження скасовано. + + + Save failed! + Збереження провалилось! + + + + Config + + Configure + Конфігурування + + + Size + Розмір + + + 176x220 "SmartPhone" + 176x220 "Смартфон" + + + 240x320 "PDA" + 240x320 "PDA" + + + 320x240 "TV" / "QVGA" + 320x240 "TV" / "QVGA" + + + 640x480 "VGA" + 640x480 "VGA" + + + 800x480 + 800x480 + + + 800x600 + 800x600 + + + 1024x768 + 1024x768 + + + Custom + Користувацький + + + Depth + Глибина кольору + + + 1 bit monochrome + 1 біт монохромний + + + 2 bit grayscale + 2 біти сірий + + + 4 bit grayscale + 4 біти сірий + + + 8 bit + 8 біт + + + 12 (16) bit + 12 (16) біт + + + 15 bit + 15 біт + + + 16 bit + 16 біт + + + 18 bit + 18 біт + + + 24 bit + 24 біти + + + 32 bit + 32 біти + + + 32 bit ARGB + 32 біти ARGB + + + Swap red and blue channels + Поміняти червоний та блакитний канали + + + BGR format + Формат BGR + + + Skin + Обкладинка + + + None + Немає + + + Emulate touch screen (no mouse move) + Емулювати тачскрін (без пересувань миші) + + + Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) + Емулювати LCD-екран (Лише фіксований масштаб з 3x збільшенням) + + + <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. + <p>Зверніть увагу, що будь-який додаток, який використовує віртуальний фреймбуфер буде закрито, якщо ви зміните розмір чи глибину кольору <i>зверху</i>. Ви можете довільно змінювати гамму <i>знизу</i>. + + + Gamma + Гамма + + + Blue + Блакитний + + + 1.0 + 1,0 + + + Green + Зелений + + + All + Усі + + + Red + Червоний + + + Set all to 1.0 + Встановити усі в 1.0 + + + &OK + &OK + + + &Cancel + &Скасувати + + + + DeviceSkin + + The image file '%1' could not be loaded. + Неможливо завантажити файл зображення '%1'. + + + The skin directory '%1' does not contain a configuration file. + Тека обкладинки '%1' не містить конфігураційного файлу. + + + The skin configuration file '%1' could not be opened. + Неможливо відкрити конфігураційний файл '%1'. + + + The skin configuration file '%1' could not be read: %2 + Неможливо прочитати конфігураційний файл '%1': %2 + + + Syntax error: %1 + Синтаксична помилка: %1 + + + The skin "up" image file '%1' does not exist. + Зображення обкладинки "вгору" '%1' не існує. + + + The skin "down" image file '%1' does not exist. + Зображення обкладинки "вниз" '%1' не існує. + + + The skin "closed" image file '%1' does not exist. + Зображення обкладинки "закрито" '%1' не існує. + + + The skin cursor image file '%1' does not exist. + Зображення обкладинки для курсору '%1' не існує. + + + Syntax error in area definition: %1 + Синтаксична помилка в описі області: %1 + + + Mismatch in number of areas, expected %1, got %2. + Не співпадає кількість областей, очікувалось %1, отримано %2. + + + + QVFb + + Browse... + Оглянути... + + + Load Custom Skin... + Завантажити обкладинку користувача... + + + All QVFB Skins (*.skin) + Усі обкладинки QVFB (*.skin) + + + -- cgit v0.12 From 23e5a48e77f1b30905fbc6d4fa8d91b88d152c0d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 12:59:14 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/index.qdoc | 3 ++- doc/src/overviews.qdoc | 1 - doc/src/windows-and-dialogs/dialogs.qdoc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index ded57f5..1032e30 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -66,7 +66,8 @@
    -
  • Basic Qt Architecture
    • +
  • Qt Basic Concepts
    • +
  • Qt GUI Concepts
  • Cross-platform & Platform-specific Development
  • Qt & standard technologies
  • Qt How-to's & best practices
    • diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index b72df98..a1773a3 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -29,7 +29,6 @@ \page overviews.html \title All Overviews and HOWTOs - \ingroup qt-basic-concepts \generatelist overviews */ diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index f6649fd..960d7be 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -28,12 +28,12 @@ /*! \group standard-dialogs \ingroup qt-basic-concepts - \title Standard Dialog Classes + \title Standard Dialogs + \brief A list of Qt classes for implementing standard dialogs. */ /*! \group dialog-classes - \ingroup qt-basic-concepts \title Classes for Building Dialogs */ -- cgit v0.12 From d3ab1fccea2b1e011e7518269a29045a53f0a30b Mon Sep 17 00:00:00 2001 From: Jani Hautakangas Date: Mon, 9 Aug 2010 09:47:31 +0300 Subject: Pending surface might not get destroyed if no flush() happens in between graphics system change. This patch ensures that all old surfaces are destroyed before new graphics system is activated. Reviewed-by: Jason Barron --- src/gui/kernel/qapplication_s60.cpp | 2 +- src/gui/painting/qgraphicssystem_runtime.cpp | 19 ++++++------------- src/gui/painting/qgraphicssystem_runtime_p.h | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index a14b1a7..c3824f9 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1067,7 +1067,7 @@ void QSymbianControl::Draw(const TRect& controlRect) const if (QApplicationPrivate::runtime_graphics_system) { QRuntimeWindowSurface *rtSurface = static_cast(qwidget->windowSurface()); - s60Surface = static_cast(rtSurface->m_windowSurface); + s60Surface = static_cast(rtSurface->m_windowSurface.data()); } else #endif s60Surface = static_cast(qwidget->windowSurface()); diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index be04df6..e1e0ad0 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -251,7 +251,7 @@ QPixmapData* QRuntimePixmapData::runtimeData() const } QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, QWidget *window) - : QWindowSurface(window), m_windowSurface(0), m_pendingWindowSurface(0), m_graphicsSystem(gs) + : QWindowSurface(window), m_graphicsSystem(gs) { } @@ -259,7 +259,6 @@ QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, Q QRuntimeWindowSurface::~QRuntimeWindowSurface() { m_graphicsSystem->removeWindowSurface(this); - delete m_windowSurface; } QPaintDevice *QRuntimeWindowSurface::paintDevice() @@ -278,8 +277,7 @@ void QRuntimeWindowSurface::flush(QWidget *widget, const QRegion ®ion, #ifdef QT_DEBUG qDebug() << "QRuntimeWindowSurface::flush() - destroy pending window surface"; #endif - delete m_pendingWindowSurface; - m_pendingWindowSurface = 0; + m_pendingWindowSurface.reset(); } } @@ -355,7 +353,7 @@ QWindowSurface *QRuntimeGraphicsSystem::createWindowSurface(QWidget *widget) con { Q_ASSERT(m_graphicsSystem); QRuntimeWindowSurface *rtSurface = new QRuntimeWindowSurface(this, widget); - rtSurface->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); + rtSurface->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); widget->setWindowSurface(rtSurface); m_windowSurfaces << rtSurface; return rtSurface; @@ -379,7 +377,6 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) for (int i = 0; i < m_pixmapDatas.size(); ++i) { QRuntimePixmapData *proxy = m_pixmapDatas.at(i); QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data); - // ### TODO Optimize. Openvg and s60raster graphics systems could switch internal ARGB32_PRE QImage buffers. newData->fromImage(proxy->m_data->toImage(), Qt::NoOpaqueDetection); delete proxy->m_data; proxy->m_data = newData; @@ -390,14 +387,10 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) QRuntimeWindowSurface *proxy = m_windowSurfaces.at(i); QWidget *widget = proxy->m_windowSurface->window(); - if(m_windowSurfaceDestroyPolicy == DestroyImmediately) { - delete proxy->m_windowSurface; - proxy->m_pendingWindowSurface = 0; - } else { - proxy->m_pendingWindowSurface = proxy->m_windowSurface; - } + if(m_windowSurfaceDestroyPolicy == DestroyAfterFirstFlush) + proxy->m_pendingWindowSurface.reset(proxy->m_windowSurface.take()); - proxy->m_windowSurface = m_graphicsSystem->createWindowSurface(widget); + proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); qt_widget_private(widget)->invalidateBuffer(widget->rect()); } } diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h index d4c9152..0232241 100644 --- a/src/gui/painting/qgraphicssystem_runtime_p.h +++ b/src/gui/painting/qgraphicssystem_runtime_p.h @@ -129,8 +129,8 @@ public: virtual QPoint offset(const QWidget *widget) const; - QWindowSurface *m_windowSurface; - QWindowSurface *m_pendingWindowSurface; + QScopedPointer m_windowSurface; + QScopedPointer m_pendingWindowSurface; private: const QRuntimeGraphicsSystem *m_graphicsSystem; -- cgit v0.12 From 24742e54332a71db0bc5ae7b1632924ae592aea7 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Mon, 9 Aug 2010 13:39:51 +0200 Subject: OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, we would try to create one with samples = 1 anyway, potentially resulting in an INVALID_VALUE error. Task-number: QTBUG-12757 Reviewed-by: Samuel Rødal --- src/opengl/qglframebufferobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index deffc20..9b8a3d1 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -445,11 +445,11 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, GLint maxSamples; glGetIntegerv(GL_MAX_SAMPLES_EXT, &maxSamples); - samples = qBound(1, int(samples), int(maxSamples)); + samples = qBound(0, int(samples), int(maxSamples)); glGenRenderbuffers(1, &color_buffer); glBindRenderbuffer(GL_RENDERBUFFER_EXT, color_buffer); - if (glRenderbufferStorageMultisampleEXT) { + if (glRenderbufferStorageMultisampleEXT && samples > 0) { glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, samples, internal_format, size.width(), size.height()); } else { -- cgit v0.12 From 7d39a66fe88c039876285b21b592de20cf2e78ed Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 13:40:48 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/widgets-and-layouts/widgets.qdoc | 1 - doc/src/windows-and-dialogs/dialogs.qdoc | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index baf3dce..fbce744 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,7 +29,6 @@ \page widgets-and-layouts.html \title Widgets and Layouts \ingroup qt-gui-concepts - \ingroup qt-basic-concepts \brief The primary elements for designing user interfaces in Qt. \section1 Widgets diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 960d7be..bcf9c0e 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -27,17 +27,12 @@ /*! \group standard-dialogs - \ingroup qt-basic-concepts + \ingroup qt-gui-concepts \title Standard Dialogs \brief A list of Qt classes for implementing standard dialogs. */ /*! - \group dialog-classes - \title Classes for Building Dialogs -*/ - -/*! \page dialogs.html \title Dialog Windows \ingroup qt-gui-concepts -- cgit v0.12 From 631b56c7e8e628c3399faeab3932338195073a38 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 13:45:12 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 1032e30..c1c63da 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -68,7 +68,7 @@
  • Qt Basic Concepts
  • Qt GUI Concepts
    • -
  • Cross-platform & Platform-specific Development
    • +
  • Cross-platform & Platform-specific dev
  • Qt & standard technologies
  • Qt How-to's & best practices
-- cgit v0.12 From 75bd4d9b1f14b1aea085af3f6714c06ab6ae1cd2 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 9 Aug 2010 16:11:30 +1000 Subject: PathView required some diagonal movement before a drag was initiated. Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell --- src/declarative/graphicsitems/qdeclarativepathview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 06ac275..5771f84 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1061,7 +1061,7 @@ void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event) if (!d->stealMouse) { QPointF delta = event->pos() - d->startPoint; - if (qAbs(delta.x()) > QApplication::startDragDistance() && qAbs(delta.y()) > QApplication::startDragDistance()) + if (qAbs(delta.x()) > QApplication::startDragDistance() || qAbs(delta.y()) > QApplication::startDragDistance()) d->stealMouse = true; } -- cgit v0.12 From 5f611f5a68a0994b46dbe696e5275c4fb40b7470 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:23 +1000 Subject: Explain Flipable example further --- src/declarative/graphicsitems/qdeclarativeflipable.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index 8c9d2dd..b266273 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -83,10 +83,16 @@ public: \image flipable.gif - The \l Rotation element is used to specify the angle and axis of the flip, - and the \l State defines the changes in angle which produce the flipping - effect. Finally, the \l Transition creates the animation that changes the - angle over one second. + The \l Rotation element is used to specify the angle and axis of the flip. + When \c flipped is \c true, the item changes to the "back" state, where + the angle is changed to 180 degrees to produce the flipping effect. + Finally, the \l Transition creates the animation that changes the + angle over one second: when the item changes between its "back" and + default states, the NumberAnimation animates the angle between + its old and new values. + + See the \l {QML States} and \l {QML Animation} documentation for more + details on state changes and how animations work within transitions. \sa {declarative/ui-components/flipable}{Flipable example} */ -- cgit v0.12 From 7c05fdc74c6ad04c549bf367f68e3f9d8d2c438d Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 10:58:43 +1000 Subject: Merge sections about when property and default state --- doc/src/declarative/qdeclarativestates.qdoc | 95 ++++++++++++++++++----------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc index 0b91756..274040a 100644 --- a/doc/src/declarative/qdeclarativestates.qdoc +++ b/doc/src/declarative/qdeclarativestates.qdoc @@ -84,18 +84,34 @@ Rectangle. \snippet doc/src/snippets/declarative/states.qml 0 -A \l State item defines all the changes to be made in the new state. You +The \l State item defines all the changes to be made in the new state. It could specify additional properties to be changed, or create additional -PropertyChanges for other objects. (Note that a \l State can modify the -properties of other objects, not just the object that owns the state.) +PropertyChanges for other objects. It can also modify the properties of other +objects, not just the object that owns the state. For example: -For example: +\qml +Rectangle { + ... + states: [ + State { + name: "moved" + PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } + PropertyChanges { target: someOtherItem; width: 1000 } + } + ] +} +\endqml + +As a convenience, if an item only has one state, its \l {Item::}{states} +property can be defined as a single \l State, without the square-brace list +syntax: \qml -State { - name: "moved" - PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" } - PropertyChanges { target: someOtherItem; width: 1000 } +Item { + ... + states: State { + ... + } } \endqml @@ -118,54 +134,61 @@ transitions between them. Of course, the \l Rectangle in the example above could have simply been moved by setting its position to (50, 50) in the mouse area's \c onClicked handler. -However, aside from enabling batched property changes, the use of states allows -an item to revert to its \e {default state}, which contains all of the items' -initial property values before they were modified in a state change. +However, aside from enabling batched property changes, one of the features of +QML states is the ability of an item to revert to its \e {default state}. +The default state contains all of an item's initial property values before +they were modified in a state change. -The default state is specified by an empty string. If the MouseArea in the -above example was changed to this: +For example, suppose the \l Rectangle should move to (50,50) when the mouse is +pressed, and then move back to its original position when the mouse is +released. This can be achieved by using the \l {State::}{when} property, +like this: -\qml -MouseArea { - anchors.fill: parent - onClicked: myRect.state == 'moved' ? myRect.state = "" : myRect.state = 'moved'; -} -\endqml - -This would toggle the \l Rectangle's state between the \e moved and \e default -states when clicked. The properties can be reverted to their initial -values without requiring the definition of another \l State that defines these -value changes. +\qml +Rectangle { + ... + MouseArea { + id: mouseArea + anchors.fill: parent + } + states: State { + name: "moved"; when: mouseArea.pressed + ... + } +} +\endqml -\section1 The "when" property +The \l {State::}{when} property is set to an expression that evaluates to +\c true when the item should be set to that state. When the mouse is pressed, +the state is changed to \e moved. When it is released, the item reverts to its +\e default state, which defines all of the item's original property values. -The \l {State::}{when} property is useful for specifying when a state should be -applied. This can be set to an expression that evaluates to \c true when an -item should change to a particular state. +Alternatively, an item can be explicitly set to its default state by setting its +\l {Item::}{state} property to an empty string (""). For example, instead of +using the \l {State::}{when} property, the above code could be changed to: -If the above example was changed to this: - \qml Rectangle { ... MouseArea { - id: mouseArea anchors.fill: parent + onPressed: myRect.state = 'moved'; + onReleased: myRect.state = ''; } states: State { - name: "moved"; when: mouseArea.pressed + name: "moved" ... } +} \endqml -The \l Rectangle would automatically change to the \e moved state when the -mouse is pressed, and revert to the default state when it is released. This is -simpler (and a better, more declarative method) than creating \c onPressed -and \c onReleased handlers in the MouseArea to set the current state. +Obviously it makes sense to use the \l {State::}{when} property when possible +as it provides a simpler (and a better, more declarative) solution than +assigning the state from signal handlers. \section1 Animating state changes -- cgit v0.12 From 380335c8b8afd302f2f3f783163b2563ee9a122a Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 11:10:22 +1000 Subject: Mention QML_IMPORT_TRACE in Modules docs --- doc/src/declarative/modules.qdoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 9e51a40..467b7d0 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -302,5 +302,13 @@ For examples of \c qmldir files for plugins, see the \l {declarative/cppextensions/plugins}{Plugins} example and \l {Tutorial: Writing QML extensions with C++}. + +\section1 Debugging + +The \c QML_IMPORT_TRACE environment variable can be useful for debugging +when there are problems with finding and loading modules. See +\l{Debugging module imports} for more information. + + */ / -- cgit v0.12 From 45f6c749ff5f1773a5a52f1b40278ad390f3ae59 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Mon, 9 Aug 2010 17:08:23 +1000 Subject: XmlListModel doc fixes Task-number: QTBUG-12749 --- src/declarative/util/qdeclarativexmllistmodel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 7c1e1fd..8bd829e 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -560,7 +560,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListPropertyprogress; } +/*! + \qmlmethod void XmlListModel::errorString() + + Returns a string description of the last error that occurred + if \l status is XmlListModel::Error. +*/ QString QDeclarativeXmlListModel::errorString() const { Q_D(const QDeclarativeXmlListModel); -- cgit v0.12 From 7829343dc9e12befd6c471cc72d00139bad5d42b Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Mon, 9 Aug 2010 13:42:26 +0200 Subject: CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That code is deprecated for the most part, however under certain circumstances could be run. The fix is to check the value when using the deprecated code and change the return value to follow the logic of the new code. Task-number: QTBUG-12732 Reviewed-by: João Abecasis --- src/corelib/io/qfsfileengine_win.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 21930e1..35fa04b 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1958,6 +1958,10 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + // Since this is a special case, we check if the return value was NULL and if so + // we change it to INVALID_HANDLE_VALUE to follow the logic inside this function. + if(0 == handle) + handle = INVALID_HANDLE_VALUE; #endif if (handle == INVALID_HANDLE_VALUE) { -- cgit v0.12 From eea84818e98af917d3cf2bf04ea17a416ef9d55e Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 9 Aug 2010 13:55:23 +0200 Subject: Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. Reviewer: David Boddie Task number: QTBUG-11938 --- demos/books/bookwindow.cpp | 2 +- demos/browser/browsermainwindow.cpp | 2 +- demos/browser/webview.cpp | 2 +- demos/qtdemo/menumanager.cpp | 2 +- src/corelib/concurrent/qtconcurrentfilter.cpp | 2 +- src/corelib/concurrent/qtconcurrentmap.cpp | 2 +- src/corelib/concurrent/qtconcurrentresultstore.cpp | 2 +- src/corelib/io/qfileinfo.cpp | 4 ++-- src/corelib/thread/qmutexpool.cpp | 2 +- src/corelib/tools/qbytearraymatcher.h | 2 +- src/corelib/tools/qstringmatcher.h | 2 +- src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp | 2 +- src/declarative/qml/qdeclarativecompiledbindings.cpp | 2 +- src/declarative/qml/qdeclarativecomponent.cpp | 4 ++-- src/declarative/qml/qdeclarativeimageprovider.cpp | 2 +- src/declarative/qml/qdeclarativeinstruction.cpp | 2 +- src/declarative/qml/qdeclarativeproperty.cpp | 2 +- src/declarative/qml/qdeclarativescriptparser.cpp | 2 +- src/gui/embedded/qkbdlinuxinput_qws.cpp | 2 +- src/gui/embedded/qkbdqnx_qws.cpp | 2 +- src/gui/itemviews/qsortfilterproxymodel.cpp | 2 +- src/gui/kernel/qapplication_s60.cpp | 4 ++-- src/gui/kernel/qwidget_win.cpp | 4 ++-- src/gui/widgets/qcommandlinkbutton.cpp | 2 +- src/gui/widgets/qmainwindowlayout.cpp | 2 +- src/gui/widgets/qmenu.cpp | 4 ++-- src/gui/widgets/qmenubar.cpp | 2 +- src/gui/widgets/qprintpreviewwidget.cpp | 2 +- src/gui/widgets/qtoolbarextension.cpp | 2 +- src/network/kernel/qhostinfo.cpp | 2 +- src/network/socket/qabstractsocket.cpp | 2 +- src/network/socket/qlocalsocket_win.cpp | 2 +- src/network/socket/qnativesocketengine_unix.cpp | 2 +- src/network/ssl/qsslsocket.cpp | 2 +- src/opengl/qgl.cpp | 2 +- src/qt3support/widgets/q3gridview.cpp | 2 +- src/script/api/qscriptcontext.cpp | 2 +- src/tools/moc/moc.cpp | 2 +- tools/qdoc3/htmlgenerator.cpp | 4 ++-- 39 files changed, 45 insertions(+), 45 deletions(-) diff --git a/demos/books/bookwindow.cpp b/demos/books/bookwindow.cpp index 089d5e0..c801283 100644 --- a/demos/books/bookwindow.cpp +++ b/demos/books/bookwindow.cpp @@ -64,7 +64,7 @@ BookWindow::BookWindow() model->setEditStrategy(QSqlTableModel::OnManualSubmit); model->setTable("books"); - // Remeber the indexes of the columns + // Remember the indexes of the columns authorIdx = model->fieldIndex("author"); genreIdx = model->fieldIndex("genre"); diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp index 8c2ed89..50c2cf8 100644 --- a/demos/browser/browsermainwindow.cpp +++ b/demos/browser/browsermainwindow.cpp @@ -670,7 +670,7 @@ void BrowserMainWindow::slotPrivateBrowsing() " items are automatically removed from the Downloads window," \ " new cookies are not stored, current cookies can't be accessed," \ " site icons wont be stored, session wont be saved, " \ - " and searches are not addded to the pop-up menu in the Google search box." \ + " and searches are not added to the pop-up menu in the Google search box." \ " Until you close the window, you can still click the Back and Forward buttons" \ " to return to the webpages you have opened.").arg(title); diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp index 2f9b3e6..2cbd2f1 100644 --- a/demos/browser/webview.cpp +++ b/demos/browser/webview.cpp @@ -260,7 +260,7 @@ void WebView::setProgress(int progress) void WebView::loadFinished() { if (100 != m_progress) { - qWarning() << "Recieved finished signal while progress is still:" << progress() + qWarning() << "Received finished signal while progress is still:" << progress() << "Url:" << url(); } m_progress = 0; diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index c9ffecb..5b851b4 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -449,7 +449,7 @@ void MenuManager::init(MainWindow *window) window->scene->setStickyFocus(true); window->setFocus(); }else{ - qDebug() << "Error intializing QML subsystem, Declarative examples will not work"; + qDebug() << "Error initializing QML subsystem, Declarative examples will not work"; } } diff --git a/src/corelib/concurrent/qtconcurrentfilter.cpp b/src/corelib/concurrent/qtconcurrentfilter.cpp index 36febe7..29c3edb 100644 --- a/src/corelib/concurrent/qtconcurrentfilter.cpp +++ b/src/corelib/concurrent/qtconcurrentfilter.cpp @@ -117,7 +117,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::filteredReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. \section1 Additional API Features diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index e74d69c..4303ff6 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -161,7 +161,7 @@ function, and should merge the \e{intermediate} into the \e{result} variable. QtConcurrent::mappedReduced() guarantees that only one thread will call reduce at a time, so using a mutex to lock the result variable - is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to + is not necessary. The QtConcurrent::ReduceOptions enum provides a way to control the order in which the reduction is done. If QtConcurrent::UnorderedReduce is used (the default), the order is undefined, while QtConcurrent::OrderedReduce ensures that the reduction diff --git a/src/corelib/concurrent/qtconcurrentresultstore.cpp b/src/corelib/concurrent/qtconcurrentresultstore.cpp index ad4b2cf..65f3afa 100644 --- a/src/corelib/concurrent/qtconcurrentresultstore.cpp +++ b/src/corelib/concurrent/qtconcurrentresultstore.cpp @@ -236,7 +236,7 @@ int ResultStoreBase::count() const return resultCount; } -// returns the insert index, calling this funciton with +// returns the insert index, calling this function with // index equal to -1 returns the next available index. int ResultStoreBase::updateInsertIndex(int index, int _count) { diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 37591c5..61f7180 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -797,12 +797,12 @@ QString QFileInfo::suffix() const \bold{Note:} The QDir returned always corresponds to the object's parent directory, even if the QFileInfo represents a directory. - For each of the follwing, dir() returns a QDir for + For each of the following, dir() returns a QDir for \c{"~/examples/191697"}. \snippet doc/src/snippets/fileinfo/main.cpp 0 - For each of the follwing, dir() returns a QDir for + For each of the following, dir() returns a QDir for \c{"."}. \snippet doc/src/snippets/fileinfo/main.cpp 1 diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp index d9abdc5..59211fb 100644 --- a/src/corelib/thread/qmutexpool.cpp +++ b/src/corelib/thread/qmutexpool.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -// qt_global_mutexpool is here for backwards compatability only, +// qt_global_mutexpool is here for backwards compatibility only, // use QMutexpool::instance() in new clode. Q_CORE_EXPORT QMutexPool *qt_global_mutexpool = 0; Q_GLOBAL_STATIC_WITH_ARGS(QMutexPool, globalMutexPool, (QMutex::Recursive)) diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 8e7bc21..d3db4e9 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -78,7 +78,7 @@ private: QByteArrayMatcherPrivate *d; QByteArray q_pattern; #ifdef Q_CC_RVCT -// explicitely allow anonymous unions for RVCT to prevent compiler warnings +// explicitly allow anonymous unions for RVCT to prevent compiler warnings # pragma push # pragma anon_unions #endif diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 1aafcb8..451aeb6 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -78,7 +78,7 @@ private: QString q_pattern; Qt::CaseSensitivity q_cs; #ifdef Q_CC_RVCT -// explicitely allow anonymous unions for RVCT to prevent compiler warnings +// explicitly allow anonymous unions for RVCT to prevent compiler warnings # pragma push # pragma anon_unions #endif diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index ceb1961..a489b5a 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -525,7 +525,7 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId) QVariant value = model->m_listModelInterface->data(data->m_index, *it); return value; } else if (model->m_roles.count() == 1 && propName == "modelData") { - //for compatability with other lists, assign modelData if there is only a single role + //for compatibility with other lists, assign modelData if there is only a single role QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first()); return value; } diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp index 507e47b..723da94 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp @@ -1628,7 +1628,7 @@ void QDeclarativeBindingCompiler::dump(const QByteArray &programData) /*! Clear the state associated with attempting to compile a specific binding. -This does not clear the global "commited binding" states. +This does not clear the global "committed binding" states. */ void QDeclarativeBindingCompilerPrivate::resetInstanceState() { diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 1d48b1a..5f4a063 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -192,7 +192,7 @@ class QByteArray; \value Null This QDeclarativeComponent has no data. Call loadUrl() or setData() to add QML content. \value Ready This QDeclarativeComponent is ready and create() may be called. \value Loading This QDeclarativeComponent is loading network data. - \value Error An error has occured. Call errors() to retrieve a list of \{QDeclarativeError}{errors}. + \value Error An error has occurred. Call errors() to retrieve a list of \{QDeclarativeError}{errors}. */ void QDeclarativeComponentPrivate::typeDataReady() @@ -518,7 +518,7 @@ void QDeclarativeComponent::loadUrl(const QUrl &url) } /*! - Return the list of errors that occured during the last compile or create + Return the list of errors that occurred during the last compile or create operation. An empty list is returned if isError() is not set. */ QList QDeclarativeComponent::errors() const diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 241df87..27269b7 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -112,7 +112,7 @@ public: } \endcode - Now the images can be succesfully loaded in QML: + Now the images can be successfully loaded in QML: \image imageprovider.png diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index 0f7b09d..1767d2f 100644 --- a/src/declarative/qml/qdeclarativeinstruction.cpp +++ b/src/declarative/qml/qdeclarativeinstruction.cpp @@ -218,7 +218,7 @@ void QDeclarativeCompiledData::dump(QDeclarativeInstruction *instr, int idx) qWarning().nospace() << idx << "\t\t" << line << "\t" << "DEFER" << "\t\t\t" << instr->defer.deferCount; break; default: - qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKOWN INSTRUCTION" << "\t" << instr->type; + qWarning().nospace() << idx << "\t\t" << line << "\t" << "XXX UNKNOWN INSTRUCTION" << "\t" << instr->type; break; } #endif // QT_NO_DEBUG_STREAM diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index 071dd07..515c4d6 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -640,7 +640,7 @@ QDeclarativePropertyPrivate::binding(const QDeclarativeProperty &that) is assumed by the caller. \a flags is passed through to the binding and is used for the initial update (when - the binding sets the intial value, it will use these flags for the write). + the binding sets the initial value, it will use these flags for the write). */ QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(const QDeclarativeProperty &that, diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index f703cf5..0657f49 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -760,7 +760,7 @@ bool ProcessAST::visit(AST::UiArrayBinding *node) prop->listValueRange.offset = node->lbracketToken.offset; prop->listValueRange.length = node->rbracketToken.offset + node->rbracketToken.length - node->lbracketToken.offset; - // Store the positions of the comma token too, again for the DOM to be able to retreive it. + // Store the positions of the comma token too, again for the DOM to be able to retrieve it. prop->listCommaPositions = collectCommas(node->members); while (propertyCount--) diff --git a/src/gui/embedded/qkbdlinuxinput_qws.cpp b/src/gui/embedded/qkbdlinuxinput_qws.cpp index 6c91a08..f53c444 100644 --- a/src/gui/embedded/qkbdlinuxinput_qws.cpp +++ b/src/gui/embedded/qkbdlinuxinput_qws.cpp @@ -138,7 +138,7 @@ QWSLinuxInputKbPrivate::QWSLinuxInputKbPrivate(QWSLinuxInputKeyboardHandler *h, // record the original mode so we can restore it again in the destructor. ::ioctl(m_tty_fd, KDGKBMODE, &m_orig_kbmode); - // setting this tranlation mode is even needed in INPUT mode to prevent + // setting this translation mode is even needed in INPUT mode to prevent // the shell from also interpreting codes, if the process has a tty // attached: e.g. Ctrl+C wouldn't copy, but kill the application. ::ioctl(m_tty_fd, KDSKBMODE, K_MEDIUMRAW); diff --git a/src/gui/embedded/qkbdqnx_qws.cpp b/src/gui/embedded/qkbdqnx_qws.cpp index fbc683e..72d1cb5 100644 --- a/src/gui/embedded/qkbdqnx_qws.cpp +++ b/src/gui/embedded/qkbdqnx_qws.cpp @@ -150,7 +150,7 @@ void QWSQnxKeyboardHandler::socketActivated() // figure out whether it's a press bool isPress = packet.data.key_cap & KEY_DOWN; - // figure out wheter the key is still pressed and the key event is repeated + // figure out whether the key is still pressed and the key event is repeated bool isRepeat = packet.data.key_cap & KEY_REPEAT; Qt::Key key = Qt::Key_unknown; diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index f9b6b94..953a7f1 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -774,7 +774,7 @@ void QSortFilterProxyModelPrivate::source_items_inserted( if (model->rowCount(source_parent) == delta_item_count) { // Items were inserted where there were none before. // If it was new rows make sure to create mappings for columns so that a - // valid mapping can be retreived later and vice-versa. + // valid mapping can be retrieved later and vice-versa. QVector &orthogonal_proxy_to_source = (orient == Qt::Horizontal) ? m->source_rows : m->source_columns; QVector &orthogonal_source_to_proxy = (orient == Qt::Horizontal) ? m->proxy_rows : m->proxy_columns; diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 1f6a4ae..e36ebb9 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1328,7 +1328,7 @@ void qt_init(QApplicationPrivate * /* priv */, int) // framework destruction. TTrapHandler *origTrapHandler = User::TrapHandler(); - // The S60 framework has not been initalized. We need to do it. + // The S60 framework has not been initialized. We need to do it. TApaApplicationFactory factory(S60->s60ApplicationFactory ? S60->s60ApplicationFactory : newS60Application); CApaCommandLine* commandLine = 0; @@ -1506,7 +1506,7 @@ void qt_init(QApplicationPrivate * /* priv */, int) */ // Register WId with the metatype system. This is to enable - // QWidgetPrivate::create_sys to used delayed slot invokation in order + // QWidgetPrivate::create_sys to used delayed slot invocation in order // to destroy WId objects during reparenting. qRegisterMetaType("WId"); } diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 23f57da..59035b1 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -166,7 +166,7 @@ static void qt_tablet_init() qt_tablet_widget = new QWidget(0); qt_tablet_widget->createWinId(); qt_tablet_widget->setObjectName(QLatin1String("Qt internal tablet widget")); - // We dont need this internal widget to appear in QApplication::topLevelWidgets() + // We don't need this internal widget to appear in QApplication::topLevelWidgets() if (QWidgetPrivate::allWidgets) QWidgetPrivate::allWidgets->remove(qt_tablet_widget); LOGCONTEXT lcMine; @@ -1547,7 +1547,7 @@ bool QWidgetPrivate::shouldShowMaximizeButton() { if (data.window_flags & Qt::MSWindowsFixedSizeDialogHint) return false; - // if the user explicitely asked for the maximize button, we try to add + // if the user explicitly asked for the maximize button, we try to add // it even if the window has fixed size. if (data.window_flags & Qt::CustomizeWindowHint && data.window_flags & Qt::WindowMaximizeButtonHint) diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp index d3b5869..a6f5f7d 100644 --- a/src/gui/widgets/qcommandlinkbutton.cpp +++ b/src/gui/widgets/qcommandlinkbutton.cpp @@ -349,7 +349,7 @@ void QCommandLinkButton::paintEvent(QPaintEvent *) QStyleOptionButton option; initStyleOption(&option); - //Enable command link appearence on Vista + //Enable command link appearance on Vista option.features |= QStyleOptionButton::CommandLinkButton; option.text = QString(); option.icon = QIcon(); //we draw this ourselves diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index 593e391..62ee398 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -943,7 +943,7 @@ void QMainWindowLayout::toggleToolBarsVisible() #ifdef Q_WS_MAC if (layoutState.mainWindow->unifiedTitleAndToolBarOnMac()) { // If we hit this case, someone has pressed the "toolbar button" which will - // toggle the unified toolbar visiblity, because that's what the user wants. + // toggle the unified toolbar visibility, because that's what the user wants. // We might be in a situation where someone has hidden all the toolbars // beforehand (maybe in construction), but now they've hit this button and // and are expecting the items to show. What do we do? diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 7941c4e..4bea6de 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -262,7 +262,7 @@ void QMenuPrivate::updateActionRects() const const int deskFw = style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, &opt, q); const int tearoffHeight = tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, q) : 0; - //for compatability now - will have to refactor this away.. + //for compatibility now - will have to refactor this away tabWidth = 0; maxIconWidth = 0; hasCheckableItems = false; @@ -1154,7 +1154,7 @@ void QMenuPrivate::_q_actionHovered() bool QMenuPrivate::hasMouseMoved(const QPoint &globalPos) { - //determines if the mouse has moved (ie its intial position has + //determines if the mouse has moved (ie its initial position has //changed by more than QApplication::startDragDistance() //or if there were at least 6 mouse motions) return motions > 6 || diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index e8e80b7..df16f7f 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -102,7 +102,7 @@ void QMenuBarExtension::paintEvent(QPaintEvent *) QStylePainter p(this); QStyleOptionToolButton opt; initStyleOption(&opt); - // We do not need to draw both extention arrows + // We do not need to draw both extension arrows opt.features &= ~QStyleOptionToolButton::HasMenu; p.drawComplexControl(QStyle::CC_ToolButton, opt); } diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp index 45b15ef..ea311d3 100644 --- a/src/gui/widgets/qprintpreviewwidget.cpp +++ b/src/gui/widgets/qprintpreviewwidget.cpp @@ -469,7 +469,7 @@ void QPrintPreviewWidgetPrivate::setZoomFactor(qreal _zoomFactor) \o Create the QPrintPreviewWidget Construct the QPrintPreviewWidget either by passing in an - exisiting QPrinter object, or have QPrintPreviewWidget create a + existing QPrinter object, or have QPrintPreviewWidget create a default constructed QPrinter object for you. \o Connect the paintRequested() signal to a slot. diff --git a/src/gui/widgets/qtoolbarextension.cpp b/src/gui/widgets/qtoolbarextension.cpp index 032c6f0..574a775 100644 --- a/src/gui/widgets/qtoolbarextension.cpp +++ b/src/gui/widgets/qtoolbarextension.cpp @@ -75,7 +75,7 @@ void QToolBarExtension::paintEvent(QPaintEvent *) QStylePainter p(this); QStyleOptionToolButton opt; initStyleOption(&opt); - // We do not need to draw both extention arrows + // We do not need to draw both extension arrows opt.features &= ~QStyleOptionToolButton::HasMenu; p.drawComplexControl(QStyle::CC_ToolButton, opt); } diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 8ae1305..348b0d2 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -647,7 +647,7 @@ void QHostInfoLookupManager::lookupFinished(QHostInfoRunnable *r) work(); } -// This function returns immediatly when we had a result in the cache, else it will later emit a signal +// This function returns immediately when we had a result in the cache, else it will later emit a signal QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id) { *valid = false; diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index b604e89..505db71 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1380,7 +1380,7 @@ void QAbstractSocket::connectToHostImplementation(const QString &hostName, quint #endif } else { if (d->threadData->eventDispatcher) { - // this internal API for QHostInfo either immediatly gives us the desired + // this internal API for QHostInfo either immediately gives us the desired // QHostInfo from cache or later calls the _q_startConnecting slot. bool immediateResultValid = false; QHostInfo hostInfo = qt_qhostinfo_lookup(hostName, diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 4907f2c..1e0bced 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -306,7 +306,7 @@ void QLocalSocketPrivate::startAsyncRead() /*! \internal Sets the correct size of the read buffer after a read operation. - Returns false, if an error occured or the connection dropped. + Returns false, if an error occurred or the connection dropped. */ bool QLocalSocketPrivate::completeAsyncRead() { diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index f91ce5f..fe28863 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -562,7 +562,7 @@ int QNativeSocketEnginePrivate::nativeAccept() #else int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); #endif - //check if we have vaild descriptor at all + //check if we have valid descriptor at all if(acceptedDescriptor > 0) { // Ensure that the socket is closed on exec*() ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC); diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index f73068e..91265f3 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -210,7 +210,7 @@ valid. On failure, QSslSocket will emit the QSslSocket::sslErrors() signal. This mode is the default for clients. - \value AutoVerifyPeer QSslSocket will automaticaly use QueryPeer for + \value AutoVerifyPeer QSslSocket will automatically use QueryPeer for server sockets and VerifyPeer for client sockets. \sa QSslSocket::peerVerifyMode() diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 6120a85..4daa866 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1991,7 +1991,7 @@ struct DDSFormat { option helps preserve this default behavior. \omitvalue CanFlipNativePixmapBindOption Used by x11 from pixmap to choose - wether or not it can bind the pixmap upside down or not. + whether or not it can bind the pixmap upside down or not. \omitvalue MemoryManagedBindOption Used by paint engines to indicate that the pixmap should be memory managed along side with diff --git a/src/qt3support/widgets/q3gridview.cpp b/src/qt3support/widgets/q3gridview.cpp index 343b49f..b270a38 100644 --- a/src/qt3support/widgets/q3gridview.cpp +++ b/src/qt3support/widgets/q3gridview.cpp @@ -84,7 +84,7 @@ using namespace Qt; size in a potentially scrollable canvas. If you need rows and columns with different sizes, use a Q3Table instead. If you need a simple list of items, use a Q3ListBox. If you need to present - hierachical data use a Q3ListView, and if you need random objects + hierarichal data use a Q3ListView, and if you need random objects at random positions, consider using either a Q3IconView or a Q3Canvas. */ diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index 1a11100..abaf5f9 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -324,7 +324,7 @@ QScriptValue QScriptContext::argumentsObject() const When a function is called as constructor, the thisObject() contains the newly constructed object to be initialized. - \note This function is only guarenteed to work for a context + \note This function is only guaranteed to work for a context corresponding to native functions. */ bool QScriptContext::isCalledAsConstructor() const diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 84d1567..ac49d65 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1211,7 +1211,7 @@ bool Moc::until(Token target) { //when searching commas within the default argument, we should take care of template depth (anglecount) // unfortunatelly, we do not have enough semantic information to know if '<' is the operator< or - // the begining of a template type. so we just use heuristics. + // the beginning of a template type. so we just use heuristics. int possible = -1; while (index < symbols.size()) { diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index d23b41e..eb33ce9 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2027,7 +2027,7 @@ void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker) } /*! - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, @@ -2113,7 +2113,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node, /*! Revised for the new doc format. - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. */ void HtmlGenerator::generateTableOfContents(const Node *node, CodeMarker *marker, -- cgit v0.12 From 6648d81c880012bad52380bd73bbe92d68260f7e Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 9 Aug 2010 14:27:50 +0200 Subject: doc: Fixed some qdoc errors. --- doc/src/frameworks-technologies/dnd.qdoc | 1 - doc/src/index.qdoc | 14 +++++++------- doc/src/overviews.qdoc | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc index c5dd27c..ebfa39e 100644 --- a/doc/src/frameworks-technologies/dnd.qdoc +++ b/doc/src/frameworks-technologies/dnd.qdoc @@ -30,7 +30,6 @@ \title Drag and Drop \brief An overview of the drag and drop system provided by Qt. - \ingroup technology-apis \ingroup qt-gui-concepts Drag and drop provides a simple visual mechanism which users can use diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index c1c63da..0609eb8 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -65,11 +65,10 @@
@@ -78,8 +77,9 @@
  • Qt Quick
  • Introduction to QML
  • QML Elements
    • -
  • UI components
    • - +
  • Model/View Programming
    • +
  • Network Programming
    • +
  • Graphics and Printing
    • diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index a1773a3..3c02705 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -63,7 +63,7 @@ /*! \group qt-graphics - \title Qt Graphics and Painting + \title Qt Graphics and Printing \brief The Qt components for doing graphics. -- cgit v0.12 From 163458f6363d32be453a186e02216f574f62dda3 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 9 Aug 2010 14:48:47 +0200 Subject: Added comment about calendarPopup in setCalendarWidget function documentation. Reviewer: David Boddie Task: QTBUG-12300 --- src/gui/widgets/qdatetimeedit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index 50fa9c9..7a61dc7 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -754,6 +754,7 @@ QCalendarWidget *QDateTimeEdit::calendarWidget() const Sets the given \a calendarWidget as the widget to be used for the calendar pop-up. The editor does not automatically take ownership of the calendar widget. + \note calendarPopup must be set to true before setting the calendar widget. \sa calendarPopup */ void QDateTimeEdit::setCalendarWidget(QCalendarWidget *calendarWidget) -- cgit v0.12 From 3b9c811a658d45f6e84a98ac26a5d122b34254fc Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Mon, 9 Aug 2010 13:27:31 +0200 Subject: Fix invalid memory write during recursive timer activation The handler for one timer recurses the event loop, and the handler for another timer removes the first timer, returning from the recursion and the handler for the first timer causes an invalid write (since the timer info for the first timer has been deleted). Fix this by keeping an active reference in QTimerInfo (instead of just a bool inTimerEvent). If this is non-zero, the timer is currently being delivered, so we prevent more delivery. When a timer is removed and it's activateRef is set, we clear it so that the delivery code knows now to write to memory that's already been freed. A side effect of this change is that we no longer need to track the currentTimerInfo "globally" anymore, it can be a normal local variable in the QTimerInfoList::activateTimers() function. Task-number: QT-3553 Reviewed-by: olivier Reviewed-by: joao --- src/corelib/kernel/qeventdispatcher_unix.cpp | 31 ++++++++------------ src/corelib/kernel/qeventdispatcher_unix_p.h | 4 +-- tests/auto/qtimer/tst_qtimer.cpp | 44 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index f7d45ac..9dadd82 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -331,7 +331,7 @@ QTimerInfoList::QTimerInfoList() } #endif - firstTimerInfo = currentTimerInfo = 0; + firstTimerInfo = 0; } timeval QTimerInfoList::updateCurrentTime() @@ -445,7 +445,7 @@ bool QTimerInfoList::timerWait(timeval &tm) // Find first waiting timer not already active QTimerInfo *t = 0; for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) { - if (!(*it)->inTimerEvent) { + if (!(*it)->activateRef) { t = *it; break; } @@ -474,7 +474,7 @@ void QTimerInfoList::registerTimer(int timerId, int interval, QObject *object) t->interval.tv_usec = (interval % 1000) * 1000; t->timeout = updateCurrentTime() + t->interval; t->obj = object; - t->inTimerEvent = false; + t->activateRef = 0; timerInsert(t); } @@ -489,8 +489,8 @@ bool QTimerInfoList::unregisterTimer(int timerId) removeAt(i); if (t == firstTimerInfo) firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; + if (t->activateRef) + *(t->activateRef) = 0; // release the timer id if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) @@ -515,8 +515,8 @@ bool QTimerInfoList::unregisterTimers(QObject *object) removeAt(i); if (t == firstTimerInfo) firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; + if (t->activateRef) + *(t->activateRef) = 0; // release the timer id if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) @@ -552,10 +552,7 @@ int QTimerInfoList::activateTimers() bool firstTime = true; timeval currentTime; int n_act = 0, maxCount = count(); - - QTimerInfo *saveFirstTimerInfo = firstTimerInfo; - QTimerInfo *saveCurrentTimerInfo = currentTimerInfo; - firstTimerInfo = currentTimerInfo = 0; + firstTimerInfo = 0; while (maxCount--) { currentTime = updateCurrentTime(); @@ -567,7 +564,7 @@ int QTimerInfoList::activateTimers() if (isEmpty()) break; - currentTimerInfo = first(); + QTimerInfo *currentTimerInfo = first(); if (currentTime < currentTimerInfo->timeout) break; // no timer has expired @@ -594,21 +591,19 @@ int QTimerInfoList::activateTimers() if (currentTimerInfo->interval.tv_usec > 0 || currentTimerInfo->interval.tv_sec > 0) n_act++; - if (!currentTimerInfo->inTimerEvent) { + if (!currentTimerInfo->activateRef) { // send event, but don't allow it to recurse - currentTimerInfo->inTimerEvent = true; + currentTimerInfo->activateRef = ¤tTimerInfo; QTimerEvent e(currentTimerInfo->id); QCoreApplication::sendEvent(currentTimerInfo->obj, &e); if (currentTimerInfo) - currentTimerInfo->inTimerEvent = false; + currentTimerInfo->activateRef = 0; } } - firstTimerInfo = saveFirstTimerInfo; - currentTimerInfo = saveCurrentTimerInfo; - + firstTimerInfo = 0; return n_act; } diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index cbe58de..060a163 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -77,7 +77,7 @@ struct QTimerInfo { timeval interval; // - timer interval timeval timeout; // - when to sent event QObject *obj; // - object to receive event - bool inTimerEvent; + QTimerInfo **activateRef; // - ref from activateTimers }; class QTimerInfoList : public QList @@ -92,7 +92,7 @@ class QTimerInfoList : public QList #endif // state variables used by activateTimers() - QTimerInfo *firstTimerInfo, *currentTimerInfo; + QTimerInfo *firstTimerInfo; public: QTimerInfoList(); diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp index a0408ef..8d213ed 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/qtimer/tst_qtimer.cpp @@ -86,6 +86,7 @@ private slots: void timerIdPersistsAfterThreadExit(); void cancelLongTimer(); void singleShotStaticFunctionZeroTimeout(); + void recurseOnTimeoutAndStopTimer(); }; class TimerHelper : public QObject @@ -623,5 +624,48 @@ void tst_QTimer::singleShotStaticFunctionZeroTimeout() QCOMPARE(helper.count, 1); } +class RecursOnTimeoutAndStopTimerTimer : public QObject +{ + Q_OBJECT + +public: + QTimer *one; + QTimer *two; + +public slots: + void onetrigger() + { + QCoreApplication::processEvents(); + } + + void twotrigger() + { + one->stop(); + } +}; + +void tst_QTimer::recurseOnTimeoutAndStopTimer() +{ + QEventLoop eventLoop; + QTimer::singleShot(1000, &eventLoop, SLOT(quit())); + + RecursOnTimeoutAndStopTimerTimer t; + t.one = new QTimer(&t); + t.two = new QTimer(&t); + + QObject::connect(t.one, SIGNAL(timeout()), &t, SLOT(onetrigger())); + QObject::connect(t.two, SIGNAL(timeout()), &t, SLOT(twotrigger())); + + t.two->setSingleShot(true); + + t.one->start(); + t.two->start(); + + (void) eventLoop.exec(); + + QVERIFY(!t.one->isActive()); + QVERIFY(!t.two->isActive()); +} + QTEST_MAIN(tst_QTimer) #include "tst_qtimer.moc" -- cgit v0.12 From af3a204b8b3e780438c39425ba74338cc6a46a80 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Aug 2010 17:38:05 +0200 Subject: configure: fix error message when calling config.status Calling configure in a shadow build directory led to error messages when trying to delete the content of $$QT_BUILD_TREE/mkspecs. Task-number: QTBUG-12764 Reviewed-by: ossi --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 74f5505..25f1ef5 100755 --- a/configure +++ b/configure @@ -2407,7 +2407,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then # symlink the mkspecs directory mkdir -p "$outpath/mkspecs" - rm -f "$outpath"/mkspecs/* + rm -rf "$outpath"/mkspecs/* ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" rm -f "$outpath/mkspecs/default" -- cgit v0.12 From 3833dc0a0535fa8320e17c741ca2746e9bebcaa9 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 9 Aug 2010 20:27:42 +0200 Subject: qdoc: Fixed non-well-formed markup. Reviewed-by: Trust Me To-be-really-reviewed-by: Qt Doc Team --- tools/qdoc3/htmlgenerator.cpp | 24 +++++++++++------------- tools/qdoc3/test/qt-html-templates.qdocconf | 3 ++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index b1a8336..27d5b0f 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1717,7 +1717,7 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << "\n"; } if (!cn->name().isEmpty()) - out() << "
  • " << cn->name() << "
    • \n"; + out() << "
  • " << protect(cn->name()) << "
    • \n"; } else if (node->type() == Node::Fake) { const FakeNode* fn = static_cast(node); @@ -1725,52 +1725,50 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << "
  • Modules
    • "; QString name = node->name(); if (!name.isEmpty()) - out() << "
  • " << name << "
    • \n"; + out() << "
  • " << protect(name) << "
    • \n"; } else if (node->subType() == Node::Group) { if (fn->name() == QString("modules")) out() << "
  • Modules
    • "; else { - out() << "
  • " << title << "
    • "; + out() << "
  • " << protect(title) << "
    • "; } } else if (node->subType() == Node::Page) { if (fn->name() == QString("qdeclarativeexamples.html")) { out() << "
  • Examples
    • "; - out() << "
  • QML Examples & Demos
    • "; + out() << "
  • QML Examples & Demos
    • "; } else if (fn->name().startsWith("examples-")) { out() << "
  • Examples
    • "; - out() << "
  • " << title << "
    • "; + out() << "
  • " << protect(title) << "
    • "; } else if (fn->name() == QString("namespaces.html")) { out() << "
  • Namespaces
    • "; } else { - out() << "
  • " << title << "
    • "; + out() << "
  • " << protect(title) << "
    • "; } } else if (node->subType() == Node::QmlClass) { out() << "
  • QML Elements
    • "; - out() << "
  • " << title << "
    • "; + out() << "
  • " << protect(title) << "
    • "; } else if (node->subType() == Node::Example) { out() << "
  • Examples
    • "; QStringList sl = fn->name().split('/'); if (sl.contains("declarative")) - out() << "
  • QML Examples & Demos
    • "; + out() << "
  • QML Examples & Demos
    • "; else { - QString name = "examples-" + sl.at(0) + ".html"; // this generates an empty link + QString name = protect("examples-" + sl.at(0) + ".html"); // this generates an empty link QString t = CodeParser::titleFromName(name); - // out() << "
  • " - // << t << "
    • "; } - out() << "
  • " << title << "
    • "; + out() << "
  • " << protect(title) << "
    • "; } } else if (node->type() == Node::Namespace) { out() << "
  • Namespaces
    • "; - out() << "
  • " << title << "
    • "; + out() << "
  • " << protect(title) << "
    • "; } } diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index cf15628..67d7165 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -168,4 +168,5 @@ HTML.footer = " \n" \ " \n" \ " \n" \ "
    \n" \ - "
    \n" + " \n" \ + " \n" -- cgit v0.12 From 48cd20335f838db5aa31031c10352ca7058d84e8 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 10 Aug 2010 10:20:14 +1000 Subject: Associate qmlInfo() documentation with QDeclarativeEngine Task-number: QTBUG-12755 --- src/declarative/qml/qdeclarativeinfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index c980a2a..c6560dd 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE /*! \fn QDeclarativeInfo qmlInfo(const QObject *object) + \relates QDeclarativeEngine \brief Prints warnings messages that include the file and line number for QML types. -- cgit v0.12 From bacf934f35c51baf49d0b73cf4fb79e860e24303 Mon Sep 17 00:00:00 2001 From: Arvid Ephraim Picciani Date: Mon, 9 Aug 2010 15:28:59 -0700 Subject: add performance comparisons to qregexp benchmark Reviewed-by: hjk --- tests/benchmarks/corelib/tools/qregexp/main.cpp | 304 +++++++++++++++++++++ tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 11 +- tests/benchmarks/corelib/tools/qregexp/qregexp.qrc | 6 + 3 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 tests/benchmarks/corelib/tools/qregexp/qregexp.qrc diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp index ab9ed71..51cde95 100644 --- a/tests/benchmarks/corelib/tools/qregexp/main.cpp +++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp @@ -38,16 +38,27 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include #include #include +#include #include +#ifdef HAVE_BOOST +#include +#endif + +#include +#include "pcre/pcre.h" +#define ZLIB_VERSION "1.2.3.4" class tst_qregexp : public QObject { Q_OBJECT +public: + tst_qregexp(); private slots: void escape_old(); void escape_old_data() { escape_data(); } @@ -59,10 +70,56 @@ private slots: void escape_new3_data() { escape_data(); } void escape_new4(); void escape_new4_data() { escape_data(); } +/* + JSC outperforms everything. + Boost is less impressive then expected. + */ + void simpleFind1(); + void rangeReplace1(); + void matchReplace1(); + + void simpleFind2(); + void rangeReplace2(); + void matchReplace2(); + + void simpleFindJSC(); + void rangeReplaceJSC(); + void matchReplaceJSC(); + +#ifdef HAVE_BOOST + void simpleFindBoost(); + void rangeReplaceBoost(); + void matchReplaceBoost(); +#endif + +/* those apply an (incorrect) regexp on entire source + (this main.cpp). JSC appears to handle this + (ab)use case best. QRegExp performs extremly bad. + */ + void horribleWrongReplace1(); + void horribleReplace1(); + void horribleReplace2(); + void horribleWrongReplace2(); + void horribleWrongReplaceJSC(); + void horribleReplaceJSC(); +#ifdef HAVE_BOOST + void horribleWrongReplaceBoost(); + void horribleReplaceBoost(); +#endif private: + QString str1; + QString str2; void escape_data(); }; +tst_qregexp::tst_qregexp() + :QObject() + ,str1("We are all happy monkeys") +{ + QFile f(":/main.cpp"); + f.open(QFile::ReadOnly); + str2=f.readAll(); +} static void verify(const QString "ed, const QString &expected) { @@ -285,6 +342,253 @@ void tst_qregexp::escape_new4() // "return quoted" } } + + +void tst_qregexp::simpleFind1() +{ + int roff; + QRegExp rx("happy"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + roff = rx.indexIn(str1); + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplace1() +{ + QString r; + QRegExp rx("[a-f]"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str1).replace(rx, "-"); + } + QCOMPARE(r, QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplace1() +{ + QString r; + QRegExp rx("[^a-f]*([a-f]+)[^a-f]*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str1).replace(rx, "\\1"); + } + QCOMPARE(r, QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplace1() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, str2); +} + +void tst_qregexp::horribleReplace1() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*"); + rx.setPatternSyntax(QRegExp::RegExp); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, QString("1.2.3")); +} + + +void tst_qregexp::simpleFind2() +{ + int roff; + QRegExp rx("happy"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + roff = rx.indexIn(str1); + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplace2() +{ + QString r; + QRegExp rx("[a-f]"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str1).replace(rx, "-"); + } + QCOMPARE(r, QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplace2() +{ + QString r; + QRegExp rx("[^a-f]*([a-f]+)[^a-f]*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str1).replace(rx, "\\1"); + } + QCOMPARE(r, QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplace2() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, str2); +} + +void tst_qregexp::horribleReplace2() +{ + QString r; + QRegExp rx(".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*"); + rx.setPatternSyntax(QRegExp::RegExp2); + QBENCHMARK{ + r = QString(str2).replace(rx, "\\1.\\2.\\3"); + } + QCOMPARE(r, QString("1.2.3")); +} + + +void tst_qregexp::simpleFindJSC() +{ + int numr; + const char * errmsg=" "; + QString rxs("happy"); + JSRegExp *rx = jsRegExpCompile(rxs.utf16(), rxs.length(), JSRegExpDoNotIgnoreCase, JSRegExpSingleLine, 0, &errmsg); + QVERIFY(rx != 0); + QString s(str1); + int offsetVector[3]; + QBENCHMARK{ + numr = jsRegExpExecute(rx, s.utf16(), s.length(), 0, offsetVector, 3); + } + jsRegExpFree(rx); + QCOMPARE(numr, 1); + QCOMPARE(offsetVector[0], 11); +} + +void tst_qregexp::rangeReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str1); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/[a-f]/g, '-') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str1); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/[^a-f]*([a-f]+)[^a-f]*/g, '$1') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("eaeaae")); +} + +void tst_qregexp::horribleWrongReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + engine.globalObject().setProperty("s", str2); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*/gm, '$1.$2.$3') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), str2); +} + +void tst_qregexp::horribleReplaceJSC() +{ + QScriptValue r; + QScriptEngine engine; + // the m flag doesnt actually work here; dunno + engine.globalObject().setProperty("s", str2.replace('\n', ' ')); + QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*/gm, '$1.$2.$3') } )"); + QVERIFY(replaceFunc.isFunction()); + QBENCHMARK{ + r = replaceFunc.call(QScriptValue()); + } + QCOMPARE(r.toString(), QString("1.2.3")); +} + + +#ifdef HAVE_BOOST +void tst_qregexp::simpleFindBoost(){ + int roff; + boost::regex rx ("happy", boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string::const_iterator start, end; + start = s.begin(); + end = s.end(); + boost::match_flag_type flags = boost::match_default; + QBENCHMARK{ + boost::match_results what; + regex_search(start, end, what, rx, flags); + roff = (what[0].first)-start; + } + QCOMPARE(roff, 11); +} + +void tst_qregexp::rangeReplaceBoost() +{ + boost::regex pattern ("[a-f]", boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "-"); + } + QCOMPARE(r, std::string("W- -r- -ll h-ppy monk-ys")); +} + +void tst_qregexp::matchReplaceBoost() +{ + boost::regex pattern ("[^a-f]*([a-f]+)[^a-f]*",boost::regex_constants::perl); + std::string s = str1.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1"); + } + QCOMPARE(r, std::string("eaeaae")); +} + +void tst_qregexp::horribleWrongReplaceBoost() +{ + boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*", boost::regex_constants::perl); + std::string s = str2.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1.$2.$3"); + } + QCOMPARE(r, s); +} + +void tst_qregexp::horribleReplaceBoost() +{ + boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*", boost::regex_constants::perl); + std::string s = str2.toStdString(); + std::string r; + QBENCHMARK{ + r = boost::regex_replace (s, pattern, "$1.$2.$3"); + } + QCOMPARE(r, std::string("1.2.3")); +} +#endif //HAVE_BOOST + QTEST_MAIN(tst_qregexp) #include "main.moc" diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index e0f47c9..ffdad12 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -3,10 +3,19 @@ TEMPLATE = app TARGET = tst_bench_qregexp DEPENDPATH += . INCLUDEPATH += . - +RESOURCES+=qregexp.qrc QT -= gui +QT += script CONFIG += release # Input SOURCES += main.cpp + +include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri ) + +exists( /usr/include/boost/regex.hpp ){ +DEFINES+=HAVE_BOOST +LIBS+=-lboost_regex +} + diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc b/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc new file mode 100644 index 0000000..a7fe13c --- /dev/null +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.qrc @@ -0,0 +1,6 @@ + + + main.cpp + + + -- cgit v0.12 From 6feb5b75ce96aeeefee189af003949db8c031519 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 10 Aug 2010 11:50:49 +1000 Subject: Don't double-add item change listeners. When a Repeater was used as the child of an Item binding to childrenRect, the item change listener was being added twice for the items created by the Repeater. Task-number: QTBUG-12722 --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 ++-- .../qdeclarativeitem/data/childrenRectBug3.qml | 15 +++++++++++++++ .../declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | 12 ++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index ff05997..9d782b9 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2724,12 +2724,12 @@ QVariant QDeclarativeItem::itemChange(GraphicsItemChange change, } break; case ItemChildAddedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childAdded(qobject_cast( value.value())); break; case ItemChildRemovedChange: - if (d->_contents) + if (d->_contents && d->componentComplete) d->_contents->childRemoved(qobject_cast( value.value())); break; diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml new file mode 100644 index 0000000..f19ab4f --- /dev/null +++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml @@ -0,0 +1,15 @@ +import Qt 4.7 + +Rectangle { + width: 300 + height: 300 + + Rectangle { + height: childrenRect.height + + Repeater { + model: 1 + Rectangle { } + } + } +} diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index d76d360..25ca157 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -75,6 +75,7 @@ private slots: void childrenRect(); void childrenRectBug(); void childrenRectBug2(); + void childrenRectBug3(); void childrenProperty(); void resourcesProperty(); @@ -780,6 +781,17 @@ void tst_QDeclarativeItem::childrenRectBug2() delete canvas; } +// QTBUG-12722 +void tst_QDeclarativeItem::childrenRectBug3() +{ + QDeclarativeView *canvas = new QDeclarativeView(0); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/childrenRectBug3.qml")); + canvas->show(); + + //don't crash on delete + delete canvas; +} + template T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName) { -- cgit v0.12 From f3ac9de816c0bff9961110c5a734871da2e129cf Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 10 Aug 2010 07:21:10 +0200 Subject: Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression Commit eea84818e98af917d3cf2bf04ea17a416ef9d55e corrected some spelling mistakes, one of which this test was relying on. Reviewed-by: trustme --- .../declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index d5a911a..db1f191 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -585,7 +585,7 @@ void tst_qdeclarativeinstruction::dump() << "45\t\t48\tDEFER\t\t\t7" << "46\t\tNA\tDEFER\t\t\t7" << "47\t\t48\tSTORE_IMPORTED_SCRIPT\t2" - << "48\t\t50\tXXX UNKOWN INSTRUCTION\t1234" + << "48\t\t50\tXXX UNKNOWN INSTRUCTION\t1234" << "49\t\t51\tSTORE_VARIANT_INTEGER\t\t32\t11" << "50\t\t52\tSTORE_VARIANT_DOUBLE\t\t19\t33.7" << "-------------------------------------------------------------------------------"; -- cgit v0.12 From a1641e27d2e2f5e29362e3737be6b9d75714d138 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Mon, 9 Aug 2010 15:56:34 +0200 Subject: Add text decoration support to QStaticText The original code path of QStaticText does not include decoration drawing, this patch generalized the drawTextItemDecoration() function to draw decoration for drawText(), then use that to draw decoration for QStaticText. A helper function called drawDecorationForGlyphs() is made to allow easier extension for direct glyphs drawing support. Task-number: QTBUG-12121 Reviewed-by: Eskil --- src/gui/painting/qpainter.cpp | 84 +++++++++++++++++++---- tests/auto/qstatictext/tst_qstatictext.cpp | 106 +++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 13 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 9dadbd5..b694d9c 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -90,6 +90,15 @@ void qt_format_text(const QFont &font, const QRectF &_r, int tf, const QTextOption *option, const QString& str, QRectF *brect, int tabstops, int* tabarray, int tabarraylen, QPainter *painter); +static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, + QTextCharFormat::UnderlineStyle underlineStyle, + const QTextItem::RenderFlags flags, qreal width, + const QTextCharFormat &charFormat); +// Helper function to calculate left most position, width and flags for decoration drawing +static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray, + const QFixedPoint *positions, int glyphCount, + QFontEngine *fontEngine, const QFont &font, + const QTextCharFormat &charFormat); static inline QGradient::CoordinateMode coordinateMode(const QBrush &brush) { @@ -5923,6 +5932,10 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText currentColor = item->color; } d->extended->drawStaticTextItem(item); + + drawDecorationForGlyphs(this, item->glyphs, item->glyphPositions, + item->numGlyphs, item->fontEngine, staticText_d->font, + QTextCharFormat()); } if (currentColor != oldPen.color()) setPen(oldPen); @@ -6290,15 +6303,15 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen) return pixmap; } -static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QTextItemInt &ti) +static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, + QTextCharFormat::UnderlineStyle underlineStyle, + const QTextItem::RenderFlags flags, qreal width, + const QTextCharFormat &charFormat) { - QTextCharFormat::UnderlineStyle underlineStyle = ti.underlineStyle; if (underlineStyle == QTextCharFormat::NoUnderline - && !(ti.flags & (QTextItem::StrikeOut | QTextItem::Overline))) + && !(flags & (QTextItem::StrikeOut | QTextItem::Overline))) return; - QFontEngine *fe = ti.fontEngine; - const QPen oldPen = painter->pen(); const QBrush oldBrush = painter->brush(); painter->setBrush(Qt::NoBrush); @@ -6307,7 +6320,7 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const pen.setWidthF(fe->lineThickness().toReal()); pen.setCapStyle(Qt::FlatCap); - QLineF line(pos.x(), pos.y(), pos.x() + ti.width.toReal(), pos.y()); + QLineF line(pos.x(), pos.y(), pos.x() + width, pos.y()); const qreal underlineOffset = fe->underlinePosition().toReal(); // deliberately ceil the offset to avoid the underline coming too close to @@ -6322,21 +6335,21 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const painter->save(); painter->translate(0, pos.y() + 1); - QColor uc = ti.charFormat.underlineColor(); + QColor uc = charFormat.underlineColor(); if (uc.isValid()) pen.setColor(uc); // Adapt wave to underlineOffset or pen width, whatever is larger, to make it work on all platforms const QPixmap wave = generateWavyPixmap(qMax(underlineOffset, pen.widthF()), pen); - const int descent = (int) ti.descent.toReal(); + const int descent = (int) fe->descent().toReal(); painter->setBrushOrigin(painter->brushOrigin().x(), 0); - painter->fillRect(pos.x(), 0, qCeil(ti.width.toReal()), qMin(wave.height(), descent), wave); + painter->fillRect(pos.x(), 0, qCeil(width), qMin(wave.height(), descent), wave); painter->restore(); } else if (underlineStyle != QTextCharFormat::NoUnderline) { QLineF underLine(line.x1(), underlinePos, line.x2(), underlinePos); - QColor uc = ti.charFormat.underlineColor(); + QColor uc = charFormat.underlineColor(); if (uc.isValid()) pen.setColor(uc); @@ -6348,14 +6361,14 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const pen.setStyle(Qt::SolidLine); pen.setColor(oldPen.color()); - if (ti.flags & QTextItem::StrikeOut) { + if (flags & QTextItem::StrikeOut) { QLineF strikeOutLine = line; strikeOutLine.translate(0., - fe->ascent().toReal() / 3.); painter->setPen(pen); painter->drawLine(strikeOutLine); } - if (ti.flags & QTextItem::Overline) { + if (flags & QTextItem::Overline) { QLineF overLine = line; overLine.translate(0., - fe->ascent().toReal()); painter->setPen(pen); @@ -6366,6 +6379,50 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const painter->setBrush(oldBrush); } +static void drawDecorationForGlyphs(QPainter *painter, const glyph_t *glyphArray, + const QFixedPoint *positions, int glyphCount, + QFontEngine *fontEngine, const QFont &font, + const QTextCharFormat &charFormat) +{ + if (!(font.underline() || font.strikeOut() || font.overline())) + return; + + QFixed leftMost; + QFixed rightMost; + QFixed baseLine; + for (int i=0; iboundingBox(glyphArray[i]); + if (i == 0 || leftMost > positions[i].x) + leftMost = positions[i].x; + + // We don't support glyphs that do not share a common baseline. If this turns out to + // be a relevant use case, then we need to find clusters of glyphs that share a baseline + // and do a drawTextItemDecorations call per cluster. + if (i == 0 || baseLine < positions[i].y) + baseLine = positions[i].y; + + // We use the advance rather than the actual bounds to match the algorithm in drawText() + if (i == 0 || rightMost < positions[i].x + gm.xoff) + rightMost = positions[i].x + gm.xoff; + } + + QFixed width = rightMost - leftMost; + QTextItem::RenderFlags flags = 0; + + if (font.underline()) + flags |= QTextItem::Underline; + if (font.overline()) + flags |= QTextItem::Overline; + if (font.strikeOut()) + flags |= QTextItem::StrikeOut; + + drawTextItemDecoration(painter, QPointF(leftMost.toReal(), baseLine.toReal()), + fontEngine, + font.underline() ? QTextCharFormat::SingleUnderline + : QTextCharFormat::NoUnderline, flags, + width.toReal(), charFormat); +} + void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti) { #ifdef QT_DEBUG_DRAW @@ -6496,7 +6553,8 @@ void QPainter::drawTextItem(const QPointF &p, const QTextItem &_ti) else d->engine->drawTextItem(p, ti); } - drawTextItemDecoration(this, p, ti); + drawTextItemDecoration(this, p, ti.fontEngine, ti.underlineStyle, ti.flags, ti.width.toReal(), + ti.charFormat); if (d->state->renderHints != oldRenderHints) { d->state->renderHints = oldRenderHints; diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp index 1d166f4..0ae5320 100644 --- a/tests/auto/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/qstatictext/tst_qstatictext.cpp @@ -85,6 +85,10 @@ private slots: void setPenPlainText(); void setPenRichText(); void richTextOverridesPen(); + + void drawStruckOutText(); + void drawOverlinedText(); + void drawUnderlinedText(); }; void tst_QStaticText::init() @@ -620,5 +624,107 @@ void tst_QStaticText::richTextOverridesPen() } } +void tst_QStaticText::drawStruckOutText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setStrikeOut(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawStruckOutText_imageDrawText.png"); + imageDrawStaticText.save("drawStruckOutText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + +void tst_QStaticText::drawOverlinedText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setOverline(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawOverlinedText_imageDrawText.png"); + imageDrawStaticText.save("drawOverlinedText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + +void tst_QStaticText::drawUnderlinedText() +{ + QPixmap imageDrawText(1000, 1000); + QPixmap imageDrawStaticText(1000, 1000); + + imageDrawText.fill(Qt::white); + imageDrawStaticText.fill(Qt::white); + + QString s = QString::fromLatin1("Foobar"); + + QFont font; + font.setUnderline(true); + + { + QPainter p(&imageDrawText); + p.setFont(font); + p.drawText(QPointF(50, 50), s); + } + + { + QPainter p(&imageDrawStaticText); + QStaticText text = QStaticText(s); + p.setFont(font); + p.drawStaticText(QPointF(50, 50 - QFontMetricsF(p.font()).ascent()), text); + } + +#if defined(DEBUG_SAVE_IMAGE) + imageDrawText.save("drawUnderlinedText_imageDrawText.png"); + imageDrawStaticText.save("drawUnderlinedText_imageDrawStaticText.png"); +#endif + + QCOMPARE(imageDrawText, imageDrawStaticText); +} + QTEST_MAIN(tst_QStaticText) #include "tst_qstatictext.moc" -- cgit v0.12 From 30b82b9440fcfc4a703d1a2b1150efd6b4147093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 4 Aug 2010 10:37:58 +0200 Subject: Fixed a bug in implementation of sizeHint() when there was a constraint The constraint was not adjusted with the margins before passing it on to the engine (which is unaware of the margins). Task-number: Found during QT-3570 Reviewed-by: Paul --- src/gui/graphicsview/qgraphicsgridlayout.cpp | 3 ++- src/gui/graphicsview/qgraphicslinearlayout.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp index 062b5ac..3fc7f10 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.cpp +++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp @@ -641,7 +641,8 @@ QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constrain Q_D(const QGraphicsGridLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp index 37408ef..1588364 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp @@ -528,7 +528,8 @@ QSizeF QGraphicsLinearLayout::sizeHint(Qt::SizeHint which, const QSizeF &constra Q_D(const QGraphicsLinearLayout); qreal left, top, right, bottom; getContentsMargins(&left, &top, &right, &bottom); - return d->engine.sizeHint(d->styleInfo(), which , constraint) + QSizeF(left + right, top + bottom); + const QSizeF extraMargins(left + right, top + bottom); + return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins; } /*! -- cgit v0.12 From 62b5ef3cc1306e46a4042b14867f2f92d9a110f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 4 Aug 2010 10:51:51 +0200 Subject: Fix (implement!) hfw/wfh in QGridLayoutEngine Note that only height-for-width works, since we cannot add QSizePolicy::hasWidthForHeight() in a patch release. Task-number: QT-3570 Reviewed-by: Paul --- src/gui/graphicsview/qgraphicslayoutitem.cpp | 51 ++- src/gui/graphicsview/qgraphicslayoutitem_p.h | 6 + src/gui/graphicsview/qgridlayoutengine.cpp | 251 +++++++++++++- src/gui/graphicsview/qgridlayoutengine_p.h | 23 +- .../tst_qgraphicsgridlayout.cpp | 364 ++++++++++++++++++++- 5 files changed, 678 insertions(+), 17 deletions(-) diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp index 5a7f1af..3707591 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.cpp +++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp @@ -48,6 +48,7 @@ #include "qgraphicslayoutitem.h" #include "qgraphicslayoutitem_p.h" #include "qwidget.h" +#include "qgraphicswidget.h" #include @@ -139,9 +140,11 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) if (!sizeHintCacheDirty && cachedConstraint == constraint) return cachedSizeHints; + const bool hasConstraint = constraint.width() >= 0 || constraint.height() >= 0; + for (int i = 0; i < Qt::NSizeHints; ++i) { cachedSizeHints[i] = constraint; - if (userSizeHints) + if (userSizeHints && !hasConstraint) combineSize(cachedSizeHints[i], userSizeHints[i]); } @@ -259,6 +262,52 @@ void QGraphicsLayoutItemPrivate::setSizeComponent( q->updateGeometry(); } + +bool QGraphicsLayoutItemPrivate::hasHeightForWidth() const +{ + Q_Q(const QGraphicsLayoutItem); + if (isLayout) { + const QGraphicsLayout *l = static_cast(q); + for (int i = l->count() - 1; i >= 0; --i) { + if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasHeightForWidth()) + return true; + } + } else if (QGraphicsItem *item = q->graphicsItem()) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->layout()) { + return QGraphicsLayoutItemPrivate::get(w->layout())->hasHeightForWidth(); + } + } + } + return q->sizePolicy().hasHeightForWidth(); +} + +bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const +{ + // enable this code when we add QSizePolicy::hasWidthForHeight() (For 4.8) +#if 1 + return false; +#else + Q_Q(const QGraphicsLayoutItem); + if (isLayout) { + const QGraphicsLayout *l = static_cast(q); + for (int i = l->count() - 1; i >= 0; --i) { + if (QGraphicsLayoutItemPrivate::get(l->itemAt(i))->hasWidthForHeight()) + return true; + } + } else if (QGraphicsItem *item = q->graphicsItem()) { + if (item->isWidget()) { + QGraphicsWidget *w = static_cast(item); + if (w->layout()) { + return QGraphicsLayoutItemPrivate::get(w->layout())->hasWidthForHeight(); + } + } + } + return q->sizePolicy().hasWidthForHeight(); +#endif +} + /*! \class QGraphicsLayoutItem \brief The QGraphicsLayoutItem class can be inherited to allow your custom diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h index 15cc7a5..b752e03 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem_p.h +++ b/src/gui/graphicsview/qgraphicslayoutitem_p.h @@ -65,6 +65,9 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutItemPrivate public: virtual ~QGraphicsLayoutItemPrivate(); QGraphicsLayoutItemPrivate(QGraphicsLayoutItem *parent, bool isLayout); + static QGraphicsLayoutItemPrivate *get(QGraphicsLayoutItem *q) { return q->d_func();} + static const QGraphicsLayoutItemPrivate *get(const QGraphicsLayoutItem *q) { return q->d_func();} + void init(); QSizeF *effectiveSizeHints(const QSizeF &constraint) const; QGraphicsItem *parentItem() const; @@ -73,6 +76,9 @@ public: enum SizeComponent { Width, Height }; void setSizeComponent(Qt::SizeHint which, SizeComponent component, qreal value); + bool hasHeightForWidth() const; + bool hasWidthForHeight() const; + QSizePolicy sizePolicy; QGraphicsLayoutItem *parent; diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index a084647..ea54a90 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -545,6 +545,24 @@ QSizePolicy::Policy QGridLayoutItem::sizePolicy(Qt::Orientation orientation) con : sizePolicy.verticalPolicy(); } +/* + returns true if the size policy returns true for either hasHeightForWidth() + or hasWidthForHeight() + */ +bool QGridLayoutItem::hasDynamicConstraint() const +{ + return QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth() + || QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight(); +} + +Qt::Orientation QGridLayoutItem::dynamicConstraintOrientation() const +{ + if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasHeightForWidth()) + return Qt::Vertical; + else //if (QGraphicsLayoutItemPrivate::get(q_layoutItem)->hasWidthForHeight()) + return Qt::Horizontal; +} + QSizePolicy::ControlTypes QGridLayoutItem::controlTypes(LayoutSide /* side */) const { return q_layoutItem->sizePolicy().controlType(); @@ -613,7 +631,14 @@ QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal heig qreal cellWidth = width; qreal cellHeight = height; - QSizeF size = effectiveMaxSize().boundedTo(QSizeF(cellWidth, cellHeight)); + QSize constraint; + if (hasDynamicConstraint()) { + if (dynamicConstraintOrientation() == Qt::Vertical) + constraint.setWidth(cellWidth); + else + constraint.setHeight(cellHeight); + } + QSizeF size = effectiveMaxSize(constraint).boundedTo(QSizeF(cellWidth, cellHeight)); width = size.width(); height = size.height(); @@ -675,13 +700,13 @@ void QGridLayoutItem::insertOrRemoveRows(int row, int delta, Qt::Orientation ori Note that effectiveSizeHint does not take sizePolicy into consideration, (since it only evaluates the hints, as the name implies) */ -QSizeF QGridLayoutItem::effectiveMaxSize() const +QSizeF QGridLayoutItem::effectiveMaxSize(const QSizeF &constraint) const { - QSizeF size; + QSizeF size = constraint; bool vGrow = (sizePolicy(Qt::Vertical) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag; bool hGrow = (sizePolicy(Qt::Horizontal) & QSizePolicy::GrowFlag) == QSizePolicy::GrowFlag; if (!vGrow || !hGrow) { - QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize); + QSizeF pref = layoutItem()->effectiveSizeHint(Qt::PreferredSize, constraint); if (!vGrow) size.setHeight(pref.height()); if (!hGrow) @@ -689,7 +714,7 @@ QSizeF QGridLayoutItem::effectiveMaxSize() const } if (!size.isValid()) { - QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize); + QSizeF maxSize = layoutItem()->effectiveSizeHint(Qt::MaximumSize, constraint); if (size.width() == -1) size.setWidth(maxSize.width()); if (size.height() == -1) @@ -1010,6 +1035,7 @@ void QGridLayoutEngine::invalidate() q_cachedEffectiveLastRows[Ver] = -1; q_cachedDataForStyleInfo.invalidate(); q_cachedSize = QSizeF(); + q_cachedConstraintOrientation = UnknownConstraint; } static void visualRect(QRectF *geom, Qt::LayoutDirection dir, const QRectF &contentsRect) @@ -1074,10 +1100,13 @@ QRectF QGridLayoutEngine::cellRect(const QLayoutStyleInfo &styleInfo, } QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which, - const QSizeF & /* constraint */) const + const QSizeF &constraint) const { ensureColumnAndRowData(styleInfo); + if (hasDynamicConstraint()) + return dynamicallyConstrainedSizeHint(which, constraint); + switch (which) { case Qt::MinimumSize: return QSizeF(q_totalBoxes[Hor].q_minimumSize, q_totalBoxes[Ver].q_minimumSize); @@ -1375,7 +1404,11 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, const QLayoutSt box = &multiCell.q_box; multiCell.q_stretch = itemStretch; } - box->combine(item->box(orientation)); + // Items with constraints are not included in the orientation that + // they are constrained (since it depends on the hfw/constraint function). + // They must be combined at a later stage. + if (!item->hasDynamicConstraint() || orientation != item->dynamicConstraintOrientation()) + box->combine(item->box(orientation)); if (effectiveRowSpan == 1) { QSizePolicy::ControlTypes controls = item->controlTypes(top); @@ -1532,6 +1565,138 @@ void QGridLayoutEngine::ensureColumnAndRowData(const QLayoutStyleInfo &styleInfo q_cachedDataForStyleInfo = styleInfo; } +QSizeF QGridLayoutEngine::dynamicallyConstrainedSizeHint(Qt::SizeHint which, + const QSizeF &constraint) const +{ + Q_ASSERT(hasDynamicConstraint()); + if (constraint.width() < 0 && constraint.height() < 0) { + // Process the hfw / wfh items that we did not process in fillRowData() + const Qt::Orientation constraintOrient = constraintOrientation(); + + QGridLayoutRowData rowData = constraintOrient == Qt::Vertical ? q_rowData : q_columnData; + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + if (item->hasDynamicConstraint()) { + QGridLayoutBox box = item->box(constraintOrient); + QGridLayoutBox &rowBox = rowData.boxes[item->firstRow(constraintOrient)]; + rowBox.combine(box); + } + } + + QGridLayoutBox totalBoxes[2]; + if (constraintOrient == Qt::Vertical) { + totalBoxes[Hor] = q_columnData.totalBox(0, columnCount()); + totalBoxes[Ver] = rowData.totalBox(0, rowCount()); + } else { + totalBoxes[Hor] = rowData.totalBox(0, columnCount()); + totalBoxes[Ver] = q_rowData.totalBox(0, rowCount()); + } + return QSizeF(totalBoxes[Hor].q_sizes(which), totalBoxes[Ver].q_sizes(which)); + } + + + Q_ASSERT(constraint.width() >= 0 || constraint.height() >= 0); + q_xx.resize(columnCount()); + q_yy.resize(rowCount()); + q_widths.resize(columnCount()); + q_heights.resize(rowCount()); + q_descents.resize(rowCount()); + + + const Qt::Orientation orientation = constraintOrientation(); + QGridLayoutRowData *colData; + QGridLayoutRowData constrainedRowData; + QGridLayoutBox *totalBox; + qreal *sizes; + qreal *pos; + qreal *descents; + qreal targetSize; + qreal cCount; + qreal rCount; + + if (orientation == Qt::Vertical) { + // height for width + colData = &q_columnData; + totalBox = &q_totalBoxes[Hor]; + sizes = q_widths.data(); + pos = q_xx.data(); + descents = 0; + targetSize = constraint.width(); + cCount = columnCount(); + rCount = rowCount(); + constrainedRowData = q_rowData; + } else { + // width for height + colData = &q_rowData; + totalBox = &q_totalBoxes[Ver]; + sizes = q_heights.data(); + pos = q_yy.data(); + descents = q_descents.data(); + targetSize = constraint.height(); + cCount = rowCount(); + rCount = columnCount(); + constrainedRowData = q_columnData; + } + colData->calculateGeometries(0, cCount, targetSize, pos, sizes, descents, *totalBox); + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + + if (item->hasDynamicConstraint()) { + const qreal size = sizes[item->firstColumn(orientation)]; + QGridLayoutBox box = item->box(orientation, size); + QGridLayoutBox &rowBox = constrainedRowData.boxes[item->firstRow(orientation)]; + rowBox.combine(box); + } + } + const qreal newSize = constrainedRowData.totalBox(0, rCount).q_sizes(which); + + return (orientation == Qt::Vertical) ? QSizeF(targetSize, newSize) : QSizeF(newSize, targetSize); +} + + +/** + returns false if the layout has contradicting constraints (i.e. some items with a horizontal + constraint and other items with a vertical constraint) + */ +bool QGridLayoutEngine::ensureDynamicConstraint() const +{ + if (q_cachedConstraintOrientation == UnknownConstraint) { + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + if (item->hasDynamicConstraint()) { + Qt::Orientation itemConstraintOrientation = item->dynamicConstraintOrientation(); + if (q_cachedConstraintOrientation == UnknownConstraint) { + q_cachedConstraintOrientation = itemConstraintOrientation; + } else if (q_cachedConstraintOrientation != itemConstraintOrientation) { + q_cachedConstraintOrientation = UnfeasibleConstraint; + qWarning("QGridLayoutEngine: Unfeasible, cannot mix horizontal and" + " vertical constraint in the same layout"); + return false; + } + } + } + if (q_cachedConstraintOrientation == UnknownConstraint) + q_cachedConstraintOrientation = NoConstraint; + } + return true; +} + +bool QGridLayoutEngine::hasDynamicConstraint() const +{ + if (!ensureDynamicConstraint()) + return false; + return q_cachedConstraintOrientation != NoConstraint; +} + +/* + * return value is only valid if hasConstraint() returns true + */ +Qt::Orientation QGridLayoutEngine::constraintOrientation() const +{ + (void)ensureDynamicConstraint(); + return (Qt::Orientation)q_cachedConstraintOrientation; +} + void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo, const QSizeF &size) const { @@ -1544,10 +1709,74 @@ void QGridLayoutEngine::ensureGeometries(const QLayoutStyleInfo &styleInfo, q_widths.resize(columnCount()); q_heights.resize(rowCount()); q_descents.resize(rowCount()); - q_columnData.calculateGeometries(0, columnCount(), size.width(), q_xx.data(), q_widths.data(), - 0, q_totalBoxes[Hor]); - q_rowData.calculateGeometries(0, rowCount(), size.height(), q_yy.data(), q_heights.data(), - q_descents.data(), q_totalBoxes[Ver]); + + + Qt::Orientation orientation = Qt::Vertical; + if (hasDynamicConstraint()) + orientation = constraintOrientation(); + + /* + In order to do hfw we need to first distribute the columns, then the rows. + In order to do wfh we need to first distribute the rows, then the columns. + + If there is no constraint, the order of distributing the rows or columns first is irrelevant. + We choose horizontal just to keep the same behaviour as before (however, there shouldn't + be any behaviour difference). + */ + + QGridLayoutRowData *colData; + QGridLayoutRowData rowData; + qreal *widths; + qreal *heights; + qreal *xx; + qreal *yy; + qreal *xdescents = 0; + qreal *ydescents = 0; + qreal cCount; + qreal rCount; + QSizeF oSize = size; + if (orientation == Qt::Vertical) { + // height for width + colData = &q_columnData; + rowData = q_rowData; + widths = q_widths.data(); + heights = q_heights.data(); + xx = q_xx.data(); + yy = q_yy.data(); + cCount = columnCount(); + rCount = rowCount(); + ydescents = q_descents.data(); + } else { + // width for height + colData = &q_rowData; + rowData = q_columnData; + widths = q_heights.data(); + heights = q_widths.data(); + xx = q_yy.data(); + yy = q_xx.data(); + cCount = rowCount(); + rCount = columnCount(); + xdescents = q_descents.data(); + oSize.transpose(); + } + + colData->calculateGeometries(0, cCount, oSize.width(), xx, widths, + xdescents, q_totalBoxes[orientation == Qt::Horizontal]); + for (int i = q_items.count() - 1; i >= 0; --i) { + QGridLayoutItem *item = q_items.at(i); + const int col = item->firstColumn(orientation); + const int row = item->firstRow(orientation); + if (item->hasDynamicConstraint()) { + const qreal sz = widths[col]; + QGridLayoutBox box = item->box(orientation, sz); + rowData.boxes[row].combine(box); + } + } + + QGridLayoutBox &totalBox = q_totalBoxes[orientation == Qt::Vertical]; + totalBox = rowData.totalBox(0, rCount); + rowData.calculateGeometries(0, rCount, oSize.height(), yy, heights, + ydescents, totalBox); q_cachedSize = size; } diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h index 9ac9a8e..580af7e 100644 --- a/src/gui/graphicsview/qgridlayoutengine_p.h +++ b/src/gui/graphicsview/qgridlayoutengine_p.h @@ -91,6 +91,14 @@ enum LayoutSide { Bottom }; +enum { + NoConstraint, + HorizontalConstraint, + VerticalConstraint, + UnknownConstraint, // need to update cache + UnfeasibleConstraint // not feasible, it be has some items with Vertical and others with Horizontal constraints +}; + template class QLayoutParameter { @@ -270,6 +278,10 @@ public: inline void setAlignment(Qt::Alignment alignment) { q_alignment = alignment; } QSizePolicy::Policy sizePolicy(Qt::Orientation orientation) const; + + bool hasDynamicConstraint() const; + Qt::Orientation dynamicConstraintOrientation() const; + QSizePolicy::ControlTypes controlTypes(LayoutSide side) const; QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; QGridLayoutBox box(Qt::Orientation orientation, qreal constraint = -1.0) const; @@ -280,7 +292,7 @@ public: void setGeometry(const QRectF &rect); void transpose(); void insertOrRemoveRows(int row, int delta, Qt::Orientation orientation = Qt::Vertical); - QSizeF effectiveMaxSize() const; + QSizeF effectiveMaxSize(const QSizeF &constraint) const; #ifdef QT_DEBUG void dump(int indent = 0) const; @@ -372,6 +384,14 @@ public: int column, int rowSpan, int columnSpan) const; QSizeF sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHint which, const QSizeF &constraint) const; + + // heightForWidth / widthForHeight support + QSizeF dynamicallyConstrainedSizeHint(Qt::SizeHint which, const QSizeF &constraint) const; + bool ensureDynamicConstraint() const; + bool hasDynamicConstraint() const; + Qt::Orientation constraintOrientation() const; + + QSizePolicy::ControlTypes controlTypes(LayoutSide side) const; void transpose(); void setVisualDirection(Qt::LayoutDirection direction); @@ -405,6 +425,7 @@ private: // Lazily computed from the above user input mutable int q_cachedEffectiveFirstRows[NOrientations]; mutable int q_cachedEffectiveLastRows[NOrientations]; + mutable quint8 q_cachedConstraintOrientation : 2; // Layout item input mutable QLayoutStyleInfo q_cachedDataForStyleInfo; diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index d1d6860..28980cb 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -107,12 +107,13 @@ private slots: void avoidRecursionInInsertItem(); void styleInfoLeak(); void task236367_maxSizeHint(); + void heightForWidth(); }; class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { @@ -125,9 +126,12 @@ public: QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const { - if (m_sizeHints[which].isValid()) { + if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) { return m_sizeHints[which]; } + if (m_fnConstraint) { + return m_fnConstraint(which, constraint); + } return QGraphicsWidget::sizeHint(which, constraint); } @@ -136,7 +140,13 @@ public: updateGeometry(); } + void setConstraintFunction(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + } + QSizeF m_sizeHints[Qt::NSizeHints]; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); + }; struct ItemDesc @@ -146,7 +156,8 @@ struct ItemDesc m_rowSpan(1), m_colSpan(1), m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)), - m_align(0) + m_align(0), + m_fnConstraint(0) { } @@ -213,8 +224,20 @@ struct ItemDesc return (*this); } + ItemDesc &heightForWidth(QSizeF (*fnConstraint)(Qt::SizeHint, const QSizeF &)) { + m_fnConstraint = fnConstraint; + m_constraintOrientation = Qt::Vertical; + return (*this); + } + void apply(QGraphicsGridLayout *layout, QGraphicsWidget *item) { - item->setSizePolicy(m_sizePolicy); + QSizePolicy sp = m_sizePolicy; + if (m_fnConstraint) { + sp.setHeightForWidth(m_constraintOrientation == Qt::Vertical); + //sp.setWidthForHeight(m_constraintOrientation == Qt::Horizontal); + } + + item->setSizePolicy(sp); for (int i = 0; i < Qt::NSizeHints; ++i) { if (!m_sizes[i].isValid()) continue; @@ -233,6 +256,7 @@ struct ItemDesc break; } } + layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan); layout->setAlignment(item, m_align); } @@ -240,6 +264,7 @@ struct ItemDesc void apply(QGraphicsGridLayout *layout, RectWidget *item) { for (int i = 0; i < Qt::NSizeHints; ++i) item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]); + item->setConstraintFunction(m_fnConstraint); apply(layout, static_cast(item)); } @@ -251,6 +276,9 @@ struct ItemDesc QSizeF m_sizeHints[Qt::NSizeHints]; QSizeF m_sizes[Qt::NSizeHints]; Qt::Alignment m_align; + + Qt::Orientation m_constraintOrientation; + QSizeF (*m_fnConstraint)(Qt::SizeHint, const QSizeF &); }; typedef QList ItemList; @@ -2116,6 +2144,17 @@ void tst_QGraphicsGridLayout::alignment2() delete widget; } +static QSizeF hfw1(Qt::SizeHint, const QSizeF &constraint) +{ + QSizeF result(constraint); + if (constraint.width() < 0 && constraint.height() < 0) { + return QSizeF(50, 400); + } else if (constraint.width() >= 0) { + result.setHeight(20000./constraint.width()); + } + return result; +} + void tst_QGraphicsGridLayout::geometries_data() { @@ -2145,6 +2184,186 @@ void tst_QGraphicsGridLayout::geometries_data() << QRectF(0, 0, 60,10) << QRectF(0, 10, 60,10) ); + // change layout height and verify + QTest::newRow("hfw-h401") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 401) + << (RectList() + << QRectF(0, 0, 50, 1) << QRectF(50, 0, 50, 1) + << QRectF(0, 1, 50,100) << QRectF(50, 1, 50,400) + ); + + + QTest::newRow("hfw-h408") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 408) + << (RectList() + << QRectF(0, 0, 50, 8) << QRectF(50, 0, 50, 8) + << QRectF(0, 8, 50,100) << QRectF(50, 8, 50,400) + ); + + QTest::newRow("hfw-h410") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 410) + << (RectList() + << QRectF(0, 0, 50,10) << QRectF(50, 0, 50,10) + << QRectF(0, 10, 50,100) << QRectF(50, 10, 50,400) + ); + + QTest::newRow("hfw-h470") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(500, 500)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 470) + << (RectList() + << QRectF(0, 0, 50,70) << QRectF(50, 0, 50,70) + << QRectF(0, 70, 50,100) << QRectF(50, 70, 50,400) + ); + + + // change layout width and verify + QTest::newRow("hfw-w100") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(100, 401) + << (RectList() + << QRectF( 0, 0, 50, 1) << QRectF( 50, 0, 50, 1) + << QRectF( 0, 1, 50, 100) << QRectF( 50, 1, 50, 400) + ); + + QTest::newRow("hfw-w160") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(160, 401) + << (RectList() + << QRectF( 0, 0, 80, 100) << QRectF( 80, 0, 80, 100) + << QRectF( 0, 100, 80, 100) << QRectF( 80, 100, 80, 250) + ); + + + QTest::newRow("hfw-w500") << (ItemList() + << ItemDesc(0,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(0,1) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,0) + .minSize(QSizeF(1,1)) + .preferredSize(QSizeF(50,10)) + .maxSize(QSizeF(100, 100)) + << ItemDesc(1,1) + .minSize(QSizeF(40,40)) + .preferredSize(QSizeF(50,400)) + .maxSize(QSizeF(5000, 5000)) + .heightForWidth(hfw1) + ) + << QSizeF(500, 401) + << (RectList() + << QRectF( 0, 0, 100, 100) << QRectF(100, 0, 100, 100) + << QRectF( 0, 100, 100, 100) << QRectF(100, 100, 400, 50) + ); + } void tst_QGraphicsGridLayout::geometries() @@ -2215,6 +2434,143 @@ void tst_QGraphicsGridLayout::task236367_maxSizeHint() QCOMPARE(widget->size(), QSizeF(w, h)); } +/* +static qreal hfw(qreal w) +{ + if (w == 0) + return 20000; + return 20000/w; +} +*/ +static QSizeF hfw(Qt::SizeHint /*which*/, const QSizeF &constraint) +{ + QSizeF result(constraint); + const qreal cw = constraint.width(); + const qreal ch = constraint.height(); + if (cw < 0 && ch < 0) { + return QSizeF(200, 100); + } else if (cw >= 0) { + result.setHeight(20000./cw); + } else if (cw == 0) { + result.setHeight(20000); + } else if (ch >= 0) { + result.setWidth(20000./ch); + } else if (ch == 0) { + result.setWidth(20000); + } + + return result; +} + +static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired) +{ + Q_ASSERT(sumDesired != 0.0); + return desired * qPow(sumAvailable / sumDesired, desired / sumDesired); +} + +static void expectedWidth(qreal minSize1, qreal prefSize1, + qreal minSize2, qreal prefSize2, + qreal targetSize, qreal *width1, qreal *width2) +{ + qreal sumAvail,factor1,factor2; + // stretch behaviour is different below and above preferred size... + if (targetSize < prefSize1 + prefSize2) { + sumAvail = targetSize - minSize1 - minSize2; + const qreal desired1 = prefSize1 - minSize1; + const qreal desired2 = prefSize2 - minSize2; + const qreal sumDesired = desired1 + desired2; + factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired); + factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired); + const qreal sumFactors = factor1 + factor2; + *width1 = sumAvail*factor1/sumFactors + minSize1; + *width2 = sumAvail*factor2/sumFactors + minSize2; + } else { + sumAvail = targetSize - prefSize1 - prefSize2; + factor1 = prefSize1; + factor2 = prefSize2; + const qreal sumFactors = factor1 + factor2; + *width1 = sumAvail*factor1/sumFactors + prefSize1; + *width2 = sumAvail*factor2/sumFactors + prefSize2; + } +} + + +bool qFuzzyCompare(const QSizeF &a, const QSizeF &b) +{ + return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height()); +} + +void tst_QGraphicsGridLayout::heightForWidth() +{ + QGraphicsWidget *widget = new QGraphicsWidget; + QGraphicsGridLayout *layout = new QGraphicsGridLayout; + widget->setLayout(layout); + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + RectWidget *w00 = new RectWidget; + w00->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w00->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w00->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w00, 0, 0); + + RectWidget *w01 = new RectWidget; + w01->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w01->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w01->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w01, 0, 1); + + RectWidget *w10 = new RectWidget; + w10->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w10->setSizeHint(Qt::PreferredSize, QSizeF(10,10)); + w10->setSizeHint(Qt::MaximumSize, QSizeF(100,100)); + layout->addItem(w10, 1, 0); + + RectWidget *w11 = new RectWidget; + w11->setSizeHint(Qt::MinimumSize, QSizeF(1,1)); + w11->setSizeHint(Qt::MaximumSize, QSizeF(30000,30000)); + w11->setConstraintFunction(hfw); + QSizePolicy sp(QSizePolicy::Preferred, QSizePolicy::Preferred); + sp.setHeightForWidth(true); + w11->setSizePolicy(sp); + layout->addItem(w11, 1, 1); + + QSizeF prefSize = layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1)); + QCOMPARE(prefSize, QSizeF(10+200, 10+100)); + + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(2, -1)), QSizeF(2, 20001)); + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(2, -1)), QSizeF(2, 20010)); + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(2, -1)), QSizeF(2, 20100)); + qreal width1; + qreal width2; + expectedWidth(1, 10, 1, 200, 20, &width1, &width2); + QSizeF expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(20, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(20, -1)), expectedSize); + expectedSize.rheight()+=90; + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(20, -1)), expectedSize); + + expectedWidth(1, 10, 1, 200, 300, &width1, &width2); + expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(300, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(300, -1)), expectedSize); + // the height of the hfw widget is shorter than the one to the left, which is 100, so + // the total height of the last row is 100 (which leaves the layout height to be 200) + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(300, -1)), QSizeF(300, 200)); + + // the hfw item is shorter than the item to the left + expectedWidth(1, 10, 1, 200, 500, &width1, &width2); + expectedSize = hfw(Qt::MinimumSize, QSizeF(width2, -1)) + QSizeF(width1, 1); + QCOMPARE(layout->effectiveSizeHint(Qt::MinimumSize, QSizeF(500, -1)), expectedSize); + expectedSize.rheight()+=9; + QCOMPARE(layout->effectiveSizeHint(Qt::PreferredSize, QSizeF(500, -1)), expectedSize); + // the height of the hfw widget is shorter than the one to the left, which is 100, so + // the total height of the last row is 100 (which leaves the layout height to be 200) + QCOMPARE(layout->effectiveSizeHint(Qt::MaximumSize, QSizeF(500, -1)), QSizeF(500, 200)); + +} + QTEST_MAIN(tst_QGraphicsGridLayout) #include "tst_qgraphicsgridlayout.moc" -- cgit v0.12 From 1c959c35234838cbb69f676cd96e27dc30bd85c1 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 10 Aug 2010 12:46:41 +0200 Subject: Doc: Adding radius support for CSS3 and webkit --- doc/src/template/style/style.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 9b37693..d6b0fda 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -114,6 +114,8 @@ { border: 1px solid #DDDDDD; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; margin: 0 20px 10px 10px; padding: 20px 15px 20px 20px; overflow-x: auto; @@ -121,6 +123,8 @@ table, pre { -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; background-color: #F6F6F6; border: 1px solid #E6E6E6; border-collapse: separate; @@ -855,6 +859,8 @@ background-color:#F6F6F6; border:1px solid #E6E6E6; -moz-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; font-size:12pt; padding-left:10px; margin-top:10px; @@ -911,6 +917,8 @@ { display: none; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; position: fixed; top: 100px; @@ -974,6 +982,8 @@ { float: right; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; background-color: #F6F6F6; border: 1px solid #DDDDDD; margin: 0 20px 10px 10px; @@ -1068,6 +1078,8 @@ .relpage { -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; padding: 25px 25px; clear: both; @@ -1084,6 +1096,8 @@ h3.fn, span.fn { -moz-border-radius:7px 7px 7px 7px; + -webkit-border-radius:7px 7px 7px 7px; + border-radius:7px 7px 7px 7px; background-color: #F6F6F6; border-width: 1px; border-style: solid; @@ -1102,6 +1116,8 @@ border-style: solid; border-color: #E6E6E6; -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px 7px 7px 7px; + border-radius: 7px 7px 7px 7px; width:100%; } -- cgit v0.12 From 2281a3a7a62a5a81de7fefaf0b84f130b16bd44f Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 10 Aug 2010 10:54:26 +0200 Subject: QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. If passed "a(b", qNormalizeType would return a pointer to the \0 at the end of the string. We would add \0 to the result (thinking it is ',' or ')' ) And continue to process the memory after the string. Reviewed-by: Kent Hansen Task-number: QT-1591 --- src/corelib/kernel/qmetaobject.cpp | 5 ++++- tests/auto/qmetaobject/tst_qmetaobject.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 79a38cd..9854e68 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1009,8 +1009,11 @@ QByteArray QMetaObject::normalizedSignature(const char *method) int argdepth = 0; int templdepth = 0; while (*d) { - if (argdepth == 1) + if (argdepth == 1) { d = qNormalizeType(d, templdepth, result); + if (!*d) //most likely an invalid signature. + break; + } if (*d == '(') ++argdepth; if (*d == ')') diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index 62416b1..bb96da1 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -714,6 +714,8 @@ void tst_QMetaObject::normalizedSignature_data() QTest::newRow("const12") << "void foo(Fooconst*const *const)" << "void foo(Foo*const*const)"; QTest::newRow("const13") << "void foo(const Foo&)" << "void foo(Foo)"; QTest::newRow("const14") << "void foo(Fooconst&)" << "void foo(Foo)"; + + QTest::newRow("invalid1") << "a( b" << "a(b"; } void tst_QMetaObject::normalizedSignature() @@ -721,7 +723,7 @@ void tst_QMetaObject::normalizedSignature() QFETCH(QString, signature); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedSignature(signature.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedSignature(signature.toLatin1()), result.toLatin1()); } void tst_QMetaObject::normalizedType_data() @@ -759,7 +761,7 @@ void tst_QMetaObject::normalizedType() QFETCH(QString, type); QFETCH(QString, result); - QCOMPARE(QString::fromLatin1(QMetaObject::normalizedType(type.toLatin1())), result); + QCOMPARE(QMetaObject::normalizedType(type.toLatin1()), result.toLatin1()); } void tst_QMetaObject::customPropertyType() -- cgit v0.12 From c21f95aab2228168452d1d7bb4e332a8c6164a02 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 10 Aug 2010 11:35:51 +0200 Subject: Added one test for QRegExp Task-number: QT-1289 --- tests/auto/qregexp/tst_qregexp.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp index ea07323..d0d26ee 100644 --- a/tests/auto/qregexp/tst_qregexp.cpp +++ b/tests/auto/qregexp/tst_qregexp.cpp @@ -105,6 +105,7 @@ private slots: void QTBUG_7049_data(); void QTBUG_7049(); + void interval(); }; // Testing get/set functions @@ -1426,5 +1427,22 @@ void tst_QRegExp::QTBUG_7049() QCOMPARE( re.cap(2), cap2 ); } +void tst_QRegExp::interval() +{ + { + QRegExp exp("a{0,1}"); + QVERIFY(exp.isValid()); + } + { + QRegExp exp("a{1,1}"); + QVERIFY(exp.isValid()); + } + { + QRegExp exp("a{1,0}"); + QVERIFY(!exp.isValid()); + } +} + + QTEST_APPLESS_MAIN(tst_QRegExp) #include "tst_qregexp.moc" -- cgit v0.12 From bfc32c590d797599ddfb814f023e5837c663ec23 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 10 Aug 2010 13:09:46 +0200 Subject: Mac: Fix crash when using style to draw on other things than widgets When drawing a complex control using the style, you are allowd to skip giving a widget as the last argument. But when doing so, it caused a crash in the mac style. Reviewed-by: Fabien Freling --- src/gui/styles/qmacstyle_mac.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index ae90d26..671a888 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -1440,6 +1440,9 @@ QMacStylePrivate::QMacStylePrivate(QMacStyle *style) bool QMacStylePrivate::animatable(QMacStylePrivate::Animates as, const QWidget *w) const { + if (!w) + return false; + if (as == AquaPushButton) { QPushButton *pb = const_cast(static_cast(w)); if (w->window()->isActiveWindow() && pb && !mouseDown) { -- cgit v0.12 From bc7a42be16c5218ba5022c95bf1334a15a9151a6 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 10 Aug 2010 13:33:38 +0200 Subject: doc: Some reorganization of top page topic hierarchy. --- doc/src/frameworks-technologies/dbus-adaptors.qdoc | 1 - doc/src/frameworks-technologies/dbus-intro.qdoc | 2 +- doc/src/frameworks-technologies/ipc.qdoc | 13 ++++++------- doc/src/modules.qdoc | 7 +++---- doc/src/xml-processing/xml-patterns.qdoc | 2 +- doc/src/xml-processing/xml-processing.qdoc | 8 +++++--- doc/src/xml-processing/xquery-introduction.qdoc | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc index 181a8d9..f193a67 100644 --- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc +++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc @@ -30,7 +30,6 @@ \title Using QtDBus Adaptors \brief How to create and use DBus adaptors in Qt. - \ingroup technology-apis \ingroup best-practices Adaptors are special classes that are attached to any QObject-derived class diff --git a/doc/src/frameworks-technologies/dbus-intro.qdoc b/doc/src/frameworks-technologies/dbus-intro.qdoc index bccb6da..9d4cd95 100644 --- a/doc/src/frameworks-technologies/dbus-intro.qdoc +++ b/doc/src/frameworks-technologies/dbus-intro.qdoc @@ -27,7 +27,7 @@ /*! \page intro-to-dbus.html - \title Introduction to D-Bus + \title D-Bus \brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus. \keyword QtDBus diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc index 23234ae..26a8cec 100644 --- a/doc/src/frameworks-technologies/ipc.qdoc +++ b/doc/src/frameworks-technologies/ipc.qdoc @@ -56,13 +56,12 @@ \section1 D-Bus - The \l{QtDBus} module is a Unix-only library - you can use to implement IPC using the D-Bus protocol. It extends - Qt's \l{signalsandslots.html} {Signals and Slots} mechanism to the - IPC level, allowing a signal emitted by one process to be - connected to a slot in another process. This \l {Introduction to - D-Bus} page has detailed information on how to use the \l{QtDBus} - module. + The \l{QtDBus} module is a Unix-only library you can use to + implement IPC using the D-Bus protocol. It extends Qt's + \l{signalsandslots.html} {Signals and Slots} mechanism to the IPC + level, allowing a signal emitted by one process to be connected to + a slot in another process. This \l {D-Bus} page has detailed + information on how to use the \l{QtDBus} module. \section1 Qt COmmunications Protocol (QCOP) diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index c35d71c..941459b 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -442,7 +442,7 @@ \section1 Further Reading General overviews of XQuery and XSchema can be found in the - \l{Using XML Technologies} document. + \l{XQuery} document. An introduction to the XQuery language can be found in \l{A Short Path to XQuery}. @@ -842,8 +842,7 @@ \target The QDBus compiler \brief The QtDBus module is a Unix-only library that you can use - to perform Inter-Process Communication using the \l{Introduction to - D-Bus}{D-Bus} protocol. + to perform Inter-Process Communication using the \l{D-Bus} protocol. Applications using the QtDBus module can provide services to other, remote applications by exporting objects, as well as use @@ -869,7 +868,7 @@ directory. When installing Qt from source, this module is built when Qt's tools are built. - See the \l {Introduction to D-Bus} page for detailed information on + See the \l {D-Bus} page for detailed information on how to use this module. This module is part of all \l{Qt editions}. diff --git a/doc/src/xml-processing/xml-patterns.qdoc b/doc/src/xml-processing/xml-patterns.qdoc index dcf92f6..d0c8709 100644 --- a/doc/src/xml-processing/xml-patterns.qdoc +++ b/doc/src/xml-processing/xml-patterns.qdoc @@ -27,7 +27,7 @@ /*! \page xmlprocessing.html - \title Using XML Technologies + \title XQuery \previouspage Working with the DOM Tree \contentspage XML Processing diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc index 0d58301..dcdd8d1 100644 --- a/doc/src/xml-processing/xml-processing.qdoc +++ b/doc/src/xml-processing/xml-processing.qdoc @@ -32,13 +32,15 @@ \brief Classes that support XML, via, for example DOM and SAX. These classes are relevant to XML users. - + \generatelist{related} */ /*! \page xml-processing.html \title XML Processing + \ingroup technology-apis + \brief An Overview of the XML processing facilities in Qt. In addition to core XML support, classes for higher level querying @@ -57,7 +59,7 @@ \o \l {XML Streaming} \o \l {The SAX Interface} \o \l {Working with the DOM Tree} - \o \l {Using XML Technologies}{XQuery/XPath and XML Schema} + \o \l {XQuery}{XQuery/XPath and XML Schema} \list \o \l{A Short Path to XQuery} \endlist @@ -525,7 +527,7 @@ \previouspage The SAX Interface \contentspage XML Processing - \nextpage {Using XML Technologies}{XQuery/XPath and XML Schema} + \nextpage {XQuery}{XQuery/XPath and XML Schema} DOM Level 2 is a W3C Recommendation for XML interfaces that maps the constituents of an XML document to a tree structure. The specification diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc index 09af688..b79c205 100644 --- a/doc/src/xml-processing/xquery-introduction.qdoc +++ b/doc/src/xml-processing/xquery-introduction.qdoc @@ -29,7 +29,7 @@ \page xquery-introduction.html \title A Short Path to XQuery -\startpage Using XML Technologies +\startpage XQuery \target XQuery-introduction XQuery is a language for querying XML data or non-XML data that can be -- cgit v0.12 From 846f1b44eea4bb34d080d055badb40a4a13d369e Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 10 Aug 2010 13:59:57 +0200 Subject: QSslSocket: fix security vulnerability with wildcard IP addresses This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore Task-number: QT-3704 --- src/network/ssl/qsslsocket_openssl.cpp | 5 +++++ tests/auto/qsslsocket/tst_qsslsocket.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b4d030c..bb6910a 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -1288,6 +1288,11 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QStri if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) return false; + // Check if the hostname is an IP address, if so then wildcards are not allowed + QHostAddress addr(hostname); + if (!addr.isNull()) + return false; + // Ok, I guess this was a wildcard CN and the hostname matches. return true; } diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 0c12974..6c1dd8f 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1072,6 +1072,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true ); // Failing CN matches QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); @@ -1085,6 +1086,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false ); } void tst_QSslSocket::wildcard() -- cgit v0.12 From 2b42bac65ae90f94b04ff556e5033014d37d223d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 10 Aug 2010 14:14:25 +0200 Subject: doc: Changed some titles so lists of contents sort better. --- doc/src/deployment/deployment.qdoc | 2 +- doc/src/development/developing-with-qt.qdoc | 2 +- doc/src/frameworks-technologies/containers.qdoc | 2 +- doc/src/frameworks-technologies/model-view-programming.qdoc | 2 +- doc/src/getting-started/demos.qdoc | 2 +- doc/src/overviews.qdoc | 7 ++++--- doc/src/porting/porting4.qdoc | 4 ++-- doc/src/porting/qt4-tulip.qdoc | 2 +- doc/src/qt4-intro.qdoc | 2 +- src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 2 +- src/corelib/global/qglobal.cpp | 5 +++-- src/corelib/tools/qpair.qdoc | 4 ++-- src/dbus/qdbusargument.cpp | 4 ++-- src/xmlpatterns/api/qxmlquery.cpp | 7 +++---- 14 files changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 4573f3c..020ca16 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -155,7 +155,7 @@ \row \o QtWebKit \o WebKit \o WebKit is licensed under the GNU LGPL version 2 or later. This has implications for developers of closed source applications. - Please see \l{QtWebKit Module#License Information}{the QtWebKit module + Please see \l{WebKit in Qt#License Information}{the QtWebKit module documentation} for more information. \row \o \l{Phonon Module}{Phonon} \o Phonon diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc index f9b38b8..b88fe3f 100644 --- a/doc/src/development/developing-with-qt.qdoc +++ b/doc/src/development/developing-with-qt.qdoc @@ -83,7 +83,7 @@ \o \l {Known Issues} \o \l {Platform Notes} \o \l {Platform Notes - Symbian} - \o \l {Qt For ActiveX} + \o \l {ActiveX in Qt} \o \l {Qt for Embedded Linux Classes} \o \l {Qt for Embedded Platforms} \o \l {Qt for Mac OS X - Specific Issues} diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc index 58061ad..797326e 100644 --- a/doc/src/frameworks-technologies/containers.qdoc +++ b/doc/src/frameworks-technologies/containers.qdoc @@ -43,7 +43,7 @@ /*! \page containers.html - \title Generic Containers + \title Container Classes \ingroup technology-apis \ingroup groups \keyword container class diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc index 131f063..7167f97 100644 --- a/doc/src/frameworks-technologies/model-view-programming.qdoc +++ b/doc/src/frameworks-technologies/model-view-programming.qdoc @@ -1011,7 +1011,7 @@ \snippet doc/src/snippets/reading-selections/window.cpp 0 - The above code uses Qt's convenient \l{Generic Containers}{foreach + The above code uses Qt's convenient \l{Container Classes}{foreach keyword} to iterate over, and modify, the items corresponding to the indexes returned by the selection model. diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc index ef16224..94b19c3 100644 --- a/doc/src/getting-started/demos.qdoc +++ b/doc/src/getting-started/demos.qdoc @@ -134,7 +134,7 @@ \section1 QtWebKit \list - \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit Module}{WebKit module} + \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module} can be used to implement a small Web browser. \endlist diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 3c02705..caf9404 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -91,11 +91,12 @@ /*! \group qt-activex - \title Qt For ActiveX - \brief Qt API's for using ActiveX controls, servers, and COM. + \title ActiveX in Qt \ingroup technology-apis \ingroup platform-specific + \brief Qt API's for using ActiveX controls, servers, and COM. + These pages document Qt's API's for developing with ActiveX controls, servers, and COM. @@ -104,7 +105,7 @@ /*! \group qt-sql - \title Using SQL in Qt + \title SQL in Qt \brief Qt API's for using SQL. \ingroup technology-apis \ingroup best-practices diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc index 0bbf35f..7b80e13 100644 --- a/doc/src/porting/porting4.qdoc +++ b/doc/src/porting/porting4.qdoc @@ -2598,7 +2598,7 @@ seems feeble. \endomit - See \l{Generic Containers} for a list of Qt 4 containers. + See \l{Container Classes} for a list of Qt 4 containers. \section1 QPtrDict @@ -3939,7 +3939,7 @@ check the index against QVector::size() yourself. \endlist - See \l{Generic Containers} for an overview of the Qt 4 container + See \l{Container Classes} for an overview of the Qt 4 container classes. \section1 QVariant diff --git a/doc/src/porting/qt4-tulip.qdoc b/doc/src/porting/qt4-tulip.qdoc index 08542a6..333af84 100644 --- a/doc/src/porting/qt4-tulip.qdoc +++ b/doc/src/porting/qt4-tulip.qdoc @@ -97,7 +97,7 @@ you are iterating, that won't affect the loop. For details about the new containers, see the - \l{Generic Containers} and \l{Generic Algorithms} overview documents. + \l{Container Classes} and \l{Generic Algorithms} overview documents. In addition to the new containers, considerable work has also gone into QByteArray and QString. The Qt 3 QCString class has been diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 8867fd9..88ef2a8 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -86,7 +86,7 @@ In Qt 4.4: \list - \o \l{QtWebkit Module}{Qt WebKit integration}, making it possible for developers + \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers to use a fully-featured Web browser to display documents and access online services. \o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}. diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index d3f5502..0335d46 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -1,6 +1,6 @@ /*! \module QtWebKit - \title QtWebKit Module + \title WebKit in Qt \contentspage All Qt Modules \previouspage QtSvg \nextpage QtXml diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 0e3a8d3..af35316 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2914,8 +2914,9 @@ int qrand() \relates You can use this macro to specify information about a custom type - \a Type. With accurate type information, Qt's \l{generic - containers} can choose appropriate storage methods and algorithms. + \a Type. With accurate type information, Qt's \l{Container Classes} + {generic containers} can choose appropriate storage methods and + algorithms. \a Flags can be one of the following: diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index e60243f..d49c09e 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -35,7 +35,7 @@ pair type is not available. It stores one value of type T1 and one value of type T2. It can be used as a return value for a function that needs to return two values, or as the value type of - a \l{generic container}. + a \l{Container classes}{generic container}. Here's an example of a QPair that stores one QString and one \c double value: @@ -53,7 +53,7 @@ requirements; these requirements are documented on a per-function basis. - \sa {Generic Containers} + \sa {Container Classes} */ /*! \typedef QPair::first_type diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index fbbc6a2..0bde085 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -825,7 +825,7 @@ void QDBusArgument::endStructure() \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 6 If the type you want to marshall is a QList, QVector or any of the - Qt's \l {Generic Containers} that take one template parameter, + Qt's \l {Container Classes} that take one template parameter, you need not declare an \c{operator<<} function for it, since QtDBus provides generic templates to do the job of marshalling the data. The same applies for STL's sequence containers, such @@ -952,7 +952,7 @@ void QDBusArgument::endStructure() const \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 9 If the type you want to demarshall is a QList, QVector or any of the - Qt's \l {Generic Containers} that take one template parameter, you + Qt's \l {Container Classes} that take one template parameter, you need not declare an \c{operator>>} function for it, since QtDBus provides generic templates to do the job of demarshalling the data. The same applies for STL's sequence containers, such as \c {std::list}, diff --git a/src/xmlpatterns/api/qxmlquery.cpp b/src/xmlpatterns/api/qxmlquery.cpp index e106d74..55af49b 100644 --- a/src/xmlpatterns/api/qxmlquery.cpp +++ b/src/xmlpatterns/api/qxmlquery.cpp @@ -151,8 +151,8 @@ QT_BEGIN_NAMESPACE \endcode \note For the current release, XSLT support should be considered - experimental. See section \l{Using XML technologies#XSLT - 2.0}{XSLT conformance} for details. + experimental. See section \l{XQuery#XSLT 2.0} {XSLT conformance} for + details. Stylesheet parameters are bound using bindVariable(). @@ -291,8 +291,7 @@ QXmlQuery::QXmlQuery(const QXmlNamePool &np) : d(new QXmlQueryPrivate(np)) create instances of QXmlQuery for running XQueries. \note The XSL-T support in this release is considered experimental. - See the \l{Using XML technologies#XSLT 2.0}{XSLT conformance} for - details. + See the \l{XQuery#XSLT 2.0} {XSLT conformance} for details. \since 4.5 \sa queryLanguage() -- cgit v0.12 From ca9270722b4412d9f70efe1ef4ad51635deca75a Mon Sep 17 00:00:00 2001 From: "Richard J. Moore" Date: Sun, 6 Jun 2010 22:10:08 +0100 Subject: Fix handling of SSL certificates with wildcard domain names Merge-request: 731 Task-number: QTBUG-4455 Reviewed-by: Peter Hartmann --- src/network/ssl/qsslsocket_openssl.cpp | 42 +++++++++++++++++++++++++++++--- src/network/ssl/qsslsocket_openssl_p.h | 1 + tests/auto/qsslsocket/tst_qsslsocket.cpp | 24 ++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 6f77600..6f0ccff 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -827,17 +827,16 @@ bool QSslSocketBackendPrivate::startHandshake() QString peerName = (verificationPeerName.isEmpty () ? q->peerName() : verificationPeerName); QString commonName = configuration.peerCertificate.subjectInfo(QSslCertificate::CommonName); - QRegExp regexp(commonName, Qt::CaseInsensitive, QRegExp::Wildcard); - if (!regexp.exactMatch(peerName)) { + if (!isMatchingHostname(commonName.lower(), peerName.lower())) { bool matched = false; foreach (const QString &altName, configuration.peerCertificate .alternateSubjectNames().values(QSsl::DnsEntry)) { - regexp.setPattern(altName); - if (regexp.exactMatch(peerName)) { + if (isMatchingHostname(altName.lower(), peerName.lower())) { matched = true; break; } } + if (!matched) { // No matches in common names or alternate names. QSslError error(QSslError::HostNameMismatch, configuration.peerCertificate); @@ -962,4 +961,39 @@ QList QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates return certificates; } +bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QString &hostname) +{ + int wildcard = cn.indexOf(QLatin1Char('*')); + + // Check this is a wildcard cert, if not then just compare the strings + if (wildcard < 0) + return cn == hostname; + + int firstCnDot = cn.indexOf(QLatin1Char('.')); + int secondCnDot = cn.indexOf(QLatin1Char('.'), firstCnDot+1); + + // Check at least 3 components + if ((-1 == secondCnDot) || (secondCnDot+1 >= cn.length())) + return false; + + // Check * is last character of 1st component (ie. there's a following .) + if (wildcard+1 != firstCnDot) + return false; + + // Check only one star + if (cn.lastIndexOf(QLatin1Char('*')) != wildcard) + return false; + + // Check characters preceding * (if any) match + if (wildcard && (hostname.leftRef(wildcard) != cn.leftRef(wildcard))) + return false; + + // Check characters following first . match + if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) + return false; + + // Ok, I guess this was a wildcard CN and the hostname matches. + return true; +} + QT_END_NAMESPACE diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 836f064..05eb4fa 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -115,6 +115,7 @@ public: static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); static QList STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); + Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname); }; QT_END_NAMESPACE diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 5dd7c19..225e2e8 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -55,6 +55,7 @@ #include #include "private/qhostinfo_p.h" +#include "private/qsslsocket_openssl_p.h" #include "../network-settings.h" @@ -163,6 +164,7 @@ private slots: void setDefaultCiphers(); void supportedCiphers(); void systemCaCertificates(); + void wildcardCertificateNames(); void wildcard(); void setEmptyKey(); void spontaneousWrite(); @@ -1048,6 +1050,28 @@ void tst_QSslSocket::systemCaCertificates() QCOMPARE(certs, QSslSocket::defaultCaCertificates()); } +void tst_QSslSocket::wildcardCertificateNames() +{ + // Passing CN matches + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("www.example.com"), QString("www.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + + // Failing CN matches + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.*.com"), QString("www.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("baa.foo.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("baa.example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.com"), QString("example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*fail.com"), QString("example.com")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example.")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); +} + void tst_QSslSocket::wildcard() { QSKIP("TODO: solve wildcard problem", SkipAll); -- cgit v0.12 From b5f95fbf615b113e3e6d2b42f6b84309d6588b1f Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Mon, 12 Jul 2010 10:47:00 +0200 Subject: fix build for -no-qt3support QString::lower() is QT3_SUPPORT, the correct method is QString::toLower(). --- src/network/ssl/qsslsocket_openssl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 6f0ccff..103a7ef 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -827,11 +827,11 @@ bool QSslSocketBackendPrivate::startHandshake() QString peerName = (verificationPeerName.isEmpty () ? q->peerName() : verificationPeerName); QString commonName = configuration.peerCertificate.subjectInfo(QSslCertificate::CommonName); - if (!isMatchingHostname(commonName.lower(), peerName.lower())) { + if (!isMatchingHostname(commonName.toLower(), peerName.toLower())) { bool matched = false; foreach (const QString &altName, configuration.peerCertificate .alternateSubjectNames().values(QSsl::DnsEntry)) { - if (isMatchingHostname(altName.lower(), peerName.lower())) { + if (isMatchingHostname(altName.toLower(), peerName.toLower())) { matched = true; break; } -- cgit v0.12 From 87c62128266a4e2289c1854e35aba3fc17d44045 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Tue, 10 Aug 2010 13:59:57 +0200 Subject: QSslSocket: fix security vulnerability with wildcard IP addresses This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore Task-number: QT-3704 --- src/network/ssl/qsslsocket_openssl.cpp | 5 +++++ tests/auto/qsslsocket/tst_qsslsocket.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 103a7ef..625d739 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -992,6 +992,11 @@ bool QSslSocketBackendPrivate::isMatchingHostname(const QString &cn, const QStri if (hostname.midRef(hostname.indexOf(QLatin1Char('.'))) != cn.midRef(firstCnDot)) return false; + // Check if the hostname is an IP address, if so then wildcards are not allowed + QHostAddress addr(hostname); + if (!addr.isNull()) + return false; + // Ok, I guess this was a wildcard CN and the hostname matches. return true; } diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 225e2e8..8f7e0d9 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1057,6 +1057,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example.com"), QString("www.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx*.example.com"), QString("xxxwww.example.com")), true ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("f*.example.com"), QString("foo.example.com")), true ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("192.168.0.0"), QString("192.168.0.0")), true ); // Failing CN matches QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("xxx.example.com"), QString("www.example.com")), false ); @@ -1070,6 +1071,7 @@ void tst_QSslSocket::wildcardCertificateNames() QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.example."), QString("www.example")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString(""), QString("www")), false ); QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*"), QString("www")), false ); + QCOMPARE( QSslSocketBackendPrivate::isMatchingHostname(QString("*.168.0.0"), QString("192.168.0.0")), false ); } void tst_QSslSocket::wildcard() -- cgit v0.12 From 9986c3f0c0681c7ea8bc8e5cfea5662880db6654 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 10 Aug 2010 15:03:59 +0200 Subject: qdoc: Ensured that text is encoded correctly. --- tools/qdoc3/htmlgenerator.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 27d5b0f..356e615 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1717,7 +1717,7 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << "\n"; } if (!cn->name().isEmpty()) - out() << "
  • " << protect(cn->name()) << "
    • \n"; + out() << "
  • " << protectEnc(cn->name()) << "
    • \n"; } else if (node->type() == Node::Fake) { const FakeNode* fn = static_cast(node); @@ -1725,13 +1725,13 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, out() << "
  • Modules
    • "; QString name = node->name(); if (!name.isEmpty()) - out() << "
  • " << protect(name) << "
    • \n"; + out() << "
  • " << protectEnc(name) << "
    • \n"; } else if (node->subType() == Node::Group) { if (fn->name() == QString("modules")) out() << "
  • Modules
    • "; else { - out() << "
  • " << protect(title) << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } else if (node->subType() == Node::Page) { @@ -1741,18 +1741,18 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, } else if (fn->name().startsWith("examples-")) { out() << "
  • Examples
    • "; - out() << "
  • " << protect(title) << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } else if (fn->name() == QString("namespaces.html")) { out() << "
  • Namespaces
    • "; } else { - out() << "
  • " << protect(title) << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } else if (node->subType() == Node::QmlClass) { out() << "
  • QML Elements
    • "; - out() << "
  • " << protect(title) << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } else if (node->subType() == Node::Example) { out() << "
  • Examples
    • "; @@ -1760,15 +1760,15 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, if (sl.contains("declarative")) out() << "
  • QML Examples & Demos
    • "; else { - QString name = protect("examples-" + sl.at(0) + ".html"); // this generates an empty link + QString name = protectEnc("examples-" + sl.at(0) + ".html"); // this generates an empty link QString t = CodeParser::titleFromName(name); } - out() << "
  • " << protect(title) << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } else if (node->type() == Node::Namespace) { out() << "
  • Namespaces
    • "; - out() << "
  • " << protect(title) << "
    • "; + out() << "
  • " << protectEnc(title) << "
    • "; } } -- cgit v0.12 From 8229eded4cba85ae53c1b03ce87981ebabd2f3ae Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Tue, 10 Aug 2010 14:02:52 +0100 Subject: Fix regression with SSL connections failing on symbian Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann --- src/network/ssl/qsslsocket_openssl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b4d030c..aea04a3 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -750,7 +750,7 @@ QList QSslSocketPrivate::systemCaCertificates() ptrCertCloseStore(hSystemStore, 0); } } -#elif defined(Q_OS_UNIX) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) systemCerts.append(QSslCertificate::fromPath(QLatin1String("/var/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // AIX systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Solaris systemCerts.append(QSslCertificate::fromPath(QLatin1String("/opt/openssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // HP-UX -- cgit v0.12 From 87b7587f25928272900900a106f360a4fbb4d6cd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 10 Aug 2010 16:18:22 +0200 Subject: Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 Integrated changes: || || [Qt] NPAPI plugins not drawn until page scrolled || --- src/3rdparty/webkit/.tag | 2 +- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 10 ++++++++++ src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm | 5 ++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index fb2703e..d31a2b4 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -413404da27312051bb3ff2cfd0f3fca42aa4b245 +72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index c256434..62aa8ce 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 413404da27312051bb3ff2cfd0f3fca42aa4b245 + 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 5b78226..98d4d51 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2010-08-10 Tor Arne Vestbø + + Reviewed by Simon Hausmann. + + Make sure NPAPI plugins get an initial setNPWindow on Mac + + https://bugs.webkit.org/show_bug.cgi?id=43782 + + * plugins/mac/PluginViewMac.mm: + 2010-06-14 Andreas Kling Reviewed by Tor Arne Vestbø. diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm index 57d74ab..c8781a8 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.mm @@ -227,7 +227,10 @@ bool PluginView::platformStart() #endif } - show(); + updatePluginWidget(); + + if (!m_plugin->quirks().contains(PluginQuirkDeferFirstSetWindowCall)) + setNPWindowIfNeeded(); // TODO: Implement null timer throttling depending on plugin activation m_nullEventTimer.set(new Timer(this, &PluginView::nullEventTimerFired)); -- cgit v0.12 From 05b9dc5a1cc649231b29807f2a87bb7164c5234a Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Tue, 10 Aug 2010 17:11:25 +0200 Subject: Fix memory leak in QtScript variable object The d-pointer is of type JSVariableObjectData*, but JSVariableObjectData doesn't have a virtual destructor. Hence we must cast the d-pointer to our subclass when deleting. In particular, this will ensure that the destructor of the symbolTable member is called, which will deallocate the table storage. (For QScriptActivationObject this did not cause a leak in practice, because its symbolTable is always empty, and JSC's hash table uses lazy allocation.) Task-number: QTBUG-12479 Reviewed-by: Olivier Goffart --- src/script/bridge/qscriptactivationobject.cpp | 2 +- src/script/bridge/qscriptstaticscopeobject.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp index 6a8ae56..85224d1 100644 --- a/src/script/bridge/qscriptactivationobject.cpp +++ b/src/script/bridge/qscriptactivationobject.cpp @@ -53,7 +53,7 @@ QScriptActivationObject::QScriptActivationObject(JSC::ExecState *callFrame, JSC: QScriptActivationObject::~QScriptActivationObject() { - delete d; + delete d_ptr(); } bool QScriptActivationObject::getOwnPropertySlot(JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::PropertySlot& slot) diff --git a/src/script/bridge/qscriptstaticscopeobject.cpp b/src/script/bridge/qscriptstaticscopeobject.cpp index 44548a4..940c859 100644 --- a/src/script/bridge/qscriptstaticscopeobject.cpp +++ b/src/script/bridge/qscriptstaticscopeobject.cpp @@ -87,7 +87,7 @@ QScriptStaticScopeObject::QScriptStaticScopeObject(WTF::NonNullPassRefPtr Date: Wed, 11 Aug 2010 10:04:53 +1000 Subject: Don't destroy ListModel child list nodes. These are owned by the root and must not be destroyed by child lists. Task-number: QTBUG-12771 Reviewed-by: Bea Lam --- src/declarative/util/qdeclarativelistmodel.cpp | 26 +++++++++++++--------- src/declarative/util/qdeclarativelistmodel_p_p.h | 13 +++++++++++ .../tst_qdeclarativelistmodel.cpp | 7 +++--- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 3ede335..b0d47a9 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -108,9 +108,9 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM \snippet doc/src/snippets/declarative/listmodel-modify.qml delegate - When creating content dynamically, note that the set of available properties cannot be changed - except by first clearing the model. Whatever properties are first added to the model are then the - only permitted properties in the model until it is cleared. + Note that when creating content dynamically the set of available properties cannot be changed + once set. Whatever properties are first added to the model are the + only permitted properties in the model. \section2 Using threaded list models with WorkerScript @@ -283,8 +283,7 @@ int QDeclarativeListModel::count() const /*! \qmlmethod ListModel::clear() - Deletes all content from the model. The properties are cleared such that - different properties may be set on subsequent additions. + Deletes all content from the model. \sa append() remove() */ @@ -945,13 +944,14 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash *ro } NestedListModel::NestedListModel(QDeclarativeListModel *base) - : _root(0), m_listModel(base), _rolesOk(false) + : _root(0), m_ownsRoot(false), m_listModel(base), _rolesOk(false) { } NestedListModel::~NestedListModel() { - delete _root; + if (m_ownsRoot) + delete _root; } QVariant NestedListModel::valueForNode(ModelNode *node, bool *hasNested) const @@ -1051,8 +1051,8 @@ void NestedListModel::clear() _rolesOk = false; roleStrings.clear(); - delete _root; - _root = 0; + if (_root) + _root->clear(); } void NestedListModel::remove(int index) @@ -1067,8 +1067,10 @@ void NestedListModel::remove(int index) bool NestedListModel::insert(int index, const QScriptValue& valuemap) { - if (!_root) + if (!_root) { _root = new ModelNode; + m_ownsRoot = true; + } ModelNode *mn = new ModelNode; mn->setObjectValue(valuemap); @@ -1099,8 +1101,10 @@ void NestedListModel::move(int from, int to, int n) bool NestedListModel::append(const QScriptValue& valuemap) { - if (!_root) + if (!_root) { _root = new ModelNode; + m_ownsRoot = true; + } ModelNode *mn = new ModelNode; mn->setObjectValue(valuemap); _root->values << qVariantFromValue(mn); diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 532eefa..c41f016 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -130,6 +130,7 @@ public: void checkRoles() const; ModelNode *_root; + bool m_ownsRoot; QDeclarativeListModel *m_listModel; private: @@ -157,6 +158,18 @@ struct ModelNode QList values; QHash properties; + void clear() { + ModelNode *node; + for (int ii = 0; ii < values.count(); ++ii) { + node = qvariant_cast(values.at(ii)); + if (node) { delete node; node = 0; } + } + values.clear(); + + qDeleteAll(properties.values()); + properties.clear(); + } + QDeclarativeListModel *model(const NestedListModel *model) { if (!modelCache) { modelCache = new QDeclarativeListModel; diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 858c26d..10805b4 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -271,6 +271,9 @@ void tst_qdeclarativelistmodel::dynamic_data() QTest::newRow("nested-insert") << "{append({'foo':123});insert(0,{'bars':[{'a':1},{'b':2},{'c':3}]});get(0).bars.get(0).a}" << 1 << ""; QTest::newRow("nested-set") << "{append({'foo':123});set(0,{'foo':[{'x':123}]});get(0).foo.get(0).x}" << 123 << ""; + QTest::newRow("nested-count") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.count}" << 3 << ""; + QTest::newRow("nested-clear") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.clear(); get(0).bars.count}" << 0 << ""; + // XXX //QTest::newRow("nested-setprop") << "{append({'foo':123});setProperty(0,'foo',[{'x':123}]);get(0).foo.get(0).x}" << 123 << ""; } @@ -344,9 +347,7 @@ void tst_qdeclarativelistmodel::dynamic_worker() waitForWorker(item); QDeclarativeExpression e(eng.rootContext(), &model, operations.last().toString()); - if (QByteArray(QTest::currentDataTag()).startsWith("nested")) - QVERIFY(e.evaluate().toInt() != result); - else + if (!QByteArray(QTest::currentDataTag()).startsWith("nested")) QCOMPARE(e.evaluate().toInt(), result); } -- cgit v0.12 From e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 11 Aug 2010 13:58:08 +1000 Subject: Compile on Symbian Task-number: QTBUG-12771 --- src/declarative/util/qdeclarativelistmodel.cpp | 12 +++++++++--- src/declarative/util/qdeclarativelistmodel_p_p.h | 12 +----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index b0d47a9..20fe3a9 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -1209,16 +1209,22 @@ ModelNode::ModelNode() ModelNode::~ModelNode() { - qDeleteAll(properties.values()); + clear(); + if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; } + if (objectCache) { delete objectCache; objectCache = 0; } +} +void ModelNode::clear() +{ ModelNode *node; for (int ii = 0; ii < values.count(); ++ii) { node = qvariant_cast(values.at(ii)); if (node) { delete node; node = 0; } } + values.clear(); - if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; } - if (objectCache) { delete objectCache; objectCache = 0; } + qDeleteAll(properties.values()); + properties.clear(); } void ModelNode::setObjectValue(const QScriptValue& valuemap) { diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index c41f016..8231414 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -158,17 +158,7 @@ struct ModelNode QList values; QHash properties; - void clear() { - ModelNode *node; - for (int ii = 0; ii < values.count(); ++ii) { - node = qvariant_cast(values.at(ii)); - if (node) { delete node; node = 0; } - } - values.clear(); - - qDeleteAll(properties.values()); - properties.clear(); - } + void clear(); QDeclarativeListModel *model(const NestedListModel *model) { if (!modelCache) { -- cgit v0.12 From 0d4d065cc9757159c5b6fa817892f5707bc1ecae Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 11 Aug 2010 14:32:51 +1000 Subject: Don't build bearercloud example if Qt was build w/o SVG support Task-number: QTBUG-12791 Reviewed-by: David Laing --- examples/network/network.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/network/network.pro b/examples/network/network.pro index 16c4087..458561a 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -16,9 +16,12 @@ SUBDIRS = \ threadedfortuneserver \ googlesuggest \ torrent \ - bearercloud \ bearermonitor + contains(QT_CONFIG, svg) { + SUBDIRS += bearercloud + } + # no QProcess !vxworks:!qnx:SUBDIRS += network-chat -- cgit v0.12 From 0c1d29300c7248ead3392bb385ceae6889dc2834 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 11 Aug 2010 15:06:56 +1000 Subject: Fix cppextension examples. Print a useful message on error. Specify the QML url correctly. --- examples/declarative/cppextensions/referenceexamples/adding/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/attached/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/binding/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/coercion/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/default/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/extended/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/grouped/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/properties/main.cpp | 4 ++-- examples/declarative/cppextensions/referenceexamples/signal/main.cpp | 4 ++-- .../declarative/cppextensions/referenceexamples/valuesource/main.cpp | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp index 391113c..19cf034 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp @@ -51,13 +51,13 @@ int main(int argc, char ** argv) //![0] QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); Person *person = qobject_cast(component.create()); if (person) { qWarning() << "The person's name is" << person->name(); qWarning() << "They wear a" << person->shoeSize() << "sized shoe"; } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp index 5a39a98..65cbc93 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -83,7 +83,7 @@ int main(int argc, char ** argv) } } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp index fe1bbc8..150f961 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -85,7 +85,7 @@ int main(int argc, char ** argv) party->startParty(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return app.exec(); diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp index 5c53368..5b16f99 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -70,7 +70,7 @@ int main(int argc, char ** argv) for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/default/main.cpp b/examples/declarative/cppextensions/referenceexamples/default/main.cpp index f611bc4..bfba642 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/default/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -68,7 +68,7 @@ int main(int argc, char ** argv) for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp index 65527c3..08c8440 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp @@ -51,14 +51,14 @@ int main(int argc, char ** argv) qmlRegisterExtendedType("People", 1,0, "QLineEdit"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); QLineEdit *edit = qobject_cast(component.create()); if (edit) { edit->show(); return app.exec(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); return 0; } } diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp index e56a14d..6f7f13f 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -78,7 +78,7 @@ int main(int argc, char ** argv) qWarning() << bestShoe->name() << "is wearing the best shoes!"; } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp index 80237ef..d974647 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Person"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -61,7 +61,7 @@ int main(int argc, char ** argv) for (int ii = 0; ii < party->guestCount(); ++ii) qWarning() << " " << party->guest(ii)->name(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp index 56c0809..ad87bee 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -84,7 +84,7 @@ int main(int argc, char ** argv) party->startParty(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return 0; diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp index 40dc3cb..aa77665 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char ** argv) qmlRegisterType("People", 1,0, "Girl"); QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, ":example.qml"); + QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); BirthdayParty *party = qobject_cast(component.create()); if (party && party->host()) { @@ -86,7 +86,7 @@ int main(int argc, char ** argv) party->startParty(); } else { - qWarning() << "An error occurred"; + qWarning() << component.errors(); } return app.exec(); -- cgit v0.12 From 83795c1348f879d6742b4ef20b2315e0055e45a6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 10 Aug 2010 17:17:27 +0200 Subject: configure.exe: don't write the QT_NAMESPACE define to .qmake.cache Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi --- tools/configure/configureapp.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e27e16d..a0ca33a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -988,7 +988,6 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i); dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i); } else if (configCmdLine.at(i) == "-qtlibinfix") { ++i; -- cgit v0.12 From b1d5e111d8bb4dba3bd13f7af5ac2fb7c91db71e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Aug 2010 18:16:18 +0200 Subject: add comment explaining why this file does magic instead of just voodoo Reviewed-by: joerg Reviewed-by: Simon Hausmann --- mkspecs/features/qt_config.prf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 0a2d985..b6fba65 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -1,3 +1,6 @@ +# This file is loaded by the mkspecs, before .qmake.cache has been loaded. +# Consequently, we have to do some stunts to get values out of the cache. + exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri -- cgit v0.12 From bf992abf98056151def8ff0b853fce8f1924b02a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Aug 2010 12:29:39 +0200 Subject: don't load modules from qt.prf they are already loaded in qconfig.pri, which is loaded from qt_config.prf, which is explicitly loaded by every qmake spec. Reviewed-by: Simon Hausmann Reviewed-by: joerg --- mkspecs/features/qt.prf | 3 --- 1 file changed, 3 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index aa0f06e..07c89dd 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -31,9 +31,6 @@ plugin { #Qt plugins } } -#handle modules -for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) - #handle includes INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt -- cgit v0.12 From 199b7ccb2a82e6a87808c3873c158ca38120dfdf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Aug 2010 18:17:22 +0200 Subject: fix loading of module configs do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698 --- configure | 3 --- configure.exe | Bin 1309696 -> 1320448 bytes mkspecs/features/qt_config.prf | 1 + tools/configure/configureapp.cpp | 2 -- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configure b/configure index 25f1ef5..35fe2eb 100755 --- a/configure +++ b/configure @@ -7886,9 +7886,6 @@ QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC -#modules -for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod) - EOF if [ "$CFG_RPATH" = "yes" ]; then echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" diff --git a/configure.exe b/configure.exe index 220e605..c5bff85 100755 Binary files a/configure.exe and b/configure.exe differ diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index b6fba65..19e01a1 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -11,6 +11,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { debug(1, "Cannot load qconfig.pri!") } else { debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") + for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod) } load(qt_functions) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a0ca33a..0c716d1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2944,8 +2944,6 @@ void Configure::generateCachefile() configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; } - configStream << "#modules" << endl << "for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)" << endl; - configStream.flush(); configFile.close(); } -- cgit v0.12 From ebdc597eea6e44b66d6c98d252531af5d0da04f8 Mon Sep 17 00:00:00 2001 From: Henrik Hartz Date: Wed, 11 Aug 2010 10:01:59 +0200 Subject: Remember to reset clipping when overriding paint in QDeclarativeItem --- src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 9d782b9..17c094c 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2500,7 +2500,9 @@ QDeclarativeListProperty QDeclarativeItemPrivate::transi This property holds whether clipping is enabled. if clipping is enabled, an item will clip its own painting, as well - as the painting of its children, to its bounding rectangle. + as the painting of its children, to its bounding rectangle. If you set + clipping during an item's paint operation, remember to re-set it to + prevent clipping the rest of your scene. Non-rectangular clipping regions are not supported for performance reasons. */ -- cgit v0.12 From 62968f33452016b31020e524fa6ba6d2cefd0278 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 11 Aug 2010 11:29:07 +0200 Subject: qdoc: Added list of all members (including inherited) page to QML elements. --- .../qdeclarativeitem/data/childrenRectBug3.qml | 30 +++++++-------- tools/qdoc3/codemarker.cpp | 4 +- tools/qdoc3/codemarker.h | 3 +- tools/qdoc3/cppcodemarker.cpp | 45 +++++++++++++++++++++- tools/qdoc3/cppcodemarker.h | 3 +- tools/qdoc3/ditaxmlgenerator.cpp | 4 +- tools/qdoc3/htmlgenerator.cpp | 43 ++++++++++++++++++++- tools/qdoc3/htmlgenerator.h | 5 ++- 8 files changed, 113 insertions(+), 24 deletions(-) diff --git a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml index f19ab4f..54b5b68 100644 --- a/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml +++ b/tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml @@ -1,15 +1,15 @@ -import Qt 4.7 - -Rectangle { - width: 300 - height: 300 - - Rectangle { - height: childrenRect.height - - Repeater { - model: 1 - Rectangle { } - } - } -} +import Qt 4.7 + +Rectangle { + width: 300 + height: 300 + + Rectangle { + height: childrenRect.height + + Repeater { + model: 1 + Rectangle { } + } + } +} diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp index 7130d61..ec86ae3 100644 --- a/tools/qdoc3/codemarker.cpp +++ b/tools/qdoc3/codemarker.cpp @@ -624,7 +624,9 @@ QString CodeMarker::macName(const Node *node, const QString &name) Get the list of documentation sections for the children of the specified QmlClassNode. */ -QList
    CodeMarker::qmlSections(const QmlClassNode* , SynopsisStyle ) +QList
    CodeMarker::qmlSections(const QmlClassNode* , + SynopsisStyle , + const Tree* ) { return QList
    (); } diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h index 53ad4a8..f17b28e 100644 --- a/tools/qdoc3/codemarker.h +++ b/tools/qdoc3/codemarker.h @@ -153,7 +153,8 @@ class CodeMarker Status status) = 0; #ifdef QDOC_QML virtual QList
    qmlSections(const QmlClassNode* qmlClassNode, - SynopsisStyle style); + SynopsisStyle style, + const Tree* tree); #endif virtual const Node* resolveTarget(const QString& target, const Tree* tree, diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp index 562e92b..3615a84 100644 --- a/tools/qdoc3/cppcodemarker.cpp +++ b/tools/qdoc3/cppcodemarker.cpp @@ -1127,7 +1127,8 @@ QString CppCodeMarker::addMarkUp(const QString& protectedCode, Currently, it only handles QML property groups. */ QList
    CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, - SynopsisStyle style) + SynopsisStyle style, + const Tree* tree) { QList
    sections; if (qmlClassNode) { @@ -1244,6 +1245,48 @@ QList
    CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode, append(sections,qmlmethods); append(sections,qmlattachedmethods); } + else { + FastSection all(qmlClassNode,"","","member","members"); + + QStack stack; + stack.push(qmlClassNode); + + while (!stack.isEmpty()) { + const QmlClassNode* ancestorClass = stack.pop(); + + NodeList::ConstIterator c = ancestorClass->childNodes().begin(); + while (c != ancestorClass->childNodes().end()) { + // if ((*c)->access() != Node::Private) + if ((*c)->subType() == Node::QmlPropertyGroup) { + const QmlPropGroupNode* qpgn = static_cast(*c); + NodeList::ConstIterator p = qpgn->childNodes().begin(); + while (p != qpgn->childNodes().end()) { + if ((*p)->type() == Node::QmlProperty) { + insert(all,*p,style,Okay); + } + ++p; + } + } + else + insert(all,*c,style,Okay); + ++c; + } + + if (!ancestorClass->links().empty()) { + if (ancestorClass->links().contains(Node::InheritsLink)) { + QPair linkPair; + linkPair = ancestorClass->links()[Node::InheritsLink]; + QStringList strList(linkPair.first); + const Node* n = tree->findNode(strList,Node::Fake); + if (n && n->subType() == Node::QmlClass) { + const QmlClassNode* qcn = static_cast(n); + stack.prepend(qcn); + } + } + } + } + append(sections, all); + } } return sections; diff --git a/tools/qdoc3/cppcodemarker.h b/tools/qdoc3/cppcodemarker.h index eca3936..804a302 100644 --- a/tools/qdoc3/cppcodemarker.h +++ b/tools/qdoc3/cppcodemarker.h @@ -80,7 +80,8 @@ class CppCodeMarker : public CodeMarker SynopsisStyle style, Status status); QList
    qmlSections(const QmlClassNode* qmlClassNode, - SynopsisStyle style); + SynopsisStyle style, + const Tree* tree); const Node* resolveTarget(const QString& target, const Tree* tree, const Node* relative, diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 816ab9f..7892025 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -1764,7 +1764,7 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker generateQmlInstantiates(qml_cn, marker); generateBrief(qml_cn, marker); generateQmlInheritedBy(qml_cn, marker); - sections = marker->qmlSections(qml_cn,CodeMarker::Summary); + sections = marker->qmlSections(qml_cn,CodeMarker::Summary,0); s = sections.begin(); while (s != sections.end()) { out() << "\n"; @@ -1781,7 +1781,7 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker generateAlsoList(fake, marker); out() << "
    \n"; - sections = marker->qmlSections(qml_cn,CodeMarker::Detailed); + sections = marker->qmlSections(qml_cn,CodeMarker::Detailed,0); s = sections.begin(); while (s != sections.end()) { out() << "

    " << protectEnc((*s).name) << "

    \n"; diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index eb33ce9..e8fd155 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1493,7 +1493,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker) const QmlClassNode* qml_cn = 0; if (fake->subType() == Node::QmlClass) { qml_cn = static_cast(fake); - sections = marker->qmlSections(qml_cn,CodeMarker::Summary); + sections = marker->qmlSections(qml_cn,CodeMarker::Summary,0); generateTableOfContents(fake,marker,§ions); } else if (fake->name() != QString("index.html")) @@ -1575,6 +1575,13 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker) generateQmlInherits(qml_cn, marker); generateQmlInheritedBy(qml_cn, marker); generateQmlInstantiates(qml_cn, marker); + + QString allQmlMembersLink = generateAllQmlMembersFile(qml_cn, marker); + if (!allQmlMembersLink.isEmpty()) { + out() << "
  • " + << "List of all members, including inherited members
    • \n"; + } + s = sections.begin(); while (s != sections.end()) { out() << "\n"; - sections = marker->qmlSections(qml_cn,CodeMarker::Detailed); + sections = marker->qmlSections(qml_cn,CodeMarker::Detailed,0); s = sections.begin(); while (s != sections.end()) { out() << "

    " << protectEnc((*s).name) << "

    \n"; @@ -2291,6 +2298,38 @@ QString HtmlGenerator::generateListOfAllMemberFile(const InnerNode *inner, return fileName; } +/*! + This function creates an html page on which are listed all + the members of QML class \a qml_cn, including the inherited + members. The \a marker is used for formatting stuff. + */ +QString HtmlGenerator::generateAllQmlMembersFile(const QmlClassNode* qml_cn, + CodeMarker* marker) +{ + QList
    sections; + QList
    ::ConstIterator s; + + sections = marker->qmlSections(qml_cn,CodeMarker::SeparateList,myTree); + if (sections.isEmpty()) + return QString(); + + QString fileName = fileBase(qml_cn) + "-members." + fileExtension(qml_cn); + beginSubPage(qml_cn->location(), fileName); + QString title = "List of All Members for " + qml_cn->name(); + generateHeader(title, qml_cn, marker); + generateTitle(title, Text(), SmallSubTitle, qml_cn, marker); + out() << "

    This is the complete list of members for "; + generateFullName(qml_cn, 0, marker); + out() << ", including inherited members.

    \n"; + + Section section = sections.first(); + generateSectionList(section, 0, marker, CodeMarker::SeparateList); + + generateFooter(); + endSubPage(); + return fileName; +} + QString HtmlGenerator::generateLowStatusMemberFile(const InnerNode *inner, CodeMarker *marker, CodeMarker::Status status) diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index ec79896..07226f5 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -169,7 +169,10 @@ class HtmlGenerator : public PageGenerator void generateTableOfContents(const Node *node, CodeMarker *marker, QList
    * sections = 0); - QString generateListOfAllMemberFile(const InnerNode *inner, CodeMarker *marker); + QString generateListOfAllMemberFile(const InnerNode *inner, + CodeMarker *marker); + QString generateAllQmlMembersFile(const QmlClassNode* qml_cn, + CodeMarker* marker); QString generateLowStatusMemberFile(const InnerNode *inner, CodeMarker *marker, CodeMarker::Status status); -- cgit v0.12 From bb696453f6f87cad58982af3455335478fedb8cc Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 11 Aug 2010 11:49:35 +0200 Subject: Disable minRightBearing optimization in QTextLayout on Mac Neither of the Mac font engines have implemented minimum right bearing, which will cause them to return 0 for the minimum value. This will cause the right bearing to never be calculated prior to breaking and thus never be a part of the breaking width. Since actually implementing the functions is too time consuming for right now, we will disable the optimization for the time being. Reviewed-by: Olivier --- src/gui/text/qtextlayout.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index da43913..7d5fa43 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1952,7 +1952,9 @@ void QTextLine::layout_helper(int maxGlyphs) // expand the text beyond the edge. if (sb_or_ws|breakany) { QFixed rightBearing = lbh.rightBearing; // store previous right bearing +#if !defined(Q_WS_MAC) if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width) +#endif lbh.adjustRightBearing(); if (lbh.checkFullOtherwiseExtend(line)) { // we are too wide, fix right bearing -- cgit v0.12 From 997e4161cf937aa34a16bb2e708fa1bc7909355f Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 11 Aug 2010 12:45:58 +0200 Subject: Doc: Fixing bug involving header misplacement in Creator style Task-number: QTBUG-11408 --- doc/src/template/style/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index d6b0fda..6a32e53 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -1375,7 +1375,7 @@ .creator .wrapper { position:relative; - top:50px; + top:5px; } .creator .wrapper .bd { @@ -1486,7 +1486,7 @@ - position:fixed; + /* position:fixed;*/ } -- cgit v0.12 From 5fa15620d09df1164cc28aa9b1e646a61f87e909 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 11 Aug 2010 12:47:05 +0200 Subject: Doc: Fixing typo --- src/gui/styles/qstylesheetstyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index dff525e..92e2c81 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4094,7 +4094,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q if (pe1 != PseudoElement_None) { QRenderRule subRule = renderRule(w, opt, pe1); if (subRule.bg != 0 || subRule.hasDrawable()) { - //We test subRule.bg dirrectly because hasBackground() would return false for background:none. + //We test subRule.bg directly because hasBackground() would return false for background:none. //But we still don't want the default drawning in that case (example for QScrollBar::add-page) (task 198926) subRule.drawRule(p, opt->rect); } else if (fallback) { -- cgit v0.12 From 98b7e8ac793d95a6a8350c7fc25faebd6f44cd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= Date: Wed, 11 Aug 2010 09:28:32 +0200 Subject: Layout items had the wrong size if the layout was resized to maximum. The problem was that if targetSize was the layouts maximum size, then sumAvailable could be reduced to exactly 0 in the "while (keepGoing)" loop. That would mean that we would not enter the block that actually copied the new sizes from the temporary "newSizes" array to the output "sizes" array due to the "if (sumAvailable > 0)" condition. Task-number: none, discovered while fixing QT-3570 Reviewed-by: Frederik Gladhorn --- src/gui/graphicsview/qgridlayoutengine.cpp | 15 +++++++------- .../tst_qgraphicsgridlayout.cpp | 24 +++++++++++----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp index a084647..4fba5ff 100644 --- a/src/gui/graphicsview/qgridlayoutengine.cpp +++ b/src/gui/graphicsview/qgridlayoutengine.cpp @@ -250,6 +250,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz sumAvailable = targetSize - totalBox.q_preferredSize; if (sumAvailable > 0.0) { + qreal sumCurrentAvailable = sumAvailable; bool somethingHasAMaximumSize = false; qreal sumPreferredSizes = 0.0; @@ -308,12 +309,12 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz qreal ultimateFactor = (stretch * ultimateSumPreferredSizes / sumStretches) - (box.q_preferredSize); - qreal transitionalFactor = sumAvailable + qreal transitionalFactor = sumCurrentAvailable * (ultimatePreferredSize - box.q_preferredSize) / (ultimateSumPreferredSizes - sumPreferredSizes); - qreal alpha = qMin(sumAvailable, + qreal alpha = qMin(sumCurrentAvailable, ultimateSumPreferredSizes - sumPreferredSizes); qreal beta = ultimateSumPreferredSizes - sumPreferredSizes; @@ -321,7 +322,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz + ((beta - alpha) * transitionalFactor)) / beta; } sumFactors += factors[i]; - if (desired < sumAvailable) + if (desired < sumCurrentAvailable) somethingHasAMaximumSize = true; newSizes[i] = -1.0; @@ -337,12 +338,12 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz continue; const QGridLayoutBox &box = boxes.at(start + i); - qreal avail = sumAvailable * factors[i] / sumFactors; + qreal avail = sumCurrentAvailable * factors[i] / sumFactors; if (sizes[i] + avail >= box.q_maximumSize) { newSizes[i] = box.q_maximumSize; - sumAvailable -= box.q_maximumSize - sizes[i]; + sumCurrentAvailable -= box.q_maximumSize - sizes[i]; sumFactors -= factors[i]; - keepGoing = (sumAvailable > 0.0); + keepGoing = (sumCurrentAvailable > 0.0); if (!keepGoing) break; } @@ -352,7 +353,7 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz for (int i = 0; i < n; ++i) { if (newSizes[i] < 0.0) { qreal delta = (sumFactors == 0.0) ? 0.0 - : sumAvailable * factors[i] / sumFactors; + : sumCurrentAvailable * factors[i] / sumFactors; newSizes[i] = sizes[i] + delta; } } diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index d1d6860..5b03767 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -485,12 +485,12 @@ void tst_QGraphicsGridLayout::alignment() widget->resize(widget->effectiveSizeHint(Qt::MaximumSize)); QApplication::processEvents(); - QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0, 25, 50, 25)); - QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 25, 50, 25)); - QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 25, 50, 25)); + QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(0, 50, 50, 50)); + QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(125, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(125, 50, 50, 50)); + QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(250, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(250, 50, 50, 50)); delete widget; } @@ -544,12 +544,12 @@ void tst_QGraphicsGridLayout::columnAlignment() | HCenter | Right | Left | +---------------------------------+ */ - QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25, 26, 50, 25)); // item is king - QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 26, 50, 25)); // item is king - QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252, 0, 50, 25)); - QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 26, 50, 25)); // item is king + QCOMPARE(layout->itemAt(0,0)->geometry(), QRectF(0, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,0)->geometry(), QRectF(25, 51, 50, 50)); // item is king + QCOMPARE(layout->itemAt(0,1)->geometry(), QRectF(126, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,1)->geometry(), QRectF(151, 51, 50, 50)); // item is king + QCOMPARE(layout->itemAt(0,2)->geometry(), QRectF(252, 0, 50, 50)); + QCOMPARE(layout->itemAt(1,2)->geometry(), QRectF(202, 51, 50, 50)); // item is king delete widget; } -- cgit v0.12 From a77dbcdbb7022cc754ba87aea9a4fc471d1e4495 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 4 Aug 2010 11:59:49 +0200 Subject: QSslCertificate: support expiration dates > 2049 X509 has two time formats: UTC, where the year is in two-digit format, and generalized time with four-digit years. This patch allows dates specified generalized time. Reviewed-by: Thiago Macieira Task-number: QTBUG-12489 --- src/network/ssl/qsslsocket_openssl_symbols.cpp | 121 ++++++++++++--------- .../cert-large-expiration-date.pem | 15 +++ tests/auto/qsslcertificate/tst_qsslcertificate.cpp | 15 +++ 3 files changed, 101 insertions(+), 50 deletions(-) create mode 100644 tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 09ecd4d..d1225c1 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -761,74 +761,95 @@ bool q_resolveOpenSslSymbols() //============================================================================== QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime) { - char lBuffer[24]; - char *pBuffer = lBuffer; - size_t lTimeLength = aTime->length; char *pString = (char *) aTime->data; if (aTime->type == V_ASN1_UTCTIME) { + + char lBuffer[24]; + char *pBuffer = lBuffer; + if ((lTimeLength < 11) || (lTimeLength > 17)) return QDateTime(); memcpy(pBuffer, pString, 10); pBuffer += 10; pString += 10; - } else { - if (lTimeLength < 13) - return QDateTime(); - - memcpy(pBuffer, pString, 12); - pBuffer += 12; - pString += 12; - } - if ((*pString == 'Z') || (*pString == '-') || (*pString == '+')) { - *pBuffer++ = '0'; - *pBuffer++ = '0'; - } else { - *pBuffer++ = *pString++; - *pBuffer++ = *pString++; - // Skip any fractional seconds... - if (*pString == '.') { - pString++; - while ((*pString >= '0') && (*pString <= '9')) + if ((*pString == 'Z') || (*pString == '-') || (*pString == '+')) { + *pBuffer++ = '0'; + *pBuffer++ = '0'; + } else { + *pBuffer++ = *pString++; + *pBuffer++ = *pString++; + // Skip any fractional seconds... + if (*pString == '.') { pString++; + while ((*pString >= '0') && (*pString <= '9')) + pString++; + } } - } - *pBuffer++ = 'Z'; - *pBuffer++ = '\0'; + *pBuffer++ = 'Z'; + *pBuffer++ = '\0'; - time_t lSecondsFromUCT; - if (*pString == 'Z') { - lSecondsFromUCT = 0; - } else { - if ((*pString != '+') && (*pString != '-')) - return QDateTime(); + time_t lSecondsFromUCT; + if (*pString == 'Z') { + lSecondsFromUCT = 0; + } else { + if ((*pString != '+') && (*pString != '-')) + return QDateTime(); + + lSecondsFromUCT = ((pString[1] - '0') * 10 + (pString[2] - '0')) * 60; + lSecondsFromUCT += (pString[3] - '0') * 10 + (pString[4] - '0'); + lSecondsFromUCT *= 60; + if (*pString == '-') + lSecondsFromUCT = -lSecondsFromUCT; + } + + tm lTime; + lTime.tm_sec = ((lBuffer[10] - '0') * 10) + (lBuffer[11] - '0'); + lTime.tm_min = ((lBuffer[8] - '0') * 10) + (lBuffer[9] - '0'); + lTime.tm_hour = ((lBuffer[6] - '0') * 10) + (lBuffer[7] - '0'); + lTime.tm_mday = ((lBuffer[4] - '0') * 10) + (lBuffer[5] - '0'); + lTime.tm_mon = (((lBuffer[2] - '0') * 10) + (lBuffer[3] - '0')) - 1; + lTime.tm_year = ((lBuffer[0] - '0') * 10) + (lBuffer[1] - '0'); + if (lTime.tm_year < 50) + lTime.tm_year += 100; // RFC 2459 + + QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday); + QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); + + QDateTime result(resDate, resTime, Qt::UTC); + result = result.addSecs(lSecondsFromUCT); + return result; + + } else if (aTime->type == V_ASN1_GENERALIZEDTIME) { - lSecondsFromUCT = ((pString[1] - '0') * 10 + (pString[2] - '0')) * 60; - lSecondsFromUCT += (pString[3] - '0') * 10 + (pString[4] - '0'); - lSecondsFromUCT *= 60; - if (*pString == '-') - lSecondsFromUCT = -lSecondsFromUCT; + if (lTimeLength < 15) + return QDateTime(); // hopefully never triggered + + // generalized time is always YYYYMMDDHHMMSSZ (RFC 2459, section 4.1.2.5.2) + tm lTime; + lTime.tm_sec = ((pString[12] - '0') * 10) + (pString[13] - '0'); + lTime.tm_min = ((pString[10] - '0') * 10) + (pString[11] - '0'); + lTime.tm_hour = ((pString[8] - '0') * 10) + (pString[9] - '0'); + lTime.tm_mday = ((pString[6] - '0') * 10) + (pString[7] - '0'); + lTime.tm_mon = (((pString[4] - '0') * 10) + (pString[5] - '0')); + lTime.tm_year = ((pString[0] - '0') * 1000) + ((pString[1] - '0') * 100) + + ((pString[2] - '0') * 10) + (pString[3] - '0'); + + QDate resDate(lTime.tm_year, lTime.tm_mon, lTime.tm_mday); + QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); + + QDateTime result(resDate, resTime, Qt::UTC); + return result; + + } else { + qWarning("unsupported date format detected"); + return QDateTime(); } - tm lTime; - lTime.tm_sec = ((lBuffer[10] - '0') * 10) + (lBuffer[11] - '0'); - lTime.tm_min = ((lBuffer[8] - '0') * 10) + (lBuffer[9] - '0'); - lTime.tm_hour = ((lBuffer[6] - '0') * 10) + (lBuffer[7] - '0'); - lTime.tm_mday = ((lBuffer[4] - '0') * 10) + (lBuffer[5] - '0'); - lTime.tm_mon = (((lBuffer[2] - '0') * 10) + (lBuffer[3] - '0')) - 1; - lTime.tm_year = ((lBuffer[0] - '0') * 10) + (lBuffer[1] - '0'); - if (lTime.tm_year < 50) - lTime.tm_year += 100; // RFC 2459 - - QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday); - QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec); - QDateTime result(resDate, resTime, Qt::UTC); - result = result.addSecs(lSecondsFromUCT); - return result; } QT_END_NAMESPACE diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem b/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem new file mode 100644 index 0000000..416dd4d --- /dev/null +++ b/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICWjCCAcOgAwIBAgIJAM7bMShFxAVAMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQwIBcNMTAwODA0MDk1MzQxWhgPMjA1MTA4MjkwOTUzNDFa +MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ +bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ +AoGBAM2q22/WNMmn8cC+5EEYGeICySLmp9W6Ay6eKHr0Xxp3X3epETuPfvAuxp7r +OtkS18EMUegkUj8jw0IMEcbyHKFC/rTCaYOt93CxGBXMIChiMPAsFeYzGa/D6xzA +kfcRaJRQ+Ek3CDLXPnXfo7xpABXezYcPXAJrgsgBfWrwHdxzAgMBAAGjUDBOMB0G +A1UdDgQWBBSKbhnnl5uP2X+zuwFP6GovUpUN2TAfBgNVHSMEGDAWgBSKbhnnl5uP +2X+zuwFP6GovUpUN2TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKF0 +jl02liwFfupmzC5oxz2T3IyjEa21fm7QBMQJvQr5OTuX1/C7DAl7g/6/h7BH6JS3 +qpx5rXGet8SZmG8dODL4o3U4xOXnNzch7HtQixWwlx4XnFAXPMHflFX7YC5QQNHq +I8Y8IW+XjAYWpYJywWMUZIbr1/9y9gn1beYEE3pq +-----END CERTIFICATE----- diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp index d0509bb..963bf11 100644 --- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp @@ -110,6 +110,7 @@ private slots: void nulInCN(); void nulInSan(); void largeSerialNumber(); + void largeExpirationDate(); // ### add tests for certificate bundles (multiple certificates concatenated into a single // structure); both PEM and DER formatted #endif @@ -802,6 +803,20 @@ void tst_QSslCertificate::largeSerialNumber() QCOMPARE(cert.serialNumber(), QByteArray("01:02:03:04:05:06:07:08:09:10:aa:bb:cc:dd:ee:ff:17:18:19:20")); } +void tst_QSslCertificate::largeExpirationDate() // QTBUG-12489 +{ + QList certList = + QSslCertificate::fromPath(SRCDIR "more-certificates/cert-large-expiration-date.pem"); + + QCOMPARE(certList.size(), 1); + + const QSslCertificate &cert = certList.at(0); + QVERIFY(!cert.isNull()); + QCOMPARE(cert.effectiveDate().toUTC(), QDateTime(QDate(2010, 8, 4), QTime(9, 53, 41), Qt::UTC)); + // if the date is larger than 2049, then the generalized time format is used + QCOMPARE(cert.expiryDate().toUTC(), QDateTime(QDate(2051, 8, 29), QTime(9, 53, 41), Qt::UTC)); +} + #endif // QT_NO_OPENSSL QTEST_MAIN(tst_QSslCertificate) -- cgit v0.12 From c7fcd56bd3e150e57230ea1445bf4286b3f3fabe Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Thu, 5 Aug 2010 11:56:47 +0200 Subject: QXmlStreamReader: avoid unnecessary detaching Reviewed-by: Markus Goetz Task-number: QTBUG-12259 --- src/corelib/xml/qxmlstream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 853f311..91c3a19 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -1523,7 +1523,7 @@ ushort QXmlStreamReaderPrivate::getChar_helper() decoder = codec->makeDecoder(); } - decoder->toUnicode(&readBuffer, rawReadBuffer.data(), nbytesread); + decoder->toUnicode(&readBuffer, rawReadBuffer.constData(), nbytesread); if(lockEncoding && decoder->hasFailure()) { raiseWellFormedError(QXmlStream::tr("Encountered incorrectly encoded content.")); -- cgit v0.12 From bdfbedf971f3e9ef99977652308b9e2b1c213210 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 11 Aug 2010 12:46:59 +0300 Subject: Gcce building support for symbian-sbsv2 It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron --- mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm | 2 +- mkspecs/symbian-sbsv2/flm/qt/qt.xml | 1 + qmake/generators/symbian/symmake_sbsv2.cpp | 176 ++++++++++++++++----- qmake/generators/symbian/symmake_sbsv2.h | 7 + 4 files changed, 145 insertions(+), 41 deletions(-) diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm index e0b6503..47c3f1e 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm @@ -38,7 +38,7 @@ $(STORE_BUILD_TARGET): echo "# make sis target." >> $(CACHE_FILENAME) && \ echo "# Version : " >> $(CACHE_FILENAME) && \ echo "# ==============================================================================" >> $(CACHE_FILENAME) && \ - echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \ + echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(VARIANTPLATFORM) >> $(CACHE_FILENAME) $(call endrule,qmake_store_build) endef diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index 0f7db3c..12857a2 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -37,5 +37,6 @@ + diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 78f6f85..534a080 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -56,6 +56,12 @@ SymbianSbsv2MakefileGenerator::~SymbianSbsv2MakefileGenerator() { } #define FLM_DEST_DIR "epoc32/tools/makefile_templates/qt" #define FLM_SOURCE_DIR "/mkspecs/symbian-sbsv2/flm/qt" +#define UNDETECTED_GCCE_VERSION "0" +#define PLATFORM_GCCE "gcce" +#define PLATFORM_WINSCW "winscw" +#define PLATFORM_ARMV5 "armv5" +#define BUILD_DEBUG "udeb" +#define BUILD_RELEASE "urel" // Copies Qt FLMs to correct location under epocroot. // This is not done by configure as it is possible to change epocroot after configure. @@ -90,6 +96,67 @@ void SymbianSbsv2MakefileGenerator::exportFlm() } } +QString SymbianSbsv2MakefileGenerator::gcceVersion() +{ + static QString gcceVersionStr; + + if (gcceVersionStr.isEmpty()) { + // First check if QT_GCCE_VERSION has been set, and use that if it is + QByteArray qtGcceVersion = qgetenv("QT_GCCE_VERSION"); + if (!qtGcceVersion.isEmpty()) { + // Check that QT_GCCE_VERSION is in proper format + QString check(qtGcceVersion); + check.replace(QRegExp("^\\d+\\.\\d+\\.\\d+$"),QString()); + if (check.isEmpty()) { + gcceVersionStr = PLATFORM_GCCE + QString(qtGcceVersion).replace(".","_"); + return gcceVersionStr; + } else { + fprintf(stderr, "Warning: Environment variable QT_GCCE_VERSION ('%s') is in incorrect " + "format, expected format is: '1.2.3'. Attempting to autodetect GCCE version.", + qtGcceVersion.constData()); + } + } + // Sbsv2 has separate env variable defined for each gcce version, so try to determine + // which user is likely to want to use by checking version 4.0.0 to 9.9.9 and taking + // the highest found version that actually points to a valid path. + // This is kind of a kludge, but since qmake doesn't bootstrap QProcess, there + // is no Qt API available to get all environment variables. + for (int i = 9; i >= 4; i--) { + for (int j = 9; j >= 0; j--) { + for (int k = 9; k >= 0; k--) { + QByteArray gcceVar = qgetenv(qPrintable(QString("SBS_GCCE%1%2%3BIN").arg(i).arg(j).arg(k))); + if (!gcceVar.isEmpty() && fileInfo(QString::fromLocal8Bit(gcceVar.constData())).exists()) { + gcceVersionStr = QString(PLATFORM_GCCE "%1_%2_%3").arg(i).arg(j).arg(k); + return gcceVersionStr; + } + } + } + } + } + + // Indicate undetected version to avoid rechecking multiple times + if (gcceVersionStr.isEmpty()) + gcceVersionStr = UNDETECTED_GCCE_VERSION; + + return gcceVersionStr; +} + +QString SymbianSbsv2MakefileGenerator::configClause(QString &platform, + QString &build, + QString &winscwClauseTemplate, + QString &gcceClauseTemplate, + QString &genericClauseTemplate) +{ + QString retval; + if (QString::compare(platform, PLATFORM_WINSCW) == 0) + retval = winscwClauseTemplate.arg(build); + else if (QString::compare(platform, PLATFORM_GCCE) == 0) + retval = gcceClauseTemplate.arg(build); + else + retval = genericClauseTemplate.arg(platform).arg(build); + return retval; +} + void SymbianSbsv2MakefileGenerator::writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t) { for (int i = 0; i < depList.size(); ++i) { @@ -118,21 +185,45 @@ void SymbianSbsv2MakefileGenerator::writeMkFile(const QString& wrapperFileName, void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile) { + static QString debugBuild(BUILD_DEBUG); + static QString releaseBuild(BUILD_RELEASE); + QStringList allPlatforms; foreach(QString platform, project->values("SYMBIAN_PLATFORMS")) { allPlatforms << platform.toLower(); } - QStringList debugPlatforms = allPlatforms; - QStringList releasePlatforms = allPlatforms; - releasePlatforms.removeAll("winscw"); // No release for emulator - QString testClause; if (project->isActiveConfig(SYMBIAN_TEST_CONFIG)) testClause = QLatin1String(".test"); else testClause = QLatin1String(""); + QString genericClause = " -c %1_%2" + testClause; + QString winscwClause = " -c winscw_%1.mwccinc" + testClause; + QString gcceClause; + if (QString::compare(gcceVersion(), UNDETECTED_GCCE_VERSION) == 0) + allPlatforms.removeAll(PLATFORM_GCCE); + else + gcceClause = " -c arm.v5.%1." + gcceVersion() + ".release_gcce" + testClause; + + QStringList allClauses; + QStringList debugClauses; + QStringList releaseClauses; + + QStringList debugPlatforms = allPlatforms; + QStringList releasePlatforms = allPlatforms; + releasePlatforms.removeAll(PLATFORM_WINSCW); // No release for emulator + + foreach(QString item, debugPlatforms) { + debugClauses << configClause(item, debugBuild, winscwClause, gcceClause, genericClause); + } + foreach(QString item, releasePlatforms) { + releaseClauses << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause); + } + allClauses << debugClauses << releaseClauses; + + QTextStream t(&wrapperFile); t << "# ==============================================================================" << endl; @@ -172,9 +263,9 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo } t << endl; t << "first: default" << endl; - if (debugPlatforms.contains("winscw")) + if (debugPlatforms.contains(PLATFORM_WINSCW)) t << "default: debug-winscw"; - else if (debugPlatforms.contains("armv5")) + else if (debugPlatforms.contains(PLATFORM_ARMV5)) t << "default: debug-armv5"; else if (debugPlatforms.size()) t << "default: debug-" << debugPlatforms.first(); @@ -195,52 +286,50 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << "\t$(QMAKE)" << endl; t << endl; - QString winscw("winscw"); + QString currentClause; + t << "debug: " << BLD_INF_FILENAME << endl; t << "\t$(SBS)"; - foreach(QString item, debugPlatforms) { - if(QString::compare(item, winscw) == 0) - t << " -c " << item << "_udeb.mwccinc" << testClause; - else - t << " -c " << item << "_udeb" << testClause; + foreach(QString item, debugClauses) { + t << item; } t << endl; t << "release: " << BLD_INF_FILENAME << endl; t << "\t$(SBS)"; - foreach(QString item, releasePlatforms) { - if(QString::compare(item, winscw) == 0) - t << " -c " << item << "_urel.mwccinc" << testClause; - else - t << " -c " << item << "_urel" << testClause; + foreach(QString item, releaseClauses) { + t << item; } t << endl; // For more specific builds, targets are in this form: build-platform, e.g. release-armv5 foreach(QString item, debugPlatforms) { t << "debug-" << item << ": " << BLD_INF_FILENAME << endl; - if(QString::compare(item, winscw) == 0) - t << "\t$(SBS) -c " << item << "_udeb.mwccinc" << testClause << endl; - else - t << "\t$(SBS) -c " << item << "_udeb" << testClause << endl; + t << "\t$(SBS)"; + t << configClause(item, debugBuild, winscwClause, gcceClause, genericClause); + t << endl; } foreach(QString item, releasePlatforms) { t << "release-" << item << ": " << BLD_INF_FILENAME << endl; - if(QString::compare(item, winscw) == 0) - t << "\t$(SBS) -c " << item << "_urel.mwccinc" << testClause << endl; - else - t << "\t$(SBS) -c " << item << "_urel" << testClause << endl; + t << "\t$(SBS)"; + t << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause); + t << endl; } t << endl; t << "export: " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) export" << endl; - t << endl; + t << "\t$(SBS) export"; + foreach(QString clause, allClauses) { + t << clause; + } + t << endl << endl; t << "cleanexport: " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) cleanexport" << endl; - t << endl; - + t << "\t$(SBS) cleanexport"; + foreach(QString clause, allClauses) { + t << clause; + } + t << endl << endl; } // Add all extra targets including extra compiler targest also to wrapper makefile, @@ -258,30 +347,37 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo generateDistcleanTargets(t); t << "clean: " << BLD_INF_FILENAME << endl; - t << "\t-$(SBS) reallyclean" << endl; - t << endl; + t << "\t-$(SBS) reallyclean"; + foreach(QString clause, allClauses) { + t << clause; + } + t << endl << endl; t << "clean-debug: " << BLD_INF_FILENAME << endl; t << "\t$(SBS) reallyclean"; - foreach(QString item, debugPlatforms) { - t << " -c " << item << "_udeb" << testClause; + foreach(QString clause, debugClauses) { + t << clause; } - t << endl; + t << endl << endl; t << "clean-release: " << BLD_INF_FILENAME << endl; t << "\t$(SBS) reallyclean"; - foreach(QString item, releasePlatforms) { - t << " -c " << item << "_urel" << testClause; + foreach(QString clause, releaseClauses) { + t << clause; } - t << endl; + t << endl << endl; // For more specific builds, targets are in this form: clean-build-platform, e.g. clean-release-armv5 foreach(QString item, debugPlatforms) { t << "clean-debug-" << item << ": " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) reallyclean -c " << item << "_udeb" << testClause << endl; + t << "\t$(SBS) reallyclean"; + t << configClause(item, debugBuild, winscwClause, gcceClause, genericClause); + t << endl; } foreach(QString item, releasePlatforms) { t << "clean-release-" << item << ": " << BLD_INF_FILENAME << endl; - t << "\t$(SBS) reallyclean -c " << item << "_urel" << testClause << endl; + t << "\t$(SBS) reallyclean"; + t << configClause(item, releaseBuild, winscwClause, gcceClause, genericClause); + t << endl; } t << endl; } diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h index 286c91c..6644a03 100644 --- a/qmake/generators/symbian/symmake_sbsv2.h +++ b/qmake/generators/symbian/symmake_sbsv2.h @@ -65,6 +65,13 @@ public: private: void exportFlm(); + QString gcceVersion(); + QString configClause(QString &platform, + QString &build, + QString &winscwClauseTemplate, + QString &gcceClauseTemplate, + QString &genericClauseTemplate); + void writeSbsDeploymentList(const DeploymentList& depList, QTextStream& t); QString extraTargetsCache; -- cgit v0.12 From 0cafff970c52f982d5acec368b5b5fdab319688d Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Wed, 11 Aug 2010 13:46:38 +0200 Subject: Fix typos in docs Reviewed-by: David Boddie --- src/declarative/graphicsitems/qdeclarativerepeater.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 2b268fb..68e7e9a 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -133,13 +133,13 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() create items as they are required. Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. - For example, it cannot be used to repeat QtObjects: + For example, it cannot be used to repeat QObjects: \badcode Item { - //XXX does not work! Can't repeat QtObject as it doesn't derive from Item. + //XXX does not work! Can't repeat QObject as it doesn't derive from Item. Repeater { model: 10 - QtObject {} + QObject {} } } \endcode -- cgit v0.12 From 59f01a1efe818004fdc9265af6a0e9a05c43932a Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 5 Aug 2010 18:36:54 +0200 Subject: 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrected and enabled the 64-bit versions of these three functions. Speed improvements (tested on an i7): BYTE_MUL : 104.7% INTERPOLATE_PIXEL_256 : 13.2% PREMUL : 13.1% Reviewed-by: Samuel Rødal --- src/gui/painting/qdrawhelper_p.h | 140 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 73 deletions(-) diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index 1a87127..d04c70d 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -314,18 +314,61 @@ struct QSpanData void adjustSpanMethods(); }; +#if defined(Q_CC_RVCT) +# pragma push +# pragma arm +#endif +Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) { + uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; + t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; + t &= 0xff00ff; -Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) { - a += 1; - uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0; - t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f; - return t; + x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; + x = (x + ((x >> 8) & 0xff00ff) + 0x800080); + x &= 0xff00ff00; + x |= t; + return x; } +#if defined(Q_CC_RVCT) +# pragma pop +#endif -Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) { - uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0; - t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f; - return t; +#if QT_POINTER_SIZE == 8 // 64-bit versions + +Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { + quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; + t += (((quint64(y)) | ((quint64(y)) << 24)) & 0x00ff00ff00ff00ff) * b; + t >>= 8; + t &= 0x00ff00ff00ff00ff; + return (uint(t)) | (uint(t >> 24)); +} + +Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) { + quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; + t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8; + t &= 0x00ff00ff00ff00ff; + return (uint(t)) | (uint(t >> 24)); +} + +Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) { + uint a = x >> 24; + quint64 t = (((quint64(x)) | ((quint64(x)) << 24)) & 0x00ff00ff00ff00ff) * a; + t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080) >> 8; + t &= 0x000000ff00ff00ff; + return (uint(t)) | (uint(t >> 24)) | (a << 24); +} + +#else // 32-bit versions + +Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { + uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; + t >>= 8; + t &= 0xff00ff; + + x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; + x &= 0xff00ff00; + x |= t; + return x; } #if defined(Q_CC_RVCT) @@ -359,6 +402,21 @@ Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) { x |= t | (a << 24); return x; } +#endif + + +Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16(uint x, uint a) { + a += 1; + uint t = (((x & 0x07e0)*a) >> 8) & 0x07e0; + t |= (((x & 0xf81f)*(a>>2)) >> 6) & 0xf81f; + return t; +} + +Q_STATIC_INLINE_FUNCTION uint BYTE_MUL_RGB16_32(uint x, uint a) { + uint t = (((x & 0xf81f07e0) >> 5)*a) & 0xf81f07e0; + t |= (((x & 0x07e0f81f)*a) >> 5) & 0x07e0f81f; + return t; +} #define INV_PREMUL(p) \ (qAlpha(p) == 0 ? 0 : \ @@ -1847,70 +1905,6 @@ inline int qBlue565(quint16 rgb) { return (b << 3) | (b >> 2); } -#if 1 -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { - uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; - t >>= 8; - t &= 0xff00ff; - - x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; - x &= 0xff00ff00; - x |= t; - return x; -} - -#if defined(Q_CC_RVCT) -# pragma push -# pragma arm -#endif -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) { - uint t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; - t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; - t &= 0xff00ff; - - x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; - x = (x + ((x >> 8) & 0xff00ff) + 0x800080); - x &= 0xff00ff00; - x |= t; - return x; -} -#if defined(Q_CC_RVCT) -# pragma pop -#endif -#else -// possible implementation for 64 bit -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_256(uint x, uint a, uint y, uint b) { - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b; - t >>= 8; - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)); -} - -Q_STATIC_INLINE_FUNCTION uint INTERPOLATE_PIXEL_255(uint x, uint a, uint y, uint b) { - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t += (((ulong(y)) | ((ulong(y)) << 24)) & 0x00ff00ff00ff00ff) * b; - t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080); - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)); -} - -Q_STATIC_INLINE_FUNCTION uint BYTE_MUL(uint x, uint a) { - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080); - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)); -} - -Q_STATIC_INLINE_FUNCTION uint PREMUL(uint x) { - uint a = x >> 24; - ulong t = (((ulong(x)) | ((ulong(x)) << 24)) & 0x00ff00ff00ff00ff) * a; - t = (t + ((t >> 8) & 0xff00ff00ff00ff) + 0x80008000800080); - t &= 0x00ff00ff00ff00ff; - return (uint(t)) | (uint(t >> 24)) | 0xff000000; -} -#endif - const uint qt_bayer_matrix[16][16] = { { 0x1, 0xc0, 0x30, 0xf0, 0xc, 0xcc, 0x3c, 0xfc, 0x3, 0xc3, 0x33, 0xf3, 0xf, 0xcf, 0x3f, 0xff}, -- cgit v0.12 From 32a54a21d77310f7bc1f306d175e41040d024a43 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 10 Aug 2010 10:51:06 +0100 Subject: Do not include Spectrum Analyzer demo in static builds This demo includes a 3rd party library which is licensed under the LGPL. As such, the demo application may only link to the library dynamically. Task-number: QTBUG-12713 Reviewed-by: Justin McPherson --- demos/demos.pro | 2 +- demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/demos/demos.pro b/demos/demos.pro index f359bd7..fdc1e4c 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -58,7 +58,7 @@ wince*:SUBDIRS += demos_sqlbrowser contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative -contains(QT_CONFIG, multimedia):SUBDIRS += demos_spectrum +contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum # install sources.files = README *.pro diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 48d614e..b8190a9 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -22,6 +22,10 @@ #include +#ifndef QT_DLL +# error This library is licensed under the LGPL and must be dynamically linked +#endif + #if defined(FFTREAL_LIBRARY) # define FFTREAL_EXPORT Q_DECL_EXPORT #else -- cgit v0.12 From 8adeb2742a701080c7e6568a6aca1f27079e1909 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 10 Aug 2010 10:39:07 +0100 Subject: Added documentation for Spectrum Analyzer demo Task-number: QTBUG-12720 Reviewed-by: David Boddie --- doc/src/demos/spectrum.qdoc | 34 ++++++++++++++++++++++++++++++---- doc/src/getting-started/demos.qdoc | 9 +++++++++ doc/src/images/spectrum-demo.png | Bin 0 -> 21771 bytes 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 doc/src/images/spectrum-demo.png diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/demos/spectrum.qdoc index b720ce1..d5a3f85 100644 --- a/doc/src/demos/spectrum.qdoc +++ b/doc/src/demos/spectrum.qdoc @@ -28,8 +28,34 @@ /*! \example demos/spectrum \title Spectrum Analyzer -This application is a demo which uses the QtMultimedia APIs to capture and -play back PCM audio. While either recording or playback is ongoing, the -application performs real-time level and frequency spectrum analysis, -displaying the results in its main window. + + The Spectrum Analyzer demo shows how the \l{QtMultimedia Module} can be + used in Qt applications to capture and then play back an audio stream. + + \image spectrum-demo.png + + Because QtMultimedia allows the application to access the raw audio + stream, the data can either be inspected or modified by the application. + The Spectrum Analyzer demo displays three pieces of information while + audio is being either captured or played back: + + \list + \o Information about the raw audio stream, shown in the uppermost widget: + \list + \o The amount of data currently in the buffer, shown in blue + \o The segment of data which was most recently analysed to compute + the frequency spectrum, shown in green + \o The raw audio waveform, shown in white and scrolling from right to + left + \endlist + \o A representation of the frequency spectrum, shown at the lower left + \o The current RMS level of the audio stream, and the recent 'high + watermark' level, shown at the lower right + \endlist + + Spectrum analysis is performed by calculating the Fast Fourier Transform + (FFT) of a segment of audio data. An open-source library, + \l{http://ldesoras.free.fr/prod.html}{FFTReal}, against which the + application is dynamically linked, is used to compute the transform. */ + diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc index 94b19c3..4003988 100644 --- a/doc/src/getting-started/demos.qdoc +++ b/doc/src/getting-started/demos.qdoc @@ -147,6 +147,15 @@ \note The Phonon demos are currently not available for the MinGW platform. + \section1 Multimedia + + \list + \o \l{demos/spectrum}{Spectrum Analyzer} demonstrates how the \l{QtMultimedia Module} + can be used to capture and play back an audio stream, at the same time allowing the + application to access the raw audio data. This application analyzes the audio stream + in order to display a frequency spectrum. + \endlist + \section1 Animation \list diff --git a/doc/src/images/spectrum-demo.png b/doc/src/images/spectrum-demo.png new file mode 100644 index 0000000..7f4938f Binary files /dev/null and b/doc/src/images/spectrum-demo.png differ -- cgit v0.12 From a4d19eef86b07d670b8b2a3f9ad6b3448800bae5 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 11 Aug 2010 15:32:28 +0200 Subject: doc: The QML Qt element was missing from the documentation. Either someone removed the QML: prefix, or it was never there. --- doc/src/declarative/elements.qdoc | 1 + src/declarative/qml/qdeclarativeengine.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index c2930b3..c008404 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -114,6 +114,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt \row \o \l {Component} \o Encapsulate QML items as a component \row \o \l {Timer} \o Provides timed triggers \row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property +\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt. \row \o \l {WorkerScript} \o Enables the use of threads in QML \row \o \l {Loader} \o Controls the loading of items or components \row \o \l {Repeater} \o Uses a model to create multiples of components diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 3822373..de79e4d 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -184,11 +184,12 @@ void QDeclarativeEnginePrivate::defineModule() } /*! -\keyword QmlGlobalQtObject -\qmlclass Qt QDeclarativeEnginePrivate +\qmlclass QML:Qt QDeclarativeEnginePrivate \brief The QML global Qt object provides useful enums and functions from Qt. -The \c Qt object provides useful enums and functions from Qt, for use in all QML files. +\keyword QmlGlobalQtObject + +\brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files. The \c Qt object is not a QML element; it cannot be instantiated. It is a global object with enums and functions. To use it, call the members of the global \c Qt object directly. -- cgit v0.12 From 731507feef0024d3ac5c3d2c67ca6ae2b239e706 Mon Sep 17 00:00:00 2001 From: Jure Repinc Date: Wed, 11 Aug 2010 18:33:18 +0200 Subject: Updated Slovenian translations for Qt 4.7 Merge-request: 771 Reviewed-by: Oswald Buddenhagen --- translations/designer_sl.ts | 1557 ++------------ translations/qt_sl.ts | 4931 +++++++++++++++++++++---------------------- 2 files changed, 2652 insertions(+), 3836 deletions(-) diff --git a/translations/designer_sl.ts b/translations/designer_sl.ts index 9399022..8d2a161 100644 --- a/translations/designer_sl.ts +++ b/translations/designer_sl.ts @@ -1,30 +1,32 @@ + 2010-08-05 02:42+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> AbstractFindWidget - &Previous &Predhodni - &Next &Naslednji - &Case sensitive O&bčutljiv na velikost črk - Whole &words &Cele besede - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Iskanje se nadaljuje na drugem koncu @@ -32,17 +34,14 @@ AddLinkDialog - Insert Link Vstavi povezavo - Title: Besedilo: - URL: URL: @@ -50,7 +49,6 @@ AppFontDialog - Additional Fonts Dodatne pisave @@ -58,37 +56,30 @@ AppFontManager - '%1' is not a file. »%1« ni datoteka. - The font file '%1' does not have read permissions. Datoteka s pisavo »%1« nima dovoljenj za branje. - The font file '%1' is already loaded. Datoteka s pisavo »%1« je že naložena. - The font file '%1' could not be loaded. Datoteke s pisavo »%1« ni bilo moč naložiti. - '%1' is not a valid font id. »%1« ni veljaven ID za pisavo. - There is no loaded font matching the id '%1'. Ni naložene pisave, ki bi se ujemala z ID-jem »%1«. - The font '%1' (%2) could not be unloaded. Pisave »%1« (%2) ni bilo moč odstraniti. @@ -96,52 +87,42 @@ AppFontWidget - Fonts Pisave - Add font files Dodaj datoteke s pisavami - Remove current font file Odstrani trenutno datoteko s pisavo - Remove all font files Odstrani vse datoteke s pisavami - Add Font Files Dodaj datoteke s pisavami - Font files (*.ttf) Datoteke s pisavami (*.ttf) - Error Adding Fonts Napaka pri dodajanju pisav - Error Removing Fonts Napaka pri odstranjevanju pisav - Remove Fonts Odstrani pisave - Would you like to remove all fonts? Ali želite odstraniti vse pisave? @@ -149,12 +130,10 @@ AppearanceOptionsWidget - Form Obrazec - User Interface Mode Način uporabniškega vmesnika @@ -162,17 +141,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Ni moč poslati zahtevka: pomočnik se ne odziva. - The binary '%1' does not exist. Program »%1« ne obstaja. - Unable to launch assistant (%1). Ni moč zaganti pomočnika (%1). @@ -180,92 +156,74 @@ BrushPropertyManager - No brush Brez čopiča - Solid Enobarven - Dense 1 Gost 1 - Dense 2 Gost 2 - Dense 3 Gost 3 - Dense 4 Gost 4 - Dense 5 Gost 5 - Dense 6 Gost 6 - Dense 7 Gost 7 - Horizontal Vodoraven - Vertical Navpičen - Cross Križ - Backward diagonal Poševen nazaj - Forward diagonal Poševen naprej - Crossing diagonal Poševen prekrižan - Style Slog - Color Barva - [%1, %2] [%1, %2] @@ -273,360 +231,280 @@ Command - - Change signal Spremeni signal - - Change slot Spremeni režo - Change signal-slot connection Spremeni povezavo signal-reža - Change sender Spremeni pošiljatelja - Change receiver Spremeni prejemnika - Add connection Dodaj povezavo - Adjust connection Prilagodi povezavo - Delete connections Zbriši povezave - Change source Spremeni izvor - Change target Spremeni cilj - Insert '%1' Vstavi »%1« - Raise '%1' Dvigni »%1« - Lower '%1' Spusti »%1« - Delete '%1' Zbriši »%1« - Reparent '%1' Spremeni starša od »%1« - Promote to custom widget Povišaj v gradnik po meri - Demote from custom widget Ponižaj iz gradnika po meri - Lay out using grid Razporedi z uporabo mreže - Lay out vertically Razporedi navpično - Lay out horizontally Razporedi vodoravno - Break layout Razbij razporeditev - - - Move Page Premakni stran - - - - Delete Page Zbriši stran - - Page Stran - page stran - - - - Insert Page Vstavi stran - Change Tab order Spremeni vrstni red tabulatorke - Create Menu Bar Ustvari menijsko vrstico - Delete Menu Bar Zbriši menijsko vrstico - Create Status Bar Ustvari vrstico stanja - Delete Status Bar Zbriši vrstico stanja - Add Tool Bar Dodaj orodjarno - Add Dock Window Dodaj podokno - Adjust Size of '%1' Prilagodi velikost za »%1« - Change Form Layout Item Geometry Spremeni geometrijo razporeditve na obrazcu - Change Layout Item Geometry Spremeni geometrijo razporeda - Change Table Contents Spremeni vsebino tabele - Change Tree Contents Spremeni vsebino drevesa - - Add action Dodaj dejanje - - Remove action Odstrani dejanje - Add menu Dodaj meni - Remove menu Odstrani meni - Create submenu Ustvari podmeni - Delete Tool Bar Zbriši orodjarno - Set action text Nastavi besedilo dejanja - Insert action Vstavi dejanje - - Move action Premakni dejanje - Change Title Spremeni naslov - Insert Menu Vstavi meni - Change signals/slots Spremeni signale/reže - Delete Subwindow Zbriši podokno - Insert Subwindow Vstavi podokno - subwindow podokno - Subwindow Podokno - Change Z-order of '%1' Spremeni vrstni red v smeri Z od »%1« - Simplify Grid Layout Poenostavi razporeditev v mrežo - Create button group Ustvari skupino gumbov - Break button group Razbij skupino gumbov - Break button group '%1' Razbij skupino gumbov »%1« - Add buttons to group Dodaj gumbe v skupino - - Add '%1' to '%2' - Command description for adding buttons to a QButtonGroup + Command description for adding buttons to a QButtonGroup + Dodaj »%1« v »%2« - Remove buttons from group Odstrani gumbe iz te skupine - Remove '%1' from '%2' - Command description for removing buttons from a QButtonGroup + Command description for removing buttons from a QButtonGroup + Odstrani »%1« iz »%2« - Morph %1/'%2' into %3 - MorphWidgetCommand description + MorphWidgetCommand description + Pretvori %1/»%2« v %3 - Change layout of '%1' from %2 to %3 Spremeni razpored od »%1« iz %2 v %3 - Change script Spremeni skript - Changed '%1' of '%2' Spremenil »%1« od »%2« - Changed '%1' of %n objects Spremenil »%1« od %n objekta @@ -636,12 +514,10 @@ - Reset '%1' of '%2' Ponastavi »%1« od »%2« - Reset '%1' of %n objects Ponastavi »%1« od %n objekta @@ -651,12 +527,10 @@ - Add dynamic property '%1' to '%2' Dodaj dinamično lastnost »%1« k »%2« - Add dynamic property '%1' to %n objects Dodaj dinamično lastnost »%1« k %n objektu @@ -666,12 +540,10 @@ - Remove dynamic property '%1' from '%2' Odstrani dinamično lastnost »%1« od »%2« - Remove dynamic property '%1' from %n objects Odstrani dinamično lastnost »%1« od %n objekta @@ -684,22 +556,18 @@ ConnectDialog - Configure Connection Nastavi povezavo - GroupBox Skupina - Edit... Urejanje ... - Show signals and slots inherited from QWidget Prikaži signale in reže podedovane od QWidget @@ -707,17 +575,14 @@ ConnectionDelegate - <object> <objekt> - <signal> <signal> - <slot> <reža> @@ -725,110 +590,93 @@ DPI_Chooser - Standard (96 x 96) - Embedded device standard screen resolution + Embedded device standard screen resolution + Običajna (96 × 96) - Greenphone (179 x 185) - Embedded device screen resolution + Embedded device screen resolution + Greenphone (179 × 185) - High (192 x 192) - Embedded device high definition screen resolution + Embedded device high definition screen resolution + Visoka (192 × 192) Designer - Qt Designer Qt Designer - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Ta datoteka vsebuje praznine, ki so na vrhu.<br><b>Niso</b> bile shranjene v ta obrazec. - Perhaps you forgot to create a layout? Morda ste pozabili ustvariti razpored? - Invalid UI file: The root element <ui> is missing. Neveljavna datoteka UI: manjka vrhnji element <ui>. - An error has occurred while reading the UI file at line %1, column %2: %3 Prišlo je do napake med branjem datoteke UI v vrstici %1, stolpcu %2: %3 - This file cannot be read because it was created using %1. Te datoteke ni moč prebrati, ker je bila ustvarjena z %1. - This file was created using Designer from Qt-%1 and cannot be read. Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in je ni moč prebrati. - This file cannot be read because the extra info extension failed to load. Te datoteke ni moč prebrati, ker je spodletelo nalaganje razširitve za dodatne podatke. - The converted file could not be read. Pretvorjene datoteke ni bilo moč prebrati. - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in bo pretvorjena v novo obliko. - The old form has not been touched, but you will have to save the form under a new name. Stara oblika ni bila spremenjena, vendar boste novo obliko morali shraniti pod novim imenom. - This file was created using Designer from Qt-%1 and could not be read: %2 Ta datoteka je bila ustvarjena s Qt Designerjem iz Qt %1 in je ni bilo moč prebrati: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Poženite jo skozi <b>uic3&nbsp;-convert</b> in jo tako pretvorite v zapis UI za Qt 4. - Custom Widgets Gradniki po meri - Promoted Widgets Povišani gradniki - Unable to launch %1. Ni moč zagnati %1. - %1 timed out. Čas za %1 je potekel. @@ -836,12 +684,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 ni veljavna vrednost številčenja od »%2«. - '%1' could not be converted to an enumeration value of type '%2'. »%1« ne more biti pretvorjeno v vrednost številčenja vrste »%2«. @@ -849,7 +695,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. »%1« ne more biti pretvorjeno v vrednost zastavice vrste »%2«. @@ -857,13 +702,12 @@ DeviceProfile - '%1' is not a number. - Reading a number for an embedded device profile + Reading a number for an embedded device profile + »%1« ni številka. - An invalid tag <%1> was encountered. Dosežena je bila neveljavna oznaka <%1>. @@ -871,27 +715,22 @@ DeviceProfileDialog - &Family &Družina - &Point Size &Velikost točke - Style Slog - Device DPI Ločljivost (točk/palec) - Name Ime @@ -899,57 +738,46 @@ DeviceSkin - The image file '%1' could not be loaded. Slikovne datoteke »%1« ni bilo moč naložiti. - The skin directory '%1' does not contain a configuration file. Mapa s temo »%1« ne vsebuje nastavitvene datoteke. - The skin configuration file '%1' could not be opened. Nastavitvene datoteke za temo »%1« ni bilo moč odpreti. - Syntax error: %1 Skladenjska napaka: %1 - The skin cursor image file '%1' does not exist. Slikovna datoteka s kazalcem za temo »%1« ne obstaja. - Syntax error in area definition: %1 Skladenjska napaka pri določitvi območja: %1 - Mismatch in number of areas, expected %1, got %2. Neujemanje v številu območij, pričakovano %1, dobljeno %2. - The skin configuration file '%1' could not be read: %2 Nastavitvene datoteke za temo »%1« ni bilo moč prebrati: %2 - The skin "up" image file '%1' does not exist. Datoteka slike »up« teme »%1« ne obstaja. - The skin "down" image file '%1' does not exist. Datoteka slike »down« teme »%1« ne obstaja. - The skin "closed" image file '%1' does not exist. Datoteka slike »closed« teme »%1« ne obstaja. @@ -957,51 +785,46 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> - Format embedded device profile description + Format embedded device profile description + <html><table><tr><td><b>Pisava</b></td><td>%1, %2</td></tr><tr><td><b>Slog</b></td><td>%3</td></tr><tr><td><b>Ločljivost</b></td><td>%4 × %5</td></tr></table></html> EmbeddedOptionsPage - Embedded Design - Tab in preferences dialog + Tab in preferences dialog + Vgrajena zasnova - Device Profiles - EmbeddedOptionsControl group box" + EmbeddedOptionsControl group box" + Profili naprav FontPanel - Font Pisava - &Writing system S&istem pisanja - &Family &Družina - &Style &Slog - &Point size &Velikost točke @@ -1009,22 +832,18 @@ FontPropertyManager - PreferDefault Prednost ima privzeto - NoAntialias Brez glajenja robov - PreferAntialias Prednost ima glajenje robov - Antialiasing Glajenje robov @@ -1032,43 +851,47 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values + Neveljavna vrednost razširjanja za »%1«: »%2« - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values + Neveljavna najmanjša velikost za »%1«: »%2« FormEditorOptionsPage - %1 % %1 % - Preview Zoom Povečava ogleda - Default Zoom Privzeta povečava - Forms - Tab in preferences dialog + Tab in preferences dialog + Obrazci - Default Grid Privzeta mreža @@ -1076,37 +899,30 @@ FormLayoutRowDialog - Add Form Layout Row Dodaj vrstico razporeditve na obrazcu - &Label text: &Besedilo oznake: - Field &type: &Vrsta polja: - &Field name: &Ime polja: - &Buddy: &Kolega: - &Row: &Vrstica: - Label &name: &Ime oznake: @@ -1114,12 +930,10 @@ FormWindow - Unexpected element <%1> Nepričakovan element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Napaka pri lepljenju vsebine odložišča v vrstici %1, stolpcu %2: %3 @@ -1127,62 +941,50 @@ FormWindowSettings - Form Settings Nastavitve obrazca - Layout &Default &Privzeto za razpored - &Spacing: &Razmik: - &Margin: &Rob: - &Layout Function &Funkcija za razpored - Ma&rgin: R&ob: - Spa&cing: R&azmik: - Embedded Design Vgrajena zasnova - &Author &Avtor - &Include Hints Namigi za &vključevanje - &Pixmap Function F&unkcija za sličico - Grid Mreža @@ -1190,7 +992,6 @@ IconSelector - All Pixmaps ( Vse sličice ( @@ -1198,42 +999,37 @@ ItemPropertyBrowser - XX Icon Selected off - Sample string to determinate the width for the first column of the list item property browser + Sample string to determinate the width for the first column of the list item property browser + XX Ikona Izbrano izklopljeno MainWindowBase - Main - Not currently used (main tool bar) + Not currently used (main tool bar) + Glavna - File Datoteka - Edit Urejanje - Tools Orodja - Form Obrazec - Qt Designer Qt Designer @@ -1241,52 +1037,42 @@ NewForm - C&reate &Ustvari - Recent Nedavno - &Close &Zapri - &Open... &Odpri ... - &Recent Forms &Nedavni obrazci - Read error Napaka pri branju - New Form Nov obrazec - Show this Dialog on Startup Prikaži to pogovorno okno ob zagonu - A temporary form file could not be created in %1. Začasne datoteke obrazca v %1 ni bilo moč ustvariti. - The temporary form file %1 could not be written. V začasno datoteko obrazca %1 ni bilo moč pisati. @@ -1294,22 +1080,18 @@ ObjectInspectorModel - Object Objekt - Class Razred - separator ločitelj - <noname> <neimenovano> @@ -1317,12 +1099,10 @@ ObjectNameDialog - Change Object Name Spremeni ime objekta - Object Name Ime objekta @@ -1330,12 +1110,10 @@ PluginDialog - Plugin Information Podatki o vstavkih - 1 1 @@ -1343,7 +1121,6 @@ PreferencesDialog - Preferences Nastavitve @@ -1351,32 +1128,26 @@ PreviewConfigurationWidget - Form Obrazec - Print/Preview Configuration Nastavitev tiskanja/ogleda - Style Slog - Style sheet Slogovna predloga - ... ... - Device skin Tema naprave @@ -1384,17 +1155,15 @@ PromotionModel - Not used - Usage of promoted widgets + Usage of promoted widgets + Ni uporabljeno Q3WizardContainer - - Page Stran @@ -1402,59 +1171,48 @@ QAbstractFormBuilder - Unexpected element <%1> Nepričakovan element <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Prišlo je do napake med branjem datoteke UI v vrstici %1, stolpcu %2: %3 - Invalid UI file: The root element <ui> is missing. Neveljavna datoteka UI: manjka vrhnji element <ui>. - The creation of a widget of the class '%1' failed. Ustvarjanje gradnika razreda »%1« ni uspelo. - Attempt to add child that is not of class QWizardPage to QWizard. Poskus dodajanja podgradnika, ki ni razreda QWizardPage ali QWizard. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Poskus dodajanja razporeda gradniku »%1« (%2), ki že ima razpored ne-okvirne vrste %3. To nakazuje na neskladnost v datoteki *.ui. - Empty widget item in %1 '%2'. Prazna postavka gradnika v %1 »%2«. - Flags property are not supported yet. Lastnosti z zastavicami še niso podprte. - While applying tab stops: The widget '%1' could not be found. Med uveljavljanjem postankov tabulatorke: gradnika »%1« ni bilo moč najti. - Invalid QButtonGroup reference '%1' referenced by '%2'. Neveljavna referenca »%1« na QButtonGroup od »%2«. - This version of the uitools library is linked without script support. Ta različica knjižnice uitools nima podpore za skripte. @@ -1462,12 +1220,10 @@ To nakazuje na neskladnost v datoteki *.ui. QAxWidgetPlugin - ActiveX control Kontrolnik ActiveX - ActiveX control widget Gradnik kontrolnika ActiveX @@ -1475,22 +1231,18 @@ To nakazuje na neskladnost v datoteki *.ui. QAxWidgetTaskMenu - Set Control Nastavi kontrolnik - Reset Control Ponastavi kontrolnik - Licensed Control Licenciran kontrolnik - The control requires a design-time license Kontrolnik potrebuje licenco za čas snovanja @@ -1498,67 +1250,54 @@ To nakazuje na neskladnost v datoteki *.ui. QCoreApplication - %1 is not a promoted class. %1 ni povišan razred. - The base class %1 is invalid. Osnovni razred %1 ni veljaven. - The class %1 already exists. Razred %1 že obstaja. - Promoted Widgets Povišani gradniki - The class %1 cannot be removed Razreda %1 ni moč odstraniti - The class %1 cannot be removed because it is still referenced. Razreda %1 ni moč odstraniti, ker se nanj še vedno nanašajo reference. - The class %1 cannot be renamed Razreda %1 ni moč preimenovati - The class %1 cannot be renamed to an empty name. Razreda %1 ni moč preimenovati s praznim imenom. - There is already a class named %1. Razred z imenom %1 že obstaja. - Cannot set an empty include file. Ni moč nastaviti prazne vključene datoteke. - Exception at line %1: %2 Izjema v vrstici %1: %2 - Unknown error Neznana napaka - An error occurred while running the script for %1: %2 Script: %3 Prišlo je do napake pri zaganjanju skripta za %1: %2 @@ -1568,17 +1307,14 @@ Skript: %3 QDesigner - %1 - warning %1 - opozorilo - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Programa ni moč uporabiti za konzolno izdajo Qt @@ -1586,186 +1322,146 @@ Skript: %3 QDesignerActions - Edit Widgets Urejanje gradnikov - &Quit Konča&j - &Minimize Po&manjšaj - Bring All to Front Prinesi vse v ospredje - Preferences... Nastavitve ... - Clear &Menu Počisti &meni - CTRL+SHIFT+S CTRL+SHIFT+S - CTRL+R CTRL+R - CTRL+M CTRL+M - Qt Designer &Help P&riročnik za Qt Designer - Current Widget Help Pomoč za trenutni gradnik - What's New in Qt Designer? Kaj je novega v Qt Designerju? - About Plugins O vstavkih - - About Qt Designer O Qt Designer - About Qt O Qt - - Open Form Odpri obrazec - - - Designer UI files (*.%1);;All Files (*) Designerjeve datoteke UI (*.%1);;Vse datoteke (*) - %1 already exists. Do you want to replace it? %1 že obstaja. Ali jo želite nadomestiti? - Saved %1. Shranil %1. - Additional Fonts... Dodatne pisave ... - &Recent Forms N&edavni obrazci - Designer Qt Designer - Feature not implemented yet! Zmožnost še ni izdelana. - Read error Napaka pri branju - %1 Do you want to update the file location or generate a new form? %1 Ali želite posodobiti lokacijo datoteke ali ustvariti nov obrazec? - &Update &Posodobi - &New Form &Nov obrazec - - Save Form? Shranim obrazec? - Could not open file Ni bilo moč odpreti datoteke - Select New File Izberite novo datoteko - Could not write file Ni bilo moč zapisati datoteke - &Close Preview &Zapri ogled - Save &Image... S&hrani sliko ... - &Print... &Natisni ... - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1774,7 +1470,6 @@ Razlog: %2 Ali žalite poskusiti znova ali izbrati drugo datoteko? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1783,117 +1478,90 @@ Razlog: %2 Ali želite poskusiti znova? - - The backup file %1 could not be written. Varnostne kopije datoteke %1 ni bilo moč zapisati. - The backup directory %1 could not be created. Mape %1 za varnostne kopije ni bilo moč ustvariti. - The temporary backup directory %1 could not be created. Začasne mape %1 za varnostne kopije ni bilo moč ustvariti. - Image files (*.%1) Slikovne datoteke (*.%1) - - Save Image Shrani sliko - The file %1 could not be written. Datoteke %1 ni bilo moč zapisati. - &New... &Nova ... - &Open... &Odpri ... - &Save &Shrani - Save &As... Shrani &kot ... - Save A&ll Shrani &vse - Save As &Template... Shrani kot &predlogo ... - - &Close &Zapri - View &Code... Prikaži &kodo ... - - Save Form As Shrani obrazec kot - Preview failed Ogled ni uspel - Code generation failed Ustvarjanje kode ni uspelo - - Assistant Pomočnik - Saved image %1. Shranil sliko %1. - Please close all forms to enable the loading of additional fonts. Da bi omogočili nalaganje dodatnih pisav zaprite vse obrazce. - Printed %1. Natisnil %1. - ALT+CTRL+S ALT+CTRL+S @@ -1901,26 +1569,23 @@ Ali želite poskusiti znova? QDesignerAppearanceOptionsPage - Appearance - Tab in preferences dialog + Tab in preferences dialog + Videz QDesignerAppearanceOptionsWidget - Docked Window Zasidrana okna - Multiple Top-Level Windows Več ločenih oken - Toolwindow Font Pisava oken z orodji @@ -1928,22 +1593,18 @@ Ali želite poskusiti znova? QDesignerAxWidget - Reset control Ponastavi kontrolnik - Set control Nastavi kontrolnik - Control loaded Kontrolnik je naložen - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". med izvajanjem meta-klica vrste %1 je prišlo do izjeme COM, indeks %2 od »%3«. @@ -1951,17 +1612,14 @@ Ali želite poskusiti znova? QDesignerFormBuilder - Script errors occurred: Prišlo je do napak v skriptu: - The preview failed to build. Grajenje ogleda ni uspelo. - Designer Qt Designer @@ -1969,22 +1627,18 @@ Ali želite poskusiti znova? QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Shranim obrazec? - Do you want to save the changes to this document before closing? Ali želite pred zaprtjem shraniti spremembe v tem dokumentu? - If you don't save, your changes will be lost. Če ne shranite, bodo spremembe izgubljene. @@ -1992,38 +1646,30 @@ Ali želite poskusiti znova? QDesignerMenu - Type Here Pišite sem - Add Separator Dodaj ločnico - Insert separator Vstavi ločnico - Remove separator Odstrani ločnico - Remove action '%1' Odstrani dejanje »%1« - - Add separator Dodaj ločnico - Insert action Vstavi dejanje @@ -2031,22 +1677,18 @@ Ali želite poskusiti znova? QDesignerMenuBar - Type Here Pišite sem - Remove Menu '%1' Odstrani meni »%1« - Remove Menu Bar Odstrani menijsko vrstico - Menu Meni @@ -2054,37 +1696,30 @@ Ali želite poskusiti znova? QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Med razčlenjevanjem datoteke XML gradnika po meri %1 je prišlo do napake XML: %2 - A required attribute ('%1') is missing. Manjka obvezna lastnost (»%1«). - An invalid property specification ('%1') was encountered. Supported types: %2 Dosežena je bila neveljavna specifikacija lastnosti (»%1«). Podprte vrste: %2 - '%1' is not a valid string property specification. »%1« ni veljavna specifikacija lastnosti z nizom. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. XML gradnika po meri »%1« ne vsebuje niti elementa <widget> niti <ui>. - The class attribute for the class %1 is missing. Manjka razredna lastnost za razred %1. - The class attribute for the class %1 does not match the class name %2. Razredna lastnost za razred %1 se ne ujema z razredovim imenom %2. @@ -2092,7 +1727,6 @@ Ali želite poskusiti znova? QDesignerPropertySheet - Dynamic Properties Dinamične lastnosti @@ -2100,45 +1734,41 @@ Ali želite poskusiti znova? QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Vrsta razpored »%1« ni podprta, preklapljam na mrežo. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Ko je bila povprašana po strani št. %5, je razširitev vsebnika gradnika »%1« (%2) vrnila gradnik, s katerim ne upravlja Qt Designer »%3« (%4). Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml() gradnika po meri. - Unexpected element <%1> - Parsing clipboard contents + Parsing clipboard contents + Nepričakovan element <%1> - Error while pasting clipboard contents at line %1, column %2: %3 - Parsing clipboard contents + Parsing clipboard contents + Napaka pri lepljenju vsebine odložišča v vrstici %1, stolpcu %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. - Parsing clipboard contents + Parsing clipboard contents + Napaka pri lepljenju vsebine odložišča: manjka vrhnji element <ui>. QDesignerSharedSettings - The template path %1 could not be created. Poti %1 za predlogo ni bilo moč ustvariti. - An error has been encountered while parsing device profile XML: %1 Med razčlenjevanjem XML-a profila naprave je prišlo do napake: %1 @@ -2146,32 +1776,26 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QDesignerToolWindow - Property Editor Urejevalnik lastnosti - Action Editor Urejevalnik dejanj - Object Inspector Preiskovalnik objektov - Resource Browser Brskalnik po virih - Signal/Slot Editor Urejevalnik signalov/rež - Widget Box Podokno z gradniki @@ -2179,97 +1803,78 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QDesignerWorkbench - &File &Datoteka - F&orm &Obrazec - Preview in Ogled v - &Window O&kno - &Help &Pomoč - Edit Urejanje - Toolbars Orodjarne - Save Forms? Shranim obrazce? - &View &Videz - &Settings &Nastavitve - Widget Box Podokno z gradniki - If you do not review your documents, all your changes will be lost. Če ne pregledate svojih dokumentov, bodo vse spremembe izgubljene. - Discard Changes Zavrzi spremembe - Review Changes Pregled sprememb - Backup Information Podatki o varnostnih kopijah - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Zadnja seja Qt Designerja ni bila končana pravilno. Na disku so ostale varnostne kopije datotek. Ali jih želite naložiti? - The file <b>%1</b> could not be opened. Datoteke <b>%1</b> ni bilo moč odpreti. - The file <b>%1</b> is not a valid Designer UI file. Datoteka <b>%1</b> ni veljavna Designerjeva datoteka UI. - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Odprt je %n obrazec z neshranjenimi spremembami. Ali želite pred zaprtjem pregledati te spremembe? @@ -2282,92 +1887,87 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method + Prazno ime razreda je bilo posredovano do %1 (ime objekta: »%2«). - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder ni mogel ustvariti gradnika po meri razreda »%1«; uporabljen je bil osnovni razred »%2«. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder ni mogel ustvariti gradnika razreda »%1«. - The layout type `%1' is not supported. Vrsta razporeda »%1« ni podprta. - The set-type property %1 could not be read. Lastnosti %1 z vrsto množice ni bilo moč prebrati. - The enumeration-type property %1 could not be read. Lastnosti %1 z vrsto naštevanja ni bilo moč prebrati. - Reading properties of the type %1 is not supported yet. Branje lastnosti vrste %1 še ni podprto. - The property %1 could not be written. The type %2 is not supported yet. Lastnosti %1 ni bilo moč zapisati. Vrsta %2 še ni podprta. + + The enumeration-value '%1' is invalid. The default value '%2' will be used instead. + Vrednost oštevilčenja »%1« ni veljavna. Namesto nje bo uporabljena privzeta vrednost »%2«. + + + The flag-value '%1' is invalid. Zero will be used instead. + Vrednost zastavice »%1« ni veljavna. Namesto nje bo uporabljena ničla. + QStackedWidgetEventFilter - Previous Page Predhodna stran - Next Page Naslednja stran - Delete Zbriši - Before Current Page Pred trenutno stran - After Current Page Za trenutno stran - Change Page Order... Spremeni vrstni red strani ... - Change Page Order Spremeni vrstni red strani - Page %1 of %2 Stran %1 od %2 - - Insert Page Vstavi stran @@ -2375,12 +1975,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Pojdi na predhodno stran od %1 »%2« (%3/%4). - Go to next page of %1 '%2' (%3/%4). Pojdi na naslednjo stran od %1 »%2« (%3/%4). @@ -2388,28 +1986,22 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QTabWidgetEventFilter - Delete Zbriši - Before Current Page Pred trenutno stran - After Current Page Za trenutno stran - Page %1 of %2 Stran %1 od %2 - - Insert Page Vstavi stran @@ -2417,37 +2009,30 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QToolBoxHelper - Delete Page Zbriši stran - Before Current Page Pred trenutno stran - After Current Page Za trenutno stran - Change Page Order... Spremeni vrsti red strani ... - Change Page Order Spremeni vrstni red strani - Page %1 of %2 Stran %1 od %2 - Insert Page Vstavi stran @@ -2455,15 +2040,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtBoolEdit - - - True Pravilno - - False Napačno @@ -2471,12 +2051,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtBoolPropertyManager - True Pravilno - False Napačno @@ -2484,7 +2062,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtCharEdit - Clear Char Počisti znak @@ -2492,7 +2069,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtColorEditWidget - ... ... @@ -2500,22 +2076,18 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtColorPropertyManager - Red Rdeča - Green Zelena - Blue Modra - Alpha Alfa @@ -2523,97 +2095,78 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtCursorDatabase - Arrow Puščica - Up Arrow Puščica navzgor - Cross Križec - Wait Čakanje - IBeam Črtica | - Size Vertical Velikost navpično - Size Horizontal Velikost vodoravno - Size Backslash Velikost poševno nazaj - Size Slash Velikost poševno - Size All Velikost v vse smeri - Blank Prazno - Split Vertical Razdelitev navpično - Split Horizontal Razdelitev vodoravno - Pointing Hand Roka, ki kaže - Forbidden Prepovedano - Open Hand Odprta dlan - Closed Hand Zaprta dlan - What's This Kaj je to - Busy Zasedeno @@ -2621,12 +2174,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtFontEditWidget - ... ... - Select Font Izberite pisavo @@ -2634,37 +2185,30 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtFontPropertyManager - Family Družina - Point Size Velikost točke - Bold Polkrepko - Italic Ležeče - Underline Podčrtano - Strikeout Prečrtano - Kerning Spodsekavanje @@ -2672,7 +2216,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtGradientDialog - Edit Gradient Uredi preliv @@ -2680,304 +2223,242 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtGradientEditor - Start X Začetni X - Start Y Začetni Y - Final X Končni X - Final Y Končni Y - - Central X Središčni X - - Central Y Središčni Y - Focal X Žariščni X - Focal Y Žariščni Y - Radius Polmer - Angle Kot - Linear Linearen - Radial Radialen - Conical Stožčast - Pad Zapolni - Repeat Ponovi - Reflect Odbij - Form Obrazec - Gradient Editor Urejevalnik preliva - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Urejevalnik postankov preliva - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. To območje vam omogoča urejanje postankov preliva. Da podvojite obstoječo ročko postanka dvokliknite nanjo. Za ustvaritev novega postanka dvokliknite izven obstoječih ročic postankov. Da spremenite položaj postanka povlecite in spustite njegovo ročko. Če kliknete z desnim gumbom miške, se bo pojavil priročni meni z dodatnimi dejanji. - Zoom Povečava - Position Položaj - Hue Odtenek - H H - Saturation Zasičenost - S S - Sat Zas. - Value Vrednost - V V - Val Vre. - Alpha Alfa - A A - Type Vrsta - Spread Razširitev - Color Barva - Current stop's color Barva trenutnega postanka - HSV HSV - RGB RGB - Current stop's position Položaj trenutnega postanka - % % - Zoom In Povečaj - Zoom Out Zmanjšaj - Toggle details extension Preklopi prikaz podrobnosti - > > - Linear Type Linearna vrsta - ... ... - Radial Type Radialna vrsta - Conical Type Stožčasta vrsta - Pad Spread Razširitev z zapolnitvijo - Repeat Spread Razširitev s ponovitvijo - Reflect Spread Razširitev z odbojem - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. To območje prikazuje ogled urejevanega preliva. Omogoča vam tudi urejanje parametrov, ki so specifični za vrsto preliva, na primer začetna in končna točka, polmer in podobno. Za to uporabite vlečenje in spuščanje. - Show HSV specification Prikaži specifikacijo HSV - Show RGB specification Prikaži specifikacijo RGB - Reset Zoom Ponastavi povečavo @@ -2985,37 +2466,30 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtGradientStopsWidget - New Stop Nov postanek - Delete Zbriši - Flip All Obrni vse - Select All Izberi vse - Zoom In Povečaj - Zoom Out Zmanjšaj - Reset Zoom Ponastavi povečavo @@ -3023,46 +2497,34 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtGradientView - Grad Preliv - Remove Gradient Odstrani preliv - Are you sure you want to remove the selected gradient? Ali res želite odstraniti izbrani preliv? - - New... Nov ... - - Edit... Urejanje ... - - Rename Preimenuj - - Remove Odstrani - Gradient View Prikaz preliva @@ -3070,7 +2532,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtGradientViewDialog - Select Gradient Izberite preliv @@ -3078,7 +2539,6 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtKeySequenceEdit - Clear Shortcut Počisti bližnjico @@ -3086,17 +2546,14 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtLocalePropertyManager - %1, %2 %1, %2 - Language Jezik - Country Država @@ -3104,17 +2561,14 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3122,17 +2576,14 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3140,12 +2591,10 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3153,27 +2602,22 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 × %4] - X X - Y Y - Width Širina - Height Višina @@ -3181,27 +2625,22 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 × %4] - X X - Y Y - Width Širina - Height Višina @@ -3209,128 +2648,98 @@ Strani vsebnikov naj bi bile dodane z navedbo v XML-u, ki ga vrne metoda domXml( QtResourceEditorDialog - %1 already exists. Do you want to replace it? %1 že obstaja. Ali jo želite nadomestiti? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Kot kaže datoteka ni datoteka z viri. Najden je bil element »%1«, pričakovan pa element »%2«. - %1 [read-only] %1 [samo za branje] - - %1 [missing] %1 [manjka] - <no prefix> <brez predpone> - - New Resource File Nova datoteka z viri - - Resource files (*.qrc) Datoteke z viri (*.qrc) - Import Resource File Uvozi datoteko z viri - newPrefix novaPredpona - Add Files Dodaj datoteke - Incorrect Path Nepravilna pot - - - - Copy Skopiraj - Copy As... Skopiraj kot ... - Keep Obdrži - Skip Preskoči - Clone Prefix Kloniraj predpono - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Vnesite pripono, ki jo želite dodati imenom kloniranih datotek. To bi, na primer, lahko bila pripona jezika kot je »_sl«. - - Copy As Skopiraj kot - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Izbrana datoteka:</p><p>%1</p><p>je izven mape trenutne datoteke z viri:</p><p>%2</p><p>Izberite drugo pot znotraj te mape.<p> - Could not overwrite %1. Ni bilo moč nadomestiti %1. - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Opozorilo:</b> Datoteka</p><p>%1</p><p>je izven matične mape trenutne datoteke z viri.</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Da razrešite težavo, kliknite:</p><table><tr><th align="left">Skopiraj</th><td>da skopirate datoteko v matično mapo datoteke z viri</td></tr><tr><th align="left">Skopiraj kot ...</th><td>da skopirate datoteko v podmapo matične mape datoteke z viri</td></tr><tr><th align="left">Obdrži</th><td>da uporabite trenutno lokacijo</td></tr></table> - Could not copy %1 to @@ -3341,153 +2750,120 @@ v %2 - A parse error occurred at line %1, column %2 of %3: %4 Prišlo je do napake razčlenjevanja v vrstici %1, stolpcu %2 v %3: %4 - Save Resource File Shrani datoteko z viri - Edit Resources Urejanje virov - New... Nova ... - Open... Odpri ... - - Remove Odstrani - - Move Up Premakni gor - - Move Down Pomakni dol - - Add Prefix Dodaj predpono - Add Files... Dodaj datoteke ... - Change Prefix Spremeni predpono - Change Language Spremeni jezik - Change Alias Spremeni drugo ime - Clone Prefix... Kloniraj predpono ... - Prefix / Path Predpona / pot - Language / Alias Jezik / drugo ime - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Opozorilo:</b> Med ponovnim nalaganjem virov je prišlo do težav:</p><pre>%1</pre></html> - Resource Warning Opozorilo o virih - Dialog Pogovorno okno - New File Nova datoteka - N N - Remove File Odstrani datoteko - R R - I I - New Resource Nov vir - A A - Remove Resource or File Odstrani vir ali datoteko - Could not write %1: %2 Ni moč zapisati %1: %2 - Open Resource File Odpri datoteko z viri @@ -3495,24 +2871,20 @@ v QtResourceView - Size: %1 x %2 %3 Velikost: %1 × %2 %3 - Edit Resources... Urejanje virov ... - Reload Znova naloži - Copy Path Skopiraj pot @@ -3520,7 +2892,6 @@ v QtResourceViewDialog - Select Resource Izberite vir @@ -3528,17 +2899,14 @@ v QtSizeFPropertyManager - %1 x %2 %1 × %2 - Width Širina - Height Višina @@ -3546,33 +2914,26 @@ v QtSizePolicyPropertyManager - - <Invalid> <neveljavno> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Vodoravna politika - Vertical Policy Navpična politika - Horizontal Stretch Vodoravna praznina - Vertical Stretch Navpična praznina @@ -3580,17 +2941,14 @@ v QtSizePropertyManager - %1 x %2 %1 × %2 - Width Širina - Height Višina @@ -3598,107 +2956,86 @@ v QtToolBarDialog - < S E P A R A T O R > < L O Č I T E L J > - Customize Toolbars Prilagodi orodjarne - 1 1 - Actions Dejanja - Toolbars Orodjarne - New Novo - Remove Odstrani - Rename Preimenuj - Up Gor - <- <- - -> -> - Down Dol - Current Toolbar Actions Trenutna dejanja v orodjarni - Custom Toolbar Orodjarna po meri - Add new toolbar Dodaj novo orodjarno - Remove selected toolbar Odstrani izbrano orodjarno - Rename toolbar Preimenuj orodjarno - Move action up Premakni dejanje gor - Remove action from toolbar Odstrani dejanje iz orodjarne - Add action to toolbar Dodaj dejanje v orodjarno - Move action down Premakni dejanje dol @@ -3706,12 +3043,10 @@ v QtTreePropertyBrowser - Property Lastnost - Value Vrednost @@ -3719,64 +3054,52 @@ v SaveFormAsTemplate - Add path... Dodaj pot ... - Template Exists Predloga obstaja - A template with the name %1 already exists. Do you want overwrite the template? Predloga z imenom %1 že obstaja. Ali želite nadomestiti predlogo? - Overwrite Template Nadomesti predlogo - Open Error Napaka pri odpiranju - There was an error opening template %1 for writing. Reason: %2 Prišlo je do napake pri odpiranju predloge %1 za pisanje. Razlog: %2 - Write Error Napaka pri pisanju - There was an error writing the template %1 to disk. Reason: %2 Prišlo je do napake pri pisanju predloge %1 na disk. Razlog: %2 - Pick a directory to save templates in Izberite mapo za shranjevanje predlog - Save Form As Template Shranjevanje obrazca kot predloge - &Category: &Kategorija: - &Name: &Ime: @@ -3784,7 +3107,6 @@ Ali želite nadomestiti predlogo? ScriptErrorDialog - An error occurred while running the scripts for "%1": Prišlo je do napake med poganjanjem skriptov za »%1«: @@ -3794,22 +3116,18 @@ Ali želite nadomestiti predlogo? SelectSignalDialog - Go to slot Pojdi na režo - Select signal Izbiranje signala - signal signal - class razred @@ -3817,7 +3135,6 @@ Ali želite nadomestiti predlogo? SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) POŠILJATELJ(%1), SIGNAL(%2), PREJEMNIK (%3), REŽA(%4) @@ -3825,32 +3142,26 @@ Ali želite nadomestiti predlogo? SignalSlotDialogClass - Signals and slots Signali in reže - Slots Reže - ... ... - Signals Signali - Add Dodaj - Delete Zbriši @@ -3858,12 +3169,10 @@ Ali želite nadomestiti predlogo? Spacer - Horizontal Spacer '%1', %2 x %3 Vodoravni ločitelj »%1«, %2 x %3 - Vertical Spacer '%1', %2 x %3 Navpični ločitelj »%1«, %2 x %3 @@ -3871,41 +3180,51 @@ Ali želite nadomestiti predlogo? TemplateOptionsPage - Template Paths - Tab in preferences dialog + Tab in preferences dialog + Poti za predloge ToolBarManager - Configure Toolbars... Nastavi orodjarne ... - Window Okno - Help Pomoč - Style Slog - Dock views Podokna - + File + Datoteka + + + Edit + Urejanje + + + Tools + Orodja + + + Form + Obrazec + + Toolbars Orodjarne @@ -3913,30 +3232,64 @@ Ali želite nadomestiti predlogo? VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Različica %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer je snovalnik grafičnih uporabniških vmesnikov za Qt programe.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Avtorske pravice © 2009 Nokia Corporation in/ali njene podružnice. + VideoPlayerTaskMenu + + Available Mime Types + Razpoložljive vrste MIME + + + Display supported mime types... + Prikaži podprte vrste MIME ... + + + Load... + Naloži ... + + + Play + Predvajaj + + + Pause + Premor + + + Stop + Ustavi + + + Choose Video Player Media Source + Izberite večpredstavnostni vir za predvajalnik videa + + + An error has occurred in '%1': %2 + V »%1« je prišlo do napake: %2 + + + Video Player Error + Napaka predvajalnika videa + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Datoteka vsebuje gradnik po meri »%1«, katerega osnovni razred (%2) se razlikuje od trenutnega vnosa v podatkovni zbirki gradnikov (%3). Podatkovna zbirka gradnikov je ostala nespremenjena. @@ -3944,87 +3297,70 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ActionEditor - Actions Dejanja - New... Novo ... - Delete Zbriši - New action Novo dejanje - Edit action Uredi dejanje - Edit... Uredi ... - Go to slot... Pojdi na režo ... - Copy Skopiraj - Cut Izreži - Paste Prilepi - Select all Izberi vse - Icon View Prikaz ikon - Detailed View Prikaz podrobnosti - Remove actions Odstrani dejanja - Remove action '%1' Odstrani dejanje »%1« - Used In Uporabljeno v - Configure Action Editor Nastavi urejevalnik dejanj @@ -4032,32 +3368,26 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ActionModel - Name Ime - Used Uporabljeno - Text Besedilo - Shortcut Bližnjica - Checkable Stikalo - ToolTip Namig @@ -4065,27 +3395,22 @@ Ali želite nadomestiti predlogo? qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. Elementu »%1« manjka obvezna lastnost »%2«. - Empty brush name encountered. Doseženo je bilo prazno ime čopiča. - An unexpected element '%1' was encountered. Dosežen je bil nepričakovan element »%1«. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 Prišlo je do napake pri branju datoteke z definicijo čopiča »%1«, v vrstici %2 in stolpcu %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 Prišlo je do napake pri branju datoteke z viri »%1«, v vrstici %2 in stolpcu %3: %4 @@ -4093,17 +3418,14 @@ Ali želite nadomestiti predlogo? qdesigner_internal::BuddyEditor - Add buddy Dodaj kolega - Remove buddies Odstrani kolege - Remove %n buddies Odstrani %n kolega @@ -4113,7 +3435,6 @@ Ali želite nadomestiti predlogo? - Add %n buddies Dodaj %n kolega @@ -4123,7 +3444,6 @@ Ali želite nadomestiti predlogo? - Set automatically Nastavi samodejno @@ -4131,7 +3451,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::BuddyEditorPlugin - Edit Buddies Urejanje kolegov @@ -4139,7 +3458,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::BuddyEditorTool - Edit Buddies Urejanje kolegov @@ -4147,12 +3465,10 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ButtonGroupMenu - Select members Izberi člane - Break Razbij @@ -4160,32 +3476,26 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ButtonTaskMenu - Assign to button group Dodeli skupini gumbov - Button group Skupina gumbov - New button group Novi skupini gumbov - Change text... Spremeni besedilo ... - None Nobeni - Button group '%1' Skupina gumbov »%1« @@ -4193,57 +3503,46 @@ Ali želite nadomestiti predlogo? qdesigner_internal::CodeDialog - Save... Shrani ... - Copy All Skopiraj vse - &Find in Text... &Najdi v besedilu ... - A temporary form file could not be created in %1. Začasne datoteke obrazca v %1 ni bilo moč ustvariti. - The temporary form file %1 could not be written. V začasno datoteko obrazca %1 ni bilo moč pisati. - %1 - [Code] %1 - [koda] - Save Code Shrani kodo - Header Files (*.%1) Datoteke z glavo (*.%1) - The file %1 could not be opened: %2 Datoteke »%1« ni bilo moč odpreti: %2 - The file %1 could not be written: %2 Datoteke »%1« ni bilo moč zapisati: %2 - %1 - Error %1 - napaka @@ -4251,7 +3550,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ColorAction - Text Color Barva besedila @@ -4259,12 +3557,10 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ComboBoxTaskMenu - Edit Items... Uredi postavke ... - Change Combobox Contents Spreminjanje vsebine spustnega seznama @@ -4272,7 +3568,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Spremeni opis ... @@ -4280,17 +3575,14 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ConnectionEdit - Select All Izberi vse - Deselect All Odizberi vse - Delete Zbriši @@ -4298,52 +3590,42 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ConnectionModel - Sender Pošiljatelj - Signal Signal - Receiver Prejemnik - Slot Reža - <sender> <pošiljatelj> - <signal> <signal> - <receiver> <prejemnik> - <slot> <reža> - Signal and Slot Editor Urejevalnik signalov in rež - The connection already exists!<br>%1 Povezava že obstaja!<br>%1 @@ -4351,42 +3633,34 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ContainerWidgetTaskMenu - Insert Page Before Current Page Vstavi stran pred trenutno stran - Insert Page After Current Page Vstavi stran za trenutno stran - Add Subwindow Dodaj podokno - Delete Zbriši - Insert Vstavi - Subwindow Podokno - Page Stran %1 - Page %1 of %2 Stran %1 od %2 @@ -4394,69 +3668,57 @@ Ali želite nadomestiti predlogo? qdesigner_internal::DPI_Chooser - System (%1 x %2) - System resolution + System resolution + Sistemska (%1 x %2) - User defined Uporabniško določena - x - DPI X/Y separator + DPI X/Y separator + x qdesigner_internal::DesignerPropertyManager - - AlignLeft Poravnaj levo - AlignHCenter Poravnaj sredinsko (vodoravno) - AlignRight Poravnaj desno - AlignJustify Poravnaj obojestransko - AlignTop Poravnaj na vrh - - AlignVCenter Poravnaj sredinsko (navpično) - AlignBottom Poravnaj na dno - %1, %2 %1, %2 - Customized (%n roles) Po meri (%n vloga) @@ -4466,75 +3728,58 @@ Ali želite nadomestiti predlogo? - Inherited Podedovano - Horizontal Vodoravno - Vertical Navpično - Normal Off Normalna in izključena - Normal On Normalna in vključena - Disabled Off Onemogočena in izključena - Disabled On Onemogočena in vključena - Active Off Aktivna in izključena - Active On Aktivna in vključena - Selected Off Izbrana in izključena - Selected On Izbrana in vključena - - translatable prevedljivo - - disambiguation razločitev - - comment komentar @@ -4542,48 +3787,38 @@ Ali želite nadomestiti predlogo? qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Profili naprav (*.%1) - Default Privzeti - Save Profile Shrani profil - Save Profile - Error Shranjevanje profila - napaka - Unable to open the file '%1' for writing: %2 Datoteke »%1« ni moč odpreti za pisanje: %2 - Open profile Odpri profil - - Open Profile - Error Odpiranje profila - napaka - Unable to open the file '%1' for reading: %2 Datoteke »%1« ni moč odpreti za branje: %2 - '%1' is not a valid profile: %2 »%1« ni veljaven profil: %2 @@ -4591,57 +3826,46 @@ Ali želite nadomestiti predlogo? qdesigner_internal::Dialog - Dialog PogovornoOkno - StringList SeznamNizov - New String Nov niz - &New &Nov - Delete String Z&briši niz - &Delete &Zbriši - &Value: &Vrednost: - Move String Up Premakni niz gor - Up Gor - Move String Down Premakni niz dol - Down Dol @@ -4649,52 +3873,42 @@ Ali želite nadomestiti predlogo? qdesigner_internal::EmbeddedOptionsControl - None Noben - Add a profile Dodaj profil - Edit the selected profile Uredi izbrani profil - Delete the selected profile Zbriši izbrani profil - Add Profile Dodaj profil - New profile Nov profil - Edit Profile Uredi profil - Delete Profile Zbriši profil - Would you like to delete the profile '%1'? Ali želite zbrisati profil »%1«? - Default Privzeti @@ -4702,20 +3916,21 @@ Ali želite nadomestiti predlogo? qdesigner_internal::FilterWidget - - <Filter> - <filter> + Filter + Filter + + + Clear text + Počisti besedilo qdesigner_internal::FormEditor - Resource File Changed Datoteka z viri je bila spremenjena - The file "%1" has changed outside Designer. Do you want to reload it? Datoteka »%1« je bila spremenjena izven Qt Designerja. Ali jo želite naložiti znova? @@ -4723,7 +3938,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::FormLayoutMenu - Add form layout row... Dodaj vrstico razporeditve na obrazcu ... @@ -4731,54 +3945,46 @@ Ali želite nadomestiti predlogo? qdesigner_internal::FormWindow - Edit contents Uredi vsebino - F2 F2 - Resize Spremeni velikost - - Key Move Premik s tipko - + Key Resize + + + Cannot paste widgets. Designer could not find a container without a layout to paste into. Ni moč prilepiti gradnikov. Qt Designer ni mogel najti vsebnika brez razporeditve, v katerega bi prilepil. - Break the layout of the container you want to paste into, select this container and then paste again. Razbijte razporeditev za vsebnik, v katerega želite prilepiti, nato izberite vsebnik in prilepite znova. - Paste error Napaka prilepljanja - Lay out Razporedi - - Drop widget Spusti gradnik - Paste %n action(s) Prilepi %n dejanje @@ -4788,12 +3994,10 @@ Ali želite nadomestiti predlogo? - Insert widget '%1' Vstavi gradnik »%1« - Paste %n widget(s) Prilepi %n gradnik @@ -4803,27 +4007,22 @@ Ali želite nadomestiti predlogo? - Paste (%1 widgets, %2 actions) Prilepi (gradnikov: %1, dejanj: %2) - Select Ancestor Izberi predhodnika - A QMainWindow-based form does not contain a central widget. Obrazec temelječ na QMainWindow ne vsebuje osrednjega gradnika. - Raise widgets Dvigni gradnike - Lower widgets Spusti gradnike @@ -4831,12 +4030,10 @@ Ali želite nadomestiti predlogo? qdesigner_internal::FormWindowBase - Delete Zbriši - Delete '%1' Zbriši »%1« @@ -4844,200 +4041,159 @@ Ali želite nadomestiti predlogo? qdesigner_internal::FormWindowManager - Cu&t &Izreži - Cuts the selected widgets and puts them on the clipboard Izreže izbrane gradnike in jih odloži na odložišče - &Copy S&kopiraj - Copies the selected widgets to the clipboard Skopira izbrane gradnike na odložišče - &Paste Pri&lepi - Pastes the clipboard's contents Prilepi vsebino odložišča - &Delete &Zbriši - Deletes the selected widgets Zbriše izbrane gradnike - Select &All Izberi &vse - Selects all widgets Izbere vse gradnike - Bring to &Front Prinesi v o&spredje - - Raises the selected widgets Dvigne izbrane gradnike - Send to &Back Pošlji v &ozadje - - Lowers the selected widgets Spusti izbrane gradnike - Adjust &Size Prilagodi ve&likost - Adjusts the size of the selected widget Prilagodi velikost izbranega gradnika - Lay Out &Horizontally Razporedi &vodoravno - Lays out the selected widgets horizontally Izbrane gradnike razporedi vodoravno - Lay Out &Vertically Razporedi &navpično - Lays out the selected widgets vertically Izbrane gradnike razporedi navpično - Lay Out in a &Grid Razporedi v &mrežo - Lays out the selected widgets in a grid Razporedi izbrane gradnike v mrežo - Lay Out Horizontally in S&plitter Razporedi vodoravno v ra&zdelilnik - Lays out the selected widgets horizontally in a splitter Izbrane gradnike razporedi vodoravno v razdelilnik - Lay Out Vertically in Sp&litter Razporedi navpično v raz&delilnik - Lays out the selected widgets vertically in a splitter Izbrane gradnike razporedi navpično v razdelilnik - &Break Layout &Razbij razporeditev - Breaks the selected layout Razbij izbrano razporeditev - &Preview... Prikaži &ogled ... - Preview current form Prikaže ogled trenutnega obrazca - Form &Settings... &Nastavi obrazec ... - Break Layout Razbij razporeditev - Adjust Size Prilagodi velikost - Could not create form preview Title of warning message box Ni bilo moč ustvariti ogleda obrazca - Form Settings - %1 Nastavitve obrazca - %1 - Removes empty columns and rows Odstrani prazne stolpce in vrstice - Lay Out in a &Form Layout Razporedi v razporeditev na &obrazcu - Lays out the selected widgets in a form layout Razporedi izbrane gradnike v razporeditev na obrazcu - Si&mplify Grid Layout Po&enostavi razporeditev v mrežo @@ -5045,12 +4201,10 @@ Ali želite nadomestiti predlogo? qdesigner_internal::FormWindowSettings - None Noben - Device Profile: %1 Profil naprave: %1 @@ -5058,37 +4212,30 @@ Ali želite nadomestiti predlogo? qdesigner_internal::GridPanel - Form Obrazec - Grid Mreža - Visible Vidna - Grid &X Mreža &X - Snap Pripni - Reset Ponastavi - Grid &Y Mreža &Y @@ -5096,7 +4243,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::GroupBoxTaskMenu - Change title... Spremeni naslov ... @@ -5104,7 +4250,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::HtmlTextEdit - Insert HTML entity Vstavi entiteto HTML @@ -5112,92 +4257,74 @@ Ali želite nadomestiti predlogo? qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Datoteke s sličico »%1« ni moč prebrati. - The file '%1' does not appear to be a valid pixmap file: %2 Kot kaže »%1« ni veljavna datoteka s sličico: %2 - The file '%1' could not be read: %2 Datoteke »%1« ni bilo moč prebrati: %2 - Pixmap Read Error Napaka pri branju sličice - ... ... - Normal Off Normalna in izključena - Normal On Normalna in vključena - Disabled Off Onemogočena in izključena - Disabled On Onemogočena in vključena - Active Off Aktivna in izključena - Active On Aktivna in vključena - Selected Off Izbrana in izključena - Selected On Izbrana in vključena - Choose Resource... Izberi vir ... - Choose File... Izberi datoteko ... - Reset Ponastavi - Reset All Ponastavi vse - Choose a Pixmap Izbiranje sličice @@ -5205,58 +4332,46 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ItemListEditor - Properties &<< Lastnosti &<< - - Properties &>> Lastnosti &>> - Items List Seznam postavk - New Item Nova postavka - &New &Nova - Delete Item Zbriši postavko - &Delete &Zbriši - Move Item Up Premakni postavko gor - U G - Move Item Down Premakni postavko dol - D D @@ -5264,12 +4379,10 @@ Ali želite nadomestiti predlogo? qdesigner_internal::LabelTaskMenu - Change rich text... Spremeni bogato besedilo ... - Change plain text... Spremeni navadno besedilo ... @@ -5277,7 +4390,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::LanguageResourceDialog - Choose Resource Izberite vir @@ -5285,7 +4397,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::LineEditTaskMenu - Change text... Spremeni besedilo ... @@ -5293,17 +4404,14 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ListWidgetEditor - Edit List Widget Urejanje gradnika s seznamom - Edit Combobox Urejanje spustnega seznama - New Item Nova postavka @@ -5311,12 +4419,10 @@ Ali želite nadomestiti predlogo? qdesigner_internal::ListWidgetTaskMenu - Edit Items... Uredi postavke ... - Change List Contents Spreminjanje vsebine seznama @@ -5324,22 +4430,18 @@ Ali želite nadomestiti predlogo? qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Naslednje podokno - Previous Subwindow Predhodno podokno - Tile Tlakuj - Cascade V kaskado @@ -5347,7 +4449,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::MenuTaskMenu - Remove Odstrani @@ -5355,7 +4456,6 @@ Ali želite nadomestiti predlogo? qdesigner_internal::MorphMenu - Morph into Pretvori v @@ -5363,42 +4463,34 @@ Ali želite nadomestiti predlogo? qdesigner_internal::NewActionDialog - New Action... Novo dejanje ... - &Text: &Besedilo: - &Icon: &Ikona: - Shortcut: Bližnjica: - Checkable: Stikalo: - ToolTip: Namig: - ... ... - Object &name: &Ime objekta: @@ -5406,39 +4498,32 @@ Ali želite nadomestiti predlogo? qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Nastavi ime lastnosti - The current object already has a property named '%1'. Please select another, unique one. Trenutni objekt že ima lastnost z imenom »%1«.Izberite drugo, edinstveno ime - Create Dynamic Property Ustvari dinamično lastnost - Property Name Ime lastnosti - Property Type Vrsta lastnosti - The '_q_' prefix is reserved for the Qt library. Please select another name. Predpona »_q_« je rezervirana za knjižnico Qt.Izberite drugo ime. - horizontalSpacer vodoravnaPraznina @@ -5446,83 +4531,68 @@ Please select another name. qdesigner_internal::NewFormWidget - Default size Privzeta velikost - QVGA portrait (240x320) QVGA, pokončno (240x320) - QVGA landscape (320x240) QVGA, ležeče (320x240) - VGA portrait (480x640) VGA, pokončno (480x640) - VGA landscape (640x480) VGA, ležeče (640x480) - Widgets - New Form Dialog Categories + New Form Dialog Categories + Gradniki - Custom Widgets Gradniki po meri - None Nobena - Error loading form Napaka pri nalaganju obrazca - Unable to open the form template file '%1': %2 Ni moč odpreti datoteke s predlogo obrazca »%1«: %2 - Internal error: No template selected. Notranja napaka: izbrane ni nobene predloge. - 0 0 - Choose a template for a preview Izberite predlogo za ogled - Embedded Design Vgrajena zasnova - Device: Naprava: - Screen Size: Velikost zaslona @@ -5530,37 +4600,30 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - Add Dodaj - New Promoted Class Nov povišan razred - Base class name: Ime osnovnega razreda: - Promoted class name: Ime povišanega razreda: - Header file: Datoteka z glavo: - Global include Globalna vključitev - Reset Ponastavi @@ -5568,48 +4631,37 @@ Please select another name. qdesigner_internal::ObjectInspector - - &Find in Text... - &Najdi v besedilu ... + Change Current Page + Spreminjanje trenutne strani - - - qdesigner_internal::ObjectInspector::ObjectInspectorPrivate - - Change Current Page - Spreminjanje trenutne strani + &Find in Text... + &Najdi v besedilu ... qdesigner_internal::OrderDialog - Index %1 (%2) Indeks %1 (%2) - Change Page Order Spreminjanje vrstnega reda strani - Page Order Vrstni red strani - Move page up Premakni stran gor - Move page down Premakni stran dol - %1 %2 %1 %2 @@ -5617,47 +4669,38 @@ Please select another name. qdesigner_internal::PaletteEditor - Edit Palette Urejanje palete - Tune Palette Nastavitev palete - Show Details Prikaži podrobnosti - Compute Details izračunaj podrobnosti - Quick Hitro - Preview Ogled - Disabled Onemogočeno - Inactive Neaktivno - Active Aktivno @@ -5665,7 +4708,6 @@ Please select another name. qdesigner_internal::PaletteEditorButton - Change Palette Spremeni paleto @@ -5673,22 +4715,18 @@ Please select another name. qdesigner_internal::PaletteModel - Color Role Vloga barve - Active Aktivno - Inactive Neaktivno - Disabled Onemogočeno @@ -5696,28 +4734,22 @@ Please select another name. qdesigner_internal::PixmapEditor - Copy Path Skopiraj pot - Paste Path Prilepi pot - Choose Resource... Izberi vir ... - Choose File... Izberi datoteko ... - - ... ... @@ -5725,7 +4757,6 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - Edit text Uredi besedilo @@ -5733,37 +4764,30 @@ Please select another name. qdesigner_internal::PluginDialog - Components Komponente - Plugin Information Podatki o vstavkih - Refresh Osveži - Scan for newly installed custom widget plugins. Preveri razpoložljivost na novo nameščenih vstavkov za gradnike po meri. - Qt Designer couldn't find any plugins Qt Designer ni našel nobenega vstavka - Qt Designer found the following plugins Qt Designer je našel naslednje vstavke - New custom widget plugins have been found. Najdeni so bili vstavki za nove gradnike po meri. @@ -5771,7 +4795,6 @@ Please select another name. qdesigner_internal::PreviewActionGroup - %1 Style Slog %1 @@ -5779,50 +4802,38 @@ Please select another name. qdesigner_internal::PreviewConfigurationWidget - Default Privzeto - None Brez - Browse... Brskaj ... - - - qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate - Load Custom Device Skin - Naloži temo za napravo po meri + Naloži temo za napravo po meri - All QVFB Skins (*.%1) Vse teme za QVFB (*.%1) - %1 - Duplicate Skin %1 - podvojena tema - The skin '%1' already exists. Tema »%1« že obstaja. - %1 - Error %1 - napaka - %1 is not a valid skin directory: %2 %1 ni veljavna mapa s temo: @@ -5832,24 +4843,22 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - &Portrait &Pokončno - Landscape (&CCW) - Rotate form preview counter-clockwise + Rotate form preview counter-clockwise + L&ežeče (v nasprotni smeri ure) - &Landscape (CW) - Rotate form preview clockwise + Rotate form preview clockwise + &Ležeče (v smeri ure) - &Close &Zapri @@ -5857,7 +4866,6 @@ Please select another name. qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [ogled] @@ -5865,10 +4873,10 @@ Please select another name. qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. - Palette editor background + Palette editor background + Šerif bo za vajo spet skuhal domače žgance. @@ -5876,57 +4884,46 @@ skuhal domače žgance. qdesigner_internal::PreviewWidget - Preview Window Okno ogleda - LineEdit UrejevalnaVrstica - ComboBox SpustniSeznam - PushButton Gumb - ButtonGroup2 SkupinaGumbov2 - CheckBox1 PotrditvenoPolje1 - CheckBox2 PotrditvenoPolje2 - ButtonGroup SkupinaGumbov - RadioButton1 IzbirniGumb1 - RadioButton2 IzbirniGumb2 - RadioButton3 IzbirniGumb3 @@ -5934,22 +4931,18 @@ skuhal domače žgance. qdesigner_internal::PromotionModel - Name Ime - Header file Datoteka z glavo - Global include Globalna vključitev - Usage Uporaba @@ -5957,27 +4950,22 @@ skuhal domače žgance. qdesigner_internal::PromotionTaskMenu - Promoted widgets... Povišani gradniki ... - Promote to ... Povišaj v ... - Promote to Povišaj v - Demote to %1 Ponižaj v %1 - Change signals/slots... Spremeni signale/reže ... @@ -5985,59 +4973,48 @@ skuhal domače žgance. qdesigner_internal::PropertyEditor - Add Dynamic Property... Dodaj dinamično lastnost ... - Remove Dynamic Property Odstrani dinamično lastnost - Tree View Drevesni prikaz - Drop Down Button View Gumb s spustim seznamom za prikaz - Object: %1 Class: %2 Objekt: %1 Razred: %2 - Sorting Razvrsti - Color Groups Obarvaj skupine - Configure Property Editor Nastavi urejevalnik lastnosti - String... Niz ... - Bool... Bool ... - Other... Drugo ... @@ -6045,7 +5022,6 @@ Razred: %2 qdesigner_internal::PropertyLineEdit - Insert line break Vstavi prelom vrstice @@ -6053,27 +5029,22 @@ Razred: %2 qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Povišani gradniki - Promoted Classes Povišani razredi - Promote Povišaj - %1 - Error %1 - napaka - Change signals/slots... Spremeni signale/reže ... @@ -6081,22 +5052,18 @@ Razred: %2 qdesigner_internal::QDesignerResource - Loading qrc file Nalaganje datoteke *.qrc - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Podane datoteke *.qrc <p><b>%1</b></p><p>ni bilo moč najti. Ali želite posodobiti lokacijo datoteke?</p> - New location for %1 Nova lokacija za %1 - Resource files (*.qrc) Datoteke z viri (*.qrc) @@ -6104,7 +5071,6 @@ Razred: %2 qdesigner_internal::QDesignerTaskMenu - Set size constraint on %n widget(s) Nastavi omejitev velikosti za %n gradnik @@ -6114,107 +5080,86 @@ Razred: %2 - Change objectName... Spremeni ime objekta ... - Change toolTip... Spremeni namig ... - Change whatsThis... Spremeni KajJeTo ... - Change styleSheet... Spremeni slogovno predlogo ... - Create Menu Bar Ustvari menijsko vrstico - Add Tool Bar Dodaj orodjarno - Create Status Bar Ustvari vrstico stanja - Remove Status Bar Odstrani vrstico stanja - Change script... Spremeni skript ... - Change signals/slots... Spremeni signale/reže ... - Go to slot... Pojdi na režo ... - Size Constraints Omejitve velikosti - Set Minimum Width Nastavi najmanjšo širino - Set Minimum Height Nastavi najmanjšo višino - Set Minimum Size Nastavi najmanjšo velikost - Set Maximum Width Nastavi največjo širino - Set Maximum Height Nastavi največjo višino - Set Maximum Size Nastavi največjo velikost - Edit ToolTip Uredi namig - Edit WhatsThis Uredi KajJeTo - no signals available na voljo ni nobenega signala @@ -6222,13 +5167,10 @@ Razred: %2 qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Nepričakovan element <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Prišlo je do napake razčlenjevanja v vrstici %1, stolpcu %2 kode XML za gradnik %3: %4 @@ -6236,29 +5178,24 @@ Razred: %2 %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Koda XML za gradnik %1 ne vsebuje nobenega elementa gradnika. %2 - An error has been encountered at line %1 of %2: %3 Prišlo je do napake v vrstici %1 v %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> Med razčlenjevanjem za <widget> ali <ui> je bil dosežen nepričakovan element <%1>. - Unexpected end of file encountered when parsing widgets. Med razčlenjevanjem gradnikov je bil dosežen nepričakovan konec datoteke. - A widget element could not be found. Ni bilo moč najti elementa gradnika. @@ -6266,73 +5203,58 @@ Razred: %2 qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Odtenek - Sat Zasičenost - Val Vrednost - Saturation Zasičenost - Value Vrednost - R R - G G - B B - Red Rdeča - Green Zelena - Blue Modra @@ -6340,27 +5262,22 @@ Razred: %2 qdesigner_internal::RichTextEditorDialog - Edit text Uredi besedilo - &OK &V redu - &Cancel &Prekliči - Rich Text Bogato besedilo - Source Izvorna koda @@ -6368,72 +5285,58 @@ Razred: %2 qdesigner_internal::RichTextEditorToolBar - Bold Polkrepko - CTRL+B Ctrl+B - Italic Ležeče - CTRL+I CTRL+I - Underline Podčrtano - CTRL+U CTRL+U - Left Align Poravnaj levo - Center Na sredino - Right Align Poravnaj desno - Justify Obojestransko - Superscript Nadpisano - Subscript Podpisano - Insert &Link Vstavi &povezavo - Insert &Image Vstavi &sliko @@ -6441,17 +5344,14 @@ Razred: %2 qdesigner_internal::ScriptDialog - Edit script Uredi skript - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Vnesite delček Qt Scripta, ki bo izveden med nalaganjem obrazca.<br>Gradnik in njegovi podgradniki so dostopni prek spremenljivk <i>widget</i> in <i>childWidgets</i>. - Syntax error Skladenjska napaka @@ -6459,7 +5359,6 @@ Razred: %2 qdesigner_internal::ScriptErrorDialog - Script errors Napake v skriptu @@ -6467,23 +5366,18 @@ Razred: %2 qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Reža z odtisom »%1« že obstaja. - There is already a signal with the signature '%1'. Signal z odtisom »%1« že obstaja. - %1 - Duplicate Signature %1 - podvojen odtis - - Signals/Slots of %1 Signali/reže od %1 @@ -6491,12 +5385,10 @@ Razred: %2 qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Urejanje signalov/rež - F4 F4 @@ -6504,7 +5396,6 @@ Razred: %2 qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Urejanje signalov/rež @@ -6512,7 +5403,6 @@ Razred: %2 qdesigner_internal::StatusBarTaskMenu - Remove Odstrani @@ -6520,7 +5410,6 @@ Razred: %2 qdesigner_internal::StringListEditorButton - Change String List Spreminjanje seznama nizov @@ -6528,38 +5417,30 @@ Razred: %2 qdesigner_internal::StyleSheetEditorDialog - Edit Style Sheet Urejanje slogovne predloge - - Valid Style Sheet Veljavna slogovna predloga - Add Resource... Dodaj vir ... - Add Gradient... Dodaj preliv ... - Add Color... Dodaj barvo ... - Add Font... Dodaj pisavo ... - Invalid Style Sheet Neveljavna slogovna predloga @@ -6567,27 +5448,22 @@ Razred: %2 qdesigner_internal::TabOrderEditor - Start from Here Začni od tu - Restart Začni znova - Tab Order List... Seznam vrstnega reda tabulatorke ... - Tab Order List Seznam vrstnega reda tabulatorke - Tab Order Vrstni red tabulatorke @@ -6595,7 +5471,6 @@ Razred: %2 qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Urejanje vrstnega reda tabulatorke @@ -6603,7 +5478,6 @@ Razred: %2 qdesigner_internal::TabOrderEditorTool - Edit Tab Order Urejanja vrstnega reda tabulatorke @@ -6611,48 +5485,38 @@ Razred: %2 qdesigner_internal::TableWidgetEditor - New Column Nov stolpec - New Row Nova vrstica - &Columns &Stolpci - &Rows &Vrstice - Properties &<< Lastnosti &<< - - Properties &>> Lastnosti &>> - Edit Table Widget Urejanje gradnika s tabelo - &Items &Postavke - Table Items Postavke v tabeli @@ -6660,7 +5524,6 @@ Razred: %2 qdesigner_internal::TableWidgetTaskMenu - Edit Items... Uredi postavke ... @@ -6668,22 +5531,18 @@ Razred: %2 qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Izberite mapo za shranjevanje predlog - Form Obrazec - Additional Template Paths Dodatne poti za predloge - ... ... @@ -6691,22 +5550,18 @@ Razred: %2 qdesigner_internal::TextEditTaskMenu - Change HTML... Spremeni HTML ... - Edit HTML Urejanje HTML-ja - Edit Text Urejanje besedila - Change Plain Text... Spremeni navadno besedilo ... @@ -6714,22 +5569,18 @@ Razred: %2 qdesigner_internal::TextEditor - Choose Resource... Izberi vir ... - Choose File... Izberi datoteko ... - Choose a File Izbiranje datoteke - ... ... @@ -6737,27 +5588,22 @@ Razred: %2 qdesigner_internal::ToolBarEventFilter - Insert Separator Vstavi ločitelja - Remove action '%1' Odstrani dejanje »%1« - Remove Toolbar '%1' Odstrani orodjarno »%1« - Insert Separator before '%1' Vstavi ločitelja pred »%1« - Append Separator Dodaj ločitelja @@ -6765,125 +5611,98 @@ Razred: %2 qdesigner_internal::TreeWidgetEditor - &Columns &Stolpci - Per column properties Lastnosti za stolpec - Common properties Skupne lastnosti - - New Item Nova postavka - Properties &<< Lastnosti &<< - - Properties &>> Lastnosti &>> - New Column Nov stolpec - Edit Tree Widget Urejanje gradnika z drevesom - &Items &Postavke - Tree Items Postavke v drevesu - - New Subitem Nova podpostavka - New &Subitem Nova &podpostavka - Delete Item Zbriši postavko - Move Item Left (before Parent Item) Premakni postavko levo (pred matično postavko) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Premakni postavko desno (kot prvo podpostavko sledeče postavke) - R E - Move Item Up Premakni postavko gor - U G - Move Item Down Premakni postavko dol - D D - 1 1 - &New &Nova - &Delete &Zbriši @@ -6891,7 +5710,6 @@ Razred: %2 qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Uredi postavke ... @@ -6899,7 +5717,6 @@ Razred: %2 qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Opozorilo: ustvarjanje gradnika v podoknu z gradniki ni uspelo. Za to je morda kriv neveljaven XML gradnika po meri. @@ -6907,42 +5724,34 @@ Razred: %2 qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Beležnica - Custom Widgets Gradniki po meri - Expand all Razširi vse - Collapse all Skrči vse - List View Prikaz seznama - Icon View Prikaz ikon - Remove Odstrani - Edit name Urejanje imena @@ -6950,7 +5759,6 @@ Razred: %2 qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Najden je bil vstavek gradnika po meri, katerega ime (%1) je enako imenu obstoječega razreda. @@ -6958,7 +5766,6 @@ Razred: %2 qdesigner_internal::WidgetEditorTool - Edit Widgets Urejanje gradnikov @@ -6966,34 +5773,28 @@ Razred: %2 qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Tovarna gradnikov po meri, ki je registrirana za gradnike razreda %1, je vrnila 0. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Med ustvarjanjem gradnika z uporabo tovarne gradnikov po meri, ki je registrirana za gradnike razreda %1, je prišlo do neujemanja v imenu razreda. Tovarna je vrnila gradnik razreda %2. - %1 Widget Gradnik %1 - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. Trenutne strani vsebnika »%1« (%2) med dodajanjem razporeda ni bilo moč določiti. To nakazuje na neskladnost v datoteki *.ui. Verjetno je na vsebovalnem gradniku zgrajen razpored. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Poskus dodajanja razporeda gradniku »%1« (%2), ki že ima neupravljan razpored vrste %3. To nakazuje na neskladnost v datoteki *.ui. - Cannot create style '%1'. Ni moč ustvariti sloga »%1«. @@ -7001,12 +5802,10 @@ To nakazuje na neskladnost v datoteki *.ui. qdesigner_internal::WizardContainerWidgetTaskMenu - Next Naprej - Back Nazaj @@ -7014,18 +5813,62 @@ To nakazuje na neskladnost v datoteki *.ui. qdesigner_internal::ZoomMenu - %1 % - Zoom factor + Zoom factor + %1 % qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom &Povečava + + + + <Filter> + qdesigner_internal::FilterWidget| + <filter> + + + Change Current Page + qdesigner_internal::ObjectInspector::ObjectInspectorPrivate| + Spreminjanje trenutne strani + + + Load Custom Device Skin + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + Naloži temo za napravo po meri + + + All QVFB Skins (*.%1) + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + Vse teme za QVFB (*.%1) + + + %1 - Duplicate Skin + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + %1 - podvojena tema + + + The skin '%1' already exists. + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + Tema »%1« že obstaja. + + + %1 - Error + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + %1 - napaka + + + %1 is not a valid skin directory: +%2 + qdesigner_internal::PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate| + %1 ni veljavna mapa s temo: +%2 + + diff --git a/translations/qt_sl.ts b/translations/qt_sl.ts index 6c42bb8..e0cee0f 100644 --- a/translations/qt_sl.ts +++ b/translations/qt_sl.ts @@ -1,10 +1,16 @@ + 2010-08-05 12:59+0200 + MIME-Version,Content-Type,Content-Transfer-Encoding,Plural-Forms,X-Language,X-Qt-Contexts,Last-Translator,PO-Revision-Date,Project-Id-Version,Language-Team,X-Generator + Lokalize 1.1 + Slovenian <lugos-slo@lugos.si> + + # Jure Repinc <jlp@holodeck1.com>, 2010. + Jure Repinc <jlp@holodeck1.com> CloseButton - Close Tab Zapri zavihek @@ -12,45 +18,68 @@ FakeReply - Fake error ! Lažna napaka. - Invalid URL Neveljaven URL + MAC_APPLICATION_MENU + + Services + Storitve + + + Hide %1 + Skrij %1 + + + Hide Others + Skrij druge + + + Show All + Prikaži vse + + + Preferences... + Nastavitve ... + + + Quit %1 + Končaj %1 + + + About %1 + O %1 + + + Phonon:: - Notifications Obvestila - Music Glasba - Video Video - Communication Komunikacija - Games Igre - Accessibility Dostopnost @@ -58,32 +87,31 @@ Phonon::AudioOutput - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Naprava za predvajanje zvoka <b>%1</b> ne deluje.<br/>Preklapljanje na <b>%2</b>.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Preklapljanje na napravo za predvajanje zvoka <b>%1</b>,<br/>ki je ravnokar postala dostopna in ima višjo preferenco.</html> - Revert back to device '%1' Povrni nazaj na napravo »%1« + + <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> + <html>Preklapljanje na napravo za predvajanje zvoka <b>%1</b>,<br/>ki ima višjo preferenco ali pa je posebej nastavljena za ta tok.</html> + Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Opozorilo: kot kaže paket gstreamer0.10-plugins-good ni nameščen. Nekatere možnosti predvajanja videa so onemogočene. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Opozorilo: kot kaže osnovni vstavki za GStreamer niso nameščeni. @@ -93,10 +121,9 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. -Check your Gstreamer installation and make sure you +Check your GStreamer installation and make sure you have libgstreamer-plugins-base installed. Ni moč začeti predvajanja. @@ -104,39 +131,34 @@ Preverite namestitev GStreamerja in se prepričajte, da je nameščen paket libgstreamer-plugins-base. - + Missing codec helper script assistant. + Manjka pomožni skript pomočnika za kodeke. + + + Plugin codec installation failed for codec: %0 + Namesitev vstavka s kodekom ni uspela: %0 + + A required codec is missing. You need to install the following codec(s) to play this content: %0 Manjka potreben kodek. Za predvajanje te vsebine morate namestiti sledeče kodeke: %0 - - - - - - - - Could not open media source. Ni moč odpreti večpredstavnostnega vira. - Invalid source type. Neveljavna vrsta vira. - Could not locate media source. Ni moč najti večpredstavnostnega vira. - Could not open audio device. The device is already in use. Ni moč odpreti zvočne naprave. Naprava je že v uporabi. - Could not decode media source. Ni moč dekodirati večpredstavnostnega vira. @@ -144,82 +166,323 @@ da je nameščen paket libgstreamer-plugins-base. Phonon::MMF - Audio Output Predvajanje zvoka - The audio output device Naprava za predvajanje zvoka + + No error + Brez napake + + + Not found + Ni najdeno + + + Out of memory + Zmanjkalo pomnilnika + + + Not supported + Ni podprto + + + Overflow + Prekoračitev zgornje meje + + + Underflow + Prekoračitev spodnje meje + + + Already exists + Že obstaja + + + Path not found + Pot ni najdena + + + In use + V uporabi + + + Not ready + Ni pripravljeno + + + Access denied + Dostop zavrnjen + + + Could not connect + Povezava ni mogoča + + + Disconnected + Povezava prekinjena + + + Permission denied + Ni dovoljenja + + + Insufficient bandwidth + Pasovna širina ni zadostna + + + Network unavailable + Omrežje ni na voljo + + + Network communication error + Napaka komunikacije prek omrežja + + + Streaming not supported + Pretakanje ni podprto + + + Server alert + Opozorilo strežnika + + + Invalid protocol + Neveljaven protokol + + + Invalid URL + Neveljaven URL + + + Multicast error + Napaka oddajanja večim + + + Proxy server error + Napaka posredniškega strežnika + + + Proxy server not supported + Posredniški strežnik ni podprt + + + Audio output error + Napaka predvajanja zvoka + + + Video output error + Napaka prevajanja videa + + + Decoder error + Napaka dekodirnika + + + Audio or video components could not be played + Zvočne ali video komponente ni bilo moč predvajati + + + DRM error + Napaka upravljanja z omejitvami + + + Unknown error (%1) + Neznana napaka (%1) + + + + Phonon::MMF::AbstractMediaPlayer + + Not ready to play + Ni pripravljen na predvajanje + + + Error opening file + Napaka pri odpiranju datoteke + + + Error opening URL + Napaka pri odpiranju URL-ja + + + Error opening resource + Napaka pri odpiranju vira + + + Error opening source: resource not opened + Napaka pri odporanju vira: vir ni bil odprt + + + Setting volume failed + Nastavljanje glasnosti ni uspelo + + + Loading clip failed + Nalaganje posnetka ni uspelo + + + Playback complete + Predvajanje je zaključeno + + + + Phonon::MMF::AbstractVideoPlayer + + Pause failed + Prekinitev ni uspela + + + Seek failed + Pomik ni uspel + + + Getting position failed + Pridobivanje položaja ni uspelo + + + Opening clip failed + Odpiranje posnetka ni uspelo + Phonon::MMF::AudioEqualizer - - Frequency band, %1 Hz - Frekvenčni pas, %1 Hz + %1 Hz + %1 Hz + + + + Phonon::MMF::AudioPlayer + + Getting position failed + Pridobivanje položaja ni uspelo + + + + Phonon::MMF::DsaVideoPlayer + + Video display error + Napaka prikaza videa Phonon::MMF::EffectFactory - - audio equalizer - izenačevalnik zvoka + Enabled + Omogočeno + + + Phonon::MMF::EnvironmentalReverb - - Bass boost - Ojačanje basov + Decay HF ratio (%) + DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. + + - - Distance Attenuation - Utišanje zaradi razdalje + Decay time (ms) + DecayTime: Time over which reverberation is diminished. + + - - - Environmental Reverb - Okoljsko odmevanje + Density (%) + Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. + + Gostota (%) - - Loudness - Glasnost + Diffusion (%) + Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. + + Razpršitev (%) - - Source Orientation - Usmerjenost vira + Reflections delay (ms) + ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. + + Zamik odbojev (ms) - - Stereo Widening - Razširitev sterea + Reflections level (mB) + ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. + + Glasnost odbojev (mB) + + + Reverb delay (ms) + ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. + + Zamik odmeva (ms) + + + Reverb level (mB) + ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. + + Glasnost odmeva (ms) + + + Room HF level + RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. + + VF glasnost prostora + + + Room level (mB) + RoomLevel: Master volume control for all reflected sound. + + Glasnost prostora (mB) + + + + Phonon::MMF::MediaObject + + Error opening source: type not supported + Napaka pri odpiranju vira: vrsta ni podprta + + + Error opening source: resource is compressed + Napaka pri odporanju vira: vir je stisnjen + + + Error opening source: resource not valid + Napaka pri odporanju vira: vir ni veljaven + + + Error opening source: media type could not be determined + Napaka pri odpiranju vira: ni bilo moč ugotoviti vrste večpredstavnostne datoteke + + + + Phonon::MMF::StereoWidening + + Level (%) + Stopnja (%) + + + + Phonon::MMF::SurfaceVideoPlayer + + Video display error + Napaka prikaza videa Phonon::VolumeSlider - - - - Volume: %1% Glasnost: %1 % - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Uporabite ta drsnik, da nastavite glasnost. Skrajno levi položaj je 0 %, skrajno desni pa %1 %. - Muted Utišan @@ -227,12 +490,10 @@ da je nameščen paket libgstreamer-plugins-base. Q3Accel - %1, %2 not defined %1, %2 ni definiran - Ambiguous %1 not handled Brez rokovanja z dvoumnim %1 @@ -240,27 +501,22 @@ da je nameščen paket libgstreamer-plugins-base. Q3DataTable - True Pravilno - False Napačno - Insert Vstavi - Update Posodobi - Delete Izbriši @@ -268,313 +524,238 @@ da je nameščen paket libgstreamer-plugins-base. Q3FileDialog - Copy or Move a File Skopiraj ali premakni datoteko - Read: %1 Branje: %1 - - Write: %1 Pisanje: %1 - - Cancel Prekliči - - - - All Files (*) Vse datoteke (*) - Name Ime - Size Velikost - Type Vrsta - Date Datum - Attributes Lastnosti - - &OK &V redu - Look &in: Išči &v: - - - File &name: Ime &datoteke: - File &type: &Vrsta datoteke: - Back Nazaj - One directory up Za eno mapo navzgor - Create New Folder Ustvari novo mapo - List View Prikaz seznama - Detail View Prikaz podrobnosti - Preview File Info Podatki ogleda datoteke - Preview File Contents Vsebina ogleda datoteke - Read-write Branje in pisanje - Read-only Samo za branje - Write-only Samo za pisanje - Inaccessible Nedostopno - Symlink to File Simbolna povezava do datoteke - Symlink to Directory Simbolna povezava do mape - Symlink to Special Simbolna povezava do posebnega - File Datoteka - Dir Mapa - Special Posebno - - - Open Odpri - - Save As Shrani kot - - - &Open &Odpri - - &Save &Shrani - &Rename Pre&imenuj - &Delete &Izbriši - R&eload &Znova naloži - Sort by &Name Razvrsti po &imenu - Sort by &Size Razvrsti po &velikosti - Sort by &Date Razvrsti po &datumu - &Unsorted &Brez razvrščanja - Sort Razvrsti - Show &hidden files Prikaži &skrite datoteke - the file datoteko - the directory mapo - the symlink simbolno povezavo - Delete %1 Izbriši %1 - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Ali res želite izbrisati %1 »%2«?</qt> - &Yes &Da - &No &Ne - New Folder 1 Nova mapa 1 - New Folder Nova mapa - New Folder %1 Nova mapa %1 - Find Directory Najdi mapo - - Directories Mape - Directory: Mapa: - - Error Napaka - %1 File not found. Check path and filename. @@ -583,17 +764,14 @@ Datoteke ni moč najti. Preverite pot in ime datoteke. - All Files (*.*) Vse datoteke (*.*) - Open Odpri - Select a Directory Izberite mapo @@ -601,29 +779,24 @@ Preverite pot in ime datoteke. Q3LocalFs - - Could not read directory %1 Ni bilo moč brati mape %1 - Could not create directory %1 Ni bilo moč ustvariti mape %1 - Could not remove file or directory %1 Ni bilo moč odstraniti datoteke ali mape %1 - Could not rename %1 to @@ -634,14 +807,12 @@ v %2 - Could not open %1 Ni moč odpreti %1 - Could not write %1 Ni bilo moč zapisati @@ -651,12 +822,10 @@ v Q3MainWindow - Line up V vrsto - Customize... Prilagodi ... @@ -664,7 +833,6 @@ v Q3NetworkProtocol - Operation stopped by the user Dejanje zaustavil uporabnik @@ -672,8 +840,6 @@ v Q3ProgressDialog - - Cancel Prekliči @@ -681,28 +847,22 @@ v Q3TabDialog - - OK V redu - Apply Uveljavi - Help Pomoč - Defaults Privzetosti - Cancel Prekliči @@ -710,38 +870,30 @@ v Q3TextEdit - &Undo &Razveljavi - &Redo &Uveljavi - Cu&t &Izreži - &Copy S&kopiraj - &Paste Pri&lepi - Clear Počisti - - Select All Izberi vse @@ -749,67 +901,54 @@ v Q3TitleBar - System Sistem - Restore up Obnovi - Minimize Pomanjšaj - Restore down Obnovi - Maximize Razpni - Close Zapri - Contains commands to manipulate the window Vsebuje ukaze za upravljanje z oknom - Puts a minimized window back to normal Obnovi pomanjšano okno na običajno velikost - Moves the window out of the way Umakne okno, da ni v napoto - Puts a maximized window back to normal Obnovi razpeto okno - Makes the window full screen Razpne okno čez ves zaslon - Closes the window Zapre okno - Displays the name of the window and contains controls to manipulate it Prikazuje ime okna in vsebuje gumbe za nadzor okna @@ -817,7 +956,6 @@ v Q3ToolBar - More... Več ... @@ -825,51 +963,38 @@ v Q3UrlOperator - - - The protocol `%1' is not supported Protokol »%1« ni podprt. - The protocol `%1' does not support listing directories Protokol »%1« ne podpira izpisa seznama map. - The protocol `%1' does not support creating new directories Protokol »%1« ne podpira ustvarjanja novih map. - The protocol `%1' does not support removing files or directories Protokol »%1« ne podpira odstranjevanja datotek ali map. - The protocol `%1' does not support renaming files or directories Protokol »%1« ne podpira preimenovanja datotek ali map. - The protocol `%1' does not support getting files Protokol »%1« ne podpira prejemanja datotek. - The protocol `%1' does not support putting files Protokol »%1« ne podpira pošiljanja datotek. - - The protocol `%1' does not support copying or moving files or directories Protokol »%1« ne podpira kopiranja ali premikanja datotek ali map. - - (unknown) (neznano) @@ -877,27 +1002,22 @@ v Q3Wizard - &Cancel &Prekliči - < &Back < Na&zaj - &Next > &Naprej > - &Finish &Končaj - &Help &Pomoč @@ -905,44 +1025,30 @@ v QAbstractSocket - - - - Host not found Ni moč najti gostitelja - - - Connection refused Povezava je zavrnjena - Connection timed out Čas za povezavo je potekel - - - Operation on socket is not supported Dejanje na vtičnici ni podprto - Socket operation timed out Čas za dejanje na vtičnici je potekel - Socket is not connected Vtičnica ni povezana. - Network unreachable Omrežje ni dosegljivo @@ -950,17 +1056,14 @@ v QAbstractSpinBox - &Step up Korak &gor - Step &down Korak &dol - &Select All Izberi &vse @@ -968,7 +1071,6 @@ v QAccessibleButton - Press Pritisni @@ -976,28 +1078,23 @@ v QApplication - Activate Aktiviraj - Executable '%1' requires Qt %2, found Qt %3. Izvršljiva datoteka »%1« potrebuje Qt %2, najden pa je bil Qt %3. - Incompatible Qt Library Error Napaka nezdružljivosti knjižnice Qt - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR - Activates the program's main window Aktivira glavno okno programa @@ -1005,22 +1102,18 @@ v QAxSelect - Select ActiveX Control Izberite kontrolnik ActiveX - OK V redu - &Cancel &Prekliči - COM &Object: &Objekt COM: @@ -1028,17 +1121,14 @@ v QCheckBox - Uncheck Odznači - Check Označi - Toggle Preklopi @@ -1046,57 +1136,46 @@ v QColorDialog - Hu&e: &Odtenek: - &Sat: &Zasičenost: - &Val: &Vrednost: - &Red: &Rdeča: - &Green: &Zelena: - Bl&ue: &Modra: - A&lpha channel: Kanal &alfa: - Select Color Izberite barvo - &Basic colors &Osnovne barve - &Custom colors Barve po &meri - &Add to Custom Colors &Dodaj lastnim barvam @@ -1104,23 +1183,18 @@ v QComboBox - - Open Odpri - False Napačno - True Pravilno - Close Zapri @@ -1128,43 +1202,36 @@ v QCoreApplication - %1: key is empty QSystemSemaphore %1: ključ je prazen - %1: unable to make key QSystemSemaphore %1: ni moč ustvariti ključa - %1: ftok failed QSystemSemaphore %1: funkcija ftok ni uspela - %1: already exists QSystemSemaphore %1: že obstaja - %1: does not exist QSystemSemaphore %1: ne obstaja - %1: out of resources QSystemSemaphore %1: zmanjkalo je virov - %1: unknown error %2 QSystemSemaphore %1: neznana napaka %2 @@ -1173,22 +1240,18 @@ v QDB2Driver - Unable to connect Ni moč vzpostaviti povezave - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije - Unable to set autocommit Ni moč nastaviti samodejnega udejanjanja @@ -1196,33 +1259,26 @@ v QDB2Result - - Unable to execute statement Ni moč izvesti izjave - Unable to prepare statement Ni moč pripraviti izjave - Unable to bind variable Ni moč prikleniti spremenljivke - Unable to fetch record %1 Ni moč pridobiti zapisa %1 - Unable to fetch next Ni moč pridobiti sledečega - Unable to fetch first Ni moč pridobiti prvega @@ -1230,226 +1286,1060 @@ v QDateTimeEdit - AM dop. - am dop. - PM pop. - pm pop. - QDial + QDeclarativeAbstractAnimation - - QDial - QDial + Cannot animate non-existent property "%1" + Neobstoječe lastnosti »%1« ni moč animirati - - SpeedoMeter - SpeedoMeter + Cannot animate read-only property "%1" + Lastnosti »%1«, ki je samo za branje, ni moč animirati - - SliderHandle - SliderHandle + Animation is an abstract class + Animacija je abstrakten razred - QDialog - - - What's This? - Kaj je to? - + QDeclarativeAnchorAnimation - - Done - Opravljeno + Cannot set a duration of < 0 + Trajanja, ki je krajše od 0, ni moč nastaviti - QDialogButtonBox + QDeclarativeAnchors - - - - OK - V redu + Possible anchor loop detected on fill. + Ob zapolnjevanju je bila zaznana možna zanka sidra. - - &OK - &V redu + Possible anchor loop detected on centerIn. + Ob usrediščanju je bila zaznana možna zanka sidra. - - &Save - &Shrani + Cannot anchor to an item that isn't a parent or sibling. + Na objekt, ki ni nadrejen ali enakovreden, se ni moč zasidrati. - - Save - Shrani + Possible anchor loop detected on vertical anchor. + Ob navpičnem sidru je bila zaznana možna zanka sidra. - - Open - Odpri + Possible anchor loop detected on horizontal anchor. + Ob vodoravnem sidru je bila zaznana možna zanka sidra. - - &Cancel - &Prekliči + Cannot specify left, right, and hcenter anchors. + Levih, desnih in vodoravno sredinskih sider ni moč določiti. - - Cancel - Prekliči + Cannot anchor to a null item. + Na ničelni objekt se ni moč zasidrati. - - &Close - &Zapri + Cannot anchor a horizontal edge to a vertical edge. + Vodoravnega roba ni moč zasidrati na navpični rob. - - Close - Zapri + Cannot anchor item to self. + Objekta ni moč zasidrati samega nase. - - Apply - Uveljavi + Cannot specify top, bottom, and vcenter anchors. + Vrhnjih, spodnjih in navpično sredinskih sider ni moč določiti. - - Reset - Ponastavi + Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. + Sidra na osnovnici ni moč uporabiti skupaj z vrhnjimi, spodnjimi ali navpično sredinskimi sidri. - - Help - Pomoč + Cannot anchor a vertical edge to a horizontal edge. + Navpičnega roba ni moč zasidrati na vodoravni rob. + + + QDeclarativeAnimatedImage - - Don't Save - Ne shrani + Qt was built without support for QMovie + Qt je bil zgrajen brez podpore za QMovie + + + QDeclarativeBehavior - - Discard - Zavrzi + Cannot change the animation assigned to a Behavior. + Animacije, ki je prirejena obnašanju, ni moč spremeniti. + + + QDeclarativeBinding - - &Yes - &Da + Binding loop detected for property "%1" + Za lastnost »%1« je bila zaznana zanka vezave + + + QDeclarativeCompiledBindings - - Yes to &All - Da za &vse + Binding loop detected for property "%1" + Za lastnost »%1« je bila zaznana zanka vezave + + + QDeclarativeCompiler - - &No - &Ne + Invalid property assignment: "%1" is a read-only property + Neveljavna prireditev lastnosti: »%1« je lastnost, ki je samo za branje - - N&o to All - N&e za vse + Invalid property assignment: unknown enumeration + Neveljavna prireditev lastnosti: neznano oštevilčenje - - Save All - Shrani vse + Invalid property assignment: string expected + Neveljavna prireditev lastnosti: pričakovan je niz - - Abort - Prekini + Invalid property assignment: url expected + Neveljavna prireditev lastnosti: pričakovan je URL - - Retry - Poskusi znova + Invalid property assignment: unsigned int expected + Neveljavna prireditev lastnosti: pričakovano je nepredznačeno celo število - - Ignore - Spreglej + Invalid property assignment: int expected + Neveljavna prireditev lastnosti: pričakovano je celo število - - Restore Defaults - Obnovi privzete vrednosti + Invalid property assignment: number expected + Neveljavna prireditev lastnosti: pričakovano je število - - Close without Saving - Zapri brez shranjevanja + Invalid property assignment: color expected + Neveljavna prireditev lastnosti: pričakovana je barva - - - QDirModel - - Name - Ime + Invalid property assignment: date expected + Neveljavna prireditev lastnosti: pričakovan je datum - - Size - Velikost + Invalid property assignment: time expected + Neveljavna prireditev lastnosti: pričakovan je čas - - Kind - Match OS X Finder - Vrste + Invalid property assignment: datetime expected + Neveljavna prireditev lastnosti: pričakovana sta datum in čas - - Type - All other platforms - Vrsta + Invalid property assignment: point expected + Neveljavna prireditev lastnosti: pričakovana je točka - - Date Modified - Datum spremembe + Invalid property assignment: size expected + Neveljavna prireditev lastnosti: pričakovana je velikost - - - QDockWidget - - Close - Zapri + Invalid property assignment: rect expected + Neveljavna prireditev lastnosti: pričakovan je pravokotnik - - Dock - Zasidraj + Invalid property assignment: boolean expected + Neveljavna prireditev lastnosti: pričakovana je logična vrednost + + + Invalid property assignment: 3D vector expected + Neveljavna prireditev lastnosti: pričakovan je 3D vektor + + + Invalid property assignment: unsupported type "%1" + Neveljavna prireditev lastnosti: nepodprta vrsta »%1« + + + Element is not creatable. + Elementa ni moč ustvariti. + + + Component elements may not contain properties other than id + Elementi komponent ne smejo vsebovati drugih lastnosti kot ID + + + Invalid component id specification + Neveljavno določen ID komponente + + + id is not unique + ID ni edinstven + + + Invalid component body specification + Neveljavno določeno telo komponente + + + Component objects cannot declare new properties. + Objekti komponent ne morejo deklarirati novih lastnosti. + + + Component objects cannot declare new signals. + Objekti komponent ne morejo deklarirati novih signalov. + + + Component objects cannot declare new functions. + Objekti komponent ne morejo deklarirati novih funkcij. + + + Cannot create empty component specification + Prazne specifikacije komponente ni moč ustvariti + + + Incorrectly specified signal assignment + Napačno določena prireditev signalu + + + Cannot assign a value to a signal (expecting a script to be run) + Signalu ni moč prirediti vrednosti (pričakovan je skript, ki bo zagnan) + + + Empty signal assignment + Prazna prireditev signalu + + + Empty property assignment + Prazna prireditev lastnosti + + + Attached properties cannot be used here + Pripete lastnosti tu ne morejo biti uporabljene + + + Non-existent attached object + Neobstoječ pripet objekt + + + Invalid attached object assignment + Neveljavna prireditev pripetega objekta + + + Cannot assign to non-existent default property + Neobstoječi privzeti lastnosti ni moč prirediti + + + Cannot assign to non-existent property "%1" + Neobstoječi lastnosti »%1« ni moč prirediti + + + Invalid use of namespace + Napačna raba imenskega prostora + + + Not an attached property name + Ni ime pripete lastnosti + + + Invalid use of id property + Napačna raba lastnosti ID + + + Property has already been assigned a value + Lastnosti je že bila prirejena vrednost + + + Invalid grouped property access + Neveljaven dostop do skupinske lastnosti + + + Cannot assign a value directly to a grouped property + Skupinski lastnosti ni moč neposredno prirediti vrednosti + + + Invalid property use + Neveljavna raba lastnosti + + + Property assignment expected + Pričakovana je prireditev lastnosti + + + Single property assignment expected + Pričakovana je enojna prireditev lastnosti + + + Unexpected object assignment + Nepričakovana prireditev objekta + + + Cannot assign object to list + Objekta ni moč prirediti seznamu + + + Can only assign one binding to lists + Seznamom je moč prirediti le eno vezavo + + + Cannot assign primitives to lists + Seznamom ni moč prirediti osnovnih tipov + + + Cannot assign multiple values to a script property + + + + Invalid property assignment: script expected + Neveljavna prireditev lastnosti: pričakovan je skript + + + Cannot assign object to property + Objekta ni moč prirediti lastnosti + + + "%1" cannot operate on "%2" + »%1« ne more delovati na »%2« + + + Duplicate default property + Podvojena privzeta lastnost + + + Duplicate property name + Podvojeno ime lastnosti + + + Property names cannot begin with an upper case letter + Imena lastnosti se ne smejo začeti z veliko črko + + + Illegal property name + Neveljavno ime lastnosti + + + Duplicate signal name + Podvojeno ime signala + + + Signal names cannot begin with an upper case letter + Imena signalov se ne smejo začeti z veliko črko + + + Illegal signal name + Neveljavno ime signala + + + Duplicate method name + Podvojeno ime metode + + + Method names cannot begin with an upper case letter + Imena metod se ne smejo začeti z veliko črko + + + Illegal method name + Neveljavno ime metode + + + Property value set multiple times + Vrednost lastnosti je bila nastavljena večkrat + + + Invalid property nesting + Neveljavno gnezdenje lastnosti + + + Cannot override FINAL property + Lastnosti FINAL ni moč povoziti + + + Invalid property type + Neveljavna vrsta lastnosti + + + Invalid empty ID + Neveljaven prazen ID + + + IDs cannot start with an uppercase letter + ID-ji se ne smejo začeti z veliko črko + + + IDs must start with a letter or underscore + ID-ji se morajo začeti s črko ali podčrtajem + + + IDs must contain only letters, numbers, and underscores + ID-ji lahko vsebujejo le črke, števke in podčrtaje + + + ID illegally masks global JavaScript property + ID neveljavno zakriva globalno lastnost JavaScripta + + + No property alias location + Brez lokacije aliasa lastnosti + + + Invalid alias location + Neveljavna lokacija aliasa + + + Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> + Neveljavna referenca aliasa. Referenca aliasa mora biti določena kot <id> ali <id>.<lastnost> + + + Invalid alias reference. Unable to find id "%1" + Neveljavna referenca aliasa. ID-ja »%1« ni moč najti + + + + QDeclarativeComponent + + Invalid empty URL + Neveljaven prazen URL + + + + QDeclarativeCompositeTypeManager + + Resource %1 unavailable + Vir %1 ni na voljo + + + Namespace %1 cannot be used as a type + Imenskega prostora %1 ni moč uporabiti kot vrste + + + %1 %2 + %1 % {1 %2?} + + + Type %1 unavailable + Vrsta %1 ni na voljo + + + + QDeclarativeConnections + + Cannot assign to non-existent property "%1" + Neobstoječi lastnosti »%1« ni moč prirediti + + + Connections: nested objects not allowed + Povezave: gnezdeni objekti niso dovoljeni + + + Connections: syntax error + Povezave: napaka v skladnji + + + Connections: script expected + Povezave: pričakovan je skript + + + + QDeclarativeEngine + + executeSql called outside transaction() + executeSql je bil klican izven transaction() + + + Read-only Transaction + Transakcija samo za branje + + + Version mismatch: expected %1, found %2 + Neujemanje različic: pričakovana %1, najdena %2 + + + SQL transaction failed + Transakcija SQL ni uspela + + + transaction: missing callback + transaction: manjka povratni klic + + + SQL: database version mismatch + SQL: neujemanje različice podatkovne zbirke + + + + QDeclarativeFlipable + + front is a write-once property + front je lastnost, ki se jo lahko zapiše samo enkrat + + + back is a write-once property + back je lastnost, ki se jo lahko zapiše samo enkrat + + + + QDeclarativeImportDatabase + + module "%1" definition "%2" not readable + definicije »%2« modula »%1« ni moč brati + + + plugin cannot be loaded for module "%1": %2 + vstavka za modul »%1« ni moč naložiti: %2 + + + module "%1" plugin "%2" not found + vstavek »%2« modula »%1« ni bil najden + + + module "%1" version %2.%3 is not installed + modul »%1« različice %2.%3 ni nameščen + + + module "%1" is not installed + modul »%1« ni nameščen + + + "%1": no such directory + »%1«: mapa ne obstaja + + + import "%1" has no qmldir and no namespace + + + + - %1 is not a namespace + – %1 ni imenski prostor + + + - nested namespaces not allowed + – gnezdeni imenski prostori niso dovoljeni + + + local directory + krajevna mapa + + + is ambiguous. Found in %1 and in %2 + je dvoumno. Najdeno v %1 in %2 + + + is ambiguous. Found in %1 in version %2.%3 and %4.%5 + je dvoumno. Najdeno v %1 v različicah %2.%3 in %4.%5 + + + is instantiated recursively + je instanciran rekurzivno + + + is not a type + ni vrsta + + + + QDeclarativeKeyNavigationAttached + + KeyNavigation is only available via attached properties + KeyNavigation je na voljo samo s pripetimi lastnostmi + + + + QDeclarativeKeysAttached + + Keys is only available via attached properties + Keys je na voljo samo s pripetimi lastnostmi + + + + QDeclarativeListModel + + remove: index %1 out of range + remove: indeks %1 je izven obsega + + + insert: value is not an object + insert: vrednost ni objekt + + + insert: index %1 out of range + insert: indeks %1 je izven obsega + + + move: out of range + move: izven obsega + + + append: value is not an object + append: vrednost ni objekt + + + set: value is not an object + set: vrednost ni objekt + + + set: index %1 out of range + set: indeks %1 je izven obsega + + + ListElement: cannot contain nested elements + + + + ListElement: cannot use reserved "id" property + ListElement: ne more uporabiti rezervirane lastnosti »id« + + + ListElement: cannot use script for property value + ListElement: ne more uporabiti skripta za vrednost lastnosti + + + ListModel: undefined property '%1' + ListModel: nedoločena lastnost »%1« + + + + QDeclarativeLoader + + Loader does not support loading non-visual elements. + Loader ne podpira nalaganja elementov, ki niso vidni. + + + + QDeclarativeParentAnimation + + Unable to preserve appearance under complex transform + + + + Unable to preserve appearance under non-uniform scale + + + + Unable to preserve appearance under scale of 0 + + + + + QDeclarativeParentChange + + Unable to preserve appearance under complex transform + + + + Unable to preserve appearance under non-uniform scale + + + + Unable to preserve appearance under scale of 0 + + + + + QDeclarativeParser + + Illegal unicode escape sequence + Neveljavno ubežno zaporedje Unicode + + + Illegal character + Neveljaven znak + + + Unclosed string at end of line + Nezaprt niz na koncu vrstice + + + Illegal escape squence + Neveljavno ubežno zaporedje + + + Unclosed comment at end of file + Nezaprt komentar na koncu datoteke + + + Illegal syntax for exponential number + Neveljavna skladnja za eksponentno število + + + Identifier cannot start with numeric literal + + + + Unterminated regular expression literal + + + + Invalid regular expression flag '%0' + Neveljavna zastavica »%0« regularnega izraza + + + Unterminated regular expression backslash sequence + + + + Unterminated regular expression class + + + + Syntax error + Skladenjska napaka + + + Unexpected token `%1' + Nepričakovan žeton »%1« + + + Expected token `%1' + Pričakovan žeton »%1« + + + Property value set multiple times + Vrednost lastnosti je bila nastavljena večkrat + + + Expected type name + + + + Invalid import qualifier ID + + + + Reserved name "Qt" cannot be used as an qualifier + + + + Script import qualifiers must be unique. + + + + Script import requires a qualifier + + + + Library import requires a version + + + + Expected parameter type + + + + Invalid property type modifier + + + + Unexpected property type modifier + + + + Expected property type + + + + Readonly not yet supported + + + + JavaScript declaration outside Script element + + + + + QDeclarativePauseAnimation + + Cannot set a duration of < 0 + Trajanja, ki je krajše od 0, ni moč nastaviti + + + + QDeclarativePixmap + + Error decoding: %1: %2 + + + + Failed to get image from provider: %1 + + + + Cannot open: %1 + Ni moč odpreti %1: %2 + + + + QDeclarativePropertyAnimation + + Cannot set a duration of < 0 + Trajanja, ki je krajše od 0, ni moč nastaviti + + + + QDeclarativePropertyChanges + + PropertyChanges does not support creating state-specific objects. + + + + Cannot assign to non-existent property "%1" + Neobstoječi lastnosti »%1« ni moč prirediti + + + Cannot assign to read-only property "%1" + + + + + QDeclarativeTextInput + + Could not load cursor delegate + + + + Could not instantiate cursor delegate + + + + + QDeclarativeVME + + Unable to create object of type %1 + + + + Cannot assign value %1 to property %2 + + + + Cannot assign object type %1 with no default method + + + + Cannot connect mismatched signal/slot %1 %vs. %2 + + + + Cannot assign an object to signal property %1 + + + + Cannot assign object to list + Objekta ni moč prirediti seznamu + + + Cannot assign object to interface property + + + + Unable to create attached object + + + + Cannot set properties on %1 as it is null + + + + + QDeclarativeVisualDataModel + + Delegate component must be Item type. + + + + + QDeclarativeXmlListModel + + Qt was built without support for xmlpatterns + + + + + QDeclarativeXmlListModelRole + + An XmlRole query must not start with '/' + + + + + QDeclarativeXmlRoleList + + An XmlListModel query must start with '/' or "//" + + + + + QDial + + QDial + QDial + + + SpeedoMeter + SpeedoMeter + + + SliderHandle + SliderHandle + + + + QDialog + + What's This? + Kaj je to? + + + Done + Opravljeno + + + + QDialogButtonBox + + OK + V redu + + + &OK + &V redu + + + &Save + &Shrani + + + Save + Shrani + + + Open + Odpri + + + &Cancel + &Prekliči + + + Cancel + Prekliči + + + &Close + &Zapri + + + Close + Zapri + + + Apply + Uveljavi + + + Reset + Ponastavi + + + Help + Pomoč + + + Don't Save + Ne shrani + + + Discard + Zavrzi + + + &Yes + &Da + + + Yes to &All + Da za &vse + + + &No + &Ne + + + N&o to All + N&e za vse + + + Save All + Shrani vse + + + Abort + Prekini + + + Retry + Poskusi znova + + + Ignore + Spreglej + + + Restore Defaults + Obnovi privzete vrednosti + + + Close without Saving + Zapri brez shranjevanja + + + + QDirModel + + Name + Ime + + + Size + Velikost + + + Kind + Match OS X Finder + Vrste + + + Type + All other platforms + Vrsta + + + Date Modified + Datum spremembe + + + + QDockWidget + + Close + Zapri + + + Dock + Zasidraj - Float Naj lebdi @@ -1457,12 +2347,10 @@ v QDoubleSpinBox - More Več - Less Manj @@ -1470,27 +2358,22 @@ v QErrorMessage - Debug Message: Sporočilo razhroščevanja: - Warning: Opozorilo: - Fatal Error: Usodna napaka: - &Show this message again &To sporočilo naslednjič spet prikaži - &OK &V redu @@ -1498,38 +2381,30 @@ v QFile - - Destination file exists Ciljna datoteka obstaja - Will not rename sequential file using block copy Sekvenčna datoteka ne bo preimenovana z uporabo kopiranja blokov - Cannot remove source file Ni moč odstraniti izvorne datoteke - Cannot open %1 for input Ni moč odpreti %1 za vhod - Cannot open for output Ni moč odpreti za izhod - Failure to write block Neuspeh pri zapisovanju bloka - Cannot create %1 for output Ni moč ustvariti %1 za izhod @@ -1537,43 +2412,32 @@ v QFileDialog - - All Files (*) Vse datoteke (*) - Directories Mape - - - &Open &Odpri - - &Save &Shrani - Open Odpri - %1 already exists. Do you want to replace it? %1 že obstaja. Ali jo želite nadomestiti? - %1 File not found. Please verify the correct file name was given. @@ -1582,64 +2446,46 @@ Datoteka ni bila najdena. Preverite, ali je bilo podano pravilno ime datoteke. - My Computer Moj računalnik - &Rename Pre&imenuj - &Delete &Izbriši - Show &hidden files Prikaži &skrite datoteke - - Back Nazaj - - Parent Directory Matična mapa - - List View Prikaz seznama - - Detail View Prikaz podrobnosti - - Files of type: Datoteke vrste: - - Directory: Mapa: - - %1 Directory not found. Please verify the correct directory name was given. @@ -1648,475 +2494,399 @@ Mapa ni bila najdena. Preverite, ali je bilo podano pravilno ime mape. - '%1' is write protected. Do you want to delete it anyway? »%1« je zaščitena pred pisanjem. Ali jo kljub temu želite izbrisati? - Are sure you want to delete '%1'? Ali res želite izbrisati »%1«? - Could not delete directory. Ni bilo moč izbrisati mape. - Recent Places Nedavna mesta - All Files (*.*) Vse datoteke (*.*) - Save As Shrani kot - Drive Pogon - - File Datoteka - File Folder Match Windows Explorer Mapa z datotekami - Folder All other platforms Mapa - Alias Mac OS X Finder Drugo ime - Shortcut All other platforms Bližnjica - Unknown Neznano - Find Directory Najdi mapo - Show Prikaži - - Forward Naprej - New Folder Nova mapa - &New Folder &Nova mapa - - &Choose Iz&berite - Remove Odstrani - - File &name: Ime &datoteke: - - Look in: Išči v: - - Create New Folder Ustvari novo mapo + + Go back + Vrni se nazaj + + + Go forward + Napreduj naprej + + + Go to the parent directory + + + + Create a New Folder + + + + Change to list view mode + + + + Change to detail view mode + + QFileSystemModel - Invalid filename Napačno ime datoteke - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Imena »%1« ne morete uporabiti.</b><p>Poskusite z drugim imenom, ki vsebuje manj znakov ali pa ne vsebuje ločil. - Name Ime - Size Velikost - Kind Match OS X Finder Vrste - Type All other platforms Vrsta - Date Modified Datum spremembe - My Computer Moj računalnik - Computer Računalnik - - %1 TB %1 TiB - - %1 GB %1 GiB - - %1 MB %1 MiB - - %1 KB %1 KiB - - %1 bytes %1 B + + %1 byte(s) + + QFontDatabase - - Normal Normalno - - - Bold Polkrepko - - Demi Bold - - - Black - Črni + Črna - Demi - - Light Lahko - - Italic Ležeče - - Oblique Nagnjeno - Any Katerikoli - Latin Latinska - Greek Grška - Cyrillic Cirilica - Armenian Armenska - Hebrew Hebrejska - Arabic Arabska - Syriac Sirijska - Thaana Thaana - Devanagari Devanagari - Bengali Bengalska - Gurmukhi Gurmukhi - Gujarati Gujarati - Oriya - oriya + Oriya - Tamil Tamilska - Telugu Teluška - Kannada - kannada + Kannada - Malayalam - malayalam + Malayalam - Sinhala - Sinhala + Sinhala - Thai Tajska - Lao Laoška - Tibetan Tibetanska - Myanmar Mjanmarska - Georgian Gruzijska - Khmer Kmerska - Simplified Chinese Poenostavljena kitajska - Traditional Chinese Tradicionalna kitajska - Japanese Japonska - Korean Korejska - Vietnamese Vietnamska - Symbol Simbol - Ogham Oghamska - Runic Runska + + N'Ko + + QFontDialog - &Font &Pisava - Font st&yle &Slog pisave - &Size &Velikost - Effects Učinki - Stri&keout P&rečrtaj - &Underline Po&dčrtaj - Sample Vzorec - Wr&iting System S&istem pisanja - - Select Font Izberite pisavo @@ -2124,145 +2894,104 @@ Ali jo kljub temu želite izbrisati? QFtp - - Not connected Brez povezave - - Host %1 not found Gostitelj %1 ni bil najden - - Connection refused to host %1 Povezava z gostiteljem %1 je bila zavrnjena - Connection timed out to host %1 Čas za povezavo z gostiteljem %1 je potekel - - - Connected to host %1 Povezan z gostiteljem %1 - - Connection refused for data connection Podatkovna povezava je bila zavrnjena - - - - Unknown error Neznana napaka - - Connecting to host failed: %1 Povezovanje z gostiteljem %1 ni uspelo: %1 - - Login failed: %1 Prijava ni uspela: %1 - - Listing directory failed: %1 Izpis seznama map ni uspel: %1 - - Changing directory failed: %1 Spreminjanje mape ni uspelo: %1 - - Downloading file failed: %1 Prejemanje datoteke ni uspelo: %1 - - Uploading file failed: %1 Pošiljanje datoteke ni uspelo: %1 - - Removing file failed: %1 Odstranjevanje datoteke ni uspelo: %1 - - Creating directory failed: %1 Ustvarjanje mape ni uspelo: %1 - - Removing directory failed: %1 Odstranjevanje mape ni uspelo: %1 - - - Connection closed Povezava je bila prekinjena - Host %1 found Gostitelj %1 je bil najden - Connection to %1 closed Povezava s %1 je bila prekinjena - Host found Gostitelj je bil najden - Connected to host Povezan z gostiteljem @@ -2270,43 +2999,33 @@ Ali jo kljub temu želite izbrisati? QHostInfo - Unknown error Neznana napaka + + No host name given + Podano ni bilo nobeno ime gostitelja + QHostInfoAgent - - - - Host not found Ni moč najti gostitelja - - - - Unknown address type Neznana vrsta naslova - - - Unknown error Neznana napaka - No host name given Podano ni bilo nobeno ime gostitelja - Invalid hostname Neveljavno ime gostitelja @@ -2314,155 +3033,110 @@ Ali jo kljub temu želite izbrisati? QHttp - - - - Unknown error Neznana napaka - - Request aborted Zahteva prekinjena - - No server set to connect to Strežnik za povezavo ni nastavljen - - Wrong content length Napačna dolžina vsebine - - Server closed connection unexpectedly Strežnik je nepričakovano prekinil povezavo - Unknown authentication method Neznan način overjanja - Error writing response to device Napaka pri pisanju odziva na napravo - - Connection refused Povezava je zavrnjena - - - Host %1 not found Gostitelj %1 ni bil najden - - - - HTTP request failed Zahtevek HTTP ni uspel - - Invalid HTTP response header Neveljavna glava odgovora HTTP - - - - Invalid HTTP chunked body Neveljavno razdeljeno telo HTTP - Host %1 found Gostitelj %1 je bil najden - Connected to host %1 Povezan z gostiteljem %1 - Connection to %1 closed Povezava s %1 je bila prekinjena - Host found Gostitelj je bil najden - Connected to host Povezan z gostiteljem - - Connection closed Povezava je bila prekinjena - Proxy authentication required Potrebna je overitev pri posredniku - Authentication required Potrebna je overitev - Connection refused (or timed out) Povezava je bila zavrnjena (ali pa je potekel čas) - Proxy requires authentication Posrednik zahteva overitev - Host requires authentication Gostitelj zahteva overitev - Data corrupted Podatki so okvarjeni - Unknown protocol specified Naveden je bil neznan protokol - SSL handshake failed Rokovanje SSL ni uspelo - HTTPS connection requested but SSL support not compiled in Zahtevana je bila povezava HTTPS, a podpora za SSL ni bila vgrajena @@ -2470,47 +3144,38 @@ Ali jo kljub temu želite izbrisati? QHttpSocketEngine - Did not receive HTTP response from proxy Od posrednika ni bil prejet odgovor HTTP - Error parsing authentication request from proxy Napaka pri razčlenjevanju overitvenega zahtevka od posrednika - Authentication required Potrebna je overitev - Proxy denied connection Posrednik je zavrnil povezavo - Error communicating with HTTP proxy Napaka pri komunikaciji s posrednikom HTTP - Proxy server not found Posredniški strežnik ni bil najden - Proxy connection refused Povezava s posrednikom je bila zavrnjena - Proxy server connection timed out Čas za povezavo s posredniškim strežnikom je potekel - Proxy connection closed prematurely Povezava s posrednikom je bila prekinjena predčasno @@ -2518,22 +3183,18 @@ Ali jo kljub temu želite izbrisati? QIBaseDriver - Error opening database Napaka pri odpiranju podatkovne zbirke - Could not start transaction Ni bilo moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -2541,89 +3202,70 @@ Ali jo kljub temu želite izbrisati? QIBaseResult - Unable to create BLOB Ni moč ustvariti BLOB-a - Unable to write BLOB Ni moč zapisati BLOB-a - Unable to open BLOB Ni moč odpreti BLOB-a - Unable to read BLOB Ni moč prebrati BLOB-a - - Could not find array Ni bilo moč najti polja - Could not get array data Ni bilo moč pridobiti podatkov iz polja - Could not get query info Ni bilo moč pridobiti podatkov o poizvedbi - Could not start transaction Ni bilo moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Could not allocate statement Ni bilo moč dodeliti prostora za izjavo - Could not prepare statement Ni bilo moč pripraviti izjave - - Could not describe input statement Ni bilo moč opisati vhodne izjave - Could not describe statement Ni bilo moč opisati izjave - Unable to close statement Ni moč zaključiti izjave - Unable to execute query Ni moč izvesti poizvedbe - Could not fetch next item Ni bilo moč pridobiti sledeče postavke - Could not get statement info Ni bilo moč pridobiti podatkov o izjavi @@ -2631,27 +3273,22 @@ Ali jo kljub temu želite izbrisati? QIODevice - Permission denied Nimate dovoljenja - Too many open files Preveč odprtih datotek - No such file or directory Ta datoteka ali mapa ne obstaja - No space left on device Ni prostora na napravi - Unknown error Neznana napaka @@ -2659,32 +3296,26 @@ Ali jo kljub temu želite izbrisati? QInputContext - XIM XIM - FEP FEP - XIM input method Način za vnašanje XIM - Windows input method Način za vnašanje Windows - Mac OS X input method Način za vnašanje Mac OS X - S60 FEP input method Način za vnašanje S60 FEP @@ -2692,7 +3323,6 @@ Ali jo kljub temu želite izbrisati? QInputDialog - Enter a value: Vnesite vrednost: @@ -2700,66 +3330,50 @@ Ali jo kljub temu želite izbrisati? QLibrary - Could not mmap '%1': %2 Ni bilo moč izvesti funkcije mmap za »%1«: %2 - Plugin verification data mismatch in '%1' Neujemanje podatkov za potrjevanje vstavkov v »%1« - Could not unmap '%1': %2 Ni bilo moč izvesti funkcije unmap za »%1«: %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Vstavek »%1« uporablja nezdružljivo knjižnico Qt. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Vstavek »%1« uporablja nezdružljivo knjižnico Qt. Pričakovan je bil ključ gradnje »%2«, dobljen je bil »%3« - Unknown error Neznana napaka - - The shared library was not found. Deljena knjižnica ni bila najdena. - The file '%1' is not a valid Qt plugin. Datoteka »%1« ni veljaven vstavek Qt. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Vstavek »%1« uporablja nezdružljivo knjižnico Qt. (Ni moč mešati knjižnic za razhroščevanje in izdajo.) - - Cannot load library %1: %2 Ni moč naložiti knjižnice %1: %2 - - Cannot unload library %1: %2 Ni moč odstraniti knjižnice %1: %2 - - Cannot resolve symbol "%1" in %2: %3 Ni moč razrešiti simbola »%1« v %2: %3 @@ -2767,37 +3381,30 @@ Ali jo kljub temu želite izbrisati? QLineEdit - &Undo &Razveljavi - &Redo &Uveljavi - Cu&t &Izreži - &Copy S&kopiraj - &Paste Pri&lepi - Delete Izbriši - Select All Izberi vse @@ -2805,23 +3412,18 @@ Ali jo kljub temu želite izbrisati? QLocalServer - - %1: Name error %1: napaka v imenu - %1: Permission denied %1: nimate dovoljenja - %1: Address in use %1: naslov je že v uporabi - %1: Unknown error %2 %1: neznana napaka %2 @@ -2829,70 +3431,46 @@ Ali jo kljub temu želite izbrisati? QLocalSocket - - %1: Connection refused %1: povezava je bila zavrnjena - - %1: Remote closed %1: oddaljeni je prekinil - - - - %1: Invalid name %1: neveljavno ime - - %1: Socket access error %1: napaka pri dostopu do vtičnice - - %1: Socket resource error %1: napaka vira vtičnice - - %1: Socket operation timed out %1: čas za dejanje na vtičnici je potekel - - %1: Datagram too large %1: datagram je prevelik - - - %1: Connection error %1: napaka povezave - - %1: The socket operation is not supported %1: dejanje na vtičnici ni podprto - %1: Unknown error %1: neznana napaka - - %1: Unknown error %2 %1: neznana napaka %2 @@ -2900,27 +3478,22 @@ Ali jo kljub temu želite izbrisati? QMYSQLDriver - Unable to open database ' Ni moč odpreti podatkovne zbirke » - Unable to connect Ni moč vzpostaviti povezave - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -2928,59 +3501,46 @@ Ali jo kljub temu želite izbrisati? QMYSQLResult - Unable to fetch data Ni moč pridobiti podatkov - Unable to execute query Ni moč izvesti poizvedbe - Unable to store result Ni moč shraniti rezultata - - Unable to prepare statement Ni moč pripraviti izjave - Unable to reset statement Ni moč ponastaviti izjave - Unable to bind value Ni moč prikleniti vrednosti - Unable to execute statement Ni moč izvesti izjave - - Unable to bind outvalues Ni moč prikleniti izhodnih vrednosti - Unable to store statement results Ni moč shraniti rezultatov izjave - Unable to execute next query Ni moč izvesti sledeče poizvedbe - Unable to store next result Ni moč shraniti sledečega rezultata @@ -2988,7 +3548,6 @@ Ali jo kljub temu želite izbrisati? QMdiArea - (Untitled) (neimenovano) @@ -2996,92 +3555,74 @@ Ali jo kljub temu želite izbrisati? QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Zapri - Minimize Pomanjšaj - Restore Down Obnovi navzdol - &Restore &Obnovi - &Move &Premakni - &Size &Velikost - Mi&nimize Po&manjšaj - Ma&ximize &Razpni - Stay on &Top Ostani na &vrhu - &Close &Zapri - - [%1] - [%1] - Maximize Razpni - Unshade Razvij - Shade Zvij - Restore Obnovi - Help Pomoč - Menu Meni @@ -3089,21 +3630,14 @@ Ali jo kljub temu želite izbrisati? QMenu - - Close Zapri - - Open Odpri - - - Execute Izvedi @@ -3111,7 +3645,6 @@ Ali jo kljub temu želite izbrisati? QMenuBar - Actions Dejanja @@ -3119,40 +3652,30 @@ Ali jo kljub temu želite izbrisati? QMessageBox - Help Pomoč - - - - OK V redu - <h3>About Qt</h3><p>This program uses Qt version %1.</p> <h3>O Qt</h3><p>Ta program uporablja Qt različice %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> <p>Qt je skupek gradnikov C++ za razvoj programov, ki tečejo na več platformah.</p><p>Qt omogoča isto kodo prenašati med platformami Linux, Mac&nbsp;OS&nbsp;X, Windows in vsemi večjimi variantami UNIX-a. Qt je na voljo tudi za vgrajene naprave in sicer kot Qt for Embedded Linux in Qt for Windows CE.</p><p>Qt je na voljo pod tremi možnimi licenčnimi pogoji, ki ustrezajo različnim željam uporabnikov.</p><p>Qt pod licenco GNU General Public License različice 3.0 (<a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3.0</a>) je primeren za razvoj programov Qt, ki so povsem <a href="http://www.gnu.org/philosophy/free-sw.html">prosti in odprto-kodni</a>. S to licenco se uporabnikom programa zagotovijo vse pravice in svoboščine, kot jih je imel izdelovalec programa.</p><p>Qt pod licenco GNU Lesser General Public License različice 2.1 (<a href="http://www.gnu.org/licenses/lgpl-2.1.html">LGPLv2.1</a>) omogoča tudi razvoj programov, ki uporabnikom ne zagotavljajo vseh pravic in svoboščin, kot jih je imel izdelovalec. Omogoča na primer tudi razvoj zaprto-kodnih programov.</p><p>Qt pod posebno komercialno licenco je namenjen razvoju lastniških in zaprto-kodnih programov, kjer izdelovalec z uporabniki noče deliti nič izvorne kode ter pravic in svoboščin, ali pa ne more ustreči pogojem licenc GPLv3.0 ali LGPLv2.1.</p><p>Za pregled licenčnih možnosti si oglejte spletno stran <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a>.</p><p>Avtorske pravice © 2009 Nokia Corporation in/ali podružnice ter zunanji prispevajoči.</p><p>Qt je proizvod podjetja Nokia. Za dodatne podatke si oglejte <a href="http://qt.nokia.com/">qt.nokia.com</a>.</p> - About Qt O Qt - Show Details... Prikaži podrobnosti ... - Hide Details... Skrij podrobnosti ... @@ -3160,7 +3683,6 @@ Ali jo kljub temu želite izbrisati? QMultiInputContext - Select IM Izberite način vnašanja @@ -3168,12 +3690,10 @@ Ali jo kljub temu želite izbrisati? QMultiInputContextPlugin - Multiple input method switcher Orodje za preklop med načini vnašanja - Multiple input method switcher that uses the context menu of the text widgets Orodje za preklop med več načini vnašanja, ki uporablja priročni meni besedilnih gradnikov @@ -3181,132 +3701,106 @@ Ali jo kljub temu želite izbrisati? QNativeSocketEngine - The remote host closed the connection Oddaljen gostitelj je prekinil povezavo - Network operation timed out Čas za omrežni postopek je potekel - Out of resources Zmanjkalo je virov - Unsupported socket operation Nepodprto dejanje za vtičnico - Protocol type not supported Vrsta protokola ni podprta - Invalid socket descriptor Neveljaven opisnik vtičnice - Network unreachable Omrežje ni dosegljivo - Permission denied Nimate dovoljenja - Connection timed out Čas za povezavo je potekel - Connection refused Povezava je zavrnjena - The bound address is already in use Naslov za vezavo je že v uporabi - The address is not available Naslov ni na voljo - The address is protected Naslov je zaščiten - Unable to send a message Ni moč poslati sporočila - Unable to receive a message Ni moč prejeti sporočila - Unable to write Ni moč zapisovati - Network error Napaka v omrežju - Another socket is already listening on the same port Druga vtičnica že posluša na istih vratih - Unable to initialize non-blocking socket Ni moč inicializirati ne-blokirne vtičnice - Unable to initialize broadcast socket Ni moč inicializirati vtičnice za oddajanje - Attempt to use IPv6 socket on a platform with no IPv6 support Poskus uporabe vtičnice IPv6 na platformi brez podpore za IPv6 - Host unreachable Gostitelj ni dosegljiv - Datagram was too large to send Datagram je bil prevelik za pošiljanje - Operation on non-socket Dejanje na ne-vtičnici - Unknown error Neznana napaka - The proxy type is invalid for this operation Vrsta posrednika za to dejanje ni veljavna @@ -3314,43 +3808,55 @@ Ali jo kljub temu želite izbrisati? QNetworkAccessCacheBackend - Error opening %1 Napaka pri odpiranju %1 + QNetworkAccessDataBackend + + Operation not supported on %1 + Dejanje na %1 ni podprto + + + Invalid URI: %1 + Neveljaven URI: %1 + + + QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Napaka pri zapisovanju v %1: %2 + + Socket error on %1: %2 + Napaka vtičnice na %1: %2 + + + Remote host closed the connection prematurely on %1 + Oddaljen gostitelj je predčasno prekinil povezavo na %1 + QNetworkAccessFileBackend - Request for opening non-local file %1 Zahtevek za odprtje ne-krajevne datoteke %1 - Error opening %1: %2 Napaka pri odpiranju %1: %2 - Write error writing to %1: %2 Napaka pri zapisovanju v %1: %2 - Cannot open %1: Path is a directory Ni moč odpreti %1: pot je mapa - Read error reading from %1: %2 Napaka pri branju iz %1: %2 @@ -3358,27 +3864,22 @@ Ali jo kljub temu želite izbrisati? QNetworkAccessFtpBackend - No suitable proxy found Najden ni bil noben primeren posrednik - Cannot open %1: is a directory Ni moč odpreti %1: to je mapa - Logging in to %1 failed: authentication required Prijava v %1 ni uspela: potrebna je overitev - Error while downloading %1: %2 Napaka med prejemanjem %1: %2 - Error while uploading %1: %2 Napaka med pošiljanjem %1: %2 @@ -3386,58 +3887,105 @@ Ali jo kljub temu želite izbrisati? QNetworkAccessHttpBackend - No suitable proxy found Najden ni bil noben primeren posrednik + QNetworkAccessManager + + Network access is disabled. + + + + QNetworkReply - Error downloading %1 - server replied: %2 Napaka med prejemanjem %1 - strežnikov odgovor: %2 - Protocol "%1" is unknown Neznan protokol »%1« + + Network session error. + + + + Temporary network failure. + + QNetworkReplyImpl - - Operation canceled Postopek je bil preklican + QNetworkSession + + Invalid configuration. + + + + + QNetworkSessionPrivateImpl + + Roaming error + + + + Session aborted by user or system + + + + Unidentified Error + + + + Unknown session error. + + + + The session was aborted by the user or system. + + + + The requested operation is not supported by the system. + + + + The specified configuration cannot be used. + + + + Roaming was aborted or is not possible. + + + + QOCIDriver - Unable to logon Ni se moč prijaviti - Unable to initialize QOCIDriver Ni moč inicializirati - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -3445,44 +3993,34 @@ Ali jo kljub temu želite izbrisati? QOCIResult - - - Unable to bind column for batch execute Ni moč prikleniti stolpca za paketno izvršitev - Unable to execute batch statement Ni moč izvesti paketne izjave - Unable to goto next Ni se moč prestaviti na naslednjega - Unable to alloc statement Ni moč dodeliti izjave - Unable to prepare statement Ni moč pripraviti izjave - Unable to get statement type Ni moč pridobiti vrste izjave - Unable to bind value Ni moč prikleniti vrednosti - Unable to execute statement Ni moč izvesti izjave @@ -3490,32 +4028,26 @@ Ali jo kljub temu želite izbrisati? QODBCDriver - Unable to connect Ni moč vzpostaviti povezave - Unable to disable autocommit Ni moč onemogočiti samodejnega udejanjanja - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije - Unable to enable autocommit Ni moč omogočiti samodejnega udejanjanja - Unable to connect - Driver doesn't support all functionality required Ni se moč povezati - gonilnik ne podpira vseh potrebnih zmožnosti @@ -3523,51 +4055,38 @@ Ali jo kljub temu želite izbrisati? QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: ni moč nastaviti 'SQL_CURSOR_STATIC' kot lastnosti izjave. Preverite nastavitve gonilnika ODBC - - Unable to execute statement Ni moč izvesti izjave - Unable to fetch next Ni moč pridobiti sledečega - Unable to prepare statement Ni moč pripraviti izjave - Unable to bind variable Ni moč prikleniti spremenljivke - - - Unable to fetch last Ni moč pridobiti zadnjega - Unable to fetch Ni moč pridobiti - Unable to fetch first Ni moč pridobiti prvega - Unable to fetch previous Ni moč pridobiti predhodnega @@ -3575,46 +4094,25 @@ Ali jo kljub temu želite izbrisati? QObject - - Invalid hostname - Neveljavno ime gostitelja - - - - Operation not supported on %1 - Dejanje na %1 ni podprto - - - - Invalid URI: %1 - Neveljaven URI: %1 - - - - Socket error on %1: %2 - Napaka vtičnice na %1: %2 + PulseAudio Sound Server + Zvočni strežnik PulseAudio - - Remote host closed the connection prematurely on %1 - Oddaljen gostitelj je predčasno prekinil povezavo na %1 + "%1" duplicates a previous role name and will be disabled. + - - - No host name given - Podano ni bilo nobeno ime gostitelja + invalid query: "%1" + QPPDOptionsModel - Name Ime - Value Vrednost @@ -3622,32 +4120,26 @@ Ali jo kljub temu želite izbrisati? QPSQLDriver - Unable to connect Ni moč vzpostaviti povezave - Could not begin transaction Ni bilo moč začeti transakcije - Could not commit transaction Ni bilo moč udejaniti transakcije - Could not rollback transaction Ni bilo moč razveljaviti transakcije - Unable to subscribe Ni se moč naročiti - Unable to unsubscribe Ni moč preklicati naročnine @@ -3655,12 +4147,10 @@ Ali jo kljub temu želite izbrisati? QPSQLResult - Unable to create query Ni moč ustvariti poizvedbe - Unable to prepare statement Ni moč pripraviti izjave @@ -3668,102 +4158,82 @@ Ali jo kljub temu želite izbrisati? QPageSetupWidget - Centimeters (cm) Centimetri (cm) - Millimeters (mm) Milimetri (mm) - Inches (in) Palci (in) - Points (pt) Pike (pt) - Form Obrazec - Paper Papir - Page size: Velikost strani: - Width: Širina: - Height: Višina: - Paper source: Vir papirja: - Orientation Usmeritev - Portrait Pokončno - Landscape Ležeče - Reverse landscape Obrnjeno ležeče - Reverse portrait Obrnjeno pokončno - Margins Robovi - top margin vrhnji rob - left margin levi rob - right margin desni rob - bottom margin spodnji rob @@ -3771,12 +4241,10 @@ Ali jo kljub temu želite izbrisati? QPluginLoader - Unknown error Neznana napaka - The plugin was not loaded. Vstavek ni bil naložen. @@ -3784,428 +4252,344 @@ Ali jo kljub temu želite izbrisati? QPrintDialog - locally connected krajevno povezan - - Aliases: %1 Vzdevki: %1 - - unknown neznano - A0 (841 x 1189 mm) A0 (841 x 1189 mm) - A1 (594 x 841 mm) A1 (594 x 841 mm) - A2 (420 x 594 mm) A2 (420 x 594 mm) - A3 (297 x 420 mm) A3 (297 x 420 mm) - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 mm, 8,26 x 11,7 palcev) - A5 (148 x 210 mm) A5 (148 x 210 mm) - A6 (105 x 148 mm) A6 (105 x 148 mm) - A7 (74 x 105 mm) A7 (74 x 105 mm) - A8 (52 x 74 mm) A8 (52 x 74 mm) - A9 (37 x 52 mm) A9 (37 x 52 mm) - B0 (1000 x 1414 mm) B0 (1000 x 1414 mm) - B1 (707 x 1000 mm) B1 (707 x 1000 mm) - B2 (500 x 707 mm) B2 (500 x 707 mm) - B3 (353 x 500 mm) B3 (353 x 500 mm) - B4 (250 x 353 mm) B4 (250 x 353 mm) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 mm, 6,93 x 9,84 palcev) - B6 (125 x 176 mm) B6 (125 x 176 mm) - B7 (88 x 125 mm) B7 (88 x 125 mm) - B8 (62 x 88 mm) B8 (62 x 88 mm) - B9 (44 x 62 mm) B9 (44 x 62 mm) - B10 (31 x 44 mm) B10 (31 x 44 mm) - C5E (163 x 229 mm) C5E (163 x 229 mm) - DLE (110 x 220 mm) DLE (110 x 220 mm) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (7,5 x 10 palcev, 191 x 254 mm) - Folio (210 x 330 mm) Folio (210 x 330 mm) - Ledger (432 x 279 mm) Ledger (432 x 279 mm) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (8,5 x 14 palcev, 216 x 356 mm) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (8,5 x 11 palcev, 216 x 279 mm) - Tabloid (279 x 432 mm) Tabloid (279 x 432 mm) - US Common #10 Envelope (105 x 241 mm) US Common #10 Envelope (105 x 241 mm) - + Print current page + + + OK V redu - - - Print Natisni - Print To File ... Natisni v datoteko ... - Print range Natisni obseg - Print all Natisni vse - File %1 is not writable. Please choose a different file name. V datoteko %1 ni moč pisati. Izberite drugo ime datoteke. - %1 already exists. Do you want to overwrite it? %1 že obstaja. Ali jo želite nadomestiti? - File exists Datoteka obstaja - <qt>Do you want to overwrite it?</qt> <qt>Ali jo želite nadomestiti?</qt> - Print selection Natisni izbor - %1 is a directory. Please choose a different file name. %1 je mapa. Izberite drugo ime datoteke. - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Po meri - - &Options >> &Možnosti » - &Print Na&tisni - &Options << &Možnosti « - Print to File (PDF) Natisni v datoteko (PDF) - Print to File (Postscript) Natisni v datoteko (PostScript) - Local file Krajevna datoteka - Write %1 file Zapiši datoteko %1 - The 'From' value cannot be greater than the 'To' value. Vrednost »Od« ne more biti večja od vrednosti »Do«. @@ -4213,103 +4597,86 @@ Izberite drugo ime datoteke. QPrintPreviewDialog - - Page Setup Nastavitve strani - %1% %1 % - Print Preview Ogled tiskanja - Next page Naslednja stran - Previous page Predhodna stran - First page &Prva stran - Last page &Zadnja stran - Fit width Prilagodi &širini - Fit page Prilagodi strani - Zoom in Povečaj - Zoom out Zmanjšaj - Portrait Pokončno - Landscape Ležeče - Show single page Prikaži enojno stran - Show facing pages Prikaži dve strani - Show overview of all pages Prikaži ogled vseh strani - Print Natisni - Page setup Nastavitve strani - + Close + Zapri + + Export to PDF Izvozi v PDF - Export to PostScript Izvozi v PostScript @@ -4317,17 +4684,14 @@ Izberite drugo ime datoteke. QPrintPropertiesWidget - Form Obrazec - Page Stran - Advanced Napredno @@ -4335,145 +4699,121 @@ Izberite drugo ime datoteke. QPrintSettingsOutput - Form Obrazec - Copies Izvodi - Print range Obseg tiskanja - Print all Natisni vse - Pages from Strani od - to do - Selection Izbor - Output Settings Nastavitve izpisa - Copies: Izvodi: - Collate Združi - Reverse V nasprotno smer - Options Možnosti - Color Mode Barvni način - Color Barva - Grayscale Sivinsko - Duplex Printing Dvostransko tiskanje - None Brez - Long side Dolga stranica - Short side Kratka stranica + + Current Page + + QPrintWidget - Form Obrazec - Printer Tiskalnik - &Name: &Ime: - P&roperties &Lastnosti ... - Location: Lokacija: - Preview Ogled - Type: Vrsta: - Output &file: Izhodna d&atoteka: - ... ... @@ -4481,62 +4821,38 @@ Izberite drugo ime datoteke. QProcess - - Could not open input redirection for reading Preusmeritve vhoda ni bilo moč odpreti za branje - - Could not open output redirection for writing Preusmeritve izhoda ni bilo moč odpreti za pisanje - Resource error (fork failure): %1 Napaka vira (spodletela odcepitev): %1 - - - - - - - - - Process operation timed out Čas za dejanje procesa je potekel - - - - Error reading from process Napaka pri branju iz procesa - - - Error writing to process Napak pri pisanju v proces - Process crashed Program se je sesul - No program defined Določenega ni nobenega programa - Process failed to start: %1 Proces se ni uspel zagnati: %1 @@ -4544,7 +4860,6 @@ Izberite drugo ime datoteke. QProgressDialog - Cancel Prekliči @@ -4552,7 +4867,6 @@ Izberite drugo ime datoteke. QPushButton - Open Odpri @@ -4560,7 +4874,6 @@ Izberite drugo ime datoteke. QRadioButton - Check Označi @@ -4568,57 +4881,46 @@ Izberite drugo ime datoteke. QRegExp - no error occurred ni nobene napake - disabled feature used uporabljena onemogočena zmožnost - bad char class syntax napačna sintaksa znakovnega razreda - bad lookahead syntax napačna sintaksa pogleda naprej - bad repetition syntax napačna sintaksa ponavljanja - invalid octal value neveljavna osmiška vrednost - missing left delim manjkajoč levi razmejitelj - unexpected end nepričakovan konece - met internal limit dosežena notranja omejitev - invalid interval neveljaven interval - invalid category neveljavna kategorija @@ -4626,22 +4928,18 @@ Izberite drugo ime datoteke. QSQLite2Driver - Error opening database Napaka pri odpiranju podatkovne zbirke - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -4649,12 +4947,10 @@ Izberite drugo ime datoteke. QSQLite2Result - Unable to fetch results Ni moč pridobiti rezultatov - Unable to execute statement Ni moč izvesti izjave @@ -4662,27 +4958,22 @@ Izberite drugo ime datoteke. QSQLiteDriver - Error opening database Napaka pri odpiranju podatkovne zbirke - Error closing database Napaka pri zapiranju podatkovne zbirke - Unable to begin transaction Ni moč začeti transakcije - Unable to commit transaction Ni moč udejaniti transakcije - Unable to rollback transaction Ni moč razveljaviti transakcije @@ -4690,34 +4981,26 @@ Izberite drugo ime datoteke. QSQLiteResult - - - Unable to fetch row Ni moč pridobiti vrstice - Unable to execute statement Ni moč izvesti izjave - Unable to reset statement Ni moč ponastaviti izjave - Unable to bind parameters Ni moč prikleniti parametrov - Parameter count mismatch Neujemanje v številu parametrov - No query Brez poizvedbe @@ -4725,32 +5008,26 @@ Izberite drugo ime datoteke. QScriptBreakpointsModel - ID ID - Location Lokacija - Condition Pogoj - Ignore-count Število prezrtij - Single-shot Enojen zadetek - Hit-count Število zadetkov @@ -4758,12 +5035,10 @@ Izberite drugo ime datoteke. QScriptBreakpointsWidget - New Nova - Delete Izbriši @@ -4771,143 +5046,114 @@ Izberite drugo ime datoteke. QScriptDebugger - - Go to Line Pojdi v vrstico - Line: Vrstica: - Interrupt Prekini - Shift+F5 - + Shift+F5 - Continue Nadaljuj - F5 - + F5 - Step Into Vstopi - F11 - + F11 - Step Over Prestopi - F10 - + F10 - Step Out Izstopi - Shift+F11 - + Shift+F11 - Run to Cursor Zaženi do kazalca - Ctrl+F10 - + Ctrl+F10 - Run to New Script Zaženi do novega skripta - Toggle Breakpoint Preklopi prekinitveno točko - F9 - + F9 - Clear Debug Output Počisti razhroščevalni izhod - Clear Error Log Počisti dnevnik napak - Clear Console Počisti konzolo - &Find in Script... Najdi v &skriptu ... - Ctrl+F - + Ctrl+F - Find &Next Najdi &naslednje - F3 - + F3 - Find &Previous Najdi &predhodno - Shift+F3 - + Shift+F3 - Ctrl+G - + Ctrl+G - Debug Razhrošči @@ -4915,32 +5161,26 @@ Izberite drugo ime datoteke. QScriptDebuggerCodeFinderWidget - Close Zapri - Previous Predhodno - Next Naslednje - Case Sensitive Občutljivo na velikost črk - Whole words Cele besede - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Iskanje se nadaljuje na drugem koncu @@ -4948,12 +5188,10 @@ Izberite drugo ime datoteke. QScriptDebuggerLocalsModel - Name Ime - Value Vrednost @@ -4961,17 +5199,14 @@ Izberite drugo ime datoteke. QScriptDebuggerStackModel - Level Stopnja - Name Ime - Location Lokacija @@ -4979,22 +5214,18 @@ Izberite drugo ime datoteke. QScriptEdit - Toggle Breakpoint Preklopi prekinitveno točko - Disable Breakpoint Onemogoči prekinitveno točko - Enable Breakpoint Omogoči prekinitveno točko - Breakpoint Condition: Pogoj za prelomno točko: @@ -5002,52 +5233,42 @@ Izberite drugo ime datoteke. QScriptEngineDebugger - Loaded Scripts Naloženi skripti - Breakpoints Prelomne točke - Stack Sklad - Locals Krajevno - Console Konzola - Debug Output Razhroščevalni izhod - Error Log Dnevnik napak - Search Išči - View Videz - Qt Script Debugger Razhroščevalnik za Qt Script @@ -5055,7 +5276,6 @@ Izberite drugo ime datoteke. QScriptNewBreakpointWidget - Close Zapri @@ -5063,84 +5283,66 @@ Izberite drugo ime datoteke. QScrollBar - Scroll here Premakni sem - Left edge Levi rob - Top Vrh - Right edge Desni rob - Bottom Dno - Page left Za stran levo - - Page up Za stran gor - Page right Za stran desno - - Page down Za stran dol - Scroll left Premakni levo - Scroll up Premakni gor - Scroll right Premakni desno - Scroll down Premakni dol - Line up V vrsto - Position Položaj - Line down Za vrstico dol @@ -5148,111 +5350,78 @@ Izberite drugo ime datoteke. QSharedMemory - %1: unable to set key on lock %1: ni moč nastaviti ključa na zaklep - %1: create size is less then 0 %1: velikost je manjša od 0 - - %1: unable to lock %1: ni moč zakleniti - %1: unable to unlock %1: ni moč odkleniti - - - %1: permission denied %1: nimate dovoljenja - - - %1: already exists %1: že obstaja - %1: doesn't exists %1: ne obstaja - - - %1: out of resources %1: zmanjkalo je virov - - - %1: unknown error %2 %1: neznana napaka %2 - %1: key is empty %1: ključ je prazen - %1: ftok failed %1: funkcija ftok ni uspela - - - %1: unable to make key %1: ni moč ustvariti ključa - - %1: doesn't exist %1: ne obstaja - %1: UNIX key file doesn't exist %1: UNIX-ova zaklepna datoteka ne obstaja - %1: system-imposed size restrictions %1: sistemsko vsiljene omejitve velikosti - %1: not attached %1: ni pripeto - - %1: invalid size %1: neveljavna velikost - - %1: key error %1: napaka ključa - %1: size query failed %1: poizvedba po velikosti ni uspela @@ -5260,466 +5429,894 @@ Izberite drugo ime datoteke. QShortcut - Space + This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. + Preslednica - Esc Esc - Tab Tabulator - Backtab - Backspace Vračalka - Return Return - Enter Vnesi - Ins Ins - Del Del - Pause Premor - Print Natisni - SysReq SysReq - Home Začetek - End Konec - Left Levo - Up Gor - Right Desno - Down Dol - PgUp PgUp - PgDown PgDown - CapsLock CapsLock - NumLock NumLock - ScrollLock ScrollLock - Menu Meni - Help Pomoč - Back Predhodna - Forward Naslednja - Stop Ustavi - Refresh Osveži - Volume Down Tiše - Volume Mute Tiho - Volume Up Glasneje - Bass Boost Ojačanje basov - Bass Up Več basov - Bass Down Manj basov - Treble Up Več visokih tonov - Treble Down Manj visokih tonov - Media Play Predvajaj večpredstavnost - - Media Stop - Ustavi večpredstavnost + Media Stop + Ustavi večpredstavnost + + + Media Previous + Predhodna večpredstavnost + + + Media Next + Naslednja večpredstavnost + + + Media Record + Snemaj večpredstavnost + + + Media Pause + Media player pause button + + + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + + + + + Favorites + Priljubljeno + + + Search + Išči + + + Standby + V pripravljenost + + + Open URL + Odpri URL + + + Launch Mail + Zaženi pošto + + + Launch Media + Zaženi večpredstavnost + + + Launch (0) + Zaženi (0) + + + Launch (1) + Zaženi (1) + + + Launch (2) + Zaženi (2) + + + Launch (3) + Zaženi (3) + + + Launch (4) + Zaženi (4) + + + Launch (5) + Zaženi (5) + + + Launch (6) + Zaženi (6) + + + Launch (7) + Zaženi (7) + + + Launch (8) + Zaženi (8) + + + Launch (9) + Zaženi (9) + + + Launch (A) + Zaženi (A) + + + Launch (B) + Zaženi (B) + + + Launch (C) + Zaženi (C) + + + Launch (D) + Zaženi (D) + + + Launch (E) + Zaženi (E) + + + Launch (F) + Zaženi (F) + + + Monitor Brightness Up + Povečaj svetlost zaslon + + + Monitor Brightness Down + Zmanjšaj svetlost zaslona + + + Keyboard Light On/Off + Vklop/izklop lučk na tipkovnici + + + Keyboard Brightness Up + + + + Keyboard Brightness Down + + + + Power Off + Izklopi + + + Wake Up + Zbudi se + + + Eject + Izvrzi + + + Screensaver + Ohranjevalnik zaslona + + + WWW + WWW + + + Sleep + V pripravljenost + + + LightBulb + Žarnica + + + Shop + + + + History + Zgodovina + + + Add Favorite + Dodaj najljubšo + + + Hot Links + Vroče povezave + + + Adjust Brightness + Prilagodi svetlost + + + Finance + Finance + + + Community + Skupnost + + + Audio Rewind + Samodejno previj + + + Back Forward + + + + Application Left + + + + Application Right + + + + Book + Knjiga + + + CD + CD + + + Calculator + Računalo + + + Clear + Počisti + + + Clear Grab + + + + Close + Zapri + + + Copy + Kopiraj + + + Cut + Izreži + + + Display + Prikaz + + + DOS + DOS + + + Documents + Dokumenti + + + Spreadsheet + Preglednica + + + Browser + Brskalnik + + + Game + Igra + + + Go + Pojdi + + + iTouch + iTouch + + + Logoff + Odjava + + + Market + + + + Meeting + Srečanje + + + Keyboard Menu + Meni tipkovnice + + + Menu PB + + + + My Sites + Moje strani + + + News + Novice + + + Home Office + Domača pisarna + + + Option + Možnost + + + Paste + Prilepi + + + Phone + Telefon + + + Reply + Odgovori + + + Reload + Znova naloži + + + Rotate Windows + Zavrti okna + + + Rotation PB + + + + Rotation KB + + + + Save + Shrani + + + Send + Pošlji + + + Spellchecker + Črkovalnik + + + Split Screen + Razdeli zaslon + + + Support + Podpora + + + Task Panel + Opravilna vrstica + + + Terminal + Terminal + + + Tools + Orodja + + + Travel + Potovanje - - Media Previous - Predhodna večpredstavnost + Video + Video - - Media Next - Naslednja večpredstavnost + Word Processor + Urejevalnik besedila - - Media Record - Snemaj večpredstavnost + XFer + - - Favorites - Priljubljeno + Zoom In + Približaj - - Search - Išči + Zoom Out + Oddalji - - Standby - V pripravljenost + Away + Odsoten - - Open URL - Odpri URL + Messenger + Sporočilnik - - Launch Mail - Zaženi pošto + WebCam + Spletna kamera - - Launch Media - Zaženi večpredstavnost + Mail Forward + Posreduj sporočilo naprej - - Launch (0) - Zaženi (0) + Pictures + Slike - - Launch (1) - Zaženi (1) + Music + Glasba - - Launch (2) - Zaženi (2) + Battery + Baterija - - Launch (3) - Zaženi (3) + Bluetooth + Bluetooth - - Launch (4) - Zaženi (4) + Wireless + Brezžično - - Launch (5) - Zaženi (5) + Ultra Wide Band + - - Launch (6) - Zaženi (6) + Audio Forward + - - Launch (7) - Zaženi (7) + Audio Repeat + - - Launch (8) - Zaženi (8) + Audio Random Play + - - Launch (9) - Zaženi (9) + Subtitle + Podnaslov - - Launch (A) - Zaženi (A) + Audio Cycle Track + - - Launch (B) - Zaženi (B) + Time + Čas - - Launch (C) - Zaženi (C) + View + Pogled - - Launch (D) - Zaženi (D) + Top Menu + Vrhnji meni - - Launch (E) - Zaženi (E) + Suspend + Ustavi - - Launch (F) - Zaženi (F) + Hibernate + V hibernacijo - Print Screen Natisni zaslon - Page Up Za stran gor - Page Down Za stran dol - Caps Lock Caps Lock - Num Lock Num Lock - Number Lock - Scroll Lock - + Scroll Lock - Insert Vstavi - Delete Izbriši - Escape Escape - System Request Sistemska zahteva - Select Izberi - Yes Da - No Ne - Context1 Kontekst1 - Context2 Kontekst2 - Context3 Kontekst3 - Context4 Kontekst4 - Call + Button to start a call (note: a separate button is used to end the call) + Pokliči - Hangup + Button to end a call (note: a separate button is used to start the call) + Odloži - + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + + + + Flip Obrni - - + Voice Dial + Button to trigger voice dialling + + + + + Last Number Redial + Button to redial the last number called + + + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + + + + + Camera Focus + Button to focus the camera + + + + + Kanji + + + + Muhenkan + + + + Henkan + + + + Romaji + + + + Hiragana + Hiragana + + + Katakana + Katakana + + + Hiragana Katakana + + + + Zenkaku + + + + Hankaku + + + + Zenkaku Hankaku + + + + Touroku + + + + Massyo + + + + Kana Lock + + + + Kana Shift + + + + Eisu Shift + + + + Eisu toggle + + + + Code input + + + + Multiple Candidate + + + + Previous Candidate + + + + Hangul + + + + Hangul Start + + + + Hangul End + + + + Hangul Hanja + + + + Hangul Jamo + Hangul Jamo + + + Hangul Romaja + + + + Hangul Jeonja + + + + Hangul Banja + + + + Hangul PreHanja + + + + Hangul PostHanja + + + + Hangul Special + + + Ctrl Ctrl - - Shift Shift - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Domača stran @@ -5727,27 +6324,22 @@ Izberite drugo ime datoteke. QSlider - Page left Za stran levo - Page up Za stran gor - Position Položaj - Page right Za stran desno - Page down Za stran dol @@ -5755,72 +6347,58 @@ Izberite drugo ime datoteke. QSocks5SocketEngine - Connection to proxy refused Povezava s posrednikom je bila zavrnjena - Connection to proxy closed prematurely Povezava s posrednikom je bila prekinjena predčasno - Proxy host not found Ni moč najti gostitelja posrednika - Connection to proxy timed out Čas za povezavo s posrednikom je potekel - Proxy authentication failed Neuspešno overjanje posrednika - Proxy authentication failed: %1 Neuspešno overjanje posrednika: %1 - SOCKS version 5 protocol error Napaka protokola SOCKS različice 5 - General SOCKSv5 server failure Splošna napaka strežnika SOCKSv5 - Connection not allowed by SOCKSv5 server Strežnik SOCKSv5 ne dovoljuje povezave - TTL expired TTL je zapadel - SOCKSv5 command not supported Ukaz SOCKSv5 ni podprt - Address type not supported Vrsta naslova ni podprta - Unknown SOCKSv5 proxy error code 0x%1 Neznana koda napake posrednika SOCKSv5: 0x%1 - Network operation timed out Čas za omrežni postopek je potekel @@ -5828,32 +6406,26 @@ Izberite drugo ime datoteke. QSoftKeyManager - Ok V redu - Select Izbor - Done Opravljeno - Options Možnosti - Cancel Prekliči - Exit Končaj @@ -5861,12 +6433,10 @@ Izberite drugo ime datoteke. QSpinBox - More Več - Less Manj @@ -5874,137 +6444,204 @@ Izberite drugo ime datoteke. QSql - Delete Izbriši - Delete this record? Ali izbrišem ta zapis? - - - Yes Da - - - - No - Ne + No + Ne + + + Insert + Vstavi + + + Update + Posodobi + + + Save edits? + &Shranmi urejan?. + + + Cancel + Prekliči + + + Confirm + Potrdi + + + Cancel your edits? + Ali želite preklicati urejanja? + + + + QSslSocket + + Unable to write data: %1 + Ni moč zapisati podatkov: %1 + + + Unable to decrypt data: %1 + + + + Error while reading: %1 + Napaka med branjem: %1 + + + Error during SSL handshake: %1 + Napaka med rokovanjem SSL: %1 + + + Error creating SSL context (%1) + Napaka pri ustvarjanju konteksta SSL (%1) + + + Invalid or empty cipher list (%1) + Neveljaven ali prazen seznam šifer (%1) + + + Private key does not certify public key, %1 + + + + Error creating SSL session, %1 + Napaka pri ustvarjanju seje SSL: %1 + + + Error creating SSL session: %1 + Napaka pri ustvarjanju seje SSL: %1 + + + Cannot provide a certificate with no key, %1 + Ni moč priskrbeti potrdila brez ključa, %1 + + + Error loading local certificate, %1 + Napaka pri nalaganju krajevnega potrdila, %1 + + + Error loading private key, %1 + Napaka pri nalaganju zasebnega ključa, %1 + + + No error + Brez napake + + + The issuer certificate could not be found + + + + The certificate signature could not be decrypted + + + + The public key in the certificate could not be read + + + + The signature of the certificate is invalid + + + + The certificate is not yet valid + - - Insert - Vstavi + The certificate has expired + Potrdilo je preteklo - - Update - Posodobi + The certificate's notBefore field contains an invalid time + - - Save edits? - &Shranmi urejan?. + The certificate's notAfter field contains an invalid time + - - Cancel - Prekliči + The certificate is self-signed, and untrusted + - - Confirm - Potrdi + The root certificate of the certificate chain is self-signed, and untrusted + - - Cancel your edits? - Ali želite preklicati urejanja? + The issuer certificate of a locally looked up certificate could not be found + - - - QSslSocket - - Unable to write data: %1 - Ni moč zapisati podatkov: %1 + No certificates could be verified + - - Error while reading: %1 - Napaka med branjem: %1 + One of the CA certificates is invalid + - - Error during SSL handshake: %1 - Napaka med rokovanjem SSL: %1 + The basicConstraints path length parameter has been exceeded + - - Error creating SSL context (%1) - Napaka pri ustvarjanju konteksta SSL (%1) + The supplied certificate is unsuitable for this purpose + - - Invalid or empty cipher list (%1) - Neveljaven ali prazen seznam šifer (%1) + The root CA certificate is not trusted for this purpose + - - Error creating SSL session, %1 - Napaka pri ustvarjanju seje SSL: %1 + The root CA certificate is marked to reject the specified purpose + - - Error creating SSL session: %1 - Napaka pri ustvarjanju seje SSL: %1 + The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate + - - Cannot provide a certificate with no key, %1 - Ni moč priskrbeti potrdila brez ključa, %1 + The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate + - - Error loading local certificate, %1 - Napaka pri nalaganju krajevnega potrdila, %1 + The peer did not present any certificate + Vrstnik ni predložil nobenega potrdila - - Error loading private key, %1 - Napaka pri nalaganju zasebnega ključa, %1 + The host name did not match any of the valid hosts for this certificate + - - Private key does not certificate public key, %1 - Zasebni ključ ne potrjuje javnega ključa, %1 + Unknown error + Neznana napaka QStateMachine - Missing initial state in compound state '%1' V sestavljenem stanju »%1« manjka začetno stanje - Missing default state in history state '%1' V zgodovinskem stanju »%1« manjka privzeto stanje - No common ancestor for targets and source of transition from state '%1' Za cilje in začetek prehoda iz stanja »%1« ni skupnega prednika - Unknown error Neznana napaka @@ -6012,30 +6649,22 @@ Izberite drugo ime datoteke. QSystemSemaphore - - %1: out of resources %1: zmanjkalo je virov - - %1: permission denied %1: nimate dovoljenja - %1: already exists %1: že obstaja - %1: does not exist %1: ne obstaja - - %1: unknown error %2 %1: neznana napaka %2 @@ -6043,12 +6672,10 @@ Izberite drugo ime datoteke. QTDSDriver - Unable to open connection Ni moč vzpostaviti povezave - Unable to use database Podatkovne zbirke ni moč uporabljati @@ -6056,12 +6683,10 @@ Izberite drugo ime datoteke. QTabBar - Scroll Left Premakni levo - Scroll Right Premakni desno @@ -6069,7 +6694,6 @@ Izberite drugo ime datoteke. QTcpServer - Operation on socket is not supported Dejanje na vtičnici ni podprto @@ -6077,42 +6701,34 @@ Izberite drugo ime datoteke. QTextControl - &Undo &Razveljavi - &Redo &Uveljavi - Cu&t &Izreži - &Copy S&kopiraj - Copy &Link Location Skopiraj &povezavo do lokacije - &Paste Pri&lepi - Delete Izbriši - Select All Izberi vse @@ -6120,14 +6736,10 @@ Izberite drugo ime datoteke. QToolButton - - Press Pritisni - - Open Odpri @@ -6135,7 +6747,6 @@ Izberite drugo ime datoteke. QUdpSocket - This platform does not support IPv6 Ta platforma ne podpira IPv6 @@ -6143,12 +6754,10 @@ Izberite drugo ime datoteke. QUndoGroup - Undo Razveljavi - Redo Uveljavi @@ -6156,7 +6765,6 @@ Izberite drugo ime datoteke. QUndoModel - <empty> <prazno> @@ -6164,12 +6772,10 @@ Izberite drugo ime datoteke. QUndoStack - Undo Razveljavi - Redo Uveljavi @@ -6177,57 +6783,46 @@ Izberite drugo ime datoteke. QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM (oznaka z-leve-na-desno) - RLM Right-to-left mark RLM (oznaka z-desne-na-levo) - ZWJ Zero width joiner ZWJ (združevalec s širino nič) - ZWNJ Zero width non-joiner ZWNJ (ne-združevalec s širino nič) - ZWSP Zero width space ZWSP (presledek s širino nič) - LRE Start of left-to-right embedding LRE (začetek vgrajevanja z leve na desno) - RLE Start of right-to-left embedding RLE (začetek vgrajevanja z desne na levo) - LRO Start of left-to-right override LRO (začetek nadomeščanja z leve na desno) - RLO Start of right-to-left override RLO (začetek nadomeščanja z desne na levo) - PDF Pop directional formatting PDF (odstrani oblikovanje usmerjenosti) - Insert Unicode control character Vstavi kontrolni znak Unicode @@ -6235,32 +6830,26 @@ Izberite drugo ime datoteke. QWebFrame - Request cancelled Zahtevek je bil preklican - Request blocked Zahtevek je bil blokiran - Cannot show URL Lokacije ni moč prikazati - Frame load interrupted by policy change Nalaganje okvirja je bilo prekinjeno zaradi spremembe pravil - Cannot show mimetype Vrste MIME ni moč prikazati - File does not exist Datoteka ne obstaja @@ -6268,610 +6857,515 @@ Izberite drugo ime datoteke. QWebPage - + Redirection limit reached + + + Bad HTTP request Napačen zahtevek HTTP - Submit default label for Submit buttons in forms on web pages Pošlji - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Pošlji - Reset default label for Reset buttons in forms on web pages Ponastavi - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' To je stvarno kazalo z iskanjem. Vnesite iskane besede: - Choose File title for file button used in HTML forms Izberite datoteko - No file selected text to display in file button used in HTML forms when no file is selected Datoteka ni izbrana - Open in New Window Open in New Window context menu item Odpri v novem oknu - Save Link... Download Linked File context menu item Shrani povezavo ... - Copy Link Copy Link context menu item Skopiraj povezavo - Open Image Open Image in New Window context menu item Odpri sliko - Save Image Download Image context menu item Shrani sliko - Copy Image Copy Link context menu item Kopiraj sliko - Open Frame Open Frame in New Window context menu item Odpri okvir - Copy Copy context menu item Skopiraj - Go Back Back context menu item Pojdi nazaj - Go Forward Forward context menu item Pojdi naprej - Stop Stop context menu item Ustavi - Reload Reload context menu item Znova naloži - Cut Cut context menu item Izreži - Paste Paste context menu item Prilepi - No Guesses Found No Guesses Found context menu item Najdenega ni nobenega ugibanja - Ignore Ignore Spelling context menu item Prezri - Add To Dictionary Learn Spelling context menu item Dodaj v slovar - Search The Web Search The Web context menu item Iščite po spletu - Look Up In Dictionary Look Up in Dictionary context menu item Poišči v slovarju - Open Link Open Link context menu item Odpri povezavo - Ignore Ignore Grammar context menu item Prezri - Spelling Spelling and Grammar context sub-menu item Črkovanje - Show Spelling and Grammar menu item title Prikaži črkovanje in slovnico - Hide Spelling and Grammar menu item title Skrij črkovanje in slovnico - Check Spelling Check spelling context menu item Preveri črkovanje - Check Spelling While Typing Check spelling while typing context menu item Preveri črkovanje med tipkanjem - Check Grammar With Spelling Check grammar with spelling context menu item Preveri slovnico in črkovanje - Fonts Font context sub-menu item Pisave - Bold Bold context menu item Polkrepko - Italic Italic context menu item Ležeče - Underline Underline context menu item Podčrtano - Outline Outline context menu item Obris - Direction Writing direction context sub-menu item Smer - Text Direction Text direction context sub-menu item Smer besedila - Default Default writing direction context menu item Privzeta - Left to Right Left to Right context menu item Z leve na desno - Right to Left Right to Left context menu item Z desne na levo - + Missing Plug-in + Label text to be used when a plug-in is missing + + + Loading... Media controller status message when the media is loading Nalaganje ... - Live Broadcast Media controller status message when watching a live broadcast Prenos v živo - Audio Element Media controller element Zvočni element - Video Element Media controller element Video element - Mute Button Media controller element Gumb za utišanje - Unmute Button Media controller element Gumb za preklic utišanja - Play Button Media controller element Gumb za predvajanje - Pause Button Media controller element Gumb za premor - Slider Media controller element Drsnik - Slider Thumb Media controller element Ročka na drsniku - Rewind Button Media controller element Gumb za previjanje - Return to Real-time Button Media controller element Gumb za vrnitev na resnični čas - Elapsed Time Media controller element Pretečeni čas - Remaining Time Media controller element Preostali čas - Status Display Media controller element Prikaz stanja - Fullscreen Button Media controller element Gumb za cel zaslon - Seek Forward Button Media controller element Gumb za pomik naprej - Seek Back Button Media controller element Gumb za pomik nazaj - Audio element playback controls and status display Media controller element Nadzor in prikaz stanja elementa za predvajanje zvoka - Video element playback controls and status display Media controller element Nadzor in prikaz stanja elementa za predvajanje videa - Mute audio tracks Media controller element Utišaj zvočne sledi - Unmute audio tracks Media controller element Prekliči utišanje zvočnih sledi - Begin playback Media controller element Začni predvajanje - Pause playback Media controller element Prekini predvajanje - Movie time scrubber Media controller element - + Drsnik za mesto v posnetku - Movie time scrubber thumb Media controller element - + Drsnik za mesto v posnetku - Rewind movie Media controller element Previj film - Return streaming movie to real-time Media controller element Povrni film na resnični čas - Current movie time Media controller element Trenutni čas filma - Remaining movie time Media controller element Preostali čas filma - Current movie status Media controller element Trenutno stanje filma - Play movie in full-screen mode Media controller element Predvajaj film čez ves zaslon - Seek quickly back Media controller element Hitro se pomakni nazaj - Seek quickly forward Media controller element Hitro se pomakni naprej - Indefinite time Media time description Nedoločen čas - %1 days %2 hours %3 minutes %4 seconds Media time description %1 dni %2 ur %3 minut %4 sekund - %1 hours %2 minutes %3 seconds Media time description %1 ur %2 minut %3 sekund - %1 minutes %2 seconds Media time description %1 minut %2 sekund - %1 seconds Media time description %1 sekund - Inspect Inspect Element context menu item Preglej. - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed Ni nedavnih iskanj - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title Nedavna iskanja - Clear recent searches menu item in Recent Searches menu that empties menu's contents Počisti nedavna iskanja - Unknown Unknown filesize FTP directory listing item Neznana - %1 (%2x%3 pixels) Title string for images %1 (%2×%3 pik) - Web Inspector - %2 Web Inspector - %2 - Scroll here Premakni sem - Left edge Levi rob - Top Vrh - Right edge Desni rob - Bottom Dno - Page left Za stran levo - Page up Za stran gor - Page right Za stran desno - Page down Za stran dol - Scroll left Premakni levo - Scroll up Premakni gor - Scroll right Premakni desno - Scroll down Premakni dol - %n file(s) number of chosen file @@ -6882,251 +7376,197 @@ Izberite drugo ime datoteke. - JavaScript Alert - %1 Opozorilo JavaScript - %1 - JavaScript Confirm - %1 Potrditev JavaScript - %1 - JavaScript Prompt - %1 Poziv JavaScript - %1 - JavaScript Problem - %1 Težava JavaScript - %1 - The script on this page appears to have a problem. Do you want to stop the script? Kot kaže ima skript na tej strani težavo. Ali želite ustaviti skript? - Move the cursor to the next character Premakni kazalec na naslednji znak - Move the cursor to the previous character Premakni kazalec na prejšnji znak - Move the cursor to the next word Premakni kazalec v naslednjo besedo - Move the cursor to the previous word Premakni kazalec v prejšnjo besedo - Move the cursor to the next line Premakni kazalec v naslednjo vrstico - Move the cursor to the previous line Premakni kazalec v prejšnjo vrstico - Move the cursor to the start of the line Premakni kazalec na začetek vrstice - Move the cursor to the end of the line Premakni kazalec na konec vrstice - Move the cursor to the start of the block Premakni kazalec na začetek bloka - Move the cursor to the end of the block Premakni kazalec na konec bloka - Move the cursor to the start of the document Premakni kazalec na začetek dokumenta - Move the cursor to the end of the document Premakni kazalec na konec dokumenta - Select all Izberi vse - Select to the next character Izberi do naslednjega znaka - Select to the previous character Izberi do prejšnjega znaka - Select to the next word Izberi do naslednje besede - Select to the previous word Izberi do prejšnje besede - Select to the next line Izberi do naslednje vrstice - Select to the previous line Izberi do prejšnje vrstice - Select to the start of the line Izberi do začetka vrstice - Select to the end of the line Izberi do konca vrstice - Select to the start of the block Izberi do začetka bloka - Select to the end of the block Izberi do konca bloka - Select to the start of the document Izberi do začetka dokumenta - Select to the end of the document Izberi do konca dokumenta - Delete to the start of the word Izbriši do začetka besede - Delete to the end of the word Izbriši do konca besede - Insert a new paragraph Vstavi nov odstavek - Insert a new line Vstavi novo vrstico - Paste and Match Style Prilepi in uskladi slog - Remove formatting Odstrani oblikovanje - Strikethrough Prečrtano - Subscript Podpisano - Superscript Nadpisano - Insert Bulleted List Vstavi navadni seznam - Insert Numbered List Vstavi oštevilčeni seznam - Indent Zamakni - Outdent Odzamakni - Center Sredinsko - Justify Obojestransko - Align Left Poravnaj levo - Align Right Poravnaj desno - - - Remaining move time - Media controller element - Preostali čas filma - QWhatsThisAction - What's This? Kaj je to? @@ -7134,7 +7574,6 @@ Izberite drugo ime datoteke. QWidget - * * @@ -7142,57 +7581,46 @@ Izberite drugo ime datoteke. QWizard - Go Back Pojdi nazaj - Continue Nadaljuj - Commit Uveljavi - Done Opravljeno - Help Pomoč - < &Back < Na&zaj - &Finish &Zaključi - Cancel Prekliči - &Help &Pomoč - &Next &Naprej - &Next > &Naprej > @@ -7200,69 +7628,54 @@ Izberite drugo ime datoteke. QWorkspace - &Restore &Obnovi - &Move &Premakni - &Size &Velikost - Mi&nimize Po&manjšaj - Ma&ximize &Razpni - &Close &Zapri - Stay on &Top Ostani na &vrhu - - Sh&ade Zvi&j - - %1 - [%2] %1 - [%2] - Minimize Pomanjšaj - Restore Down Obnovi navzdol - Close Zapri - &Unshade Razv&ij @@ -7270,302 +7683,260 @@ Izberite drugo ime datoteke. QXml - no error occurred ni nobene napake - error triggered by consumer napako povzročil uporabnik - unexpected end of file nepričakovan konec datoteke - more than one document type definition več kot ena definicija vrste dokumenta - error occurred while parsing element napaka med analiziranjem elementa - tag mismatch neprimerna oznaka - error occurred while parsing content napaka med analiziranje vsebine - unexpected character nepričakovan znak - invalid name for processing instruction nepravilno ime za ukaz obdelave - version expected while reading the XML declaration pričakovana različica med branjem deklaracije XML - wrong value for standalone declaration napačna vrednost za samostojno deklaracijo - encoding declaration or standalone declaration expected while reading the XML declaration deklaracija kodiranja ali samostojna deklaracija je bila pričakovana med branjem deklaracije XML - standalone declaration expected while reading the XML declaration samostojna deklaracija pričakovana med branjem deklaracije XML - error occurred while parsing document type definition napaka med analiziranjem vrste definicije dokumenta - letter is expected pričakovana je črka - error occurred while parsing comment napaka med analiziranjem komentarja - error occurred while parsing reference napaka med analiziranjem reference - internal general entity reference not allowed in DTD referenca notranje splošne entitete ni dovoljena v DTD - external parsed general entity reference not allowed in attribute value referenca zunanje analizirane splošne entitete ni dovoljena v vrednosti atributa - external parsed general entity reference not allowed in DTD referenca zunanje analizirane splošne entitete ni dovoljena v DTD - unparsed entity reference in wrong context referenca neanalizirane entitete v napačnem kontekstu - recursive entities rekurzivne entitete - error in the text declaration of an external entity napaka v besedilni deklaraciji zunanje entitete + QXmlPatternistCLI + + Warning in %1, at line %2, column %3: %4 + + + + Warning in %1: %2 + + + + Unknown location + Neznana lokacija + + + Error %1 in %2, at line %3, column %4: %5 + + + + Error %1 in %2: %3 + Napaka %1 v %2: %3 + + + QXmlStream - - Extra content at end of document. Dodatna vsebina na koncu dokumenta. - Invalid entity value. Neveljavna vrednost entitete. - Invalid XML character. Neveljaven znak XML. - Sequence ']]>' not allowed in content. Zaporedje »]]>« v vsebini ni dovoljeno. - Namespace prefix '%1' not declared Predpona imenskega prostora »%1« ni deklarirana - Attribute redefined. Atribut je redefiniran. - Unexpected character '%1' in public id literal. - Invalid XML version string. Neveljaven niz različice XML. - Unsupported XML version. Nepodprta različica XML. - %1 is an invalid encoding name. %1 ni veljavno ime kodiranja. - Encoding %1 is unsupported Kodiranje %1 ni podprto - Standalone accepts only yes or no. - Invalid attribute in XML declaration. Neveljaven atribut v deklaraciji XML. - Premature end of document. Predčasen konec dokumenta. - Invalid document. Neveljaven dokument.. - Expected Pričakovan - , but got ' , vendar prejel ' - Unexpected ' Nepričakovan ' - Expected character data. Pričakoval znakovne podatke. - Recursive entity detected. Zaznana je bila rekurzivna entiteta. - Start tag expected. Pričakovana je bila začetna oznaka. - XML declaration not at start of document. Deklaracija XML ni na začetku dokumenta. - NDATA in parameter entity declaration. - %1 is an invalid processing instruction name. %1 ni veljavno ime ukaza obdelave. - Invalid processing instruction name. Neveljavno ime ukaza obdelave. - - - - Illegal namespace declaration. Neveljavna deklaracija imenskega prostora. - Invalid XML name. Neveljavno ime XML. - Opening and ending tag mismatch. Začetni in zaključni oznaki se ne ujemata. - Reference to unparsed entity '%1'. Referenca na nerazčlenjeno entiteto »%1«. - - - Entity '%1' not declared. Entiteta »%1« ni deklarirana. - Reference to external entity '%1' in attribute value. Referenca na zunanjo entiteto »%1« v vrednosti lastnosti. - Invalid character reference. Neveljavna znakovna referenca. - - Encountered incorrectly encoded content. Naletel na napačno zakodirano vsebino. - The standalone pseudo attribute must appear after the encoding. Samostojni psevdo-atribut se mora pojaviti za kodiranjem. - %1 is an invalid PUBLIC identifier. @@ -7573,240 +7944,190 @@ Izberite drugo ime datoteke. QtXmlPatterns - Network timeout. Čas za omrežje je potekel. - Element %1 can't be serialized because it appears outside the document element. - Year %1 is invalid because it begins with %2. Leto %1 ni veljavno, ker se začne z %2. - Day %1 is outside the range %2..%3. Dan %1 je izven obsega %2..%3. - Month %1 is outside the range %2..%3. Mesec %1 je izven obsega %2..%3. - Overflow: Can't represent date %1. Prekoračitev: ni moč predstaviti datuma %1. - Day %1 is invalid for month %2. Dan %1 za mesec %2 ni veljaven. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Čas 24:%1:%2.%3 ni veljaven. Ura je 24, vendar minute, sekunde in milisekunde niso vse 0; - Time %1:%2:%3.%4 is invalid. Čas %1:%2:%3.%4 ni veljaven. - Overflow: Date can't be represented. Prekoračitev: datuma ni moč predstaviti. - - At least one component must be present. Prisotna mora biti vsaj ena komponenta. - At least one time component must appear after the %1-delimiter. Za razmejiteljem %1 se mora pojaviti vsaj ena časovna komponenta. - %1 is not a valid value of type %2. %1 ni veljavna vrednost vrste %2. - When casting to %1 from %2, the source value cannot be %3. - Integer division (%1) by zero (%2) is undefined. Deljenje celega števila (%1) z nič (%2) ni določeno. - Division (%1) by zero (%2) is undefined. Deljenje (%1) z nič (%2) ni določeno. - Modulus division (%1) by zero (%2) is undefined. Ostanek deljenja (%1) z nič (%2) ni določen. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Deljenje vrednosti vrste %1 z %2 (ni število) ni dovoljeno. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Deljenje vrednosti vrste %1 z %2 ali %3 (pozitivna ali negativna nič) ni dovoljeno. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Množenje vrednosti vrste %1 z %2 ali %3 (pozitivna ali negativna neskončnost) ni dovoljeno. - A value of type %1 cannot have an Effective Boolean Value. Vrednost vrste %1 ne more imeti dejanske logične vrednosti. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Dejanske logične vrednosti ni moč izračunati za zaporedje, ki vsebuje dve ali več atomičnih vrednosti. - Value %1 of type %2 exceeds maximum (%3). Vrednost %1 vrste %2 presega maksimum (%3). - Value %1 of type %2 is below minimum (%3). Vrednost %1 vrste %2 je pod minimumom (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Vrednost vrste %1 mora vsebovati sodo število števk. Vrednost %2 temu ne zadošča. - %1 is not valid as a value of type %2. %1 ni veljavna kot vrednost vrste %2. - Operator %1 cannot be used on type %2. Operatorja %1 ni moč uporabiti na vrsti %2. - Operator %1 cannot be used on atomic values of type %2 and %3. Operatorja %1 ni moč uporabiti na atomičnih vrednostih vrst %2 in %3. - The namespace URI in the name for a computed attribute cannot be %1. URI imenskega prostora v imenu izračunane lastnosti ne more biti %1. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Ime izračunane lastnosti ne more imeti URI-ja imenskega prostora %1 s krajevnim imenom %2. - Type error in cast, expected %1, received %2. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. - A comment cannot contain %1 Komentar ne more vsebovati %1 - A comment cannot end with a %1. Komentar se ne more končati z %1. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. - A library module cannot be evaluated directly. It must be imported from a main module. Modula knjižnice ni moč ovrednotiti neposredno. Uvoziti ga je potrebno iz glavnega modula. - No template by name %1 exists. Predloga z imenom %1 ne obstaja. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. - A positional predicate must evaluate to a single numeric value. - - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid. + The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. - The data of a processing instruction cannot contain the string %1 Podatki ukaza za obdelavo ne morejo vsebovati niza %1 - No namespace binding exists for the prefix %1 - No namespace binding exists for the prefix %1 in %2 - - %1 is an invalid %2 %1 ni veljaven %2 - %1 takes at most %n argument(s). %2 is therefore invalid. %1 potrebuje največ %n argument. %2 zato ni veljavno. @@ -7816,7 +8137,6 @@ Izberite drugo ime datoteke. - %1 requires at least %n argument(s). %2 is therefore invalid. %1 potrebuje najmanj %n argument. %2 zato ni veljavno. @@ -7826,2399 +8146,2052 @@ Izberite drugo ime datoteke. - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Prvi argument za %1 ne more biti vrste %2. Mora biti številčne vrste, xs:yearMonthDuration ali xs:dayTimeDuration. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Prvi argument za %1 ne more biti vrste %2. Mora biti vrste %3, %4 ali %5. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Drugi argument za %1 ne more biti vrste %2. Mora biti vrste %3, %4 ali %5. - %1 is not a valid XML 1.0 character. %1 ni veljaven znak XML 1.0. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. - %1 was called. %1 je bila klicana. - %1 must be followed by %2 or %3, not at the end of the replacement string. - In the replacement string, %1 must be followed by at least one digit when not escaped. - In the replacement string, %1 can only be used to escape itself or %2, not %3 - %1 matches newline characters %1 se ujema z znaki za novo vrstico - %1 and %2 match the start and end of a line. %1 in %2 se ujemata z začetkom in koncem vrstice. - Matches are case insensitive Ujemanja niso občutljiva na velikost črk - Whitespace characters are removed, except when they appear in character classes Znaki za presledke so odstranjeni, razen ko se pojavijo v znakovnih razredih - %1 is an invalid regular expression pattern: %2 %1 ni veljaven vzorec regularnega izraza: %2 - %1 is an invalid flag for regular expressions. Valid flags are: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Če je prvi argument prazno zaporedje, ali pa niz z dolžino nič (brez imenskega prostora), predpone ni moč določiti. Določena je bila predpona %1. - It will not be possible to retrieve %1. %1 ne bo možno pridobiti. - The root node of the second argument to function %1 must be a document node. %2 is not a document node. - The default collection is undefined Privzeta zbirka ni določena. - %1 cannot be retrieved %1 ni moč pridobiti - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. - %1 is not a whole number of minutes. - + %1 ni celovito število minut, - Required cardinality is %1; got cardinality %2. - The item %1 did not match the required type %2. Postavka %1 se ne ujema z zahtevano vrsto %2. - - %1 is an unknown schema type. %1 ni znana vrsta sheme. - + A template with name %1 has already been declared. + + + Only one %1 declaration can occur in the query prolog. - The initialization of variable %1 depends on itself Inicializacija spremenljivke %1 je odvisna od same sebe. - - No variable by name %1 exists - Spremenljivka z imenom %1 ne obstaja - - - The variable %1 is unused Spremenljivka %1 ni uporabljena - Version %1 is not supported. The supported XQuery version is 1.0. Različica %1 ni podprta. Podpra različica XQuery je 1.0. - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Kodiranje %1 ni veljavno. Vsebovati mora le znake latinske abecede, ne sme vsebovati presledkov in se mora ujemati z regularnim izrazom %2. - No function with signature %1 is available Na voljo ni nobene funkcije s podpisom %1 - - A default namespace declaration must occur before function, variable, and option declarations. Deklaracije privzetega imenskega prostora se mora pojaviti pred deklaracijami funkcij, spremenljivk in možnosti. - Namespace declarations must occur before function, variable, and option declarations. Deklaracije imenskih prostorov se morajo pojaviti pred deklaracijami funkcij, spremenljivk in možnosti. - Module imports must occur before function, variable, and option declarations. Uvozi modulov se morajo pojaviti pred deklaracijami funkcij, spremenljivk in možnosti. - It is not possible to redeclare prefix %1. Predpone %1 ni moč znova deklarirati. - Prefix %1 is already declared in the prolog. - The name of an option must have a prefix. There is no default namespace for options. Ime možnosti mora vsebovati predpono. Privzeti imenski prostor za možnosti ne obstaja. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. - The target namespace of a %1 cannot be empty. Ciljni imenski prostor za %1 ne sme biti prazen. - The module import feature is not supported Zmožnost uvažanja modulov ni podprta - - No value is available for the external variable by name %1. - Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti. - - - - A template by name %1 has already been declared. - Predloga z imenom %1 je že bila deklarirana. - - - The keyword %1 cannot occur with any other mode name. - - The value of attribute %1 must of type %2, which %3 isn't. - Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni. - - - - The prefix %1 can not be bound. By default, it is already bound to the namespace %2. - - - - - A variable by name %1 has already been declared. - Spremenljivka z imenom %1 je že bila deklarirana. - - - A stylesheet function must have a prefixed name. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Imenski prostor za uporabniško določeno funkcijo ne sme biti prazen (poskusite z vnaprej določeno predpono %1, ki obstaja za take primere) - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Imenski prostor %1 je rezerviran, zato ga uporabniško določene funkcije ne smejo uporabiti. Poskusite z vnaprej določeno predpono %2, ki obstaja za take primere. - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Imenski prostor uporabniško določene funkcije v modulu knjižnice mora biti enak imenskemu prostoru modula. Z drugimi besedami, moral bi biti %1, namesto %2. - A function already exists with the signature %1. Funkcija s podpisom %1 že obstaja. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Zunanje funkcije niso podprte. Vse podprte funkcije je moč uporabiti neposredno, brez da bi jih najprej deklarirali kot zunanje. - - An argument by name %1 has already been declared. Every argument name must be unique. - Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno. + No variable with name %1 exists + + + + The value of attribute %1 must be of type %2, which %3 isn't. + + + + The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. + + + + A variable with name %1 has already been declared. + + + + No value is available for the external variable with name %1. + + + + An argument with name %1 has already been declared. Every argument name must be unique. + - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. - In an XSL-T pattern, function %1 cannot have a third argument. V XSL-T vzorcu funkcija %1 ne more imeti tretjega argumenta. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. - %1 is an invalid template mode name. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Ime spremenljivke priklenjene v izrazu »for« se mora razlikovati od spremenljivke položaja. Spremenljivki z imenom %1 zato trčita. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. - None of the pragma expressions are supported. Therefore, a fallback expression must be present - Each name of a template parameter must be unique; %1 is duplicated. - The %1-axis is unsupported in XQuery Os %1 v XQuery ni podprta - + No function with name %1 is available. + + + + An attribute with name %1 has already appeared on this element. + + + %1 is not a valid name for a processing-instruction. - %1 is not a valid numeric literal. - W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). - - No function by name %1 is available. - Na voljo ni nobene funkcije z imenom %1. - - - The namespace URI cannot be the empty string when binding to a prefix, %1. - %1 is an invalid namespace URI. %1 ni veljaven URI imenskega prostora. - It is not possible to bind to the prefix %1 - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Imenski prostor %1 je lahko navezan le na %2 (in je, v vsakem primeru, preddeklariran) - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Predpona %1 je lahko navezana le na %2 (in je, v vsakem primeru, preddeklarirana) - Two namespace declaration attributes have the same name: %1. Dva atributa deklaracije imenskega prostora imata isto ime: %1 - The namespace URI must be a constant and cannot use enclosed expressions. - - An attribute by name %1 has already appeared on this element. - Atribut z imenom %1 se je v tem elementu že pojavil. - - - A direct element constructor is not well-formed. %1 is ended with %2. - The name %1 does not refer to any schema type. Ime %1 se ne nanaša na nobeno vrsto sheme. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. - %1 is not an atomic type. Casting is only possible to atomic types. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. - The name of an extension expression must be in a namespace. Ime razširitvenega izraza mora biti v imenskem prostoru. - empty prazno - zero or one nič ali en - exactly one točno en - one or more en ali več - zero or more nič ali več - Required type is %1, but %2 was found. Zahtevana vrsta je %1, najdena pa je bila %2. - Promoting %1 to %2 may cause loss of precision. Povišanje %1 v %2 lahko povzroči izgubo natančnosti. - The focus is undefined. Fokus ni definiran. - It's not possible to add attributes after any other kind of node. - An attribute by name %1 has already been created. Atribut z imenom %1 je že bil ustvarjen. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. - Attribute %1 can't be serialized because it appears at the top level. - %1 is an unsupported encoding. %1 ni podprto kodiranje. - %1 contains octets which are disallowed in the requested encoding %2. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. - Ambiguous rule match. Dvoumno ujemanje s pravilom. - In a namespace constructor, the value for a namespace cannot be an empty string. - The prefix must be a valid %1, which %2 is not. - + - The prefix %1 cannot be bound. Predpone %1 ni moč navezati. - Only the prefix %1 can be bound to %2 and vice versa. Na %2 je lahko navezana le predpona %1 in obratno. - The parameter %1 is required, but no corresponding %2 is supplied. Potreben je parameter %1, vendar ustrezen %2 ni bil podan. - The parameter %1 is passed, but no corresponding %2 exists. Podan je bil parameter %1, vendar ustrezen %2 ne obstaja. - The URI cannot have a fragment - Element %1 is not allowed at this location. Element %1 na tej lokaciji ni dovoljen. - Text nodes are not allowed at this location. Besedilna vozlišča na tej lokaciji niso dovoljena. - Parse error: %1 Napaka pri razčlenjevanju: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Vrednost lastnosti različice XSL-T mora biti vrednost vrste %1, %2 pa to ni. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. - Unknown XSL-T attribute %1. Neznana XSL-T lastnost %1. - Attribute %1 and %2 are mutually exclusive. Lastnosti %1 in %2 sta medsebojno izključujoči. - In a simplified stylesheet module, attribute %1 must be present. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Če element %1 nima lastnosti %2, ne more imeti lastnosti %3 ali %4. - Element %1 must have at least one of the attributes %2 or %3. Element %1 mora imeti vsaj eno izmed lastnosti %2 in %3. - At least one mode must be specified in the %1-attribute on element %2. - Element %1 must come last. Element %1 mora biti zadnji. - At least one %1-element must occur before %2. - Only one %1-element can appear. - At least one %1-element must occur inside %2. - + - When attribute %1 is present on %2, a sequence constructor cannot be used. - Element %1 must have either a %2-attribute or a sequence constructor. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. - Element %1 cannot have children. Element %1 ne more imeti podelementov. - Element %1 cannot have a sequence constructor. - - The attribute %1 cannot appear on %2, when it is a child of %3. - A parameter in a function cannot be declared to be a tunnel. - This processor is not Schema-aware and therefore %1 cannot be used. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Vrednost lastnosti %1 elementa %2 mora biti %3 ali %4 in ne %5. - Attribute %1 cannot have the value %2. Lastnost %1 ne more imeti vrednosti %2. - The attribute %1 can only appear on the first %2 element. Lastnost %1 se lahko pojavi le pri prvem elementu %2. - At least one %1 element must appear as child of %2. - %1 has inheritance loop in its base type %2. - - Circular inheritance of base type %1. - Circular inheritance of union %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. - Base type of simple type %1 cannot be complex type %2. - Simple type %1 cannot have direct base type %2. - - Simple type %1 is not allowed to have base type %2. - Simple type %1 can only have simple atomic type as base type. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. - - Variety of item type of %1 must be either atomic or union. - - Variety of member types of %1 must be atomic. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. - Simple type %1 is only allowed to have %2 facet. - Base type of simple type %1 must have variety of type list. - Base type of simple type %1 has defined derivation by restriction as final. - Item type of base type does not match item type of %1. - - Simple type %1 contains not allowed facet type %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. - %1 is not allowed to have any facets. - Base type %1 of simple type %2 must have variety of union. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. - Member type %1 cannot be derived from member type %2 of %3's base type %4. - Derivation method of %1 must be extension because the base type %2 is a simple type. - Complex type %1 has duplicated element %2 in its content model. - Complex type %1 has non-deterministic content. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. - Complex type %1 must have simple content. - Complex type %1 must have the same simple type as its base class %2. - Complex type %1 cannot be derived from base type %2%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. - Item type of simple type %1 cannot be a complex type. - Member type of simple type %1 cannot be a complex type. - %1 is not allowed to have a member type with the same name as itself. - - - %1 facet collides with %2 facet. - %1 facet must have the same value as %2 facet of base type. - %1 facet must be equal or greater than %2 facet of base type. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. - %1 facet contains invalid regular expression - Unknown notation %1 used in %2 facet. - %1 facet contains invalid value %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. - %1 facet cannot be %2 if %3 facet of base type is %4. - - - %1 facet must be less than or equal to %2 facet. - - - %1 facet must be less than %2 facet of base type. - - %1 facet and %2 facet cannot appear together. - - - %1 facet must be greater than %2 facet of base type. - - %1 facet must be less than %2 facet. - - %1 facet must be greater than or equal to %2 facet of base type. - Simple type contains not allowed facet %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. - Only %1 and %2 facets are allowed when derived by union. - - %1 contains %2 facet with invalid data: %3. - Attribute group %1 contains attribute %2 twice. Skupina lastnosti %1 dvakrat vsebuje lastnost %2. - Attribute group %1 contains two different attributes that both have types derived from %2. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. - Complex type %1 contains attribute %2 twice. Kompleksna vrsta %1 dvakrat vsebuje lastnost %2. - Complex type %1 contains two different attributes that both have types derived from %2. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. - Element %1 is not allowed to have a value constraint if its base type is complex. - Element %1 is not allowed to have a value constraint if its type is derived from %2. - - Value constraint of element %1 is not of elements type: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. - Type of element %1 cannot be derived from type of substitution group affiliation. - Value constraint of attribute %1 is not of attributes type: %2. - Attribute %1 has value constraint but has type derived from %2. - %1 attribute in derived complex type must be %2 like in base type. - Attribute %1 in derived complex type must have %2 value constraint like in base type. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. - Attribute %1 in derived complex type must have %2 value constraint. - processContent of base wildcard must be weaker than derived wildcard. - - Element %1 exists twice with different types. Element %1 obstaja dvakrat, z različnima vrstama. - Particle contains non-deterministic wildcards. - - Base attribute %1 is required but derived attribute is not. - Type of derived attribute %1 cannot be validly derived from type of base attribute. - Value constraint of derived attribute %1 does not match value constraint of base attribute. - - Derived attribute %1 does not exists in the base definition. + Derived attribute %1 does not exist in the base definition. - Derived attribute %1 does not match the wildcard in the base definition. - Base attribute %1 is required but missing in derived definition. - Derived definition contains an %1 element that does not exists in the base definition - Derived wildcard is not a subset of the base wildcard. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard - Attribute %1 from base type is missing in derived type. - Type of derived attribute %1 differs from type of base attribute. - Base definition contains an %1 element that is missing in the derived definition - %1 references unknown %2 or %3 element %4. - %1 references identity constraint %2 that is no %3 or %4 element. - %1 has a different number of fields from the identity constraint %2 that it references. - Base type %1 of %2 element cannot be resolved. - Item type %1 of %2 element cannot be resolved. - Member type %1 of %2 element cannot be resolved. - - - Type %1 of %2 element cannot be resolved. - Base type %1 of complex type cannot be resolved. - %1 cannot have complex base type that has a %2. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. - Type of %1 element must be a simple type, %2 is not. Vrsta elementa %1 mora biti preprosta, %2 to ni. - Substitution group %1 of %2 element cannot be resolved. - Substitution group %1 has circular definition. - - Duplicated element names %1 in %2 element. Podvojeni imeni elementov %1 v elementu %2. - - - - Reference %1 of %2 element cannot be resolved. - Circular group reference for %1. - %1 element is not allowed in this scope Element %1 v tem obsegu ni dovoljen - %1 element cannot have %2 attribute with value other than %3. - %1 element cannot have %2 attribute with value other than %3 or %4. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. - Attribute group %1 has circular reference. - %1 attribute in %2 must have %3 use like in base type %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. - %1 has attribute wildcard but its base type %2 has not. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. - Enumeration facet contains invalid content: {%1} is not a value of type %2. - Namespace prefix of qualified name %1 is not defined. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. - Empty particle cannot be derived from non-empty particle. - Derived particle is missing element %1. - Derived element %1 is missing value constraint as defined in base particle. - Derived element %1 has weaker value constraint than base particle. - Fixed value constraint of element %1 differs from value constraint in base particle. - Derived element %1 cannot be nillable as base element is not nillable. - Block constraints of derived element %1 must not be more weaker than in the base element. - Simple type of derived element %1 cannot be validly derived from base element. - + Preproste vrste izpeljanega elementa %1 ni moč veljavno izpeljati iz osnovnega elementa. - Complex type of derived element %1 cannot be validly derived from base element. - + Kompleksne vrste izpeljanega elementa %1 ni moč veljavno izpeljati iz osnovnega elementa. - Element %1 is missing in derived particle. - + Element %1 v izpeljanem delcu manjka. - Element %1 does not match namespace constraint of wildcard in base particle. - Wildcard in derived particle is not a valid subset of wildcard in base particle. - + Vzorec v izpeljanem delcu ni veljavna podmnoživa vzorca iz osnovnega razreda. - processContent of wildcard in derived particle is weaker than wildcard in base particle. - + processContent vzorca v izpeljanem delcu je šibkejši kot vzorec v osnovnem delcu. - Derived particle allows content that is not allowed in the base particle. - + Izpeljani delec dovoljuje vsebino, ki v osnovnem delcu ni dovoljena. - Can not process unknown element %1, expected elements are: %2. Ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2. - Element %1 is not allowed in this scope, possible elements are: %2. Element %1 v tem obsegu ni dovoljen, možni elementi so: %2. - Child element is missing in that scope, possible child elements are: %1. V tem obsegu manjka podelement, možni podelementi so: %1. - Document is not a XML schema. Dokument ni shema XML. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. Lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4. - %1 attribute of %2 element contains invalid content: {%3}. Lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. - %1 element without %2 attribute is not allowed inside schema without target namespace. - - %1 element is not allowed inside %2 element if %3 attribute is present. Element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %3. - - - %1 element has neither %2 attribute nor %3 child element. Element %1 nima niti lastnosti %2 niti podelementa %3. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. Element %1 s podelementom %2 ne sme imeti lastnosti %3. - %1 attribute of %2 element must be %3 or %4. Lastnost %1 elementa %2 mora biti %3 ali %4. - %1 attribute of %2 element must have a value of %3. Lastnost %1 elementa %2 mora imeti vrednost %3. - - %1 attribute of %2 element must have a value of %3 or %4. Lastnost %1 elementa %2 mora imeti vrednost %3 ali %4. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. Element %1 hkrati ne sme imeti lastnosti %2 in %3. - - Content of %1 attribute of %2 element must not be from namespace %3. Vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3. - - %1 attribute of %2 element must not be %3. Lastnost %1 elementa %2 ne sme biti %3. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. - + Lastnost %1 elementa %2 mora imeti vrednost %3, ker je nastavljena lastnost %4. - Specifying use='prohibited' inside an attribute group has no effect. - + Določitev use='prohibited' znotraj skupine lastnosti nima nobenega učinka. - %1 element must have either %2 or %3 attribute. Element %1 mora imeti lastnost %2 ali %3. - %1 element must have either %2 attribute or %3 or %4 as child element. - + Element %1 mora imeti bodisi lastnost %2 bodisi vsebovati %3 ali %4 kot podelement. - %1 element requires either %2 or %3 attribute. Element %1 potrebuje vsaj lastnost %2 ali %3. - Text or entity references not allowed inside %1 element - + Sklici na besedilo ali entiteto znotraj elementa %1 niso dovoljeni. - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. - + Lastnost %1 elementa %2 mora vsebovati %3, %4 ali pa seznam URI-jev. - %1 element is not allowed in this context. Element %1 v tem kontekstu ni dovoljen. - %1 attribute of %2 element has larger value than %3 attribute. - + Lastnost %1 elementa %2 ima višjo vrednost kot lastnost %3. - Prefix of qualified name %1 is not defined. - + Predpona kvalificiranega imena %1 ni določena. - - %1 attribute of %2 element must either contain %3 or the other values. - + Lastnost %1 elementa %2 mora vsebovati bodisi %3 bodisi druge vrednosti. - - Component with id %1 has been defined previously. - Komponenta z ID-jem %1 je že bila definirana. + Component with ID %1 has been defined previously. + Komponenta z ID-jem %1 je že bila definirana. - Element %1 already defined. Element %1 je že definiran. - Attribute %1 already defined. Lastnost %1 je že definirana. - Type %1 already defined. Vrsta %1 je že definirana. - Attribute group %1 already defined. Skupina lastnosti %1 je že definirana. - Element group %1 already defined. Skupina elementov %1 je že definirana. - Notation %1 already defined. Zapis %1 je že definiran. - Identity constraint %1 already defined. - + Omejitev identitete %1 je že določena. - Duplicated facets in simple type %1. - - - %1 is not valid according to %2. %1 glede na %2 ni veljaven. - String content does not match the length facet. - String content does not match the minLength facet. - String content does not match the maxLength facet. - String content does not match pattern facet. - String content is not listed in the enumeration facet. - Signed integer content does not match the maxInclusive facet. - Signed integer content does not match the maxExclusive facet. - Signed integer content does not match the minInclusive facet. - Signed integer content does not match the minExclusive facet. - Signed integer content is not listed in the enumeration facet. - Signed integer content does not match pattern facet. - Signed integer content does not match in the totalDigits facet. - Unsigned integer content does not match the maxInclusive facet. - Unsigned integer content does not match the maxExclusive facet. - Unsigned integer content does not match the minInclusive facet. - Unsigned integer content does not match the minExclusive facet. - Unsigned integer content is not listed in the enumeration facet. - Unsigned integer content does not match pattern facet. - Unsigned integer content does not match in the totalDigits facet. - Double content does not match the maxInclusive facet. - Double content does not match the maxExclusive facet. - Double content does not match the minInclusive facet. - Double content does not match the minExclusive facet. - Double content is not listed in the enumeration facet. - Double content does not match pattern facet. - Decimal content does not match in the fractionDigits facet. - Decimal content does not match in the totalDigits facet. - Date time content does not match the maxInclusive facet. - Date time content does not match the maxExclusive facet. - Date time content does not match the minInclusive facet. - Date time content does not match the minExclusive facet. - Date time content is not listed in the enumeration facet. - Date time content does not match pattern facet. - Duration content does not match the maxInclusive facet. - Duration content does not match the maxExclusive facet. - Duration content does not match the minInclusive facet. - Duration content does not match the minExclusive facet. - Duration content is not listed in the enumeration facet. - Duration content does not match pattern facet. - Boolean content does not match pattern facet. - Binary content does not match the length facet. - Binary content does not match the minLength facet. - Binary content does not match the maxLength facet. - Binary content is not listed in the enumeration facet. - Invalid QName content: %1. Neveljavna vsebina QName: %1. - QName content is not listed in the enumeration facet. - QName content does not match pattern facet. - Notation content is not listed in the enumeration facet. - List content does not match length facet. - List content does not match minLength facet. - List content does not match maxLength facet. - List content is not listed in the enumeration facet. - List content does not match pattern facet. - Union content is not listed in the enumeration facet. - Union content does not match pattern facet. - Data of type %1 are not allowed to be empty. Podatki vrste %1 ne smejo biti prazni. - Element %1 is missing child element. Elementu %1 manjka podelement. - There is one IDREF value with no corresponding ID: %1. - + Obstaja ena vrednost IDREF brez ustreznega ID-ja: %1 - Loaded schema file is invalid. - + Naložena datoteka s shemo ni veljavna. - %1 contains invalid data. %1 vsebuje neveljavne podatke. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. - No schema defined for validation. - + Določene ni nobene sheme za potrjevanje. - No definition for element %1 available. Definicija za element %1 ni na voljo. - - - Specified type %1 is not known to the schema. - + Določena vrsta %1 shemi ni znana. - Element %1 is not defined in this scope. Element %1 v tem obsegu ni definiran. - Declaration for element %1 does not exist. Deklaracija elementa %1 ne obstaja. - Element %1 contains invalid content. Element %1 vsebuje neveljavno vsebino. - Element %1 is declared as abstract. Element %1 je deklariran kot abstrakten. - Element %1 is not nillable. - Attribute %1 contains invalid data: %2 Lastnost %1 vsebuje neveljavne podatke: %2 - Element contains content although it is nillable. - - Fixed value constrained not allowed if element is nillable. + Fixed value constraint not allowed if element is nillable. + + + + Element %1 cannot contain other elements, as it has a fixed content. - Specified type %1 is not validly substitutable with element type %2. - Complex type %1 is not allowed to be abstract. Kompleksna vrsta %1 ne sme biti abstraktna. - Element %1 contains not allowed attributes. Element %1 vsebuje nedovoljene lastnosti. - - Element %1 contains not allowed child element. Element %1 vsebuje nedovoljen podelement. - - Content of element %1 does not match its type definition: %2. Vsebina elementa %1 ne ustreza zanj določeni vrsti: %2. - - - Content of element %1 does not match defined value constraint. - + Vsebina elementa %1 ne ustreza določeni omejitvi vrednosti. - Element %1 contains not allowed child content. Element %1 vsebuje nedovoljeno vsebino v podelementih. - Element %1 contains not allowed text content. Element %1 vsebuje nedovoljeno besedilno vsebino. - - Element %1 can not contain other elements, as it has a fixed content. - Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino. - - - Element %1 is missing required attribute %2. Elementu %1 manjka obvezna lastnost %2. - Attribute %1 does not match the attribute wildcard. - + Lastnost %1 ne ustreza vzorcu za lastnost. - Declaration for attribute %1 does not exist. Deklaracija lastnosti %1 ne obstaja. - Element %1 contains two attributes of type %2. Element %1 vsebuje dve lastnosti vrste %2. - Attribute %1 contains invalid content. Lastnost %1 vsebuje neveljavno vsebino. - Element %1 contains unknown attribute %2. Element %1 vsebuje neznano lastnost %2. - - Content of attribute %1 does not match its type definition: %2. - + Vsebina lastnosti %1 ne ustreza zanjo določeni vrsti: %2. - - Content of attribute %1 does not match defined value constraint. - + Vsebina lastnosti %1 ne ustreza zanjo določeni omejitvi vrednosti. - Non-unique value found for constraint %1. - + Za omejitev %1 je bila najdena ne-edinstvena vrednost. - Key constraint %1 contains absent fields. - + Omejitev ključa %1 vsebuje manjkajoča polja. - Key constraint %1 contains references nillable element %2. - No referenced value found for key reference %1. - More than one value found for field %1. Za polje %1 je bila najdena več kot ena vrednost. - Field %1 has no simple type. Polje %1 nima preproste vrste. - ID value '%1' is not unique. Vrednost ID »%1« ni edinstvena. - '%1' attribute contains invalid QName content: %2. Lastnost »%1« vsebuje neveljavno vsebino QName: %2. + + + + + Remaining move time + QWebPage~|Media controller element + Preostali čas filma + - attribute group %1 contains attribute %2 twice + QtXmlPatterns~| skupina lastnosti %1 dvakrat vsebuje lastnost %2 - complex type %1 contains attribute %2 twice + QtXmlPatterns~| kompleksna vrsta %1 dvakrat vsebuje lastnost %2 - element %1 exists twice with different types + QtXmlPatterns~| element %1 obstaja dvakrat, z različnima vrstama - can not process unknown element %1, expected elements are: %2 + QtXmlPatterns~| ni moč obdelati neznanega elementa %1, pričakovani elementi so: %2 - element %1 is not allowed in this scope, possible elements are: %2 + QtXmlPatterns~| element %1 v tem obsegu ni dovoljen, možni elementi so: %2 - child element is missing in that scope, possible child elements are: %1 + QtXmlPatterns~| v tem obsegu manjka podelement, možni podelementi so: %1 - document is not a XML schema + QtXmlPatterns~| dokument ni shema XML - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4 + QtXmlPatterns~| lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} ni vrednost vrste %4 - %1 attribute of %2 element contains invalid content: {%3} + QtXmlPatterns~| lastnost %1 elementa %2 vsebuje neveljavno vsebino: {%3} - %1 element is not allowed inside %2 element if %3 attribute is present + QtXmlPatterns~| element %1 znotraj elementa %2 ni dovoljen, če je prisotna lastnost %3 - %1 element has neither %2 attribute nor %3 child element + QtXmlPatterns~| element %1 nima niti lastnosti %2 niti podelementa %3 - %1 element with %2 child element must not have a %3 attribute + QtXmlPatterns~| element %1 s podelementom %2 ne sme imeti lastnosti %3 - %1 attribute of %2 element must be %3 or %4 + QtXmlPatterns~| lastnost %1 elementa %2 mora biti %3 ali %4 - %1 attribute of %2 element must have a value of %3 + QtXmlPatterns~| lastnost %1 elementa %2 mora imeti vrednost %3 - %1 attribute of %2 element must have a value of %3 or %4 + QtXmlPatterns~| lastnost %1 elementa %2 mora imeti vrednost %3 ali %4 - %1 element must not have %2 and %3 attribute together + QtXmlPatterns~| element %1 hkrati ne sme imeti lastnosti %2 in %3 - content of %1 attribute of %2 element must not be from namespace %3 + QtXmlPatterns~| vsebina lastnosti %1 elementa %2 ne sme biti iz imenskega prostora %3 - %1 attribute of %2 element must not be %3 + QtXmlPatterns~| lastnost %1 elementa %2 ne sme biti %3 - %1 element must have either %2 or %3 attribute + QtXmlPatterns~| element %1 mora imeti lastnost %2 ali %3 - %1 element requires either %2 or %3 attribute + QtXmlPatterns~| element %1 potrebuje vsaj lastnost %2 ali %3 - %1 element is not allowed in this context + QtXmlPatterns~| element %1 v tem kontekstu ni dovoljen - component with id %1 has been defined previously + QtXmlPatterns~| komponenta z ID-jem %1 je že bila definirana - element %1 already defined + QtXmlPatterns~| element %1 je že definiran - attribute %1 already defined + QtXmlPatterns~| lastnost %1 je že definirana - type %1 already defined + QtXmlPatterns~| vrsta %1 je že definirana - attribute group %1 already defined + QtXmlPatterns~| skupina lastnosti %1 je že definirana - element group %1 already defined + QtXmlPatterns~| skupina elementov %1 je že definirana - notation %1 already defined + QtXmlPatterns~| zapis %1 je že definiran - type of %1 element must be a simple type, %2 is not + QtXmlPatterns~| vrsta elementa %1 mora biti preprosta, %2 to ni - duplicated element names %1 in %2 element + QtXmlPatterns~| podvojeni imeni elementov %1 v elementu %2 - %1 is not valid according to %2 + QtXmlPatterns~| %1 glede na %2 ni veljaven - invalid QName content: %1 + QtXmlPatterns~| neveljavna vsebina QName: %1 - data of type %1 are not allowed to be empty + QtXmlPatterns~| podatki vrste %1 ne smejo biti prazni - element %1 is missing child element + QtXmlPatterns~| elementu %1 manjka podelement - %1 contains invalid data + QtXmlPatterns~| %1 vsebuje neveljavne podatke - no definition for element %1 available + QtXmlPatterns~| definicija za element %1 ni na voljo - element %1 is not defined in this scope + QtXmlPatterns~| element %1 v tem obsegu ni definiran - declaration for element %1 does not exist + QtXmlPatterns~| deklaracija elementa %1 ne obstaja - element %1 contains invalid content + QtXmlPatterns~| element %1 vsebuje neveljavno vsebino - element %1 is declared as abstract + QtXmlPatterns~| element %1 je deklariran kot abstrakten - complex type %1 is not allowed to be abstract + QtXmlPatterns~| kompleksna vrsta %1 ne sme biti abstraktna - element %1 contains not allowed attributes + QtXmlPatterns~| element %1 vsebuje nedovoljene lastnosti - element %1 contains not allowed child element + QtXmlPatterns~| element %1 vsebuje nedovoljen podelement - content of element %1 does not match its type definition: %2 + QtXmlPatterns~| vsebina elementa %1 ne ustreza zanj določeni vrsti: %2 - element %1 contains not allowed child content + QtXmlPatterns~| element %1 vsebuje nedovoljeno vsebino v podelementih - element %1 contains not allowed text content + QtXmlPatterns~| element %1 vsebuje nedovoljeno besedilno vsebino - element %1 can not contain other elements, as it has a fixed content + QtXmlPatterns~| element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino - element %1 is missing required attribute %2 + QtXmlPatterns~| elementu %1 manjka obvezna lastnost %2 - declaration for attribute %1 does not exist + QtXmlPatterns~| deklaracija lastnosti %1 ne obstaja - element %1 contains two attributes of type %2 + QtXmlPatterns~| element %1 vsebuje dve lastnosti vrste %2 - attribute %1 contains invalid content + QtXmlPatterns~| lastnost %1 vsebuje neveljavno vsebino - element %1 contains unknown attribute %2 + QtXmlPatterns~| element %1 vsebuje neznano lastnost %2 - more than one value found for field %1 + QtXmlPatterns~| za polje %1 je bila najdena več kot ena vrednost - field %1 has no simple type + QtXmlPatterns~| polje %1 nima preproste vrste - ID value '%1' is not unique + QtXmlPatterns~| Vrednost ID »%1« ni edinstvena - '%1' attribute contains invalid QName content: %2 + QtXmlPatterns~| Lastnost »%1« vsebuje neveljavno vsebino QName: %2 + + Cannot start playback. + +Check your Gstreamer installation and make sure you +have libgstreamer-plugins-base installed. + Phonon::Gstreamer::MediaObject| + Ni moč začeti predvajanja. + +Preverite namestitev GStreamerja in se prepričajte, +da je nameščen paket libgstreamer-plugins-base. + + + Frequency band, %1 Hz + Phonon::MMF::AudioEqualizer| + Frekvenčni pas, %1 Hz + + + audio equalizer + Phonon::MMF::EffectFactory| + izenačevalnik zvoka + + + Bass boost + Phonon::MMF::EffectFactory| + Ojačanje basov + + + Distance Attenuation + Phonon::MMF::EffectFactory| + Utišanje zaradi razdalje + + + Environmental Reverb + Phonon::MMF::EffectFactory| + Okoljsko odmevanje + + + Loudness + Phonon::MMF::EffectFactory| + Glasnost + + + Source Orientation + Phonon::MMF::EffectFactory| + Usmerjenost vira + + + Stereo Widening + Phonon::MMF::EffectFactory| + Razširitev sterea + + + Invalid hostname + QObject| + Neveljavno ime gostitelja + + + Operation not supported on %1 + QObject| + Dejanje na %1 ni podprto + + + Invalid URI: %1 + QObject| + Neveljaven URI: %1 + + + Socket error on %1: %2 + QObject| + Napaka vtičnice na %1: %2 + + + Remote host closed the connection prematurely on %1 + QObject| + Oddaljen gostitelj je predčasno prekinil povezavo na %1 + + + No host name given + QObject| + Podano ni bilo nobeno ime gostitelja + + + Private key does not certificate public key, %1 + QSslSocket| + Zasebni ključ ne potrjuje javnega ključa, %1 + + + No variable by name %1 exists + QtXmlPatterns| + Spremenljivka z imenom %1 ne obstaja + + + No value is available for the external variable by name %1. + QtXmlPatterns| + Za zunanjo spremenljivko z imenom %1 ni na voljo nobene vrednosti. + + + A template by name %1 has already been declared. + QtXmlPatterns| + Predloga z imenom %1 je že bila deklarirana. + + + The value of attribute %1 must of type %2, which %3 isn't. + QtXmlPatterns| + Vrednost lastnosti %1 mora biti vrste %2, %3 pa to ni. + + + A variable by name %1 has already been declared. + QtXmlPatterns| + Spremenljivka z imenom %1 je že bila deklarirana. + + + An argument by name %1 has already been declared. Every argument name must be unique. + QtXmlPatterns| + Argument z imenom %1 je že bil deklariran. Vsako ime argumenta mora biti edinstveno. + + + No function by name %1 is available. + QtXmlPatterns| + Na voljo ni nobene funkcije z imenom %1. + + + An attribute by name %1 has already appeared on this element. + QtXmlPatterns| + Atribut z imenom %1 se je v tem elementu že pojavil. + + + Component with id %1 has been defined previously. + QtXmlPatterns| + Komponenta z ID-jem %1 je že bila definirana. + + + Element %1 can not contain other elements, as it has a fixed content. + QtXmlPatterns| + Element %1 ne more vsebovati drugih elementov, ker ima fiksno vsebino. + -- cgit v0.12 From 2f72664836ca16ef257759108e27d5ec6b8995a1 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Wed, 11 Aug 2010 18:35:38 +0200 Subject: update Russian translations for Qt and tools Merge-request: 2445 Reviewed-by: Oswald Buddenhagen --- tools/linguist/phrasebooks/russian.qph | 16 +- translations/assistant_ru.ts | 355 ++--- translations/designer_ru.ts | 1380 +--------------- translations/linguist_ru.ts | 443 +----- translations/qt_help_ru.ts | 78 +- translations/qt_ru.ts | 2698 +------------------------------- translations/qtconfig_ru.ts | 177 --- translations/qvfb_ru.ts | 69 - 8 files changed, 305 insertions(+), 4911 deletions(-) diff --git a/tools/linguist/phrasebooks/russian.qph b/tools/linguist/phrasebooks/russian.qph index 750fda0..5876ee9 100644 --- a/tools/linguist/phrasebooks/russian.qph +++ b/tools/linguist/phrasebooks/russian.qph @@ -498,7 +498,7 @@ Next - Следующий + Далее object @@ -1070,7 +1070,7 @@ Next - Далее + Следующий tree view @@ -1204,4 +1204,16 @@ Permission denied Доступ запрещён + + Previous + Предыдущий + + + Next + Следующее + + + Previous + Предыдущее + diff --git a/translations/assistant_ru.ts b/translations/assistant_ru.ts index 5244483..f5ba461 100644 --- a/translations/assistant_ru.ts +++ b/translations/assistant_ru.ts @@ -4,7 +4,6 @@ AboutDialog - &Close &Закрыть @@ -12,19 +11,16 @@ AboutLabel - Warning Предупреждение - Unable to launch external application. Невозможно запустить внешнее приложение. - OK Закрыть @@ -32,17 +28,14 @@ Assistant - Error registering documentation file '%1': %2 Ошибка регистрации файла документации '%1': %2 - Error: %1 Ошибка: %1 - Could not register documentation file %1 @@ -55,12 +48,10 @@ Reason: %2 - Documentation successfully registered. Документация успешно зарегистрирована. - Could not unregister documentation file %1 @@ -73,27 +64,22 @@ Reason: %2 - Documentation successfully unregistered. Документация успешно дерегистрирована. - Error reading collection file '%1': %2. - Ошибка чтения файла коллекции справки '%1': %2. + Ошибка чтения файла коллекции справки '%1': %2. - Error creating collection file '%1': %2. - Ошибка создания файла коллекции справки '%1': %2. + Ошибка создания файла коллекции справки '%1': %2. - Error reading collection file '%1': %2 - Ошибка чтения файла коллекции справки '%1': %2 + Ошибка чтения файла коллекции справки '%1': %2 - Cannot load sqlite database driver! Не удалось загрузить драйвер баз данных sqlite! @@ -101,139 +87,229 @@ Reason: BookmarkDialog - Add Bookmark Добавление закладки - Bookmark: Закладка: - Add in Folder: Добавить в папку: - + + - New Folder Новая папка + + Rename Folder + Переименовать папку + BookmarkManager - Remove Удалить - You are going to delete a Folder, this will also<br>remove it's content. Are you sure to continue? Удаление папки приведёт к удалению её содержимого.<br>Желаете продолжить? - Add Bookmark... Добавить закладку... - Ctrl+D - Untitled Неозаглавлено - Manage Bookmarks... Управление закладками... - Delete Folder Удалить папку - Rename Folder Переименовать папку - Show Bookmark Открыть закладку - Show Bookmark in New Tab Открыть закладку в новой вкладке - Delete Bookmark Удалить закладку - Rename Bookmark Переименовать закладку + BookmarkManagerWidget + + Manage Bookmarks + Управление закладками + + + Search: + Поиск: + + + Remove + Удалить + + + Import and Backup + Резервное копирование + + + OK + ОК + + + Import... + Импорт... + + + Export... + Экспорт... + + + Open File + Открыть файл + + + Files (*.xbel) + Файлы (*.xbel) + + + Save File + Сохранить файл + + + Qt Assistant + Qt Assistant + + + Unable to save bookmarks. + Невозможно сохранитьзакладки. + + + You are goingto delete a Folder, this will also<br> remove it's content. Are you sure to continue? + Удаление папки приведёт к удалению её содержимого.<br>Желаете продолжить? + + + Delete Folder + Удалить папку + + + Rename Folder + Переименовать папку + + + Show Bookmark + Открыть закладку + + + Show Bookmark in New Tab + Открыть закладку в новой вкладке + + + Delete Bookmark + Удалить закладку + + + Rename Bookmark + Переименовать закладку + + + + BookmarkModel + + Name + Название + + + Address + Адрес + + + Bookmarks Menu + Меню закладок + + + + BookmarkWidget + + Bookmarks + Закладки + + + Filter: + Фильтр: + + + Add + Добавить + + + Remove + Удалить + + + CentralWidget - Add new page Открыть новую страницу - Close current page Закрыть текущую страницу - Print Document Печать документа - - unknown безымянная вкладка - Add New Page Открыть новую страницу - Close This Page Закрыть данную страницу - Close Other Pages Закрыть остальные страницы - Add Bookmark for this Page... Добавить закладку для этой страницы... - Search Поиск @@ -241,62 +317,50 @@ Reason: CmdLineParser - Unknown option: %1 Неизвестный параметр: %1 - Unknown widget: %1 Неизвестный виджет: %1 - The collection file '%1' does not exist. - Файл коллекции справки '%1' не существует. + Файл коллекции справки '%1' не существует. - Missing collection file. - Отсутствует файл коллекции справки. + Отсутствует файл коллекции справки. - Invalid URL '%1'. Некорректный URL '%1'. - Missing URL. Отсутствует URL. - Missing widget. Отсутствует виджет. - The Qt help file '%1' does not exist. Файл справки Qt '%1' не существует. - Missing help file. Отсутствует файл справки. - Missing filter argument. Отсутствует параметр фильтра. - Error Ошибка - Notice Замечание @@ -304,12 +368,10 @@ Reason: ContentWindow - Open Link Открыть ссылку - Open Link in New Tab Открыть ссылку в новой вкладке @@ -317,40 +379,52 @@ Reason: FilterNameDialogClass - Add Filter Name Добавление фильтра - Filter Name: Название фильтра: + FindWidget + + Previous + Предыдущее + + + Next + Следующее + + + Case Sensitive + Учитывать регистр символов + + + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Search wrapped + <img src=":/trolltech/assistant/images/wrap.png">&nbsp;Поиск с начала + + + FontPanel - Font Шрифт - &Writing system Система &письма - &Family &Шрифт - &Style &Начертание - &Point size &Размер @@ -358,30 +432,37 @@ Reason: HelpViewer - <title>about:blank</title> - <title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div> <title>Ошибка 404...</title><div align="center"><br><br><h1>Страница не найдена</h1><br><h3>'%1'</h3></div> + + Copy &Link Location + Копировать &адрес ссылки + + + Open Link in New Tab Ctrl+LMB + Открыть ссылку в новой вкладке Ctrl+LMB + + + Open Link in New Tab + Открыть ссылку в новой вкладке + IndexWindow - &Look for: &Искать: - Open Link Открыть ссылку - Open Link in New Tab Открыть ссылку в новой вкладке @@ -389,99 +470,76 @@ Reason: InstallDialog - - Install Documentation Установка документации - Downloading documentation info... Загрузка информации о документации... - Download canceled. Загрузка отменена. - - - Done. Готово. - The file %1 already exists. Do you want to overwrite it? Файл %1 уже существует. Желаете перезаписать его? - Unable to save the file %1: %2. Невозможно сохранить файл %1: %2. - Downloading %1... Загрузка %1... - - - Download failed: %1. Загрузка не удалась: %1. - Documentation info file is corrupt! Файл информации о документации повреждён! - Download failed: Downloaded file is corrupted. Загрузка не удалась: загруженный файл повреждён. - Installing documentation %1... Установка документации %1... - Error while installing documentation: %1 При установке документации возникла ошибка: %1 - Available Documentation: Доступная документация: - Install Установить - Cancel Отмена - Close Закрыть - Installation Path: Путь установки: - ... ... @@ -489,297 +547,234 @@ Reason: MainWindow - - Index Указатель - - Contents Содержание - - Bookmarks Закладки - - - Qt Assistant Qt Assistant - Looking for Qt Documentation... Поиск документации Qt... - &File &Файл - Page Set&up... Параметры &страницы... - Print Preview... Предпросмотр печати... - &Print... &Печать... - New &Tab Новая &вкладка - &Close Tab &Закрыть вкладку - &Quit В&ыход - CTRL+Q - &Edit &Правка - &Copy selected Text &Копировать выделенный текст - &Find in Text... П&оиск в тексте... - &Find &Поиск - Find &Next Найти &следующее - Find &Previous Найти &предыдущее - Preferences... Настройки... - &View &Вид - Zoom &in У&величить - Zoom &out У&меньшить - Normal &Size Нормальный р&азмер - Ctrl+0 - ALT+C - ALT+I - ALT+O - Search Поиск - ALT+S - &Go &Перейти - &Home &Домой - ALT+Home - &Back &Назад - &Forward &Вперёд - Sync with Table of Contents Синхронизировать с оглавлением - Sync Синхронизировать - Next Page Следующая страница - Ctrl+Alt+Right - Previous Page Предыдущая страница - Ctrl+Alt+Left - &Bookmarks &Закладки - Could not register file '%1': %2 Не удалось зарегистрировать файл '%1': %2 - &Help &Справка - About... О программе... - Navigation Toolbar Панель навигации - &Window &Окно - Zoom Масштаб - Minimize Свернуть - Ctrl+M - Toolbars Панели инструментов - Filter Toolbar Панель фильтров - Filtered by: Отфильтровано по: - Address Toolbar Панель адреса - Address: Адрес: - Could not find the associated content item. Не удалось найти элемент, связанный с содержанием. - About %1 О %1 - Updating search index Обновление поискового индекса @@ -787,48 +782,38 @@ Reason: PreferencesDialog - - Add Documentation Добавить документацию - Qt Compressed Help Files (*.qch) Сжатые файлы справки Qt (*.qch) - The namespace %1 is already registered! Пространство имён %1 уже зарегистрировано! - The specified file is not a valid Qt Help File! Указанный файл не является корректным файлом справки Qt! - Remove Documentation Удалить документацию - Some documents currently opened in Assistant reference the documentation you are attempting to remove. Removing the documentation will close those documents. Некоторые открытые в Qt Assistant документы ссылаются на документацию, которую вы пытаетесь удалить. Её удаление приведёт к закрытию этих документов. - Cancel Отмена - OK Удалить - Use custom settings Использовать индивидуальные настройки @@ -836,117 +821,94 @@ Reason: PreferencesDialogClass - Preferences Настройки - Fonts Шрифты - Font settings: Настройки шрифта: - Browser Обозреватель - Application Приложение - Filters Фильтры - Filter: Фильтр: - Attributes: Атрибуты: - 1 1 - Add Добавить - Remove Удалить - Documentation Документация - Registered Documentation: Зарегистрированная документация: - Add... Добавить... - Options Параметры - Homepage Стартовая страница - Current Page Текущая страница - Restore to default Страница по умолчанию - On help start: При запуске: - Show my home page Отобразить стартовую страницу - Show a blank page Отобразить пустую страницу - Show my tabs from last session Восстановить предыдущую сессиию - Blank Page Пустая страница @@ -954,12 +916,10 @@ Reason: RemoteControl - Debugging Remote Control Отладочное удалённое управление - Received Command: %1 %2 Получена команда: %1 %2 @@ -967,22 +927,18 @@ Reason: SearchWidget - &Copy &Копировать - Copy &Link Location Копировать &адрес ссылки - Open Link in New Tab Открыть ссылку в новой вкладке - Select All Выделить всё @@ -990,27 +946,22 @@ Reason: TopicChooser - Choose a topic for <b>%1</b>: Выберите раздел для <b>%1</b>: - Choose Topic Выбор раздела - &Topics &Разделы - &Display &Показать - &Close &Закрыть diff --git a/translations/designer_ru.ts b/translations/designer_ru.ts index 72f3532..89977b1 100644 --- a/translations/designer_ru.ts +++ b/translations/designer_ru.ts @@ -4,27 +4,22 @@ AbstractFindWidget - &Previous &Предыдущий - &Next &Следующий - &Case sensitive &Учитывать регистр - Whole &words Слова &целиком - <img src=":/trolltech/shared/images/wrap.png">&nbsp;Search wrapped <img src=":/trolltech/shared/images/wrap.png">&nbsp;Поиск с начала @@ -32,17 +27,14 @@ AddLinkDialog - Insert Link Вставить ссылку - Title: Заголовок: - URL: URL: @@ -50,7 +42,6 @@ AppFontDialog - Additional Fonts Дополнительные шрифты @@ -58,37 +49,30 @@ AppFontManager - '%1' is not a file. '%1' не является файлом. - The font file '%1' does not have read permissions. Файл шрифтов '%1' не доступен для чтения. - The font file '%1' is already loaded. Файл шрифтов '%1'уже загружен. - The font file '%1' could not be loaded. Файл шрифтов '%1' не может быть загружен. - '%1' is not a valid font id. '%1' не является корректным идентификатором шрифта. - There is no loaded font matching the id '%1'. Нет загруженного шрифта, соответствующего идентификатору '%1'. - The font '%1' (%2) could not be unloaded. Шрифт '%1' (%2) не может быть выгружен. @@ -96,52 +80,42 @@ AppFontWidget - Fonts Шрифты - Add font files Добавить файлы шрифтов - Remove current font file Удалить текущий файл шрифта - Remove all font files Удалить все файлы шрифтов - Add Font Files Добавить файлы шрифтов - Font files (*.ttf) Файлы шрифтов (*.ttf) - Error Adding Fonts Ошибка добавления шрифтов - Error Removing Fonts Ошибка удаления шрифтов - Remove Fonts Удалить шрифты - Would you like to remove all fonts? Желаете удалить все шрифты? @@ -149,12 +123,10 @@ AppearanceOptionsWidget - Form Форма - User Interface Mode Режим пользовательского интерфейса @@ -162,17 +134,14 @@ AssistantClient - Unable to send request: Assistant is not responding. Невозможно отправить запрос: Qt Assistant не отвечает. - The binary '%1' does not exist. Исполняемый файл '%1' не существует. - Unable to launch assistant (%1). Невозможно запустить Qt Assistant (%1). @@ -180,92 +149,74 @@ BrushPropertyManager - No brush Пустая - Solid Сплошная - Dense 1 Плотность 1 - Dense 2 Плотность 2 - Dense 3 Плотность 3 - Dense 4 Плотность 4 - Dense 5 Плотность 5 - Dense 6 Плотность 6 - Dense 7 Плотность 7 - Horizontal Горизонтальная - Vertical Вертикальная - Cross Крестообразная - Backward diagonal Обратная диагональ - Forward diagonal Диагональ - Crossing diagonal Пересекающиеся диагонали - Style Стиль - Color Цвет - [%1, %2] [%1, %2] @@ -273,350 +224,269 @@ Command - - Change signal Сменить сигнал - - Change slot Сменить слот - Change signal-slot connection Изменить соединение сигнал-слот - Change sender Сменить отправителя - Change receiver Сменить получателя - Create button group Создать группу кнопок - Break button group Разбить группу кнопок - Break button group '%1' Разбить группу кнопок '%1' - Add buttons to group Добавить кнопки в группу - - Add '%1' to '%2' Command description for adding buttons to a QButtonGroup Добавить '%1' в '%2' - Remove buttons from group Удалить кнопки из группы - Remove '%1' from '%2' Command description for removing buttons from a QButtonGroup Удалить '%1' из '%2' - Add connection Добавить соединение - Adjust connection Настроить соединение - Delete connections Удалить соединения - Change source Сменить источник - Change target Сменить приёмника - Morph %1/'%2' into %3 MorphWidgetCommand description Преобразовать %1/'%2' в %3 - Insert '%1' Вставить '%1' - Change Z-order of '%1' Изменить порядок удалённости '%1' - Raise '%1' Поднять '%1' - Lower '%1' Опустить '%1' - Delete '%1' Удалить '%1' - Reparent '%1' Сменить владельца у '%1' - Promote to custom widget Преобразовать в пользовательский виджет - Demote from custom widget Преобразовать из пользовательского виджета - Lay out using grid Скомпоновать, используя сетку - Lay out vertically Скомпоновать по вертикали - Lay out horizontally Скомпоновать по горизонтали - Break layout Разбить компоновку - Simplify Grid Layout Упрощённая компоновка по сетке - - - Move Page Переместить страницу - - - - Delete Page Удалить страницу - - Page Страница - page страница - - - - Insert Page Вставить страницу - Change Tab order Изменить последовательность переключений - Create Menu Bar Создать панель меню - Delete Menu Bar Удалить панель меню - Create Status Bar Создать строку состояния - Delete Status Bar Удалить строку состояния - Add Tool Bar Добавить панель инструментов - Add Dock Window Добавить прикрепляемое окно - Adjust Size of '%1' Подогнать размер '%1' - Change Form Layout Item Geometry Изменить геометрию элементов компоновки столбцами - Change Layout Item Geometry Изменить геометрию элементов компоновки - Delete Subwindow Удалить дочернее окно - Insert Subwindow Вставить дочернее окно - subwindow дочернее окно - Subwindow Дочернее окно - Change Table Contents Изменить содержимое таблицы - Change Tree Contents Изменить содержимое дерева - - Add action Добавить действие - - Remove action Удалить действие - Add menu Добавить меню - Remove menu Удалить меню - Create submenu Создать дочернее меню - Delete Tool Bar Удалить панель инструментов - Change layout of '%1' from %2 to %3 Изменить компоновку '%1' с %2 на %3 - Set action text Установить текст действия - Insert action Вставить действие - - Move action Переместить действие - Change Title Изменить заголовок - Insert Menu Вставить меню - Changed '%1' of '%2' Изменено '%1' у '%2' - Changed '%1' of %n objects Изменено '%1' у %n объекта @@ -625,12 +495,10 @@ - Reset '%1' of '%2' Восстановлено '%1' у '%2' - Reset '%1' of %n objects Восстановлено '%1' у %n объекта @@ -639,12 +507,10 @@ - Add dynamic property '%1' to '%2' Добавлено динамическое свойство '%1' '%2' - Add dynamic property '%1' to %n objects Добавлено динамическое свойство '%1' %n объекту @@ -653,12 +519,10 @@ - Remove dynamic property '%1' from '%2' Удалено динамическое свойство '%1' у '%2' - Remove dynamic property '%1' from %n objects Удалено динамическое свойство '%1' у %n объекта @@ -667,12 +531,10 @@ - Change script Изменить сценарий - Change signals/slots Изменить сигналы/слоты @@ -680,22 +542,18 @@ ConnectDialog - Configure Connection Настройка соединения - GroupBox GroupBox - Edit... Изменить... - Show signals and slots inherited from QWidget Показывать сигналы и слоты, унаследованные от QWidget @@ -703,17 +561,14 @@ ConnectionDelegate - <object> <объект> - <signal> <сигнал> - <slot> <слот> @@ -721,19 +576,16 @@ DPI_Chooser - Standard (96 x 96) Embedded device standard screen resolution Стандартное (96 x 96) - Greenphone (179 x 185) Embedded device screen resolution Greenphone (179 x 185) - High (192 x 192) Embedded device high definition screen resolution Высокое (192 x 192) @@ -742,89 +594,72 @@ Designer - Qt Designer Qt Designer - This file contains top level spacers.<br>They have <b>NOT</b> been saved into the form. Этот файл содержит верхнеуровневые разделители.<br>Они <b>НЕ</b> были сохранены в форме. - Perhaps you forgot to create a layout? Возможно, вы забыли создать компоновщик? - Invalid UI file: The root element <ui> is missing. Некорректный файл UI: Отсутствует корневой элемент <ui>. - An error has occurred while reading the UI file at line %1, column %2: %3 При чтении файла UI в строке %1 позиции %2 возникла ошибка: %3 - This file cannot be read because it was created using %1. Не удалось прочитать файл, так как он был создан с использованием %1. - This file was created using Designer from Qt-%1 and cannot be read. Не удалось прочитать файл, так как он был создан с использованием Designer из Qt-%1. - The converted file could not be read. Не удалось прочитать преобразованный файл. - This file was created using Designer from Qt-%1 and will be converted to a new form by Qt Designer. Этот файл был создан с использованием Designer из Qt-%1 и будет преобразован в новый формат. - The old form has not been touched, but you will have to save the form under a new name. Старая форма была изменена, но вы можете сохранить форму под новым именем. - This file was created using Designer from Qt-%1 and could not be read: %2 Не удалось прочитать файл, так как он был создан с использованием Designer из Qt-%1: %2 - Please run it through <b>uic3&nbsp;-convert</b> to convert it to Qt-4's ui format. Пожалуйста, пропустите его через <b>uic3&nbsp;-convert</b> для преобразования в формат ui для Qt-4. - This file cannot be read because the extra info extension failed to load. Не удалось прочитать файл, так как возникла ошибка при загрузке расширения дополнительной информации. - Custom Widgets Пользовательские виджеты - Promoted Widgets Преобразованные виджеты - Unable to launch %1. Невозможно запустить %1. - %1 timed out. %1 время ожидания истекло. @@ -832,12 +667,10 @@ DesignerMetaEnum - %1 is not a valid enumeration value of '%2'. %1 не является корректным перечислением типа '%2'. - '%1' could not be converted to an enumeration value of type '%2'. Не удалось преобразовать '%1' к значению перечисления '%2'. @@ -845,7 +678,6 @@ DesignerMetaFlags - '%1' could not be converted to a flag value of type '%2'. Не удалось преобразовать '%1' к флаговому значению типа '%2'. @@ -853,13 +685,11 @@ DeviceProfile - '%1' is not a number. Reading a number for an embedded device profile '%1' не является числом. - An invalid tag <%1> was encountered. Обнаружен некоррекнтый тэг <%1>. @@ -867,27 +697,22 @@ DeviceProfileDialog - &Family &Шрифт - &Point Size &Размер - Style Начертание - Device DPI DPI устройства - Name Название @@ -895,57 +720,46 @@ DeviceSkin - The image file '%1' could not be loaded. Не удалось загрузить файл изображения '%1'. - The skin directory '%1' does not contain a configuration file. Каталог '%1' не содержит файла настроек обложки. - The skin configuration file '%1' could not be opened. Не удалось открыть файл настроек обложки '%1'. - The skin configuration file '%1' could not be read: %2 Не удалось прочитать файл настроек обложки '%1': %2 - Syntax error: %1 Синтаксическая ошибка: %1 - The skin "up" image file '%1' does not exist. Отсутствует файл изображения "up" обложки '%1'. - The skin "down" image file '%1' does not exist. Отсутствует файл изображения "down" обложки '%1'. - The skin "closed" image file '%1' does not exist. Отсутствует файл изображения обложки "closed" '%1'. - The skin cursor image file '%1' does not exist. Отсутствует файл изображения курсора обложки '%1'. - Syntax error in area definition: %1 Синтаксическая ошибка в определении области: %1 - Mismatch in number of areas, expected %1, got %2. Несоответствие количества областей: ожидалось %1, найдено %2. @@ -953,7 +767,6 @@ EmbeddedOptionsControl - <html><table><tr><td><b>Font</b></td><td>%1, %2</td></tr><tr><td><b>Style</b></td><td>%3</td></tr><tr><td><b>Resolution</b></td><td>%4 x %5</td></tr></table></html> Format embedded device profile description <html><table><tr><td><b>Шрифт</b></td><td>%1, %2</td></tr><tr><td><b>Стиль</b></td><td>%3</td></tr><tr><td><b>Разрешение</b></td><td>%4 x %5</td></tr></table></html> @@ -962,13 +775,11 @@ EmbeddedOptionsPage - Embedded Design Tab in preferences dialog Оформление портативных устройств - Device Profiles EmbeddedOptionsControl group box" Профили устройств @@ -977,27 +788,22 @@ FontPanel - Font Шрифт - &Writing system Система &письма - &Family &Шрифт - &Style &Начертание - &Point size &Размер @@ -1005,22 +811,18 @@ FontPropertyManager - PreferDefault По умолчанию - NoAntialias Без сглаживания - PreferAntialias Сглаживание, если возможно - Antialiasing Сглаживание @@ -1028,43 +830,44 @@ FormBuilder - Invalid stretch value for '%1': '%2' - Parsing layout stretch values + Parsing layout stretch values +---------- +Parsing layout stretch values +---------- +Parsing layout stretch values Некорректный коэффициент растяжения для '%1': '%2' - Invalid minimum size for '%1': '%2' - Parsing grid layout minimum size values + Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values +---------- +Parsing grid layout minimum size values Некорректный минимальный размер для '%1': '%2' FormEditorOptionsPage - %1 % %1 % - Preview Zoom Масштаб предпросмотра - Default Zoom Масштаб по умолчанию - Forms Tab in preferences dialog Формы - Default Grid Сетка по умолчанию @@ -1072,37 +875,30 @@ FormLayoutRowDialog - Add Form Layout Row Добавление строки компоновщика формы - &Label text: Текст &метки: - Field &type: &Тип поля: - &Field name: Имя п&оля: - &Buddy: П&артнёр: - &Row: &Строка: - Label &name: Имя м&етки: @@ -1110,12 +906,10 @@ FormWindow - Unexpected element <%1> Неожиданный элемент <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Ошибка вставки содержимого из буфера обмена в строке %1, позиции %2: %3 @@ -1123,62 +917,50 @@ FormWindowSettings - Form Settings Настройки формы - Layout &Default Компоновка по &умолчанию - &Spacing: &Отступ: - &Margin: &Границы: - &Layout Function &Функция компоновки - Ma&rgin: Г&раницы: - Spa&cing: О&тступ: - &Author &Автор - &Include Hints &Подключить подсказки - &Pixmap Function &Загрузчик изображений - Grid Сетка - Embedded Design Оформление портативных устройств @@ -1186,7 +968,6 @@ IconSelector - All Pixmaps ( Растровые изображения ( @@ -1194,7 +975,6 @@ ItemPropertyBrowser - XX Icon Selected off Sample string to determinate the width for the first column of the list item property browser XX Пикт Выделена откл @@ -1203,33 +983,27 @@ MainWindowBase - Main Not currently used (main tool bar) Главное - File Файл - Edit Правка - Tools Инструменты - Form Форма - Qt Designer Qt Designer @@ -1237,52 +1011,42 @@ NewForm - C&reate &Создать - Recent Последние - &Close &Закрыть - &Open... &Открыть... - &Recent Forms &Последние формы - Read error Ошибка чтения - New Form Новая форма - Show this Dialog on Startup Показывать диалог при старте - A temporary form file could not be created in %1. Временный файл формы не может быть создан в %1. - The temporary form file %1 could not be written. Временный файл формы %1 не может быть записан. @@ -1290,22 +1054,18 @@ ObjectInspectorModel - Object Объект - Class Класс - separator разделитель - <noname> <без имени> @@ -1313,12 +1073,10 @@ ObjectNameDialog - Change Object Name Изменить имя объекта - Object Name Имя объекта @@ -1326,12 +1084,10 @@ PluginDialog - Plugin Information Информация о модуле - 1 1 @@ -1339,7 +1095,6 @@ PreferencesDialog - Preferences Настройки @@ -1347,32 +1102,26 @@ PreviewConfigurationWidget - Form Форма - Print/Preview Configuration Настройка печати/предпросмотра - Style Стиль - Style sheet Таблица стилей - ... ... - Device skin Обложка устройства @@ -1380,7 +1129,6 @@ PromotionModel - Not used Usage of promoted widgets Не используется @@ -1389,8 +1137,6 @@ Q3WizardContainer - - Page Страница @@ -1398,59 +1144,48 @@ QAbstractFormBuilder - Unexpected element <%1> Неожиданный элемент <%1> - An error has occurred while reading the UI file at line %1, column %2: %3 Возникла ошибка при чтении файла UI в строке %1 позиции %2: %3 - Invalid UI file: The root element <ui> is missing. Некорректный файл UI: отсутствует корневой элемент <ui>. - The creation of a widget of the class '%1' failed. Не удалось создание виджета класса '%1'. - Attempt to add child that is not of class QWizardPage to QWizard. Попытка добавить в QWizard дочерний виджет, который не является классом QWizardPage. - Attempt to add a layout to a widget '%1' (%2) which already has a layout of non-box type %3. This indicates an inconsistency in the ui-file. Попытка добавить компоновщик виджету '%1' (%2), у которого уже имеется компоновщик типа %3. Это указывает на некорректность файла UI. - Empty widget item in %1 '%2'. Пустой элемент виджета в %1 '%2'. - Flags property are not supported yet. Флаговые свойства еще не поддерживаются. - While applying tab stops: The widget '%1' could not be found. При применении позиций табуляции: не удалось найти виджет '%1'. - Invalid QButtonGroup reference '%1' referenced by '%2'. '%2' содержит некорректную ссылку на QButtonGroup '%1'. - This version of the uitools library is linked without script support. Данная версия библиотеки uitools собрана без поддержки сценариев. @@ -1458,12 +1193,10 @@ This indicates an inconsistency in the ui-file. QAxWidgetPlugin - ActiveX control Элемент управления ActiveX - ActiveX control widget Виджет элемента управления ActiveX @@ -1471,22 +1204,18 @@ This indicates an inconsistency in the ui-file. QAxWidgetTaskMenu - Set Control Установить элемент управления - Reset Control Удалить элемент управления - Licensed Control Лицензионный элемент управления - The control requires a design-time license Компонент требует лицензию периода разработки @@ -1494,68 +1223,55 @@ This indicates an inconsistency in the ui-file. QCoreApplication - %1 is not a promoted class. %1 не является преобразованным классом. - The base class %1 is invalid. Неверный базовый класс %1. - The class %1 already exists. Класс %1 уже существует. - Promoted Widgets Преобразованные виджеты - The class %1 cannot be removed Нельзя удалить класс %1 - The class %1 cannot be removed because it is still referenced. Нельзя удалить класс %1, так как на него ещё есть ссылки. - The class %1 cannot be renamed Нельзя переименовать класс %1 - The class %1 cannot be renamed to an empty name. Нельзя дать классу %1 пустое имя. - There is already a class named %1. Уже есть класс с именем %1. - Cannot set an empty include file. перевод близко к тексту - буквальный совсем глаз режет Пустое имя у подключаемого файла не допустимо. - Exception at line %1: %2 Исключение в строке %1: %2 - Unknown error Неизвестная ошибка - An error occurred while running the script for %1: %2 Script: %3 При выполнении сценария %1 возникла ошибка: %2 @@ -1565,17 +1281,14 @@ Script: %3 QDesigner - %1 - warning %1 - предупреждение - Qt Designer Qt Designer - This application cannot be used for the Console edition of Qt Это приложение не может быть использовано для консольной версии Qt @@ -1583,248 +1296,194 @@ Script: %3 QDesignerActions - Saved %1. Сохранено %1. - Edit Widgets Изменение виджетов - &Quit &Выход - &Minimize &Свернуть - Bring All to Front Перенести все назад - Preferences... Настройки... - Clear &Menu Очистить &меню - CTRL+SHIFT+S - CTRL+R - CTRL+M - Qt Designer &Help &Справка по Qt Designer - Current Widget Help Справка по виджету - What's New in Qt Designer? Что нового в Qt Designer? - About Plugins О модулях - - About Qt Designer О Qt Designer - About Qt О Qt - - Open Form Открыть форму - - - Designer UI files (*.%1);;All Files (*) UI файлы Qt Designer (*.%1);;Все файлы (*) - %1 already exists. Do you want to replace it? %1 уже существует. Хотите заменить его? - Additional Fonts... Дополнительные шрифты... - &Recent Forms &Последние формы - Designer Qt Designer - Feature not implemented yet! Возможность ещё не реализована! - Read error Ошиька чтения - %1 Do you want to update the file location or generate a new form? %1 Вы хотите обновить расположение файла или генерировать новую форму? - &Update &Обновить - &New Form &Новая форма - - Save Form? Сохранить форму? - Could not open file Невозможно открыть файл - Select New File Выбрать новый файл - Could not write file Невозможно записать файл - &Close Preview &Закрыть предпросмотр - &New... &Новый... - &Open... &Открыть... - &Save &Сохранить - Save &As... Сохранить &как... - Save A&ll Сохранить &все - Save As &Template... Сохранить как &шаблон... - - &Close &Закрыть - Save &Image... Сохранить &Изображение... - &Print... &Печать... - View &Code... Показать &код... - ALT+CTRL+S - - Save Form As Сохранить форму как - Preview failed Ошибка предпросмотра - Code generation failed Ошибка генерации кода - The file %1 could not be opened. Reason: %2 Would you like to retry or select a different file? @@ -1833,7 +1492,6 @@ Would you like to retry or select a different file? Вы хотите повторить или выбрать другой файл? - It was not possible to write the entire file %1 to disk. Reason:%2 Would you like to retry? @@ -1842,55 +1500,42 @@ Would you like to retry? Желаете повторить? - - Assistant Qt Assistant - - The backup file %1 could not be written. Не удалось записать файл резервной копии %1. - The backup directory %1 could not be created. Не удалось создать каталог резервных копий %1. - The temporary backup directory %1 could not be created. Не удалось создать временный каталог резервных копий %1. - Image files (*.%1) Файлы изображений (*.%1) - - Save Image Сохранить изображение - Saved image %1. Сохранить изображение %1. - The file %1 could not be written. Файл %1 не может быть записан. - Please close all forms to enable the loading of additional fonts. Пожалуйста закройте все формы, чтобы разрешить загрузку дополнительных шрифтов. - Printed %1. Распечатано %1. @@ -1898,7 +1543,6 @@ Would you like to retry? QDesignerAppearanceOptionsPage - Appearance Tab in preferences dialog Оформление @@ -1907,17 +1551,14 @@ Would you like to retry? QDesignerAppearanceOptionsWidget - Docked Window Всё в одном окне верхнего уровня - Multiple Top-Level Windows Множество окон верхнего уровня - Toolwindow Font Шрифт окна инструментов @@ -1925,22 +1566,18 @@ Would you like to retry? QDesignerAxWidget - Reset control Сбросить элемент управления - Set control Установить элемент управления - Control loaded Элемент управления загружен - A COM exception occurred when executing a meta call of type %1, index %2 of "%3". Возникло исключение COM при выполнении мета-вызова типа %1, индекс %2 "%3". @@ -1948,17 +1585,14 @@ Would you like to retry? QDesignerFormBuilder - Script errors occurred: Возникла ошибка сценария: - The preview failed to build. Не удалось создать предпросмотр. - Designer Qt Designer @@ -1966,22 +1600,18 @@ Would you like to retry? QDesignerFormWindow - %1 - %2[*] %1 - %2[*] - Save Form? Сохранить форму? - Do you want to save the changes to this document before closing? Документ был изменен, хотите сохранить изменения? - If you don't save, your changes will be lost. Если вы не сохраните, ваши изменения будут потеряны. @@ -1989,38 +1619,30 @@ Would you like to retry? QDesignerMenu - Type Here Пишите здесь - Add Separator Добавить разделитель - Insert separator Вставить разделитель - Remove separator Удалить разделитель - Remove action '%1' Удалить действие '%1' - - Add separator Добавить разделитель - Insert action Вставить действие @@ -2028,22 +1650,18 @@ Would you like to retry? QDesignerMenuBar - Type Here Пишите здесь - Remove Menu '%1' Удалить меню '%1' - Remove Menu Bar Удалить панель меню - Menu Меню @@ -2051,37 +1669,30 @@ Would you like to retry? QDesignerPluginManager - An XML error was encountered when parsing the XML of the custom widget %1: %2 Обнаружена ошибка XML при разборе XML пользовательского виджета %1: %2 - A required attribute ('%1') is missing. Отсутствует необходимый атрибут ('%1'). - An invalid property specification ('%1') was encountered. Supported types: %2 Обнаружена неверная спецификация ('%1') свойства. Поддерживаются типы: %2 - '%1' is not a valid string property specification. '%1' не является корректной спецификацией строкового свойства. - The XML of the custom widget %1 does not contain any of the elements <widget> or <ui>. XML пользовательского виджета %1 не содержит элементов <widget> и <ui>. - The class attribute for the class %1 is missing. Отсутствует атрибут для класса %1. - The class attribute for the class %1 does not match the class name %2. Атрибут для класса %1 не совпадает с именем класса %2. @@ -2089,7 +1700,6 @@ Would you like to retry? QDesignerPropertySheet - Dynamic Properties Динамические свойства @@ -2097,31 +1707,26 @@ Would you like to retry? QDesignerResource - The layout type '%1' is not supported, defaulting to grid. Компоновка типа '%1' не поддерживается, заменена на компоновку сеткой. - The container extension of the widget '%1' (%2) returned a widget not managed by Designer '%3' (%4) when queried for page #%5. Container pages should only be added by specifying them in XML returned by the domXml() method of the custom widget. Контейнерное расширение виджета '%1' (%2) возвратило виджет, который не управляется Qt Designer '%3' (%4), при запросе страницы №%5. Страницы контейнера должны быть добавлены указанием их в XML, который возвращается методом domXml() пользовательского виджета. - Unexpected element <%1> Parsing clipboard contents Неожиданный элемент <%1> - Error while pasting clipboard contents at line %1, column %2: %3 Parsing clipboard contents Ошибка вставки содержимого буфера обмена в строку %1, позицию %2: %3 - Error while pasting clipboard contents: The root element <ui> is missing. Parsing clipboard contents Ошибка вставки содержимого буфера обмена: отсутствует корневой элемент <ui>. @@ -2130,12 +1735,10 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerSharedSettings - The template path %1 could not be created. Не удалось создать временный путь %1. - An error has been encountered while parsing device profile XML: %1 Обнаружена ошибка при разборе XML профиля устройства: %1 @@ -2143,32 +1746,26 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerToolWindow - Property Editor Редактор свойств - Action Editor Редактор действий - Object Inspector Инспектор объектов - Resource Browser Обозреватель ресурсов - Signal/Slot Editor Редактор Сигналов/Слотов - Widget Box Панель виджетов @@ -2176,47 +1773,38 @@ Container pages should only be added by specifying them in XML returned by the d QDesignerWorkbench - &File &Файл - F&orm Ф&орма - Preview in Предпросмотр в - &Window &Окно - &Help &Справка - Edit Правка - Toolbars Панель инструментов - Save Forms? Сохранить форму? - There are %n forms with unsaved changes. Do you want to review these changes before quitting? Имеется %n форма с несохранёнными изменениями. Желаете просмотреть изменения перед выходом? @@ -2225,52 +1813,42 @@ Container pages should only be added by specifying them in XML returned by the d - &View &Вид - &Settings &Настройки - Widget Box Панель виджетов - If you do not review your documents, all your changes will be lost. Если не просматривать изменения, все изменения будут потеряны. - Discard Changes Отменить изменения - Review Changes Показать изменения - Backup Information Информация о резервированых копиях - The last session of Designer was not terminated correctly. Backup files were left behind. Do you want to load them? Последняя сессия Qt Designer не была завершена корректно. Остались резервные копии файлов. Желаете загрузить их? - The file <b>%1</b> could not be opened. Не удалось открыть файл <b>%1</b>. - The file <b>%1</b> is not a valid Designer UI file. Файл <b>%1</b> не является корректным UI файлом Qt Designer. @@ -2278,53 +1856,47 @@ Container pages should only be added by specifying them in XML returned by the d QFormBuilder - An empty class name was passed on to %1 (object name: '%2'). - Empty class name passed to widget factory method + Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method +---------- +Empty class name passed to widget factory method Методу %1 (объекта '%2') было передано пустое имя класса. - QFormBuilder was unable to create a custom widget of the class '%1'; defaulting to base class '%2'. QFormBuilder не смог создать пользовательский виджет класса '%1'; был создан базовый класс '%2'. - QFormBuilder was unable to create a widget of the class '%1'. QFormBuilder не смог создать пользовательский виджет класса '%1'. - The layout type `%1' is not supported. Компоновка типа '%1' не поддерживается. - The set-type property %1 could not be read. Не удалось прочитать свойство %1 множественного типа. - The enumeration-type property %1 could not be read. Не удалось прочитать свойство %1 перечисляемого типа. - Reading properties of the type %1 is not supported yet. Чтение свойств типа %1 ещё не поддерживается. - The property %1 could not be written. The type %2 is not supported yet. Не удалось записать свойство %1. Тип %2 ещё не поддерживается. - The enumeration-value '%1' is invalid. The default value '%2' will be used instead. Значение '%1' перечисляемого типа некорректно. Будет использовано значение по умолчанию '%2'. - The flag-value '%1' is invalid. Zero will be used instead. Значение флага '%1' перечисляемого типа некорректно. Будет использовано значение '0' (нуль). @@ -2332,48 +1904,38 @@ Container pages should only be added by specifying them in XML returned by the d QStackedWidgetEventFilter - Previous Page Предыдущая страница - Next Page Следующая страница - Delete Удалить - Before Current Page Перед текущей страницей - After Current Page После текущей страницы - Change Page Order... Изменить порядок страниц... - Change Page Order Изменить порядок страниц - Page %1 of %2 Страница %1 из %2 - - Insert Page Вставить страницу @@ -2381,12 +1943,10 @@ Container pages should only be added by specifying them in XML returned by the d QStackedWidgetPreviewEventFilter - Go to previous page of %1 '%2' (%3/%4). Перейти к предыдущей странице из %1 '%2' (%3/%4). - Go to next page of %1 '%2' (%3/%4). Перейти к следующей странице из %1 '%2' (%3/%4). @@ -2394,28 +1954,22 @@ Container pages should only be added by specifying them in XML returned by the d QTabWidgetEventFilter - Delete Удалить - Before Current Page Перед текущей страницей - After Current Page После текущей страницы - Page %1 of %2 Страница %1 из %2 - - Insert Page Вставить страницу @@ -2423,37 +1977,30 @@ Container pages should only be added by specifying them in XML returned by the d QToolBoxHelper - Delete Page Удалить страницу - Before Current Page Перед текущей страницей - After Current Page После текущей страницы - Change Page Order... Изменить порядок страниц... - Change Page Order Изменить порядок страниц - Page %1 of %2 Страница %1 из %2 - Insert Page Вставить страницу @@ -2461,15 +2008,10 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolEdit - - - True Вкл. - - False Выкл. @@ -2477,12 +2019,10 @@ Container pages should only be added by specifying them in XML returned by the d QtBoolPropertyManager - True Вкл. - False Выкл. @@ -2490,7 +2030,6 @@ Container pages should only be added by specifying them in XML returned by the d QtCharEdit - Clear Char Стереть символ @@ -2498,7 +2037,6 @@ Container pages should only be added by specifying them in XML returned by the d QtColorEditWidget - ... ... @@ -2506,22 +2044,18 @@ Container pages should only be added by specifying them in XML returned by the d QtColorPropertyManager - Red Красный - Green Зелёный - Blue Синий - Alpha Альфа @@ -2529,97 +2063,78 @@ Container pages should only be added by specifying them in XML returned by the d QtCursorDatabase - Arrow Arrow - Up Arrow Up Arrow - Cross Cross - Wait Wait - IBeam IBeam - Size Vertical Size Vertical - Size Horizontal Size Horizontal - Size Backslash Size Backslash - Size Slash Size Slash - Size All Size All - Blank Blank - Split Vertical Split Vertical - Split Horizontal Split Horizontal - Pointing Hand Pointing Hand - Forbidden Forbidden - Open Hand Open Hand - Closed Hand Closed Hand - What's This What's This - Busy Busy @@ -2627,12 +2142,10 @@ Container pages should only be added by specifying them in XML returned by the d QtFontEditWidget - ... ... - Select Font Выбрать шрифт @@ -2640,37 +2153,30 @@ Container pages should only be added by specifying them in XML returned by the d QtFontPropertyManager - Family Шрифт - Point Size Размер - Bold Жирный - Italic Курсив - Underline Подчёркнутый - Strikeout Зачёркнутый - Kerning Интервал @@ -2678,7 +2184,6 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientDialog - Edit Gradient Правка градиента @@ -2686,304 +2191,242 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientEditor - Start X X начала - Start Y Y начала - Final X X конца - Final Y Y конца - - Central X X центра - - Central Y Y центра - Focal X X фокуса - Focal Y Y фокуса - Radius Радиус - Angle Угол - Linear Линейный - Radial Радиальный - Conical Конический - Pad Равномерная - Repeat Цикличная - Reflect Зеркальная - Form Форма - Gradient Editor Редактор градиента - This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop. Эта область отображает предварительный вариант настраиваемого градиента. Также она позволяет менять с помощью перетаскивания характерные для градиента параметры, такие как: начальная и конечная точки, радиус и пр. - 1 1 - 2 2 - 3 3 - 4 4 - 5 5 - Gradient Stops Editor Редактор опорных точек градиента - This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions. Эта область позволяет редактировать опорные точки градиента. Двойной щелчок на существующей точке создаст её копию. Двойной клик вне существующей точки создаст новую. Точки можно перемещать путем удерживания левой кнопки. По правой кнопке можно получить контекстное меню дополнительных действий. - Zoom Масштаб - Reset Zoom 100% - Position Положение - Hue Оттенок - H H - Saturation Насыщенность - S S - Sat Насыщение - Value Значение - V V - Val Значение - Alpha Альфа - A A - Type Тип - Spread Заливка - Color Цвет - Current stop's color Цвет текущей точки - Show HSV specification Настройки в виде HSV - HSV HSV - Show RGB specification Настройки в виде RGB - RGB RGB - Current stop's position Положение текущей точки - % % - Zoom In Увеличить - Zoom Out Уменьшить - Toggle details extension Показать/скрыть детальные настройки - > > - Linear Type Линейный тип - ... ... - Radial Type Радиальный тип - Conical Type Конический тип - Pad Spread Равномерная заливка - Repeat Spread Цикличная заливка - Reflect Spread Зеркальная заливка @@ -2991,37 +2434,30 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientStopsWidget - New Stop Новая точка - Delete Удалить - Flip All Отобразить зеркально - Select All Выделить всё - Zoom In Увеличить - Zoom Out Уменьшить - Reset Zoom Сбросить масштаб @@ -3029,46 +2465,34 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientView - Grad Градиент - Remove Gradient Удалить градиент - Are you sure you want to remove the selected gradient? Вы действительно желаете удалить выбранный градиент? - - New... Новый... - - Edit... Правка... - - Rename Переименовать - - Remove Удалить - Gradient View Просмотр градиента @@ -3076,8 +2500,6 @@ Container pages should only be added by specifying them in XML returned by the d QtGradientViewDialog - - Select Gradient Выбрать градиент @@ -3085,7 +2507,6 @@ Container pages should only be added by specifying them in XML returned by the d QtKeySequenceEdit - Clear Shortcut Удалить комбинацию горячих клавиш @@ -3093,17 +2514,14 @@ Container pages should only be added by specifying them in XML returned by the d QtLocalePropertyManager - %1, %2 %1, %2 - Language Язык - Country Страна @@ -3111,17 +2529,14 @@ Container pages should only be added by specifying them in XML returned by the d QtPointFPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3129,17 +2544,14 @@ Container pages should only be added by specifying them in XML returned by the d QtPointPropertyManager - (%1, %2) (%1, %2) - X X - Y Y @@ -3147,12 +2559,10 @@ Container pages should only be added by specifying them in XML returned by the d QtPropertyBrowserUtils - [%1, %2, %3] (%4) [%1, %2, %3] (%4) - [%1, %2] [%1, %2] @@ -3160,27 +2570,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectFPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Ширина - Height Высота @@ -3188,27 +2593,22 @@ Container pages should only be added by specifying them in XML returned by the d QtRectPropertyManager - [(%1, %2), %3 x %4] [(%1, %2), %3 x %4] - X X - Y Y - Width Ширина - Height Высота @@ -3216,128 +2616,98 @@ Container pages should only be added by specifying them in XML returned by the d QtResourceEditorDialog - %1 already exists. Do you want to replace it? %1 уже существует. Хотите заменить его? - The file does not appear to be a resource file; element '%1' was found where '%2' was expected. Похоже, файл не является файлом ресурсов, так как вместо элемента '%2' стоит '%1'. - %1 [read-only] %1 [только для чтения] - - %1 [missing] %1 [отсутствует] - <no prefix> <без префикса> - - New Resource File Новый файл ресурсов - - Resource files (*.qrc) Файл ресурсов (*.qrc) - Import Resource File Импортировать файл ресурсов - newPrefix newPrefix - <p><b>Warning:</b> The file</p><p>%1</p><p>is outside of the current resource file's parent directory.</p> <p><b>Предупреждение:</b> Файл</p><p>%1</p><p>находится за пределами каталога текущего файла ресурсов.</p> - <p>To resolve the issue, press:</p><table><tr><th align="left">Copy</th><td>to copy the file to the resource file's parent directory.</td></tr><tr><th align="left">Copy As...</th><td>to copy the file into a subdirectory of the resource file's parent directory.</td></tr><tr><th align="left">Keep</th><td>to use its current location.</td></tr></table> <p>Для решения нажмите:</p><table><tr><th align="left">Копировать</th><td>, чтобы скопировать в каталог файла ресурсов.</td></tr><tr><th align="left">Копировать как...</th><td>, чтобы скопировать в подкаталог каталога файла ресурсов.</td></tr><tr><th align="left">Оставить</th><td>, чтобы использовать текущее размещение.</td></tr></table> - Add Files Добавить файлы - Incorrect Path Неверный путь - - - - Copy Копировать - Copy As... Копировать как... - Keep Оставить - Skip Пропустить - Clone Prefix Приставка при клонировании - Enter the suffix which you want to add to the names of the cloned files. This could for example be a language extension like "_de". Введите окончание, которое нужно добавлять к именам клонируемых файлов. Это может быть, например, языковое расширение, вроде "_ru". - - Copy As Копировать как - <p>The selected file:</p><p>%1</p><p>is outside of the current resource file's directory:</p><p>%2</p><p>Please select another path within this directory.<p> <p>Выбранный файл:</p><p>%1</p><p>находится вне каталога текущего файла ресурсов:</p><p>%2</p><p>Пожалуйста, выберите путь внутри этого каталога.<p> - Could not overwrite %1. Не удалось перезаписать %1. - Could not copy %1 to @@ -3348,153 +2718,120 @@ to %2 - A parse error occurred at line %1, column %2 of %3: %4 Возникла ошибка разбора в строке %1 позиции %2 из %3: %4 - Save Resource File Сохранение файла ресурсов - Could not write %1: %2 Не удалось записать %1: %2 - Edit Resources Правка ресурсов - New... Новый... - Open... Открыть... - Open Resource File Открыть файл ресурсов - - Remove Удалить - - Move Up Поднять - - Move Down Опустить - - Add Prefix Добавить приставку - Add Files... Добавить файлы... - Change Prefix Сменить приставку - Change Language Сменить язык - Change Alias Сменить псевдоним - Clone Prefix... Приставка при клонировании... - Prefix / Path Приставка / Путь - Language / Alias Язык / Псевдоним - <html><p><b>Warning:</b> There have been problems while reloading the resources:</p><pre>%1</pre></html> <html><p><b>Предупреждение:</b> Возникли проблемы при перезагрузке ресурсов:</p><pre>%1</pre></html> - Resource Warning Предупреждение - Dialog Диалог - New File Новый файл - N N - Remove File Удалить файл - R R - I I - New Resource Новый ресурс - A A - Remove Resource or File Удалить ресурс или файл @@ -3502,24 +2839,20 @@ to QtResourceView - Size: %1 x %2 %3 Размер: %1 x %2 %3 - Edit Resources... Изменить ресурсы... - Reload Перезагрузить - Copy Path Скопировать путь @@ -3527,7 +2860,6 @@ to QtResourceViewDialog - Select Resource Выбрать ресурс @@ -3535,17 +2867,14 @@ to QtSizeFPropertyManager - %1 x %2 %1 x %2 - Width Ширина - Height Высота @@ -3553,33 +2882,26 @@ to QtSizePolicyPropertyManager - - <Invalid> <Неверный> - [%1, %2, %3, %4] [%1, %2, %3, %4] - Horizontal Policy Горизонтальная политика - Vertical Policy Вертикальная политика - Horizontal Stretch Горизонтальное растяжение - Vertical Stretch Вертикальное растяжение @@ -3587,17 +2909,14 @@ to QtSizePropertyManager - %1 x %2 %1 x %2 - Width Ширина - Height Высота @@ -3605,107 +2924,86 @@ to QtToolBarDialog - Custom Toolbar Пользовательская панель инструментов - < S E P A R A T O R > < Р А З Д Е Л И Т Е Л Ь > - Customize Toolbars Настройка панелей инструментов - 1 1 - Actions Действия - Toolbars Панель инструментов - Add new toolbar Добавить новую панель инструментов - New Новая - Remove selected toolbar Удалить выбранную панель инструментов - Remove Удалить - Rename toolbar Переименовать панель инструментов - Rename Переименовать - Move action up Переместить действие вверх - Up Вверх - Remove action from toolbar Удалить действие из панели инструментов - <- <- - Add action to toolbar Добавить действие на панель инструментов - -> -> - Move action down Переместить действие вниз - Down Вниз - Current Toolbar Actions Текущие действия панели инструментов @@ -3713,12 +3011,10 @@ to QtTreePropertyBrowser - Property Свойство - Value Значение @@ -3726,64 +3022,52 @@ to SaveFormAsTemplate - Add path... Добавить путь... - Template Exists Шаблон существует - A template with the name %1 already exists. Do you want overwrite the template? Шаблон с именем %1 уже существует. Желаете заменить шаблон? - Overwrite Template Заменить шаблон - Open Error Ошибка открытия - There was an error opening template %1 for writing. Reason: %2 Возникла ошибка открытия шаблона %1 для записи. Причина: %2 - Write Error Ошибка записи - There was an error writing the template %1 to disk. Reason: %2 Возникла ошибка записи шаблона %1 на диск. Причина: %2 - Pick a directory to save templates in Выберите каталог для сохранения шаблонов - Save Form As Template Сохранить форму как шаблон - &Category: &Категория: - &Name: &Имя: @@ -3791,7 +3075,6 @@ Do you want overwrite the template? ScriptErrorDialog - An error occurred while running the scripts for "%1": При выполнения сценариев для "%1" возникла ошибка: @@ -3801,22 +3084,18 @@ Do you want overwrite the template? SelectSignalDialog - Go to slot Переход к слоту - Select signal Выбор сигнала - signal сигнал - class класс @@ -3824,7 +3103,6 @@ Do you want overwrite the template? SignalSlotConnection - SENDER(%1), SIGNAL(%2), RECEIVER(%3), SLOT(%4) ОТПРАВИТЕЛЬ(%1), СИГНАЛ(%2), ПОЛУЧАТЕЛЬ(%3), СЛОТ(%4) @@ -3832,32 +3110,26 @@ Do you want overwrite the template? SignalSlotDialogClass - Signals and slots Сигналы и слоты - Slots Слоты - Add Добавить - ... ... - Delete Удалить - Signals Сигналы @@ -3865,12 +3137,10 @@ Do you want overwrite the template? Spacer - Horizontal Spacer '%1', %2 x %3 Горизонтальный разделитель '%1', %2 x %3 - Vertical Spacer '%1', %2 x %3 Вертикальный разделитель '%1', %2 x %3 @@ -3878,7 +3148,6 @@ Do you want overwrite the template? TemplateOptionsPage - Template Paths Tab in preferences dialog Слово "пути" опустил, т.к. с другими вкладками не перепутать, а длинная вкладка не смотрится. @@ -3888,52 +3157,42 @@ Do you want overwrite the template? ToolBarManager - Configure Toolbars... Настройка панелей инструментов... - Window Окно - Help Справка - Style Стиль - Dock views Прикрепляемые панели - File Файл - Edit Правка - Tools Инструменты - Form Форма - Toolbars Панели инструментов @@ -3941,30 +3200,64 @@ Do you want overwrite the template? VersionDialog - <h3>%1</h3><br/><br/>Version %2 <h3>%1</h3><br/><br/>Версия %2 - Qt Designer Qt Designer - <br/>Qt Designer is a graphical user interface designer for Qt applications.<br/> <br/>Qt Designer - дизайнер графического интерфейса пользователя для Qt-приложений.<br/> - %1<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). %1<br/>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения. + VideoPlayerTaskMenu + + Available Mime Types + Доступные типы данных + + + Display supported mime types... + Показывать поддерживаемые типы данных... + + + Load... + Загрузить... + + + Play + Воспроизвести + + + Pause + Пауза + + + Stop + Остановить + + + Choose Video Player Media Source + Выберите источник медиа-данных + + + An error has occurred in '%1': %2 + В "%1" произошла ошибка: %2 + + + Video Player Error + Ошибка видеоплеера + + + WidgetDataBase - The file contains a custom widget '%1' whose base class (%2) differs from the current entry in the widget database (%3). The widget database is left unchanged. Файл содержит пользовательский виджет '%1', базовый класс (%2) которого отличается от текущей записи в базе виджетов (%3). База виджетов оставлена без изменений. @@ -3972,87 +3265,70 @@ Do you want overwrite the template? qdesigner_internal::ActionEditor - New... Новое... - Edit... Правка... - Go to slot... Перейти к слоту... - Copy Копировать - Cut Вырезать - Paste Вставить - Select all Выделить всё - Delete Удалить - Actions Действия - Configure Action Editor Настроить редактор действий - Icon View Значки - Detailed View Подробно - New action Новое действие - Edit action Правка действия - Remove action '%1' Удалить действие '%1' - Remove actions Удаление дествий - Used In Используется в @@ -4060,32 +3336,26 @@ Do you want overwrite the template? qdesigner_internal::ActionModel - Name Имя - Used Используется - Text Текст - Shortcut Горячая клавиша - Checkable Триггерное - ToolTip Подсказка @@ -4093,27 +3363,22 @@ Do you want overwrite the template? qdesigner_internal::BrushManagerProxy - The element '%1' is missing the required attribute '%2'. У элемента '%1' отсутствует необходимый атрибут '%2'. - Empty brush name encountered. Обнаружено пустое название кисти. - An unexpected element '%1' was encountered. Обнаружен неожиданный элемент '%1'. - An error occurred when reading the brush definition file '%1' at line line %2, column %3: %4 При чтении файла описания кистей '%1' возникла ошибка разбора строки %2 в позиции %3: %4 - An error occurred when reading the resource file '%1' at line %2, column %3: %4 При чтении файла ресурсов '%1' возникла ошибка разбора строки %2 в позиции %3: %4 @@ -4121,17 +3386,14 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditor - Add buddy Добавить партнёра - Remove buddies Удалить партнёров - Remove %n buddies Удалить %n партнёра @@ -4140,7 +3402,6 @@ Do you want overwrite the template? - Add %n buddies Добавить %n партнёра @@ -4149,7 +3410,6 @@ Do you want overwrite the template? - Set automatically Установить автоматически @@ -4157,7 +3417,6 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorPlugin - Edit Buddies Изменение партнёров @@ -4165,7 +3424,6 @@ Do you want overwrite the template? qdesigner_internal::BuddyEditorTool - Edit Buddies Изменение партнёров @@ -4173,12 +3431,10 @@ Do you want overwrite the template? qdesigner_internal::ButtonGroupMenu - Select members Выбрать элементы - Break Разделить @@ -4186,32 +3442,26 @@ Do you want overwrite the template? qdesigner_internal::ButtonTaskMenu - Assign to button group Назначить группу кнопок - Button group Группа кнопок - New button group Новая группа кнопок - Change text... Изменить текст... - None Нет - Button group '%1' Группа кнопок '%1' @@ -4219,57 +3469,46 @@ Do you want overwrite the template? qdesigner_internal::CodeDialog - Save... Сохранить... - Copy All Копировать всё - &Find in Text... &Найти в тексте... - A temporary form file could not be created in %1. Не удалось создать временный файл формы в %1. - The temporary form file %1 could not be written. Не удалось записать временный файл формы %1. - %1 - [Code] %1 - [код] - Save Code Сохранить код - Header Files (*.%1) Заголовочные файлы (*.%1) - The file %1 could not be opened: %2 Не удалось открыть файл %1: %2 - The file %1 could not be written: %2 Не удалось записать файл %1: %2 - %1 - Error %1 - Ошибка @@ -4277,7 +3516,6 @@ Do you want overwrite the template? qdesigner_internal::ColorAction - Text Color Цвет текста @@ -4285,12 +3523,10 @@ Do you want overwrite the template? qdesigner_internal::ComboBoxTaskMenu - Edit Items... Изменить элементы... - Change Combobox Contents Изменено содержимое Combobox @@ -4298,7 +3534,6 @@ Do you want overwrite the template? qdesigner_internal::CommandLinkButtonTaskMenu - Change description... Изменить описание... @@ -4306,17 +3541,14 @@ Do you want overwrite the template? qdesigner_internal::ConnectionEdit - Select All Выделить всё - Deselect All Снять выделение - Delete Удалить @@ -4324,52 +3556,42 @@ Do you want overwrite the template? qdesigner_internal::ConnectionModel - Sender Отправитель - Signal Сигнал - Receiver Получатель - Slot Слот - <sender> <отправитель> - <signal> <сигнал> - <receiver> <получатель> - <slot> <слот> - The connection already exists!<br>%1 Подключение уже существует!<br>%1 - Signal and Slot Editor Радактор сигналов и слотов @@ -4377,42 +3599,34 @@ Do you want overwrite the template? qdesigner_internal::ContainerWidgetTaskMenu - Delete Удалить - Insert Вставить - Insert Page Before Current Page Вставить страницу перед текущей - Insert Page After Current Page Вставить страницу после текущей - Add Subwindow Добавить дочернее окно - Subwindow Дочернее окно - Page Страница - Page %1 of %2 Страница %1 из %2 @@ -4420,18 +3634,15 @@ Do you want overwrite the template? qdesigner_internal::DPI_Chooser - System (%1 x %2) System resolution Системное (%1 x %2) - User defined Пользовательское - x DPI X/Y separator x @@ -4440,49 +3651,38 @@ Do you want overwrite the template? qdesigner_internal::DesignerPropertyManager - - AlignLeft - AlignHCenter - AlignRight - AlignJustify - AlignTop - - AlignVCenter - AlignBottom - %1, %2 %1, %2 - Customized (%n roles) Настроено (%n роль) @@ -4491,75 +3691,58 @@ Do you want overwrite the template? - Inherited Унаследованная - Horizontal Горизонтальное - Vertical Вертикальное - Normal Off Нормальный, выкл - Normal On Нормальный, вкл - Disabled Off Выключенный, выкл - Disabled On Выключенный, вкл - Active Off Активный, выкл - Active On Активный, вкл - Selected Off Выбранный, выкл - Selected On Выбранный, вкл - - translatable переводимый - - disambiguation уточнение - - comment примечание @@ -4567,48 +3750,38 @@ Do you want overwrite the template? qdesigner_internal::DeviceProfileDialog - Device Profiles (*.%1) Профили устройства (*.%1) - Default По умолчанию - Save Profile Сохранение профиля - Save Profile - Error Ошибка сохранения профиля - Unable to open the file '%1' for writing: %2 Не удалось открыть файл '%1' для записи: %2 - Open profile Открытие профиля - - Open Profile - Error Ошибка отрытия профиля - Unable to open the file '%1' for reading: %2 Не удалось открыть файл '%1' для чтения: %2 - '%1' is not a valid profile: %2 '%1' не является корректным профилем: %2 @@ -4616,57 +3789,46 @@ Do you want overwrite the template? qdesigner_internal::Dialog - Dialog Диалог - StringList Список строк - New String Новая строка - &New &Новая - Delete String Удалить строку - &Delete &Удалить - &Value: &Значение: - Move String Up Переместить строку вверх - Up Вверх - Move String Down Переместить строку вниз - Down Вниз @@ -4674,52 +3836,42 @@ Do you want overwrite the template? qdesigner_internal::EmbeddedOptionsControl - None Нет - Add a profile Добавить профиль - Edit the selected profile Изменить выбранный профиль - Delete the selected profile Удалить выбранный профиль - Add Profile Добавление профиля - New profile Новый профиль - Edit Profile Изменение профиля - Delete Profile Удаление профиля - Would you like to delete the profile '%1'? Желаете удалить профиль '%1'? - Default По умолчанию @@ -4727,12 +3879,10 @@ Do you want overwrite the template? qdesigner_internal::FilterWidget - Filter Фильтр - Clear text Очистить текст @@ -4740,12 +3890,10 @@ Do you want overwrite the template? qdesigner_internal::FormEditor - Resource File Changed Файл ресурсов был изменён - The file "%1" has changed outside Designer. Do you want to reload it? Файл "%1" был изменён вне Qt Designer. Желаете перезагрузить его? @@ -4753,7 +3901,6 @@ Do you want overwrite the template? qdesigner_internal::FormLayoutMenu - Add form layout row... Добавить строку компоновщика формы... @@ -4761,37 +3908,30 @@ Do you want overwrite the template? qdesigner_internal::FormWindow - Edit contents Изменить содержимое - F2 - Insert widget '%1' Вставить виджет '%1' - Resize Изменение размера - Key Move Перемещение клавишей - Key Resize Изменение размера клавишей - Paste %n action(s) Вставлено %n действие @@ -4800,7 +3940,6 @@ Do you want overwrite the template? - Paste %n widget(s) Вставлен %n виджет @@ -4809,53 +3948,42 @@ Do you want overwrite the template? - Paste (%1 widgets, %2 actions) Вставлено (%1 виджетов, %2 действий) - Cannot paste widgets. Designer could not find a container without a layout to paste into. Не удалось вставить виджеты. Qt Designer не смог найти контейнер без компоновщика для вставки виджетов. - Break the layout of the container you want to paste into, select this container and then paste again. Удалите компоновщик из контейнера, в который желаете вставить виджеты, выберите его и повторите вставку. - Paste error Ошибка вставки - Raise widgets Поднятие виджетов - Lower widgets Опускание виджетов - Select Ancestor Выбрать предка - Lay out Компоновка - - Drop widget Вставка виджета - A QMainWindow-based form does not contain a central widget. Форма, основанная на QMainWindow, не содержит центрального виджета. @@ -4863,12 +3991,10 @@ Do you want overwrite the template? qdesigner_internal::FormWindowBase - Delete '%1' Удалить '%1' - Delete Удалить @@ -4876,200 +4002,159 @@ Do you want overwrite the template? qdesigner_internal::FormWindowManager - Cu&t &Вырезать - Cuts the selected widgets and puts them on the clipboard Вырезает выбранные виджеты и помещает их в буфер обмена - &Copy &Копировать - Copies the selected widgets to the clipboard Копирует выбранные виджеты в буфер обмена - &Paste В&ставить - Pastes the clipboard's contents Вставляет содержимое буфера обмена - &Delete &Удалить - Deletes the selected widgets Удаляет выбранные виджеты - Select &All &Выделить все - Selects all widgets Выделяет все виджеты - Bring to &Front Переместить &вперед - - Raises the selected widgets Поднимает выбранные виджеты на передний план - Send to &Back Переместить &назад - - Lowers the selected widgets Опускает выбранные виджеты на задний план - Adjust &Size Подогнать &размер - Adjusts the size of the selected widget Подгоняет размер выбранного виджета - Lay Out &Horizontally Скомпоновать по &горизонтали - Lays out the selected widgets horizontally Компонует выделенные виджеты по горизонтали (QHBoxLayout) - Lay Out &Vertically Скомпоновать по &вертикали - Lays out the selected widgets vertically Компонует выделенные виджеты по вертикали (QVBoxLayout) - Lay Out in a &Form Layout Скомпоновать в &две колонки - Lays out the selected widgets in a form layout Компонует выделенные виджеты в две колонки (QFormLayout) - Lay Out in a &Grid Скомпоновать по &сетке - Lays out the selected widgets in a grid Компонует выделенные виджеты по сетке (QGridLayout) - Lay Out Horizontally in S&plitter Скомпоновать по г&оризонтали с разделителем - Lays out the selected widgets horizontally in a splitter Компонует выделенные виджеты по горизонтали (QSplitter) - Lay Out Vertically in Sp&litter Скомпоновать по в&ертикали с разделителем - Lays out the selected widgets vertically in a splitter Компонует выделенные виджеты по вертикали (QSplitter) - &Break Layout &Удалить компоновщик - Breaks the selected layout Удаляет выбранный компоновщик - Si&mplify Grid Layout Упрост&ить компоновку по сетке - Removes empty columns and rows Удаляет пустые колонки и строки в QGridLayout - &Preview... &Предпросмотр... - Preview current form Предпросмотр формы - Form &Settings... &Настройки формы... - Break Layout Удалить компоновщик - Adjust Size Подогнать размер - Could not create form preview Title of warning message box Не удалось создать предпросмотр формы - Form Settings - %1 Настройки формы - %1 @@ -5077,12 +4162,10 @@ Do you want overwrite the template? qdesigner_internal::FormWindowSettings - None Нет - Device Profile: %1 Профиль устройства: %1 @@ -5090,37 +4173,30 @@ Do you want overwrite the template? qdesigner_internal::GridPanel - Form Форма - Grid Сетка - Visible Видимая - Grid &X Сетка &X - Snap Прилипать - Reset Сбросить - Grid &Y Сетка &Y @@ -5128,7 +4204,6 @@ Do you want overwrite the template? qdesigner_internal::GroupBoxTaskMenu - Change title... Изменить заголовок... @@ -5136,7 +4211,6 @@ Do you want overwrite the template? qdesigner_internal::HtmlTextEdit - Insert HTML entity Вставить элемент HTML @@ -5144,92 +4218,74 @@ Do you want overwrite the template? qdesigner_internal::IconSelector - The pixmap file '%1' cannot be read. Невозможно прочитать файл растрового изображения '%1'. - The file '%1' does not appear to be a valid pixmap file: %2 Файл '%1' не похож на корректный файл растрового изображения: %2 - The file '%1' could not be read: %2 Не удалось прочитать файл %1: %2 - Choose a Pixmap Выбор растрового изображения - Pixmap Read Error Ошибка чтения растрового изображения - ... ... - Normal Off Нормальный, выкл - Normal On Нормальный, вкл - Disabled Off Выключенный, выкл - Disabled On Выключенный, вкл - Active Off Активный, выкл - Active On Активный, вкл - Selected Off Выбранный, выкл - Selected On Выбранный, вкл - Choose Resource... Выбрать ресурс... - Choose File... Выбрать файл... - Reset Сбросить - Reset All Сбросить всё @@ -5237,58 +4293,46 @@ Do you want overwrite the template? qdesigner_internal::ItemListEditor - Properties &<< Свойства &<< - - Properties &>> Свойства &>> - Items List Список элементов - New Item Новый элемент - &New &Новый - Delete Item Удалить элемент - &Delete &Удалить - Move Item Up Переместить элемент вверх - U U - Move Item Down Переместить элемент вниз - D D @@ -5296,12 +4340,10 @@ Do you want overwrite the template? qdesigner_internal::LabelTaskMenu - Change rich text... Изменить форматированный текст... - Change plain text... Изменить обычный текст... @@ -5309,7 +4351,6 @@ Do you want overwrite the template? qdesigner_internal::LanguageResourceDialog - Choose Resource Выбор ресурса @@ -5317,7 +4358,6 @@ Do you want overwrite the template? qdesigner_internal::LineEditTaskMenu - Change text... Изменить текст... @@ -5325,17 +4365,14 @@ Do you want overwrite the template? qdesigner_internal::ListWidgetEditor - New Item Новый элемент - Edit List Widget Изменение виджета List - Edit Combobox Изменение виджета ComboBox @@ -5343,12 +4380,10 @@ Do you want overwrite the template? qdesigner_internal::ListWidgetTaskMenu - Edit Items... Изменить элементы... - Change List Contents Изменение содержимого списка @@ -5356,22 +4391,18 @@ Do you want overwrite the template? qdesigner_internal::MdiContainerWidgetTaskMenu - Next Subwindow Следующее дочернее докно - Previous Subwindow Предыдущее дочернее докно - Tile Замостить - Cascade Каскадом @@ -5379,7 +4410,6 @@ Do you want overwrite the template? qdesigner_internal::MenuTaskMenu - Remove Удалить @@ -5387,7 +4417,6 @@ Do you want overwrite the template? qdesigner_internal::MorphMenu - Morph into Преобразовать в @@ -5395,42 +4424,34 @@ Do you want overwrite the template? qdesigner_internal::NewActionDialog - New Action... Новое действие... - &Text: &Текст: - Object &name: &Имя объекта: - &Icon: &Значок: - Shortcut: Горячая клавиша: - Checkable: Триггерное: - ToolTip: Подсказка: - ... ... @@ -5438,41 +4459,34 @@ Do you want overwrite the template? qdesigner_internal::NewDynamicPropertyDialog - Set Property Name Установка имени свойства - The current object already has a property named '%1'. Please select another, unique one. Объект уже содержит свойство с именем '%1'. Укажите другое имя. - The '_q_' prefix is reserved for the Qt library. Please select another name. Приставка '_q_' зарезервирована для целей библиотеки Qt. Укажите другое имя. - Create Dynamic Property Создание динамического свойства - Property Name Имя свойства - horizontalSpacer - Property Type Тип свойства @@ -5480,83 +4494,67 @@ Please select another name. qdesigner_internal::NewFormWidget - Default size Размер по умолчанию - QVGA portrait (240x320) QVGA книжная (240x320) - QVGA landscape (320x240) QVGA альбомная (320x240) - VGA portrait (480x640) VGA книжная (480x640) - VGA landscape (640x480) VGA альбомная (640x480) - Widgets New Form Dialog Categories Виджеты - Custom Widgets Пользовательские виджеты - None Нет - Error loading form Ошибка загрузки формы - Unable to open the form template file '%1': %2 Невозможно открыть файл шаблона формы '%1': %2 - Internal error: No template selected. Внутренняя ошибка: Шаблон не выбран. - 0 0 - Choose a template for a preview Выберите шаблон для предпросмотра - Embedded Design Оформление портативных устройств - Device: Устройство: - Screen Size: Размер экрана: @@ -5564,37 +4562,30 @@ Please select another name. qdesigner_internal::NewPromotedClassPanel - Add Добавить - New Promoted Class Новый преобразованный класс - Base class name: Имя базового класса: - Promoted class name: Имя преобразованного класса: - Header file: Заголовочный файл: - Global include Глобальное включение - Reset Восстановить @@ -5602,12 +4593,10 @@ Please select another name. qdesigner_internal::ObjectInspector - &Find in Text... &Найти в тексте... - Change Current Page Смена текущей страницы @@ -5615,32 +4604,26 @@ Please select another name. qdesigner_internal::OrderDialog - Index %1 (%2) Индекс %1 (%2) - %1 %2 %1 %2 - Change Page Order Изменение порядка страниц - Page Order Порядок страниц - Move page up Переместить страницу выше - Move page down Переместить страницу ниже @@ -5648,47 +4631,38 @@ Please select another name. qdesigner_internal::PaletteEditor - Edit Palette Правка палитры - Tune Palette Настройка палитры - Show Details Показывать детали - Compute Details Расчитывать детали - Quick Быстрый - Preview Предпросмотр - Disabled Выключенная - Inactive Неактивная - Active Активная @@ -5696,7 +4670,6 @@ Please select another name. qdesigner_internal::PaletteEditorButton - Change Palette Изменить палитру @@ -5704,22 +4677,18 @@ Please select another name. qdesigner_internal::PaletteModel - Color Role Роль цвета - Active Активный - Inactive Неактивный - Disabled Выключенный @@ -5727,28 +4696,22 @@ Please select another name. qdesigner_internal::PixmapEditor - Choose Resource... Выбрать ресурс... - Choose File... Выбрать файл... - Copy Path Скопировать путь - Paste Path Вставить путь - - ... ... @@ -5756,7 +4719,6 @@ Please select another name. qdesigner_internal::PlainTextEditorDialog - Edit text Правка текста @@ -5764,37 +4726,30 @@ Please select another name. qdesigner_internal::PluginDialog - Components Компоненты - Plugin Information Информация о модуле - Refresh Обновить - Scan for newly installed custom widget plugins. Поиск вновь установленных модулей пользовательских виджетов. - Qt Designer couldn't find any plugins Qt Designer не может найти ни одного модуля - Qt Designer found the following plugins Qt Designer нашёл следующие модули - New custom widget plugins have been found. Найдены новые модули пользовательских виджетов. @@ -5802,7 +4757,6 @@ Please select another name. qdesigner_internal::PreviewActionGroup - %1 Style Стиль %1 @@ -5810,47 +4764,38 @@ Please select another name. qdesigner_internal::PreviewConfigurationWidget - Default По умолчанию - None Нет - Browse... Обзор... - Load Custom Device Skin Загрузить особую обложку устройства - All QVFB Skins (*.%1) Все обложки QVFB (*.%1) - %1 - Duplicate Skin %1 - Повторяющаяся обложка - The skin '%1' already exists. Обложка '%1' уже существует. - %1 - Error %1 - Ошибка - %1 is not a valid skin directory: %2 %1 не является корректным каталогом обложек: @@ -5860,24 +4805,20 @@ Please select another name. qdesigner_internal::PreviewDeviceSkin - &Portrait &Книжная - Landscape (&CCW) Rotate form preview counter-clockwise Альбомная (&против ЧС) - &Landscape (CW) Rotate form preview clockwise &Альбомная (по ЧС) - &Close &Закрыть @@ -5885,7 +4826,6 @@ Please select another name. qdesigner_internal::PreviewManager - %1 - [Preview] %1 - [Предпросмотр] @@ -5893,7 +4833,6 @@ Please select another name. qdesigner_internal::PreviewMdiArea - The moose in the noose ate the goose who was loose. Palette editor background @@ -5903,57 +4842,46 @@ ate the goose who was loose. qdesigner_internal::PreviewWidget - Preview Window Окно предпросмотра - LineEdit LineEdit - ComboBox ComboBox - PushButton PushButton - ButtonGroup2 ButtonGroup2 - CheckBox1 CheckBox1 - CheckBox2 CheckBox2 - ButtonGroup ButtonGroup - RadioButton1 RadioButton1 - RadioButton2 RadioButton2 - RadioButton3 RadioButton3 @@ -5961,22 +4889,18 @@ ate the goose who was loose. qdesigner_internal::PromotionModel - Name Имя - Header file Заголовочный файл - Global include Глобальное включение - Usage Использование @@ -5984,27 +4908,22 @@ ate the goose who was loose. qdesigner_internal::PromotionTaskMenu - Promoted widgets... Преобразованные виджеты... - Promote to ... Преобразовать в ... - Change signals/slots... Изменить сигналы/слоты... - Promote to Преобразовать в - Demote to %1 Преобразовать в %1 @@ -6012,57 +4931,46 @@ ate the goose who was loose. qdesigner_internal::PropertyEditor - Add Dynamic Property... Добавить динамическое свойство... - Remove Dynamic Property Удалить динамическое свойство - Sorting Сортировка - Color Groups Цветовые группы - Tree View Древовидный список - Drop Down Button View Вид выпадающего списка - String... Строка... - Bool... Булево... - Other... Другое... - Configure Property Editor Настроить радактор свойств - Object: %1 Class: %2 Объект: %1 @@ -6072,7 +4980,6 @@ Class: %2 qdesigner_internal::PropertyLineEdit - Insert line break Вставить разрыв строки @@ -6080,27 +4987,22 @@ Class: %2 qdesigner_internal::QDesignerPromotionDialog - Promoted Widgets Преобразованные виджеты - Promoted Classes Преобразованные классы - Promote Преобразовать - Change signals/slots... Изменить сигналы/слоты... - %1 - Error %1 - Ошибка @@ -6108,22 +5010,18 @@ Class: %2 qdesigner_internal::QDesignerResource - Loading qrc file Загрузка файла qrc - The specified qrc file <p><b>%1</b></p><p>could not be found. Do you want to update the file location?</p> Не удалось найти указанный файл qrc <p><b>%1</b></p><p>Желаете обновить его расположение?</p> - New location for %1 Новое расположение %1 - Resource files (*.qrc) Файл ресурсов (*.qrc) @@ -6131,112 +5029,90 @@ Class: %2 qdesigner_internal::QDesignerTaskMenu - Change objectName... Изменить objectName... - Change toolTip... Изменить toolTip... - Change whatsThis... Изменить whatsThis... - Change styleSheet... Изменить styleSheet... - Create Menu Bar Создать панель меню - Add Tool Bar Добавить панель инструментов - Create Status Bar Создать строку состояния - Remove Status Bar Удалить строку состояния - Change script... Изменить сценарий... - Change signals/slots... Изменить сигналы/слоты... - Go to slot... Перейти к слоту... - Size Constraints Ограничения размера - Set Minimum Width Установить минимальную ширину - Set Minimum Height Установить минимальную высоту - Set Minimum Size Установить минимальный размер - Set Maximum Width Установить максимальную ширину - Set Maximum Height Установить максимальную высоту - Set Maximum Size Установить максимальный размер - Edit ToolTip Правка текста всплывающей подсказки - Edit WhatsThis Правка текста подсказки режима "Что это?" - no signals available Нет доступных сигналов - Set size constraint on %n widget(s) Установка ограничений размера для %n виджета @@ -6248,42 +5124,34 @@ Class: %2 qdesigner_internal::QDesignerWidgetBox - - Unexpected element <%1> Неожиданный элемент <%1> - A parse error occurred at line %1, column %2 of the XML code specified for the widget %3: %4 %5 Возникла ошибка разбора в строке %1 позиции %2 кода XML, определённого для виджета %3: %4 %5 - The XML code specified for the widget %1 does not contain any widget elements. %2 Код XML, определённый для виджета %1, не содержит каких-либо элементов виджетов. %2 - An error has been encountered at line %1 of %2: %3 Обнаружена ошибка в строке %1 из %2: %3 - Unexpected element <%1> encountered when parsing for <widget> or <ui> Обнаружен неожиданный элемент <%1> вместо <widget> или <ui> - Unexpected end of file encountered when parsing widgets. Файл неожиданно закончился при разборе виджетов. - A widget element could not be found. Не удалось обнаружить элемент виджета. @@ -6291,73 +5159,58 @@ Class: %2 qdesigner_internal::QtGradientStopsController - H H - S S - V V - - Hue Оттенок - Sat Насыщ - Val Знач - Saturation Насыщенность - Value Значение - R R - G G - B B - Red Красный - Green Зелёный - Blue Синий @@ -6365,27 +5218,22 @@ Class: %2 qdesigner_internal::RichTextEditorDialog - Edit text Правка текста - Rich Text Форматированный текст - Source Исходник - &OK &ОК - &Cancel От&мена @@ -6393,72 +5241,58 @@ Class: %2 qdesigner_internal::RichTextEditorToolBar - Bold Жирный - CTRL+B - Italic Курсив - CTRL+I - Underline Подчёркнутый - CTRL+U - Left Align По левому краю - Center По центру - Right Align По правому краю - Justify По ширине - Superscript Верхний индекс - Subscript Нижний индекс - Insert &Link Вставить &ссылку - Insert &Image Вставить &изображение @@ -6466,17 +5300,14 @@ Class: %2 qdesigner_internal::ScriptDialog - Edit script Правка сценария - <html>Enter a Qt Script snippet to be executed while loading the form.<br>The widget and its children are accessible via the variables <i>widget</i> and <i>childWidgets</i>, respectively. <html>Укажите сценарий Qt, который должен выполняться при загрузке формы.<br>Виджет и его дочерние виджеты доступны через переменные <i>widget</i> и <i>childWidgets</i>. - Syntax error Синтаксическая ошибка @@ -6484,7 +5315,6 @@ Class: %2 qdesigner_internal::ScriptErrorDialog - Script errors Ошибки сценария @@ -6492,23 +5322,18 @@ Class: %2 qdesigner_internal::SignalSlotDialog - There is already a slot with the signature '%1'. Уже есть слот с сигнатурой '%1'. - There is already a signal with the signature '%1'. Уже есть сигнал с сигнатурой '%1'. - %1 - Duplicate Signature %1 - Повторяющаяся сигнатура - - Signals/Slots of %1 Сигналы/слоты %1 @@ -6516,12 +5341,10 @@ Class: %2 qdesigner_internal::SignalSlotEditorPlugin - Edit Signals/Slots Изменение сигналов/слотов - F4 @@ -6529,7 +5352,6 @@ Class: %2 qdesigner_internal::SignalSlotEditorTool - Edit Signals/Slots Изменение сигналов/слотов @@ -6537,7 +5359,6 @@ Class: %2 qdesigner_internal::StatusBarTaskMenu - Remove Удалить @@ -6545,7 +5366,6 @@ Class: %2 qdesigner_internal::StringListEditorButton - Change String List Изменить список строк @@ -6553,38 +5373,30 @@ Class: %2 qdesigner_internal::StyleSheetEditorDialog - - Valid Style Sheet Корректная таблица стилей - Add Resource... Добавить ресурс... - Add Gradient... Добавить градиент... - Add Color... Добавить цвет... - Add Font... Добавить шрифт... - Edit Style Sheet Правка таблицы стилей - Invalid Style Sheet Некорректная таблица стилей @@ -6592,27 +5404,22 @@ Class: %2 qdesigner_internal::TabOrderEditor - Start from Here Начать отсюда - Restart Перезапустить - Tab Order List... Список порядка переключений... - Tab Order List Список порядка переключений - Tab Order Порядок переключений @@ -6620,7 +5427,6 @@ Class: %2 qdesigner_internal::TabOrderEditorPlugin - Edit Tab Order Изменение порядка переключений @@ -6628,7 +5434,6 @@ Class: %2 qdesigner_internal::TabOrderEditorTool - Edit Tab Order Изменить порядок переключений @@ -6636,48 +5441,38 @@ Class: %2 qdesigner_internal::TableWidgetEditor - - Properties &>> Свойства &>> - Edit Table Widget Правка табличного виджета - &Items &Элементы - Table Items Элементы таблицы - New Column Новый столбец - New Row Новая строка - &Columns С&толбцы - &Rows &Строки - Properties &<< Свойства &<< @@ -6685,7 +5480,6 @@ Class: %2 qdesigner_internal::TableWidgetTaskMenu - Edit Items... Изменить элементы... @@ -6693,22 +5487,18 @@ Class: %2 qdesigner_internal::TemplateOptionsWidget - Pick a directory to save templates in Выберите каталог для сохранения шаблонов - Form Форма - Additional Template Paths Дополнительные пути к шаблонам - ... ... @@ -6716,22 +5506,18 @@ Class: %2 qdesigner_internal::TextEditTaskMenu - Edit HTML Правка HTML - Change HTML... Изменить HTML... - Edit Text Правка текста - Change Plain Text... Правка обычного текста... @@ -6739,22 +5525,18 @@ Class: %2 qdesigner_internal::TextEditor - Choose Resource... Выбрать ресурс... - Choose File... Выбрать файл... - ... ... - Choose a File Выбор файла @@ -6762,27 +5544,22 @@ Class: %2 qdesigner_internal::ToolBarEventFilter - Insert Separator before '%1' Вставить разделитель перед '%1' - Append Separator Добавить разделитель - Remove action '%1' Удалить действие '%1' - Remove Toolbar '%1' Удалить панель инструментов '%1' - Insert Separator Вставить разделитель @@ -6790,125 +5567,98 @@ Class: %2 qdesigner_internal::TreeWidgetEditor - New Column Новый столбец - &Columns С&толбцы - Per column properties Свойства столбца - Common properties Общие свойства - - New Item Новый элемент - - New Subitem Новый дочерний элемент - Properties &<< Свойства &<< - - Properties &>> Свойства &>> - Edit Tree Widget Изменение виджета Дерево - &Items &Элементы - Tree Items Элементы дерева - 1 1 - &New &Новый - New &Subitem Новый &дочерний элемент - Delete Item Удалить элемент - &Delete &Удалить - Move Item Left (before Parent Item) Переместить элемент влево (перед родительским) - L L - Move Item Right (as a First Subitem of the Next Sibling Item) Переместить элемент вправо (сделать первым дочерним элементом соседнего элемента) - R - Move Item Up Переместить элемент вверх - U U - Move Item Down Переместить элемент вниз - D D @@ -6916,7 +5666,6 @@ Class: %2 qdesigner_internal::TreeWidgetTaskMenu - Edit Items... Изменить элементы... @@ -6924,7 +5673,6 @@ Class: %2 qdesigner_internal::WidgetBox - Warning: Widget creation failed in the widget box. This could be caused by invalid custom widget XML. Предупреждение: Не удалось создать виджет. Это могло произойти из-за некорректного XML пользовательского виджета. @@ -6932,42 +5680,34 @@ Class: %2 qdesigner_internal::WidgetBoxTreeWidget - Scratchpad Блокнот - Custom Widgets Пользовательские виджеты - Expand all Развернуть всё - Collapse all Свернуть всё - List View Список - Icon View Значки - Remove Удалить - Edit name Изменить имя @@ -6975,7 +5715,6 @@ Class: %2 qdesigner_internal::WidgetDataBase - A custom widget plugin whose class name (%1) matches that of an existing class has been found. Обнаружен пользовательский модуль виджета, имя класса (%1) которого совпадает с уже имеющимся. @@ -6983,7 +5722,6 @@ Class: %2 qdesigner_internal::WidgetEditorTool - Edit Widgets Изменение виджетов @@ -6991,34 +5729,28 @@ Class: %2 qdesigner_internal::WidgetFactory - The custom widget factory registered for widgets of class %1 returned 0. Пользовательская фабрика виджетов, зарегистрированная для класса %1, вернула 0. - A class name mismatch occurred when creating a widget using the custom widget factory registered for widgets of class %1. It returned a widget of class %2. Обнаружено несоответствие имени класса при создании виджета с использованием пользовательской фабрики виджетов, зарегистрированной для класса %1. Она вернула виджет класса %2. - %1 Widget Виджет %1 - The current page of the container '%1' (%2) could not be determined while creating a layout.This indicates an inconsistency in the ui-file, probably a layout being constructed on a container widget. При создании компоновщика не удалось определить текущую страницу контейнера '%1' (%2). Это указывает на некорректность файла ui - возможно, компоновщик был создан для контейнерного виджета. - Attempt to add a layout to a widget '%1' (%2) which already has an unmanaged layout of type %3. This indicates an inconsistency in the ui-file. Попытка добавить компоновщик виджету '%1' (%2), у которого уже есть компоновщик типа %3. Это указывает на некорректность файла ui. - Cannot create style '%1'. Не удалось создать стиль '%1'. @@ -7026,12 +5758,10 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::WizardContainerWidgetTaskMenu - Next Далее - Back Назад @@ -7039,7 +5769,6 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomMenu - %1 % Zoom factor %1 % @@ -7048,7 +5777,6 @@ This indicates an inconsistency in the ui-file. qdesigner_internal::ZoomablePreviewDeviceSkin - &Zoom Мас&штаб diff --git a/translations/linguist_ru.ts b/translations/linguist_ru.ts index 625a0f1..2d06f25 100644 --- a/translations/linguist_ru.ts +++ b/translations/linguist_ru.ts @@ -4,7 +4,6 @@ AboutDialog - Qt Linguist Qt Linguist @@ -12,77 +11,62 @@ BatchTranslationDialog - Qt Linguist - Batch Translation Qt Linguist - Пакетный перевод - Options Параметры - Set translated entries to finished Помечать переведенные записи как завершённые - Retranslate entries with existing translation Переводить записи, уже имеющие перевод - Translate also finished entries Также переводить записи с завершёнными переводами - Phrase book preference Предпочитаемые глоссарии - Move up Поднять - Move down Опустить - &Run &Выполнить - Cancel Отмена - Batch Translation of '%1' - Qt Linguist Пакетный перевод '%1' - Qt Linguist - Searching, please wait... Идёт поиск, ожидайте... - &Cancel От&мена - Linguist batch translator Пакетный переводчик Qt Linguist - Batch translated %n entries Автоматически переведена %n запись @@ -91,12 +75,10 @@ - Note that the modified entries will be reset to unfinished if 'Set translated entries to finished' above is unchecked Имейте в виду, что изменённые записи будут отмечены как незавершённые, если не включен параметр "Помечать переведенные записи как завершённые" - The batch translator will search through the selected phrase books in the order given above Пакетный переводчик будет искать в выбранных глоссариях в указанном выше порядке @@ -104,45 +86,36 @@ DataModel - <qt>Duplicate messages found in '%1': <qt>В '%1' обнаружены повторяющиеся сообщения: - - <p>[more duplicates omitted] <p>[остальные повторы не указаны] - <p>* ID: %1 <p>* ID: %1 - <p>* Context: %1<br>* Source: %2 <p>* Контекст: %1<br>* Источник: %2 - <br>* Comment: %3 <br>* Комментарий: %3 - Linguist does not know the plural rules for '%1'. Will assume a single universal form. Qt Linguist не знает правила множественных форм для '%1'. Будет использована универсальная единичная форма. - Cannot create '%2': %1 Не удалось создать '%2': %1 - Universal Form Универсальная форма @@ -150,37 +123,30 @@ Will assume a single universal form. ErrorsView - Accelerator possibly superfluous in translation. Возможно, лишний акселератор в переводе. - Accelerator possibly missing in translation. Возможно, пропущен акселератор в переводе. - Translation does not end with the same punctuation as the source text. Перевод не заканчивается тем же знаком препинания, что и исходный текст. - A phrase book suggestion for '%1' was ignored. Предложение глоссария для '%1' пропущено. - Translation does not refer to the same place markers as in the source text. Перевод не содержит тех же маркеров форматирования, что и исходный текст. - Translation does not contain the necessary %n place marker. Перевод не содержит необходимого маркера форматирования %n. - Unknown error Неизвестная ошибка @@ -188,98 +154,79 @@ Will assume a single universal form. FindDialog - Choose Edit|Find from the menu bar or press Ctrl+F to pop up the Find dialog - Find Поиск - This window allows you to search for some text in the translation source file. Данное окно позволяет искать текст в файле перевода. - &Find what: &Искать: - Type in the text to search for. Введите искомый текст. - Options Параметры - Source texts are searched when checked. Если отмечено, поиск будет вестись в исходных текстах. - &Source texts &Исходные тексты - Translations are searched when checked. Если отмечено, поиск будет вестись в переведённых текстах. - &Translations &Переводы - Texts such as 'TeX' and 'tex' are considered as different when checked. Если отмечено, строки "ПрИмЕр" и "пример" будет считаться разными. - &Match case С учётом &регистра - Comments and contexts are searched when checked. Если отмечено, поиск будет вестись по контекстам и комментариям. - &Comments &Комментарии - Ignore &accelerators Пропускать &акселераторы - Click here to find the next occurrence of the text you typed in. Найти следующее совпадение для введённого текста. - Find Next Найти далее - Click here to close this window. Закрыть окно. - Cancel Отмена @@ -287,30 +234,25 @@ Will assume a single universal form. FormMultiWidget - Alt+Delete translate, but don't change - Shift+Alt+Insert translate, but don't change - Alt+Insert translate, but don't change - Confirmation - Qt Linguist Подтверждение - Qt Linguist - Delete non-empty length variant? Удалить вариант перевода? @@ -318,7 +260,6 @@ Will assume a single universal form. LRelease - Dropped %n message(s) which had no ID. Удалено %n сообщение, у которого не было ID. @@ -327,7 +268,6 @@ Will assume a single universal form. - Excess context/disambiguation dropped from %n message(s). Удалён лишний контекст из %n сообщения. @@ -336,107 +276,80 @@ Will assume a single universal form. - - Generated %n translation(s) (%1 finished and %2 unfinished) - + Generated %n translation(s) (%1 finished and %2 unfinished) - Создан %n перевод (%1 завершённых и %2 незавершённых) - - Создано %n перевода (%1 завершённых и %2 незавершённых) - - Создано %n переводов (%1 завершённых и %2 незавершённых) - + Создан %n перевод (%1 завершённых и %2 незавершённых) + Создано %n перевода (%1 завершённых и %2 незавершённых) + Создано %n переводов (%1 завершённых и %2 незавершённых) - - Ignored %n untranslated source text(s) - + Ignored %n untranslated source text(s) - Пропущен %n непереведённый исходный текст - - Пропущено %n непереведённых исходных текста - - Пропущено %n непереведённых исходных текстов - + Пропущен %n непереведённый исходный текст + Пропущено %n непереведённых исходных текста + Пропущено %n непереведённых исходных текстов MainWindow - This is the application's main window. Основное окно программы. - Source text Исходный текст - - Index Индекс - - Context Контекст - Items Записи - This panel lists the source contexts. В данной панели перечислены исходные контексты. - Strings Строки - Phrases and guesses Фразы и похожие переводы - Sources and Forms Исходники и формы - Warnings Предупреждения - MOD status bar: file(s) modified ИЗМ - Loading... Загрузка... - - Loading File - Qt Linguist Загрузка файла - Qt Linguist - The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first? @@ -445,7 +358,6 @@ Close the open file(s) first? Закрыть открытые файлы? - The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file? @@ -454,7 +366,6 @@ Skip loading the first named file? Пропустить загрузку файла? - %n translation unit(s) loaded. Загружена %n запись. @@ -463,124 +374,84 @@ Skip loading the first named file? - Related files (%1);; Связанные файлы (%1);; - Open Translation Files Открыть файлы перевода - - File saved. Файл сохранён. - - - Release Скомпилировать - Qt message files for released applications (*.qm) All files (*) Скомпилированные файлы перевода для приложений Qt (*.qm) Все файлы (*) - - File created. Файл создан. - - Printing... Печать... - Context: %1 Контекст: %1 - finished завершён - unresolved неразрешённый - obsolete устаревший - - Printing... (page %1) Печать... (страница %1) - - Printing completed Печать завершена - - Printing aborted Печать прервана - Search wrapped. Поиск с начала. - - - - - - - - - - Qt Linguist Qt Linguist - - Cannot find the string '%1'. Не удалось найти строку '%1'. - Search And Translate in '%1' - Qt Linguist Поиск и перевод '%1' - Qt Linguist - - - Translate - Qt Linguist Перевод - Qt Linguist - Translated %n entry(s) Переведена %n запись @@ -589,39 +460,32 @@ All files (*) - No more occurrences of '%1'. Start over? Нет больше совпадений с '%1'. Начать заново? - Create New Phrase Book Создать глоссарий - Qt phrase books (*.qph) All files (*) Глоссарии Qt (*.qph) Все файлы (*) - Phrase book created. Глоссарий создан. - Open Phrase Book Открыть глоссарий - Qt phrase books (*.qph);;All files (*) Глоссарии Qt (*.qph);;Все файлы (*) - %n phrase(s) loaded. Загружена %n фраза. @@ -630,879 +494,690 @@ All files (*) - - - Add to phrase book Добавить в глоссарий - No appropriate phrasebook found. Подходящий глоссарий не найден. - Adding entry to phrasebook %1 Добавление записи в глоссарий %1 - Select phrase book to add to Выберите глоссарий, в который желаете добавить фразу - Unable to launch Qt Assistant (%1) Не удалось запустить Qt Assistant (%1) - Version %1 Версия %1 - <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). <center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist - инструмент для добавления переводов в приложения на основе Qt.</p><p>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения. - Do you want to save the modified files? Желаете сохранить изменённые файлы? - Do you want to save '%1'? Желаете сохранить '%1'? - Qt Linguist[*] Qt Linguist[*] - %1[*] - Qt Linguist %1[*] - Qt Linguist - - No untranslated translation units left. Непереведённых записей не осталось. - &Window &Окно - Minimize Свернуть - Ctrl+M - Display the manual for %1. Показать руководство для %1. - Display information about %1. Показать информацию о %1. - &Save '%1' &Сохранить'%1' - Save '%1' &As... Сохранить'%1' &как... - Release '%1' Скомпилировать '%1' - Release '%1' As... Скомпилировать '%1' как... - &Close '%1' &Закрыть '%1' - - &Save &Сохранить - - - Save &As... Сохранить &как... - - - Release As... Скомпилировать как... - - &Close &Закрыть - Save All Сохранить все - - &Release All С&компилировать все - Close All Закрыть все - &Release С&компилировать - Translation File &Settings for '%1'... &Параметры файла перевода для '%1'... - &Batch Translation of '%1'... Пак&етный перевод '%1'... - Search And &Translate in '%1'... &Найти и перевести в '%1'... - - Translation File &Settings... &Параметры файла перевода... - - &Batch Translation... Пак&етный перевод... - Search And &Translate... &Найти и перевести... - - File Файл - - Edit Правка - - Translation Перевод - - Validation Проверка - - Help Справка - Cannot read from phrase book '%1'. Не удалось прочитать из глоссария '%1'. - Close this phrase book. Закрыть глоссарий. - Enables you to add, modify, or delete entries in this phrase book. Позволяет добавлять, изменять и удалять записи в глоссарии. - Print the entries in this phrase book. Печать записей фраз глоссария. - Cannot create phrase book '%1'. Не удалось создать глоссарий '%1'. - Do you want to save phrase book '%1'? Желаете сохранить глоссарий '%1'? - All Все - MainWindow Главное окно - &Phrases Фра&зы - &Close Phrase Book &Закрыть глоссарий - &Edit Phrase Book &Редактироваь глоссарий - &Print Phrase Book &Печатать глоссарий - V&alidation П&роверка - &View &Вид - Vie&ws Вид&ы - &Toolbars Пан&ели инструментов - &Help &Справка - &Translation П&еревод - &File &Файл - Recently Opened &Files Недавно открытые &файлы - &Edit &Правка - &Open... &Открыть... - Open a Qt translation source file (TS file) for editing Открыть исходный файл переводов Qt (файл TS) для изменения - Ctrl+O - E&xit В&ыход - Close this window and exit. Закрыть окно и выйти. - Ctrl+Q - Save Сохранить - Save changes made to this Qt translation source file Сохранить изменения в данном исходном файле перевода Qt - Save As... Сохранить как... - Save changes made to this Qt translation source file into a new file. Сохранить изменения в данном исходном файле перевода Qt в новый файл. - Create a Qt message file suitable for released applications from the current message file. Скомпилировать файл перевода Qt из текущего файла. - &Print... &Печать... - Print a list of all the translation units in the current translation source file. Печать списка всех записей перевода из текущего файла. - Ctrl+P - &Undo &Отменить - Undo the last editing operation performed on the current translation. Отменить последнее изменение текущего перевода. - Ctrl+Z - &Redo &Повторить - Redo an undone editing operation performed on the translation. Повторить отменённую правку перевода. - Ctrl+Y - Cu&t Выр&езать - Copy the selected translation text to the clipboard and deletes it. Скопировать отмеченный текст в буфер обмена и удалить его из оригинала. - Ctrl+X - &Copy &Копировать - Copy the selected translation text to the clipboard. Скопировать отмеченный текст в буфер обмена. - Ctrl+C - &Paste &Вставить - Paste the clipboard text into the translation. Вставить текст из буфера обмена в перевод. - Ctrl+V - Select &All В&ыделить всё - Select the whole translation text. Выделить весь текст перевода. - Ctrl+A - &Find... &Найти... - Search for some text in the translation source file. Найти текст в исходном файле перевода. - Ctrl+F - Find &Next Найти д&алее - Continue the search where it was left. Продолжить поиск с места, где он был остановлен. - F3 - &Prev Unfinished &Предыдущий незавершённый - Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file. Создание готового файла перевода Qt из текущего файла. Имя файла будет автоматически определено из имени .ts файла. - Length Variants Варианты перевода - Move to the previous unfinished item. Перейти к предыдущему незавершённому переводу. - Ctrl+K - &Next Unfinished &Следующий незавершённый - Move to the next unfinished item. Перейти к следующему незавершённому переводу. - Ctrl+J - P&rev Пр&едыдущий - Move to the previous item. Перейти к предыдущему переводу. - Ctrl+Shift+K - Ne&xt С&ледующий - Move to the next item. Перейти к следующему переводу. - Ctrl+Shift+J - &Done and Next &Готово и далее - Mark this item as done and move to the next unfinished item. Пометить перевод как завершённый и перейти к следующему незавершённому. - Copy from source text Скопировать из исходного текста - Copies the source text into the translation field. Скопировать исходный текст в поле перевода. - Ctrl+B - &Accelerators &Акселераторы - Toggle the validity check of accelerators, i.e. whether the number of ampersands in the source and translation text is the same. If the check fails, a message is shown in the warnings window. Переключение проверки акселераторов, т.е. совпадает ли количество амперсандов в исходном и переведённом текстах. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - &Ending Punctuation &Знаки препинания - Toggle the validity check of ending punctuation. If the check fails, a message is shown in the warnings window. Переключение проверки знаков препинания в конце текста. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - &Phrase matches Совпадение &фраз - Toggle checking that phrase suggestions are used. If the check fails, a message is shown in the warnings window. Переключение проверки использования предложений для фраз. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - Place &Marker Matches Совпадение &маркеров - Toggle the validity check of place markers, i.e. whether %1, %2, ... are used consistently in the source text and translation text. If the check fails, a message is shown in the warnings window. Переключение проверки маркеров форматирования, т.е. все ли маркеры (%1, %2, ...) исходного текста присутствуют в переведённом. Если выявлено несовпадение, будет показано сообщение в окне предупреждений. - &New Phrase Book... &Новый глоссарий... - Create a new phrase book. Создать глоссарий. - Ctrl+N - &Open Phrase Book... &Открыть глоссарий... - Open a phrase book to assist translation. Открыть глоссарий для помощи в переводе. - Ctrl+H - &Reset Sorting &Сброс сортировки - Sort the items back in the same order as in the message file. Упорядочить элементы в той последовательности, в которой они находятся в файле. - &Display guesses &Предлагать похожие - Set whether or not to display translation guesses. Определяет необходимо или нет отображать похожие переводы. - &Statistics &Статистика - Display translation statistics. Показать статистику перевода. - &Manual &Руководство - F1 - About Qt Linguist О Qt Linguist - About Qt О Qt - &What's This? &Что это? - What's This? Что это? - Enter What's This? mode. Переход в режим "Что это?". - Shift+F1 - &Search And Translate... &Найти и перевести... - Replace the translation on all entries that matches the search source text. Заменить перевод всех записей, которые совпадают с искомым исходным текстом. - Batch translate all entries using the information in the phrase books. Перевести все записи в пакетном режиме, используя информацию из глоссария. - Open/Refresh Form &Preview Открыть/обновить предпрос&мотр формы - Form Preview Tool Инструмент предпросмотра форм - F5 - &Add to Phrase Book &Добавить в глоссарий - Ctrl+T - Open Read-O&nly... Открыть только для &чтения... - &Save All &Сохранить все - Ctrl+S - Close Закрыть - &Close All &Закрыть все - Ctrl+W - Previous unfinished item Предыдущий незавершённый перевод - Next unfinished item Следующий незавершённый перевод - Move to previous item Перейти к предыдущему переводу - Next item Следующий перевод - Mark item as done and move to the next unfinished item Пометить перевод как завершённый и перейти к следующему незавершённому - Copies the source text into the translation field Скопировать исходный текст в поле перевода - Toggle the validity check of accelerators Переключение проверки акселераторов - Toggle the validity check of ending punctuation Переключение проверки знаков препинания в конце текста - Toggle checking that phrase suggestions are used Переключение проверки использования предложений для фраз - Toggle the validity check of place markers Переключение проверки маркеров форматирования - Display information about the Qt toolkit by Nokia. Показать информацию об инструментарии Qt от Nokia. @@ -1510,104 +1185,84 @@ All files (*) MessageEditor - This is the right panel of the main window. Правая панель основного окна - Russian Русский - German Немецкий - Japanese Японский - French Французский - Polish Польский - Chinese Китайский - This whole panel allows you to view and edit the translation of some source text. Данная панель позволяет просматривать и редактировать перевод исходного текста. - Source text Исходный текст - This area shows the source text. В данной области отображается исходный текст. - Source text (Plural) Исходный текст (множественная форма) - This area shows the plural form of the source text. В данной области отображается исходный текст во множественной форме. - Developer comments Комментарий разработчика - This area shows a comment that may guide you, and the context in which the text occurs. В данной области отображается комментарий, который поможет определить в каком контексте встречается переводимый текст. - Here you can enter comments for your own use. They have no effect on the translated applications. Здесь вы можете оставить комментарий для собственного использования. Комментарии не влияют на перевод приложений. - %1 translation (%2) %1 перевод (%2) - This is where you can enter or modify the translation of the above source text. Здесь вы можете ввести или изменить перевод текста, представленного выше. - %1 translation %1 перевод - %1 translator comments %1 перевод: комментарий переводчика - '%1' Line: %2 '%1' @@ -1617,22 +1272,18 @@ Line: %2 MessageModel - Completion status for %1 Состояние завершённости для %1 - <file header> <заголовок файла> - <context comment> <контекстный комментарий> - <unnamed context> <безымянный контекст> @@ -1640,113 +1291,91 @@ Line: %2 PhraseBookBox - Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox. - (New Entry) (Новая запись) - %1[*] - Qt Linguist %1[*] - Qt Linguist - Qt Linguist Qt Linguist - Cannot save phrase book '%1'. Не удалось сохранить глоссарий '%1'. - Edit Phrase Book Правка глоссария - This window allows you to add, modify, or delete entries in a phrase book. Данное окно позволяет добавлять, изменять и удалять записи в глоссарии. - &Translation: &Перевод: - This is the phrase in the target language corresponding to the source phrase. Перевод, соответствующий исходной фразе. - S&ource phrase: &Исходная фраза: - This is a definition for the source phrase. Определение исходной фразы. - This is the phrase in the source language. Фраза на исходном языке. - &Definition: &Определение: - Click here to add the phrase to the phrase book. Добавить фразу в глоссарий. - &New Entry Новая &запись - Click here to remove the entry from the phrase book. Удалить фразу из глоссария. - &Remove Entry &Удалить - Settin&gs... &Настройки... - Click here to save the changes made. Сохранить изменения. - &Save &Сохранить - Click here to close this window. Закрыть окно. - Close Закрыть @@ -1754,17 +1383,14 @@ Line: %2 PhraseModel - Source phrase Исходная фраза - Translation Перевод - Definition Определение @@ -1772,22 +1398,18 @@ Line: %2 PhraseView - Insert Вставить - Edit Правка - Guess (%1) Похожая (%1) - Guess Похожая @@ -1795,63 +1417,46 @@ Line: %2 QObject - Translation files (%1);; Файлы перевода (%1);; - All files (*) Все файлы (*) - - - - - - - Qt Linguist Qt Linguist - GNU Gettext localization files Файлы локализации GNU Gettext - GNU Gettext localization template files Файлы шаблонов локализации GNU Gettext - Compiled Qt translations Скомпилированные переводы Qt - Qt Linguist 'Phrase Book' 'Глоссарий' Qt Linguist - Qt translation sources (format 1.1) Исходные файлы перевода Qt (формат 1.1) - Qt translation sources (format 2.0) Исходные файлы перевода Qt (формат 2.0) - Qt translation sources (latest format) Исходные файлы перевода Qt (последний формат) - XLIFF localization files Файлы локализации XLIFF @@ -1859,17 +1464,14 @@ Line: %2 SourceCodeView - <i>Source code not available</i> <i>Исходный код недоступен</i> - <i>File %1 not available</i> <i>Файл %1 недоступен</i> - <i>File %1 not readable</i> <i>Невозможно прочитать файл %1</i> @@ -1877,42 +1479,34 @@ Line: %2 Statistics - Statistics Статистика - Close Закрыть - Translation Перевод - Source Источник - 0 0 - Words: Слов: - Characters: Символов: - Characters (with spaces): Символов (с пробелами): @@ -1920,72 +1514,58 @@ Line: %2 TranslateDialog - This window allows you to search for some text in the translation source file. Данное окно позволяет искать текст в файле перевода. - Type in the text to search for. Введите искомый текст. - Find &source text: &Найти текст: - &Translate to: &Перевести как: - Search options Параметры поиска - Texts such as 'TeX' and 'tex' are considered as different when checked. Если отмечено, строки "ПрИмЕр" и "пример" будет считаться разными. - Match &case С учётом &регистра - Mark new translation as &finished Помечать перевод как завер&шённый - Click here to find the next occurrence of the text you typed in. Найти следующее совпадение для введённого текста. - Find Next Найти далее - Translate Перевести - Translate All Перевести все - Click here to close this window. Закрыть окно. - Cancel Отмена @@ -1993,33 +1573,26 @@ Line: %2 TranslationSettingsDialog - Source language Исходный язык - Language Язык - Country/Region Страна/Регион - Target language Язык перевода - Any Country Любая страна - - Settings for '%1' - Qt Linguist Настройки для '%1' - Qt Linguist diff --git a/translations/qt_help_ru.ts b/translations/qt_help_ru.ts index f1aa0fa..be3583c 100644 --- a/translations/qt_help_ru.ts +++ b/translations/qt_help_ru.ts @@ -4,106 +4,92 @@ QCLuceneResultWidget - Search Results Результат поиска - Note: Примечание: - The search results may not be complete since the documentation is still being indexed! Результат поиска может быть неполным, так как документация ещё индексируется! - Your search did not match any documents. По вашему запросу не найдено ни одного документа. - (The reason for this might be that the documentation is still being indexed.) (Причиной этого может быть то, что документация ещё индексируется.) + QHelp + + Untitled + Безымянный + + + QHelpCollectionHandler - The collection file '%1' is not set up yet! Файл коллекции справки '%1' ещё не установлен! - Cannot load sqlite database driver! Не удалось загрузить драйвер базы данных sqlite! - - Cannot open collection file: %1 Не удалось открыть файл коллекции справки: %1 - Cannot create tables in file %1! Не удалось создать таблицы в файле %1! - The collection file '%1' already exists! Файл коллекции справки '%1' уже существует! - Unknown filter '%1'! Неизвестный фильтр '%1'! - Invalid documentation file '%1'! Некорректный файл документации '%1'! - Cannot register namespace '%1'! Не удалось зарегистрировать пространство имён %1! - Cannot open database '%1' to optimize! Не удалось открыть базу данных '%1' для оптимизации! - Cannot create directory: %1 Не удалось создать каталог: %1 - Cannot copy collection file: %1 Не удалось скопировать файл коллекции справки: %1 - Cannot register filter %1! Не удалось зарегистрировать фильтр %1! - Cannot open documentation file %1! Не удалось открыть файл документации %1! - The namespace %1 was not registered! Пространство имён %1 не зарегистрировано! - Namespace %1 already exists! Пространство имён %1 уже существует! @@ -111,7 +97,6 @@ QHelpDBReader - Cannot open database '%1' '%2': %3 The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string Не удалось открыть базу данных '%1' '%2': %3 @@ -120,12 +105,10 @@ QHelpEngineCore - Cannot open documentation file %1: %2! Не удалось открыть файл документации %1: %2! - The specified namespace does not exist! Указанное пространство имён не существует! @@ -133,132 +116,106 @@ QHelpGenerator - Invalid help data! Некорректные данные справки! - No output file name specified! Не указано имя результирующего файла! - Building up file structure... Создание структуры файла... - The file %1 cannot be overwritten! Невозможно перезаписать файл %1! - Cannot open data base file %1! Не удалось открыть файл базы данных %1! - Cannot register namespace %1! Не удалось зарегистрировать пространство имён %1! - Insert custom filters... Добавление индивидуальных фильтров... - Insert help data for filter section (%1 of %2)... Добавление данных справки для раздела фильтра (%1 из %2)... - Documentation successfully generated. Документация успешно создана. - Some tables already exist! Некоторые таблицы уже существуют! - Cannot create tables! Не удалось создать таблицы! - Cannot register virtual folder! Не удалось зарегистрировать виртуальный каталог! - Insert files... Добавление файлов... - The referenced file %1 must be inside or within a subdirectory of (%2). Skipping it. Файл %1 должен быть в каталоге '%2' или в его подкаталоге. Пропускаем. - The file %1 does not exist! Skipping it. Файл %1 не существует! Пропускаем. - Cannot open file %1! Skipping it. Не удалось открыть файл %1! Пропускаем. - The filter %1 is already registered! Фильтр %1 уже зарегистрирован! - Cannot register filter %1! Не удалось зарегистрировать фильтр %1! - Insert indices... Добавление указателей... - Insert contents... Добавление оглавления... - Cannot insert contents! Не удалось добавить оглавление! - Cannot register contents! Не удалось зарегистрировать оглавление! - File '%1' does not exist. Файл '%1' не существует. - File '%1' cannot be opened. Невозможно открыть файл '%1'. - File '%1' contains an invalid link to file '%2' Файл '%1' содержит некорректную ссылку на файл '%2' - Invalid links in HTML files. В файлах HTML обнаружены некорректные ссылки. @@ -266,47 +223,38 @@ QHelpProject - Unknown token. Неизвестный идентификатор. - Unknown token. Expected "QtHelpProject"! Неизвестный идентификатор. Ожидается "QtHelpProject"! - Error in line %1: %2 Ошибка в строке %1: %2 - Virtual folder has invalid syntax. Виртуальный каталог имеет некорректный синтаксис. - Namespace has invalid syntax. Пространство имён имеет некорректный синтаксис. - Missing namespace in QtHelpProject. В QtHelpProject отсутствует пространство имён. - Missing virtual folder in QtHelpProject В QtHelpProject отсутствует виртуальный каталог - Missing attribute in keyword at line %1. Отсутствует атрибут у ключевого слова в строке %1. - The input file %1 could not be opened! Невозможно открыть исходный файл %1! @@ -314,52 +262,42 @@ QHelpSearchQueryWidget - Search for: Искать: - Previous search Предыдущий запрос - Next search Следующий запрос - Search Поиск - Advanced search Расширенный поиск - words <B>similar</B> to: <B>похожие</B> слова: - <B>without</B> the words: <B>не содержит</B> слов: - with <B>exact phrase</B>: содержит <B>точную фразу</B>: - with <B>all</B> of the words: содержит <B>все</B> слова: - with <B>at least one</B> of the words: содержит <B>хотя бы одно</B> из слов: @@ -367,7 +305,6 @@ QHelpSearchResultWidget - %1 - %2 of %n Hits %1 - %2 из %n совпадения @@ -376,7 +313,6 @@ - 0 - 0 of 0 Hits 0 - 0 из 0 совпадений diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index deae134..5fbd6e3 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -4,7 +4,6 @@ CloseButton - Close Tab Закрыть вкладку @@ -12,12 +11,10 @@ FakeReply - Fake error ! Фиктивная ошибка ! - Invalid URL Некорректный адрес URL @@ -25,37 +22,30 @@ MAC_APPLICATION_MENU - Services Службы - Hide %1 Скрыть %1 - Hide Others Скрыть остальные - Show All Показать все - Preferences... Настройки… - Quit %1 Завершить %1 - About %1 О программе %1 @@ -63,32 +53,26 @@ Phonon:: - Notifications Уведомления - Music Музыка - Video Видео - Communication Общение - Games Игры - Accessibility Специальные возможности @@ -96,24 +80,18 @@ Phonon::AudioOutput - - <html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html> <html>Звуковое устройство <b>%1</b> не работает.<br/>Будет использоваться <b>%2</b>.</html> - <html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html> <html>Переключение на звуковое устройство <b>%1</b><br/>, которое стало доступно и имеет высший приоритет.</html> - - Revert back to device '%1' Возвращение к устройству "%1" - <html>Switching to the audio playback device <b>%1</b><br/>which has higher preference or is specifically configured for this stream.</html> <html>Переключение на устройство вывода звука <b>%1</b><br/>, которое имеет высший приоритет или настроено для обработки данного потока.</html> @@ -121,14 +99,12 @@ Phonon::Gstreamer::Backend - Warning: You do not seem to have the package gstreamer0.10-plugins-good installed. Some video features have been disabled. Внимание: Похоже, пакет gstreamer0.10-plugins-good не установлен. Некоторые возможности воспроизведения видео недоступны. - Warning: You do not seem to have the base GStreamer plugins installed. All audio and video support has been disabled Внимание: Похоже, основной модуль GStreamer не установлен. @@ -138,7 +114,6 @@ Phonon::Gstreamer::MediaObject - Cannot start playback. Check your GStreamer installation and make sure you @@ -149,49 +124,34 @@ have libgstreamer-plugins-base installed. что пакет libgstreamer-plugins-base установлен. - Missing codec helper script assistant. Отсутствует сценарий установки кодека. - Plugin codec installation failed for codec: %0 Не удалось установить модуль кодека: %0 - A required codec is missing. You need to install the following codec(s) to play this content: %0 Отсутствует необходимый кодек. Вам нужно установить следующие кодеки для воспроизведения данного содержимого: %0 - - - - - - - - Could not open media source. Не удалось открыть источник медиа-данных. - Invalid source type. Некорректный тип источника медиа-данных. - Could not locate media source. Не удалось найти источник медиа-данных. - Could not open audio device. The device is already in use. Не удалось открыть звуковое устройство. Устройство уже используется. - Could not decode media source. Не удалось декодировать источник медиа-данных. @@ -199,162 +159,130 @@ have libgstreamer-plugins-base installed. Phonon::MMF - Audio Output Воспроизведение звука - The audio output device Устройство воспроизведения звука - No error Нет ошибки - Not found Не найдено - Out of memory Недостаточно ресурсов - Not supported Не поддерживается - Overflow Переполнение - Underflow Переполнение - Already exists Уже существует - Path not found Путь не найден - In use Используется - Not ready Не готово - Access denied Доступ запрещён - Could not connect Не удалось установить соединение - Disconnected Соединение разорвано - Permission denied Доступ запрещён - Insufficient bandwidth Недостаточная скорость передачи данных - Network unavailable Сеть недоступна - Network communication error Ошибка сетевого обмена данными - Streaming not supported Потоковое воспроизведение не поддерживается - Server alert Сигнал сервера - Invalid protocol Некорректный протокол - Invalid URL Некорректный адрес URL - Multicast error Ошибка широковещательной передачи - Proxy server error Ошибка прокси-сервера - Proxy server not supported Прокси-сервер не поддерживается - Audio output error Ошибка воспроизведения звука - Video output error Ошибка воспроизведения видео - Decoder error Ошибка декодирования - Audio or video components could not be played Аудио- или видео-состовляющая не может быть воспроизведена - DRM error Ошибка DRM - Unknown error (%1) Неизвестная ошибка (%1) @@ -362,33 +290,26 @@ have libgstreamer-plugins-base installed. Phonon::MMF::AbstractMediaPlayer - Not ready to play Не готов к воспроизведению - - Error opening file Ошибка открытия файла - Error opening URL Ошибка открытия адреса URL - Setting volume failed Не удалось установить уровень громкости - Loading clip failed Не удалось загрузить клип - Playback complete Воспроизведение завершено @@ -396,22 +317,18 @@ have libgstreamer-plugins-base installed. Phonon::MMF::AbstractVideoPlayer - Pause failed Не удалось приостановить воспроизведение - Seek failed Не удалось установить позицию - Getting position failed Не удалось получить позицию - Opening clip failed Не удалось открыть клип @@ -419,7 +336,6 @@ have libgstreamer-plugins-base installed. Phonon::MMF::AudioEqualizer - %1 Hz %1 Гц @@ -427,7 +343,6 @@ have libgstreamer-plugins-base installed. Phonon::MMF::AudioPlayer - Getting position failed Не удалось получить позицию @@ -435,11 +350,6 @@ have libgstreamer-plugins-base installed. Phonon::MMF::DsaVideoPlayer - - - - - Video display error Ошибка отображения видео @@ -447,7 +357,6 @@ have libgstreamer-plugins-base installed. Phonon::MMF::EffectFactory - Enabled Включено @@ -455,61 +364,51 @@ have libgstreamer-plugins-base installed. Phonon::MMF::EnvironmentalReverb - Decay HF ratio (%) DecayHFRatio: Ratio of high-frequency decay time to the value specified by DecayTime. Коэффициент затухания ВЧ (%) - Decay time (ms) DecayTime: Time over which reverberation is diminished. Время затухания (мс) - Density (%) Density Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Diffusion value. Плотность (%) - Diffusion (%) Diffusion: Delay between first and subsequent reflections. Note that the S60 platform documentation does not make clear the distinction between this value and the Density value. Рассеивание (%) - Reflections delay (ms) ReflectionsDelay: Amount of delay between the arrival the direct path from the source and the arrival of the first reflection. Затухание отражений (мс) - Reflections level (mB) ReflectionsLevel: Amplitude of reflections. This value is corrected by the RoomLevel to give the final reflection amplitude. Уровень отражений (мБар) - Reverb delay (ms) ReverbDelay: Amount of time between arrival of the first reflection and start of the late reverberation. Задержка эха (мс) - Reverb level (mB) ReverbLevel Amplitude of reverberations. This value is corrected by the RoomLevel to give the final reverberation amplitude. Уровень эха (мБар) - Room HF level RoomHFLevel: Amplitude of low-pass filter used to attenuate the high frequency component of reflected sound. Уровень ВЧ отражений - Room level (mB) RoomLevel: Master volume control for all reflected sound. Уровень отражений (мБар) @@ -518,20 +417,17 @@ have libgstreamer-plugins-base installed. Phonon::MMF::MediaObject - Error opening source: type not supported - Ошибка открытыия источника: тип не поддерживается + Ошибка открытия источника: тип не поддерживается - Error opening source: media type could not be determined - Ошибка открытыия источника: тип носителя не определён + Ошибка открытия источника: не удалось определить тип медиа-данных Phonon::MMF::StereoWidening - Level (%) Уровень (%) @@ -539,8 +435,6 @@ have libgstreamer-plugins-base installed. Phonon::MMF::SurfaceVideoPlayer - - Video display error Ошибка отображения видео @@ -548,22 +442,14 @@ have libgstreamer-plugins-base installed. Phonon::VolumeSlider - - - - Volume: %1% Громкость: %1% - - - Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1% Используйте данный регулятор для настройки громкости. Крайнее левое положение соответствует 0%, крайнее правое - %1% - Muted Без звука @@ -571,12 +457,10 @@ have libgstreamer-plugins-base installed. Q3Accel - %1, %2 not defined %1, %2 не определён - Ambiguous %1 not handled @@ -584,27 +468,22 @@ have libgstreamer-plugins-base installed. Q3DataTable - True Да - False Нет - Insert Вставить - Update Обновить - Delete Удалить @@ -612,313 +491,238 @@ have libgstreamer-plugins-base installed. Q3FileDialog - Copy or Move a File Копировать или переместить файл - Read: %1 Чтение: %1 - - Write: %1 Запись: %1 - - Cancel Отмена - - - - All Files (*) Все файлы (*) - Name Имя - Size Размер - Type Тип - Date Дата - Attributes Атрибуты - - &OK &ОК - Look &in: &Папка: - - - File &name: &Имя файла: - File &type: &Тип файла: - Back Назад - One directory up Вверх на один уровень - Create New Folder Создать папку - List View Список - Detail View Подробный вид - Preview File Info Предпросмотр информации о файле - Preview File Contents Предпросмотр содержимого файла - Read-write Чтение и запись - Read-only Только чтение - Write-only Только запись - Inaccessible Нет доступа - Symlink to File Ссылка на файл - Symlink to Directory Ссылка на каталог - Symlink to Special Ссылка на спецфайл - File Файл - Dir Каталог - Special Спецфайл - - - Open Открыть - - Save As Сохранить как - - - &Open &Открыть - - &Save &Сохранить - &Rename &Переименовать - &Delete &Удалить - R&eload О&бновить - Sort by &Name По &имени - Sort by &Size По &размеру - Sort by &Date По &дате - &Unsorted &Не упорядочивать - Sort Упорядочить - Show &hidden files Показать ск&рытые файлы - the file файл - the directory каталог - the symlink ссылку - Delete %1 Удалить %1 - <qt>Are you sure you wish to delete %1 "%2"?</qt> <qt>Вы действительно хотите удалить %1 "%2"?</qt> - &Yes &Да - &No &Нет - New Folder 1 Новая папка 1 - New Folder Новая папка - New Folder %1 Новая папка %1 - Find Directory Найти каталог - - Directories Каталоги - Directory: Каталог: - - Error Ошибка - %1 File not found. Check path and filename. @@ -927,17 +731,14 @@ Check path and filename. Проверьте правильность пути и имени файла. - All Files (*.*) Все файлы (*.*) - Open Открыть - Select a Directory Выбрать каталог @@ -945,29 +746,24 @@ Check path and filename. Q3LocalFs - - Could not read directory %1 Не удалось прочитать каталог %1 - Could not create directory %1 Не удалось создать каталог %1 - Could not remove file or directory %1 Не удалось удалить файл или каталог %1 - Could not rename %1 to @@ -978,14 +774,12 @@ to %2 - Could not open %1 Не удалось открыть %1 - Could not write %1 Не удалось записать @@ -995,12 +789,10 @@ to Q3MainWindow - Line up Выровнять - Customize... Настроить... @@ -1008,7 +800,6 @@ to Q3NetworkProtocol - Operation stopped by the user Операция остановлена пользователем @@ -1016,8 +807,6 @@ to Q3ProgressDialog - - Cancel Отмена @@ -1025,28 +814,22 @@ to Q3TabDialog - - OK ОК - Apply Применить - Help Справка - Defaults По умолчанию - Cancel Отмена @@ -1054,38 +837,30 @@ to Q3TextEdit - &Undo &Отменить действие - &Redo &Повторить действие - Cu&t &Вырезать - &Copy &Копировать - &Paste В&ставить - Clear Очистить - - Select All Выделить всё @@ -1093,67 +868,54 @@ to Q3TitleBar - System Системное меню - Restore up Восстановить - Minimize Свернуть - Restore down Восстановить - Maximize Распахнуть - Close Закрыть - Contains commands to manipulate the window Содержит команды управления окном - Puts a minimized window back to normal Возвращает свёрнутое окно в нормальное состояние - Moves the window out of the way Сворачивает окно - Puts a maximized window back to normal Возвращает распахнутое окно в нормальное состояние - Makes the window full screen Разворачивает окно на весь экран - Closes the window Зыкрывает окно - Displays the name of the window and contains controls to manipulate it Отображает название окна и содержит команды управления им @@ -1161,7 +923,6 @@ to Q3ToolBar - More... Больше... @@ -1169,51 +930,38 @@ to Q3UrlOperator - - - The protocol `%1' is not supported Протокол "%1" не поддерживается - The protocol `%1' does not support listing directories Протокол "%1" не поддерживает просмотр каталогов - The protocol `%1' does not support creating new directories Протокол "%1" не поддерживает создание каталогов - The protocol `%1' does not support removing files or directories Протокол "%1" не поддерживает удаление файлов или каталогов - The protocol `%1' does not support renaming files or directories Протокол "%1" не поддерживает переименование файлов или каталогов - The protocol `%1' does not support getting files Протокол "%1" не поддерживает доставку файлов - The protocol `%1' does not support putting files Протокол "%1" не поддерживает отправку файлов - - The protocol `%1' does not support copying or moving files or directories Протокол "%1" не поддерживает копирование или перемещение файлов или каталогов - - (unknown) (неизвестно) @@ -1221,27 +969,22 @@ to Q3Wizard - &Cancel От&мена - < &Back < &Назад - &Next > &Далее > - &Finish &Завершить - &Help &Справка @@ -1249,45 +992,30 @@ to QAbstractSocket - - - - Host not found Узел не найден - - - Connection refused Отказано в соединении - Connection timed out Время на соединение истекло - - - Operation on socket is not supported Операция с сокетом не поддерживается - - Socket operation timed out Время на операцию с сокетом истекло - Socket is not connected Сокет не подключён - Network unreachable Сеть недоступна @@ -1295,17 +1023,14 @@ to QAbstractSpinBox - &Step up Шаг вв&ерх - Step &down Шаг вн&из - &Select All &Выделить всё @@ -1313,7 +1038,6 @@ to QAccessibleButton - Press Нажать @@ -1321,27 +1045,22 @@ to QApplication - Executable '%1' requires Qt %2, found Qt %3. Программный модуль "%1" требует Qt %2, найдена версия %3. - Incompatible Qt Library Error Ошибка совместимости библиотеки Qt - Activate Активировать - Activates the program's main window Активирует главное окно программы - QT_LAYOUT_DIRECTION Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout. LTR @@ -1350,22 +1069,18 @@ to QAxSelect - Select ActiveX Control Выбор компоненты ActiveX - OK Выбрать - &Cancel От&мена - COM &Object: &Объект COM: @@ -1373,17 +1088,14 @@ to QCheckBox - Uncheck Снять отметку - Check Отметить - Toggle Переключить @@ -1391,57 +1103,46 @@ to QColorDialog - Hu&e: &Тон: - &Sat: &Нас: - &Val: &Ярк: - &Red: &Красный: - &Green: &Зелёный: - Bl&ue: С&иний: - A&lpha channel: &Альфа-канал: - Select Color Выбор цвета - &Basic colors &Основные цвета - &Custom colors &Пользовательские цвета - &Add to Custom Colors &Добавить к пользовательским цветам @@ -1449,23 +1150,18 @@ to QComboBox - - Open Открыть - False Нет - True Да - Close Закрыть @@ -1473,43 +1169,36 @@ to QCoreApplication - %1: key is empty QSystemSemaphore %1: пустой ключ - %1: unable to make key QSystemSemaphore %1: невозможно создать ключ - %1: ftok failed QSystemSemaphore %1: ошибка ftok - %1: already exists QSystemSemaphore %1: уже существует - %1: does not exist QSystemSemaphore %1: не существует - %1: out of resources QSystemSemaphore %1: недостаточно ресурсов - %1: unknown error %2 QSystemSemaphore %1: неизвестная ошибка %2 @@ -1518,22 +1207,18 @@ to QDB2Driver - Unable to connect Невозможно соединиться - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию - Unable to set autocommit Невозможно установить автозавершение транзакций @@ -1541,33 +1226,26 @@ to QDB2Result - - Unable to execute statement Невозможно выполнить выражение - Unable to prepare statement Невозможно подготовить выражение - Unable to bind variable Невозможно привязать значение - Unable to fetch record %1 Невозможно получить запись %1 - Unable to fetch next Невозможно получить следующую строку - Unable to fetch first Невозможно получить первую строку @@ -1575,22 +1253,18 @@ to QDateTimeEdit - AM AM - am am - PM PM - pm pm @@ -1598,17 +1272,14 @@ to QDeclarativeAbstractAnimation - Cannot animate non-existent property "%1" Невозможно анимировать несуществуещее свойство "%1" - Cannot animate read-only property "%1" Невозможно анимировать свойство только для чтения "%1" - Animation is an abstract class Animation - это абстрактный класс @@ -1616,7 +1287,6 @@ to QDeclarativeAnchorAnimation - Cannot set a duration of < 0 Невозможно установить длительность < 0 @@ -1624,67 +1294,50 @@ to QDeclarativeAnchors - Possible anchor loop detected on fill. Обнаружена возможная цикличная привязка на fill. - Possible anchor loop detected on centerIn. Обнаружена возможная цикличная привязка на centerIn. - - - - Cannot anchor to an item that isn't a parent or sibling. Невозможно установить привязку к элементу, не являющемуся родителем или соседом. - Possible anchor loop detected on vertical anchor. Обнаружена возможная цикличная привязка к вертикальной привязке. - Possible anchor loop detected on horizontal anchor. Обнаружена возможная цикличная привязка к горизонтальной привязке. - Cannot specify left, right, and hcenter anchors. Невозможно задать левую, правую и среднюю привязки. - - Cannot anchor to a null item. Невозможно привязаться к нулевому элементу. - Cannot anchor a horizontal edge to a vertical edge. Невозможно привязать горизонтальный край к вертикальному. - - Cannot anchor item to self. Невозможно привязать элемент к самому себе. - Cannot specify top, bottom, and vcenter anchors. Невозможно задать верхнюю, нижнюю и среднюю привязки. - Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors. Невозможно использовать базовую привязку вместе с верхней, нижней и центральной по вертикали. - Cannot anchor a vertical edge to a horizontal edge. Невозможно привязать вертикальный край к горизонтальному. @@ -1692,7 +1345,6 @@ to QDeclarativeAnimatedImage - Qt was built without support for QMovie Qt было собрано без поддержки QMovie @@ -1700,7 +1352,6 @@ to QDeclarativeBehavior - Cannot change the animation assigned to a Behavior. Невозможно изменить анимацию, назначенную поведению. @@ -1708,7 +1359,6 @@ to QDeclarativeBinding - Binding loop detected for property "%1" Обнаружена цикличная привязка для свойства "%1" @@ -1716,7 +1366,6 @@ to QDeclarativeCompiledBindings - Binding loop detected for property "%1" Обнаружена цикличная привязка для свойства "%1" @@ -1724,381 +1373,303 @@ to QDeclarativeCompiler - - - - - - Invalid property assignment: "%1" is a read-only property Некорректное присваивание свойства: "%1" свойство только для чтения - Invalid property assignment: unknown enumeration Некорректное присваивание свойства: неизвестное перечисление - Invalid property assignment: string expected Некорректное присваивание свойства: ожидается значение типа "string" - Invalid property assignment: url expected Некорректное присваивание свойства: ожидается значение типа "url" - Invalid property assignment: unsigned int expected Некорректное присваивание свойства: ожидается значение типа "unsigned int" - Invalid property assignment: int expected Некорректное присваивание свойства: ожидается значение типа "int" - - Invalid property assignment: float expected - Некорректное присваивание свойства: ожидается значение типа "float" + Invalid property assignment: number expected + Некорректное присваивание свойства: ожидается число - - Invalid property assignment: double expected - Некорректное присваивание свойства: ожидается значение типа "double" - - - Invalid property assignment: color expected Некорректное присваивание свойства: ожидается значение типа "color" - Invalid property assignment: date expected Некорректное присваивание свойства: ожидается значение типа "date" - Invalid property assignment: time expected Некорректное присваивание свойства: ожидается значение типа "time" - Invalid property assignment: datetime expected Некорректное присваивание свойства: ожидается значение типа "datetime" - Invalid property assignment: point expected Некорректное присваивание свойства: ожидается значение типа "point" - Invalid property assignment: size expected Некорректное присваивание свойства: ожидается значение типа "size" - Invalid property assignment: rect expected Некорректное присваивание свойства: ожидается значение типа "rect" - Invalid property assignment: boolean expected Некорректное присваивание свойства: ожидается значение булевого типа - Invalid property assignment: 3D vector expected Некорректное присваивание свойства: ожидается значение типа "трёхмерный вектор" - Invalid property assignment: unsupported type "%1" Некорректное присваивание свойства: неподдерживаемый тип "%1" - Element is not creatable. Элемент не является создаваемым. - Component elements may not contain properties other than id Элементы Component не могут содержать свойств кроме id - Invalid component id specification Некорректная спецификация id компонента - - id is not unique id не уникален - Invalid component body specification Некорректная спецификация тела компонента - Component objects cannot declare new properties. Объекты Component не могут объявлять новые свойства. - Component objects cannot declare new signals. Объекты Component не могут объявлять новые сигналы. - Component objects cannot declare new functions. Объекты Component не могут объявлять новые функции. - Cannot create empty component specification Невозможно создать пустую спецификацю компонента - Incorrectly specified signal assignment Неверно указано назначение сигнала - Cannot assign a value to a signal (expecting a script to be run) Невозможно назначить значение сигналу (сценарий должен быть запущен) - Empty signal assignment Пустое назначение сигнала - Empty property assignment Пустое назначение свойства - Attached properties cannot be used here здесь - в данном контексте? Прикреплённые свойства не могут быть использованы здесь - - Non-existent attached object Несуществующий прикреплённый объект - - Invalid attached object assignment Некорректное назначение прикреплённого объекта - Cannot assign to non-existent default property Невозможно назначить несуществующему свойству по умолчанию - - Cannot assign to non-existent property "%1" Невозможно назначить несуществующему свойству "%1" - Invalid use of namespace Некорректное использование пространства имён - Not an attached property name Не является именем привязанного свойства - Invalid use of id property Некорректное использование свойства id - - Property has already been assigned a value Свойству уже назначено значение - - Invalid grouped property access Некорректный доступ к сгруппированному свойству - Cannot assign a value directly to a grouped property Невозможно присвоить значение непосредственно сгруппированному свойству - Invalid property use Некорректное использование свойства - Property assignment expected Ожидается назначение свойства - Single property assignment expected Ожидается одиночное назначение свойства - Unexpected object assignment Неожиданное назначение объекта - Cannot assign object to list Невозможно назначить объект списку - Can only assign one binding to lists Можно назначить только одну связь для списка - Cannot assign primitives to lists Невозможно назначить примитивы списку - Cannot assign multiple values to a script property Невозможно назначить множественное значение свойству сценария - Invalid property assignment: script expected Некорректное присваивание свойства: ожидается сценарий - Cannot assign object to property Невозможно назначить объектсвойству - "%1" cannot operate on "%2" "%1" не может воздействовать на "%2" - Duplicate default property Дублирование свойства по умолчанию - Duplicate property name Дублирование названия свойства - Property names cannot begin with an upper case letter Названия свойств не могут начинаться с заглавной буквы - + Illegal property name + Недопустимое название свойства + + Duplicate signal name Дублирование названия сигнала - Signal names cannot begin with an upper case letter Названия сигналов не могут начинаться с заглавной буквы - + Illegal signal name + Недопустимое название сигнала + + Duplicate method name Дублирование название метода - Method names cannot begin with an upper case letter Названия методов не могут начинаться с заглавной буквы - + Illegal method name + Недопустимое название метода + + Property value set multiple times Значение свойства задано несколько раз - Invalid property nesting Некорректное вложенность свойств - Cannot override FINAL property Невозможно переопределить свойство FINAL - Invalid property type Некорректный тип свойства - Invalid empty ID Некорректный пустой идентификатор - IDs cannot start with an uppercase letter Идентификаторы не могут начинаться с заглавной буквы - IDs must start with a letter or underscore Идентификаторы должны начинаться с буквы или подчёркивания - IDs must contain only letters, numbers, and underscores Идентификаторы должны содержать только буквы, цифры и подчёркивания - ID illegally masks global JavaScript property Идентификатор неверно маскирует глобальное свойство JavaScript - - No property alias location Отсутствует размещение псевдонима свойства - - Invalid alias location Некорректное размещение псевдонима - Invalid alias reference. An alias reference must be specified as <id> or <id>.<property> Некорректная ссылка на псевдоним. Ссылка на псевдоним должна быть указана, как <id> или <id>.<property> - Invalid alias reference. Unable to find id "%1" Некорректная ссылка на псевдоним. Не удалось найти id "%1" @@ -2106,7 +1677,6 @@ to QDeclarativeComponent - Invalid empty URL Пустой адрес URL @@ -2114,23 +1684,18 @@ to QDeclarativeCompositeTypeManager - - Resource %1 unavailable Ресурс "%1" недоступен - Namespace %1 cannot be used as a type Пространство имён "%1" не может быть использовано в качестве типа - %1 %2 %1 %2 - Type %1 unavailable Тип "%1" недоступен @@ -2138,23 +1703,18 @@ to QDeclarativeConnections - - Cannot assign to non-existent property "%1" Невозможно назначить несуществующему свойству "%1" - Connections: nested objects not allowed Подключения: вложенные объекты недопустимы - Connections: syntax error Подключения: синтаксическая ошибка - Connections: script expected Подключения: ожидается сценарий @@ -2162,33 +1722,26 @@ to QDeclarativeEngine - executeSql called outside transaction() executeSql() вызван вне transaction() - Read-only Transaction Транзакция только для чтения - Version mismatch: expected %1, found %2 Несовпадение версий: ожидалась %1, найдена %2 - SQL transaction failed Не удалось выполнить транзакцию SQL - transaction: missing callback транзакция: отсутствует обратный вызов - - SQL: database version mismatch Не совпадает версия базы данных SQL @@ -2196,12 +1749,10 @@ to QDeclarativeFlipable - front is a write-once property front - свойство для однократной записи - back is a write-once property back - свойство для однократной записи @@ -2209,75 +1760,58 @@ to QDeclarativeImportDatabase - module "%1" definition "%2" not readable невозможно прочитать определение "%2" модуля "%1" - plugin cannot be loaded for module "%1": %2 модуль не может быть загружен для подмодуля "%1": %2 - module "%1" plugin "%2" not found подмодуль "%1" модуля "%2" не найден - - module "%1" version %2.%3 is not installed модуль "%1" версии %2.%3 не установлен - module "%1" is not installed модуль "%1" не установлен - - "%1": no such directory "%1": каталог не существует - import "%1" has no qmldir and no namespace каталог "%1" не содержит ни qmldir, ни namespace - - %1 is not a namespace - %1 - некорректное пространство имён - - nested namespaces not allowed - вложенные пространства имён недопустимы - - local directory локальный каталог - is ambiguous. Found in %1 and in %2 неоднозначно. Найдено в %1 и %2 - is ambiguous. Found in %1 in version %2.%3 and %4.%5 неоднозначно. Найдено в %1 версий %2.%3 и %4.%5 - is instantiated recursively обрабатывается рекурсивно - is not a type не является типом @@ -2285,7 +1819,6 @@ to QDeclarativeKeyNavigationAttached - KeyNavigation is only available via attached properties KeyNavigation доступна только через прикреплённые свойства @@ -2293,7 +1826,6 @@ to QDeclarativeKeysAttached - Keys is only available via attached properties Keys доступны только через прикреплённые свойства @@ -2301,59 +1833,46 @@ to QDeclarativeListModel - remove: index %1 out of range remove: индекс %1 вне диапазона - insert: value is not an object insert: значение не является объектом - insert: index %1 out of range insert: индекс %1 вне диапазона - move: out of range move: индекс вне диапазона - append: value is not an object append: значение не является объектом - set: value is not an object set: значение не является объектом - - set: index %1 out of range set: индекс %1 вне диапазона - - ListElement: cannot contain nested elements ListElement: не может содержать вложенные элементы - ListElement: cannot use reserved "id" property ListElement: невозможно использовать зарезервированное свойство "id" - ListElement: cannot use script for property value ListElement: невозможно использовать сценарий в качестве значения свойства - ListModel: undefined property '%1' ListModel: неопределённое свойство "%1" @@ -2361,7 +1880,6 @@ to QDeclarativeLoader - Loader does not support loading non-visual elements. Загрузчик не поддерживает загрузку невизуальных элементов. @@ -2369,18 +1887,14 @@ to QDeclarativeParentAnimation - Unable to preserve appearance under complex transform Невозможно сохранить внешний вид при сложном преобразовании - - Unable to preserve appearance under non-uniform scale Невозможно сохранить внешний вид при неоднородном масштабе - Unable to preserve appearance under scale of 0 Невозможно сохранить внешний вид при масштабе 0 @@ -2388,18 +1902,14 @@ to QDeclarativeParentChange - Unable to preserve appearance under complex transform Невозможно сохранить внешний вид при сложном преобразовании - - Unable to preserve appearance under non-uniform scale Невозможно сохранить внешний вид при неоднородном масштабе - Unable to preserve appearance under scale of 0 Невозможно сохранить внешний вид при масштабе 0 @@ -2407,144 +1917,110 @@ to QDeclarativeParser - - - Illegal unicode escape sequence Неверная unicode esc-последовательность - Illegal character Недопустимый символ - Unclosed string at end of line Незакрытый текст в конце строки - Illegal escape squence Неверная esc-последовательность - Unclosed comment at end of file Незакрытый комментарий в конце строки - Illegal syntax for exponential number Недопустимый синтаксис для экспоненциального числа - Identifier cannot start with numeric literal Идентификатор не может начинаться с цифры - Unterminated regular expression literal Незаконченный литерал регулярного выражения - Invalid regular expression flag '%0' Некорректный флаг "%0" в регулярном выражении - - Unterminated regular expression backslash sequence Регулярное выражение содержит незавершённую экранированную последовательность - Unterminated regular expression class Регулярное выражение содержит незавершённый класс - - Syntax error Синтаксическая ошибка - Unexpected token `%1' Неожиданный символ "%1" - - Expected token `%1' Ожидается символ "%1" - - - Property value set multiple times Значение свойства установлено несколько раз - Expected type name Ожидается название типа - Invalid import qualifier ID Некорректный ID спецификатора импорта - Reserved name "Qt" cannot be used as an qualifier Зарезервированное имя "Qt" не может быть использовано в качестве спецификатора - Script import qualifiers must be unique. Спецификаторы импорта сценария должны быть уникальными. - Script import requires a qualifier Для импорта сценария требуется спецификатор - Library import requires a version Импорт библиотеки требует версию - Expected parameter type Ожидается тип параметра - Invalid property type modifier Некорректный модификатор типа свойства - Unexpected property type modifier Неожиданный модификатор типа свойства - Expected property type Ожидается тип свойства - Readonly not yet supported Readonly ещё не поддерживается - JavaScript declaration outside Script element Определение JavaScript вне элемента Script @@ -2552,39 +2028,28 @@ to QDeclarativePauseAnimation - Cannot set a duration of < 0 Невозможно установить длительность < 0 - QDeclarativePixmapCache + QDeclarativePixmap - Error decoding: %1: %2 Ошибка декодирования: %1: %2 - Failed to get image from provider: %1 - Не удалось получить изображение от поставщика: %1 + Не удалось получить изображение от постащика изображений: %1 - - Cannot open: %1 Не удалось открыть: %1 - - - Unknown Error loading %1 - Неизвестная ошибка загрузки %1 - QDeclarativePropertyAnimation - Cannot set a duration of < 0 Невозможно установить длительность < 0 @@ -2592,17 +2057,14 @@ to QDeclarativePropertyChanges - PropertyChanges does not support creating state-specific objects. PropertyChanges не поддерживают создание объектов, зависимых от состояния. - Cannot assign to non-existent property "%1" Невозможно назначить несуществующему свойству "%1" - Cannot assign to read-only property "%1" Невозможно назначить свойству только для чтения "%1" @@ -2610,13 +2072,10 @@ to QDeclarativeTextInput - - Could not load cursor delegate Не удалось загрузить делегат курсора - Could not instantiate cursor delegate Не удалось инстанциировать делегат курсора @@ -2624,47 +2083,38 @@ to QDeclarativeVME - Unable to create object of type %1 Невозможно создать объект типа "%1" - Cannot assign value %1 to property %2 Невозможно установить значение "%1" свойству "%2" - Cannot assign object type %1 with no default method Невозможно назначить объект типа %1 без метода по умолчанию - Cannot connect mismatched signal/slot %1 %vs. %2 Невозможно подключить отсутствующий сигнал/слот %1 к %2 - Cannot assign an object to signal property %1 Невозможно назначить объект к свойству сигнала %1 - Cannot assign object to list Невозможно назначить объект списку - Cannot assign object to interface property Невозможно назначить объект свойству интерфейса - Unable to create attached object Не удалось создать вложенный объект - Cannot set properties on %1 as it is null Невозможно установить свойства для %1, так как он нулевой @@ -2672,7 +2122,6 @@ to QDeclarativeVisualDataModel - Delegate component must be Item type. Компинент делегата должен быть типа Item. @@ -2680,8 +2129,6 @@ to QDeclarativeXmlListModel - - Qt was built without support for xmlpatterns Qt было собрано без поддержки xmlpatterns @@ -2689,7 +2136,6 @@ to QDeclarativeXmlListModelRole - An XmlRole query must not start with '/' Запрос XmlRole не должен начинаться с '/' @@ -2697,7 +2143,6 @@ to QDeclarativeXmlRoleList - An XmlListModel query must start with '/' or "//" Запрос XmlListModel должен начинаться с '/' или "//" @@ -2705,17 +2150,14 @@ to QDial - QDial QDial - SpeedoMeter SpeedoMeter - SliderHandle SliderHandle @@ -2723,12 +2165,10 @@ to QDialog - What's This? Что это? - Done Готово @@ -2736,124 +2176,98 @@ to QDialogButtonBox - - - OK ОК - Save Сохранить - &Save &Сохранить - Open Открыть - Cancel Отмена - &Cancel От&мена - Close Закрыть - &Close &Закрыть - Apply Применить - Reset Сбросить - Help Справка - Don't Save Не сохранять - Discard Отклонить - &Yes &Да - Yes to &All Да для &всех - &No &Нет - N&o to All Н&ет для всех - Save All Сохранить все - Abort Прервать - Retry Повторить - Ignore Пропустить - Restore Defaults Восстановить значения - Close without Saving Закрыть без сохранения - &OK &ОК @@ -2861,29 +2275,24 @@ to QDirModel - Name Имя - Size Размер - Kind Match OS X Finder Вид - Type All other platforms Тип - Date Modified Дата изменения @@ -2891,17 +2300,14 @@ to QDockWidget - Close Закрыть - Dock Прикрепить - Float Открепить @@ -2909,12 +2315,10 @@ to QDoubleSpinBox - More Больше - Less Меньше @@ -2922,27 +2326,22 @@ to QErrorMessage - &Show this message again &Показывать это сообщение в дальнейшем - &OK &Закрыть - Debug Message: Отладочное сообщение: - Warning: Предупреждение: - Fatal Error: Критическая ошибка: @@ -2950,38 +2349,30 @@ to QFile - - Destination file exists Файл существует - Will not rename sequential file using block copy Последовательный файл не будет переименован с использованием поблочного копирования - Cannot remove source file Невозможно удалить исходный файл - Cannot open %1 for input Невозможно открыть %1 для ввода - Cannot open for output Невозможно открыть для вывода - Failure to write block Сбой записи блока - Cannot create %1 for output Невозможно создать %1 для вывода @@ -2989,143 +2380,110 @@ to QFileDialog - - All Files (*) Все файлы (*) - - Back Назад - - List View Список - - Detail View Подробный вид - - File Файл - File Folder Match Windows Explorer Папка с файлами - Folder All other platforms Папка - Alias Mac OS X Finder Псевдоним - Shortcut All other platforms Ярлык - Open Открыть - Save As Сохранить как - - - &Open &Открыть - - &Save &Сохранить - '%1' is write protected. Do you want to delete it anyway? - + "%1" защищён от записи. +Действительно желаете удалить? - Recent Places Недавние документы - &Rename &Переименовать - &Delete &Удалить - Show &hidden files Показать ск&рытые файлы - New Folder Новая папка - Find Directory Найти каталог - Directories Каталоги - All Files (*.*) Все файлы (*.*) - - Directory: Каталог: - %1 already exists. Do you want to replace it? %1 уже существует. Хотите заменить его? - %1 File not found. Please verify the correct file name was given. @@ -3134,25 +2492,18 @@ Please verify the correct file name was given. Проверьте правильность указанного имени файла. - My Computer Мой компьютер - - Parent Directory Родительский каталог - - Files of type: Типы файлов: - - %1 Directory not found. Please verify the correct directory name was given. @@ -3161,97 +2512,74 @@ Please verify the correct directory name was given. Проверьте правильность указанного имени каталога. - Are sure you want to delete '%1'? Вы действительно хотите удалить "%1"? - Could not delete directory. Не удалось удалить каталог. - Drive Диск - Unknown Неизвестный - Show Показать - - Forward Вперёд - &New Folder &Новая папка - - &Choose &Выбрать - Remove Удалить - - File &name: &Имя файла: - - Look in: Перейти к: - - Create New Folder Создать папку - Go back Назад - Go forward Вперёд - Go to the parent directory Перейти в родительский каталог - Create a New Folder Создать новую папку - Change to list view mode Переключить в режим списка - Change to detail view mode Переключить в подробный режим @@ -3259,83 +2587,64 @@ Please verify the correct directory name was given. QFileSystemModel - - %1 TB %1 Тб - - %1 GB %1 Гб - - %1 MB %1 Мб - - %1 KB %1 Кб - %1 bytes %1 байт - Invalid filename Некорректное имя файла - <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. <b>Имя "%1" не может быть использовано.</b><p>Попробуйте использовать имя меньшей длины и/или без символов пунктуации. - Name Имя - Size Размер - Kind Match OS X Finder Вид - Type All other platforms Тип - Date Modified Дата изменения - My Computer Мой компьютер - Computer Компьютер - %1 byte(s) %1 байт @@ -3343,221 +2652,170 @@ Please verify the correct directory name was given. QFontDatabase - - Normal Обычный - - - Bold Жирный - - Demi Bold Полужирный - - - Black Чёрный - Demi Средний - - Light Светлый - - Italic Курсив - - Oblique Наклонный - Any Любая - Latin Латиница - Greek Греческая - Cyrillic Кириллица - Armenian Армянская - Hebrew Иврит - Arabic Арабская - Syriac Сирийская - Thaana Таана - Devanagari Деванагири - Bengali Бенгальская - Gurmukhi Гурмукхи - Gujarati Гуджарати - Oriya Ория - Tamil Тамильская - Telugu Телугу - Kannada Каннада - Malayalam Малайялам - Sinhala Сингальская - Thai Тайская - Lao Лаосская - Tibetan Тибетская - Myanmar Мьянма - Georgian Грузинская - Khmer Кхмерская - Simplified Chinese Китайская упрощённая - Traditional Chinese Китайская традиционная - Japanese Японская - Korean Корейская - Vietnamese Вьетнамская - Symbol Символьная - Ogham Огамическая - Runic Руническая - N'Ko Нко @@ -3565,47 +2823,38 @@ Please verify the correct directory name was given. QFontDialog - &Font &Шрифт - Font st&yle &Начертание - &Size &Размер - Effects Эффекты - Stri&keout Зачёр&кнутый - &Underline П&одчёркнутый - Sample Пример - Select Font Выбор шрифта - Wr&iting System &Система письма @@ -3613,145 +2862,104 @@ Please verify the correct directory name was given. QFtp - Host %1 found Узел %1 найден - Host found Узел найден - - - Connected to host %1 Установлено соединение с узлом %1 - Connected to host Соединение с узлом установлено - Connection to %1 closed Соединение с %1 закрыто - - - Connection closed Соединение закрыто - - Host %1 not found Узел %1 не найден - - Connection refused to host %1 В соединении с узлом %1 отказано - Connection timed out to host %1 Время на соединение с узлом %1 истекло - - - - Unknown error Неизвестная ошибка - - Connecting to host failed: %1 Не удалось соединиться с узлом: %1 - - Login failed: %1 Не удалось авторизоваться: %1 - - Listing directory failed: %1 Не удалось прочитать каталог: %1 - - Changing directory failed: %1 Не удалось сменить каталог: %1 - - Downloading file failed: %1 Не удалось загрузить файл: %1 - - Uploading file failed: %1 Не удалось отгрузить файл: %1 - - Removing file failed: %1 Не удалось удалить файл: %1 - - Creating directory failed: %1 Не удалось создать каталог: %1 - - Removing directory failed: %1 Не удалось удалить каталог: %1 - - Not connected Соединение не установлено - - Connection refused for data connection Отказ в соединении для передачи данных @@ -3759,12 +2967,10 @@ Please verify the correct directory name was given. QHostInfo - Unknown error Неизвестная ошибка - No host name given Имя узла не задано @@ -3772,37 +2978,22 @@ Please verify the correct directory name was given. QHostInfoAgent - - - - Host not found Узел не найден - - - - Unknown address type Неизвестный тип адреса - - - Unknown error Неизвестная ошибка - - No host name given Имя узла не задано - - Invalid hostname Некорректное имя узла @@ -3810,153 +3001,110 @@ Please verify the correct directory name was given. QHttp - - Connection refused Отказано в соединении - - - Host %1 not found Узел %1 не найден - - Wrong content length Неверная длина содержимого - - HTTP request failed HTTP-запрос не удался - Host %1 found Узел %1 найден - Host found Узел найден - Connected to host %1 Установлено соединение с узлом %1 - Connected to host Соединение с узлом установлено - Connection to %1 closed Соединение с узлом %1 закрыто - - Connection closed Соединение закрыто - - - - Unknown error Неизвестная ошибка - - Request aborted Запрос прерван - - No server set to connect to Не указан сервер для подключения - - Server closed connection unexpectedly Сервер неожиданно разорвал соединение - - Invalid HTTP response header Некорректный HTTP-заголовок ответа - Unknown authentication method Неизвестный метод авторизации - - - - Invalid HTTP chunked body Некорректное HTTP-фрагментирование данных - Error writing response to device Ошибка записи ответа на устройство - Proxy authentication required Требуется авторизация на прокси-сервере - Authentication required Требуется авторизация - Proxy requires authentication Прокси-сервер требует авторизацию - Host requires authentication Узел требует авторизацию - Data corrupted Данные повреждены - SSL handshake failed Квитирование SSL не удалось - Unknown protocol specified Указан неизвестный протокол - Connection refused (or timed out) В соединении отказано (или время ожидания истекло) - HTTPS connection requested but SSL support not compiled in Запрошено соединение по протоколу HTTPS, но поддержка SSL не скомпилирована @@ -3964,47 +3112,38 @@ Please verify the correct directory name was given. QHttpSocketEngine - Did not receive HTTP response from proxy Не получен HTTP-ответ от прокси-сервера - Error parsing authentication request from proxy Ошибка разбора запроса авторизации от прокси-сервера - Authentication required Требуется авторизация - Proxy denied connection Прокси-сервер запретил соединение - Error communicating with HTTP proxy Ошибка обмена данными с прокси-сервером HTTP - Proxy server not found Прокси-сервер не найден - Proxy connection refused В соединении прокси-сервером отказано - Proxy server connection timed out Время на соединение с прокси-сервером истекло - Proxy connection closed prematurely Соединение с прокси-сервером неожиданно закрыто @@ -4012,22 +3151,18 @@ Please verify the correct directory name was given. QIBaseDriver - Error opening database Ошибка открытия базы данных - Could not start transaction Не удалось начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -4035,89 +3170,70 @@ Please verify the correct directory name was given. QIBaseResult - Unable to create BLOB Невозможно создать BLOB - Unable to write BLOB Невозможно записать BLOB - Unable to open BLOB Невозможно открыть BLOB - Unable to read BLOB Невозможно прочитать BLOB - - Could not find array Не удалось найти массив - Could not get array data Не удалось найти данные массива - Could not get query info Не удалось найти информацию о запросе - Could not start transaction Не удалось начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Could not allocate statement Не удалось получить ресурсы для создания выражения - Could not prepare statement Не удалось подготовить выражение - - Could not describe input statement Не удалось описать входящее выражение - Could not describe statement Не удалось описать выражение - Unable to close statement Невозможно закрыть выражение - Unable to execute query Невозможно выполнить запрос - Could not fetch next item Не удалось получить следующий элемент - Could not get statement info Не удалось найти информацию о выражении @@ -4125,27 +3241,22 @@ Please verify the correct directory name was given. QIODevice - Permission denied Доступ запрещён - Too many open files Слишком много открытых файлов - No such file or directory Файл или каталог не существует - No space left on device Нет свободного места на устройстве - Unknown error Неизвестная ошибка @@ -4153,32 +3264,26 @@ Please verify the correct directory name was given. QInputContext - XIM Метод ввода X-сервера - FEP Метод ввода S60 FEP - XIM input method Метод ввода X-сервера - Windows input method Метод ввода Windows - Mac OS X input method Метод ввода Mac OS X - S60 FEP input method Метод ввода S60 FEP @@ -4186,7 +3291,6 @@ Please verify the correct directory name was given. QInputDialog - Enter a value: Укажите значение: @@ -4194,67 +3298,50 @@ Please verify the correct directory name was given. QLibrary - Could not mmap '%1': %2 Не удалось выполнить mmap "%1": %2 - Plugin verification data mismatch in '%1' Проверочная информация для модуля "%1" не совпадает - Could not unmap '%1': %2 Не удалось выполнить unmap "%1": %2 - The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5] Модуль "%1" использует несоместимую библиотеку Qt. (%2.%3.%4) [%5] - The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3" Модуль "%1" использует несоместимую библиотеку Qt. Ожидается ключ "%2", но получен ключ "%3" - Unknown error Неизвестная ошибка - - - The shared library was not found. Динамическая библиотека не найдена. - The file '%1' is not a valid Qt plugin. Файл "%1" - не является корректным модулем Qt. - The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.) Модуль "%1" использует несоместимую библиотеку Qt. (Невозможно совместить релизные и отладочные библиотеки.) - - Cannot load library %1: %2 Невозможно загрузить библиотеку %1: %2 - - Cannot unload library %1: %2 Невозможно выгрузить библиотеку %1: %2 - - Cannot resolve symbol "%1" in %2: %3 Невозможно разрешить символ "%1" в %2: %3 @@ -4262,37 +3349,30 @@ Please verify the correct directory name was given. QLineEdit - Select All Выделить всё - &Undo &Отменить действие - &Redo &Повторить действие - Cu&t &Вырезать - &Copy &Копировать - &Paste В&ставить - Delete Удалить @@ -4300,23 +3380,18 @@ Please verify the correct directory name was given. QLocalServer - - %1: Name error %1: Некорректное имя - %1: Permission denied %1: Доступ запрещён - %1: Address in use %1: Адрес используется - %1: Unknown error %2 %1: Неизвестная ошибка %2 @@ -4324,70 +3399,46 @@ Please verify the correct directory name was given. QLocalSocket - - %1: Connection refused %1: Отказано в соединении - - %1: Remote closed %1: Закрыто удаленной стороной - - - - %1: Invalid name %1: Некорректное имя - - %1: Socket access error %1: Ошибка обращения к сокету - - %1: Socket resource error %1: Ошибка выделения ресурсов сокета - - %1: Socket operation timed out %1: Время на операцию с сокетом истекло - - %1: Datagram too large %1: Датаграмма слишком большая - - - %1: Connection error %1: Ошибка соединения - - %1: The socket operation is not supported %1: Операция с сокетом не поддерживается - %1: Unknown error %1: Неизвестная ошибка - - %1: Unknown error %2 %1: Неизвестная ошибка %2 @@ -4395,27 +3446,22 @@ Please verify the correct directory name was given. QMYSQLDriver - Unable to open database ' Невозможно открыть базу данных ' - Unable to connect Невозможно соединиться - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -4423,60 +3469,46 @@ Please verify the correct directory name was given. QMYSQLResult - - Unable to fetch data Невозможно получить данные - Unable to execute query Невозможно выполнить запрос - Unable to store result Невозможно сохранить результат - - Unable to prepare statement Невозможно подготовить выражение - Unable to reset statement Невозможно сбросить выражение - Unable to bind value Невозможно привязать значение - Unable to execute statement Невозможно выполнить выражение - - Unable to bind outvalues Невозможно привязать результирующие значения - Unable to store statement results Невозможно сохранить результаты выполнения выражения - Unable to execute next query Невозможно выполнить следующий запрос - Unable to store next result Невозможно сохранить следующий результат @@ -4484,7 +3516,6 @@ Please verify the correct directory name was given. QMdiArea - (Untitled) (Неозаглавлено) @@ -4492,92 +3523,74 @@ Please verify the correct directory name was given. QMdiSubWindow - %1 - [%2] %1 - [%2] - Close Закрыть - Minimize Свернуть - Restore Down Восстановить - &Restore &Восстановить - &Move &Переместить - &Size &Размер - Mi&nimize &Свернуть - Ma&ximize Р&аспахнуть - Stay on &Top Оставаться &сверху - &Close &Закрыть - Maximize Распахнуть - Unshade Восстановить из заголовка - Shade Свернуть в заголовок - Restore Восстановить - Help Справка - Menu Меню - - [%1] - [%1] @@ -4585,21 +3598,14 @@ Please verify the correct directory name was given. QMenu - - Close Закрыть - - Open Открыть - - - Execute Выполнить @@ -4607,7 +3613,6 @@ Please verify the correct directory name was given. QMenuBar - Actions Действия @@ -4615,40 +3620,30 @@ Please verify the correct directory name was given. QMessageBox - - - - OK Закрыть - <h3>About Qt</h3><p>This program uses Qt version %1.</p> <h3>О Qt</h3><p>Данная программа использует Qt версии %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> <p>Qt - это инструментарий для разработки кроссплатформенных приложений на C++.</p><p>Qt предоставляет совместимость на уровне исходных текстов между MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux и всеми популярными коммерческими вариантами Unix. Также Qt доступна для встраиваемых устройств в виде Qt для Embedded Linux и Qt для Windows CE.</p><p>Qt доступна под тремя различными лицензиями, разработанными для удовлетворения различных требований.</p><p>Qt под нашей коммерческой лицензией предназначена для развития проприетарного/коммерческого программного обеспечения, когда Вы не желаете предоставлять исходные тексты третьим сторонам, или в случае невозможности принятия условий лицензий GNU LGPL версии 2.1 или GNU GPL версии 3.0.</p><p>Qt под лицензией GNU LGPL версии 2.1 предназначена для разработки программного обеспечения с открытыми исходными текстами или коммерческого программного обеспечения при соблюдении условий лицензии GNU LGPL версии 2.1.</p><p>Qt под лицензией GNU General Public License версии 3.0 предназначена для разработки программных приложений в тех случаях, когда Вы хотели бы использовать такие приложения в сочетании с программным обеспечением на условиях лицензии GNU GPL с версии 3.0 или если Вы готовы соблюдать условия лицензии GNU GPL версии 3.0.</p><p>Обратитесь к <a href="http://qt.nokia.com/products/licensing">qt.nokia.com/products/licensing</a> для обзора лицензий Qt.</p><p>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения.</p><p>Qt - продукт компании Nokia. Обратитесь к <a href="http://qt.nokia.com/">qt.nokia.com</a> для получения дополнительной информации.</p> - About Qt О Qt - Help Справка - Show Details... Показать подробности... - Hide Details... Скрыть подробности... @@ -4656,7 +3651,6 @@ Please verify the correct directory name was given. QMultiInputContext - Select IM Выбор режима ввода @@ -4664,12 +3658,10 @@ Please verify the correct directory name was given. QMultiInputContextPlugin - Multiple input method switcher Переключатель режима множественного ввода - Multiple input method switcher that uses the context menu of the text widgets Переключатель режима множественного ввода, используемый в контекстном меню текстовых редакторов @@ -4677,132 +3669,106 @@ Please verify the correct directory name was given. QNativeSocketEngine - The remote host closed the connection Удалённый узел закрыл соединение - Network operation timed out Время на сетевую операцию истекло - Out of resources Недостаточно ресурсов - Unsupported socket operation Операция с сокетом не поддерживается - Protocol type not supported Протокол не поддерживается - Invalid socket descriptor Некорректный дескриптор сокета - Network unreachable Сеть недоступна - Permission denied Доступ запрещён - Connection timed out Время на соединение истекло - Connection refused Отказано в соединении - The bound address is already in use Адрес уже используется - The address is not available Адрес недоступен - The address is protected Адрес защищён - Unable to send a message Невозможно отправить сообщение - Unable to receive a message Невозможно получить сообщение - Unable to write Невозможно записать - Network error Ошибка сети - Another socket is already listening on the same port Другой сокет уже прослушивает этот порт - Unable to initialize non-blocking socket Невозможно инициализировать не-блочный сокет - Unable to initialize broadcast socket Невозможно инициализировать широковещательный сокет - Attempt to use IPv6 socket on a platform with no IPv6 support Попытка использовать IPv6 на платформе, не поддерживающей IPv6 - Host unreachable Узел недоступен - Datagram was too large to send Датаграмма слишком большая для отправки - Operation on non-socket Операция с не-сокетом - Unknown error Неизвестная ошибка - The proxy type is invalid for this operation Некорректный тип прокси-сервера для данной операции @@ -4810,7 +3776,6 @@ Please verify the correct directory name was given. QNetworkAccessCacheBackend - Error opening %1 Ошибка открытия %1 @@ -4818,12 +3783,10 @@ Please verify the correct directory name was given. QNetworkAccessDataBackend - Operation not supported on %1 Операция не поддерживается для %1 - Invalid URI: %1 Некорректный URI: %1 @@ -4831,17 +3794,14 @@ Please verify the correct directory name was given. QNetworkAccessDebugPipeBackend - Write error writing to %1: %2 Ошибка записи в %1: %2 - Socket error on %1: %2 Ошика сокета для %1: %2 - Remote host closed the connection prematurely on %1 Удалённый узел неожиданно прервал соединение для %1 @@ -4849,30 +3809,22 @@ Please verify the correct directory name was given. QNetworkAccessFileBackend - - Request for opening non-local file %1 Запрос на открытие файла вне файловой системы %1 - - Error opening %1: %2 Ошибка открытия %1: %2 - Write error writing to %1: %2 Ошибка записи в %1: %2 - - Cannot open %1: Path is a directory Невозможно открыть %1: Указан путь к каталогу - Read error reading from %1: %2 Ошибка чтения из %1: %2 @@ -4880,27 +3832,22 @@ Please verify the correct directory name was given. QNetworkAccessFtpBackend - No suitable proxy found Подходящий прокси-сервер не найден - Cannot open %1: is a directory Невозможно открыть %1: Указан путь к каталогу - Logging in to %1 failed: authentication required Соединение с %1 не удалось: требуется авторизация - Error while downloading %1: %2 Ошибка в процессе загрузки %1: %2 - Error while uploading %1: %2 Ошибка в процессе отгрузки %1: %2 @@ -4908,7 +3855,6 @@ Please verify the correct directory name was given. QNetworkAccessHttpBackend - No suitable proxy found Подходящий прокси-сервер не найден @@ -4916,7 +3862,6 @@ Please verify the correct directory name was given. QNetworkAccessManager - Network access is disabled. Доступ в сеть отключён. @@ -4924,22 +3869,18 @@ Please verify the correct directory name was given. QNetworkReply - Error downloading %1 - server replied: %2 Ошибка загрузки %1 - ответ сервера: %2 - Protocol "%1" is unknown Неизвестный протокол "%1" - Network session error. Ошибка сетевой сессии. - Temporary network failure. Временная ошибка сети. @@ -4947,8 +3888,6 @@ Please verify the correct directory name was given. QNetworkReplyImpl - - Operation canceled Операция отменена @@ -4956,7 +3895,6 @@ Please verify the correct directory name was given. QNetworkSession - Invalid configuration. Некорректная конфигурация. @@ -4964,48 +3902,35 @@ Please verify the correct directory name was given. QNetworkSessionPrivateImpl - Roaming error или перемещения? Ошибка роуминга - Session aborted by user or system Сессия прервана пользователем или системой - Unidentified Error Неопределённая ошибка - - Unknown session error. Неизвестная ошибка сессии. - - The session was aborted by the user or system. Сессия была прервана пользователем или системой. - - The requested operation is not supported by the system. Требуемая операция не поддерживается системой. - - The specified configuration cannot be used. Невозможно использовать указанную конфигурацию. - - Roaming was aborted or is not possible. Роуминг прерван или невозможен. @@ -5013,28 +3938,23 @@ Please verify the correct directory name was given. QOCIDriver - Unable to initialize QOCIDriver Невозможно инициализировать - Unable to logon Невозможно авторизоваться - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -5042,44 +3962,34 @@ Please verify the correct directory name was given. QOCIResult - - - Unable to bind column for batch execute Невозможно привязать столбец для пакетного выполнения - Unable to execute batch statement Невозможно выполнить пакетное выражение - Unable to goto next Невозможно перейти к следующей строке - Unable to alloc statement Невозможно создать выражение - Unable to prepare statement Невозможно подготовить выражение - Unable to get statement type Невозможно определить тип выражения - Unable to bind value Невозможно привязать результирующие значения - Unable to execute statement Невозможно выполнить выражение @@ -5087,32 +3997,26 @@ Please verify the correct directory name was given. QODBCDriver - Unable to connect Невозможно соединиться - Unable to disable autocommit Невозможно отключить автозавершение транзакций - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию - Unable to enable autocommit Невозможно включить автозавершение транзакций - Unable to connect - Driver doesn't support all functionality required Невозможно соединиться - Драйвер не поддерживает требуемый функционал @@ -5120,51 +4024,38 @@ Please verify the correct directory name was given. QODBCResult - - QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration QODBCResult::reset: Невозможно установить "SQL_CURSOR_STATIC" атрибутом выражение. Проверьте настройки драйвера ODBC - - Unable to execute statement Невозможно выполнить выражение - Unable to fetch next Невозможно получить следующую строку - Unable to prepare statement Невозможно подготовить выражение - Unable to bind variable Невозможно привязать значение - - - Unable to fetch last Невозможно получить последнюю строку - Unable to fetch Невозможно получить данные - Unable to fetch first Невозможно получить первую строку - Unable to fetch previous Невозможно получить предыдущую строку @@ -5172,19 +4063,14 @@ Please verify the correct directory name was given. QObject - "%1" duplicates a previous role name and will be disabled. "%1" повторяет имя предыдущей роли и не будет использовано. - - invalid query: "%1" Некорректный запрос: "%1" - - PulseAudio Sound Server Звуковой сервер PulseAudio @@ -5192,12 +4078,10 @@ Please verify the correct directory name was given. QPPDOptionsModel - Name Имя - Value Значение @@ -5205,32 +4089,26 @@ Please verify the correct directory name was given. QPSQLDriver - Unable to connect Невозможно соединиться - Could not begin transaction Не удалось начать транзакцию - Could not commit transaction Не удалось завершить транзакцию - Could not rollback transaction Не удалось отозвать транзакцию - Unable to subscribe Невозможно подписаться - Unable to unsubscribe Невозможно отписаться @@ -5238,12 +4116,10 @@ Please verify the correct directory name was given. QPSQLResult - Unable to create query Невозможно создать запрос - Unable to prepare statement Невозможно подготовить выражение @@ -5251,102 +4127,82 @@ Please verify the correct directory name was given. QPageSetupWidget - Centimeters (cm) Сантиметры (cm) - Millimeters (mm) Миллиметры (mm) - Inches (in) Дюймы (in) - Points (pt) Точки (pt) - Form Форма - Paper Бумага - Page size: Размер страницы: - Width: Ширина: - Height: Высота: - Paper source: Источник бумаги: - Orientation Ориентация - Portrait Книжная - Landscape Альбомная - Reverse landscape Перевёрнутая альбомная - Reverse portrait Перевёрнутая книжная - Margins Поля - top margin верхнее поле - left margin левое поле - right margin правое поле - bottom margin нижнее поле @@ -5354,12 +4210,10 @@ Please verify the correct directory name was given. QPluginLoader - Unknown error Неизвестная ошибка - The plugin was not loaded. Модуль не был загружен. @@ -5367,433 +4221,344 @@ Please verify the correct directory name was given. QPrintDialog - locally connected соединено локально - - Aliases: %1 Псевдонимы: %1 - - unknown неизвестно - OK Закрыть - Print all Все страницы - Print range Диапазон страниц - A0 (841 x 1189 mm) A0 (841 x 1189 мм) - A1 (594 x 841 mm) A1 (594 x 841 мм) - A2 (420 x 594 mm) A2 (420 x 594 мм) - A3 (297 x 420 mm) A3 (297 x 420 мм) - A5 (148 x 210 mm) A5 (148 x 210 мм) - A6 (105 x 148 mm) A6 (105 x 148 мм) - A7 (74 x 105 mm) A7 (74 x 105 мм) - A8 (52 x 74 mm) A8 (52 x 74 мм) - A9 (37 x 52 mm) A9 (37 x 52 мм) - B0 (1000 x 1414 mm) B0 (1000 x 1414 мм) - B1 (707 x 1000 mm) B1 (707 x 1000 мм) - B2 (500 x 707 mm) B2 (500 x 707 мм) - B3 (353 x 500 mm) B3 (353 x 500 мм) - B4 (250 x 353 mm) B4 (250 x 353 мм) - B6 (125 x 176 mm) B6 (125 x 176 мм) - B7 (88 x 125 mm) B7 (88 x 125 мм) - B8 (62 x 88 mm) B8 (62 x 88 мм) - B9 (44 x 62 mm) B9 (44 x 62 мм) - B10 (31 x 44 mm) B10 (31 x 44 мм) - C5E (163 x 229 mm) C5E (163 x 229 мм) - DLE (110 x 220 mm) DLE (110 x 220 мм) - Folio (210 x 330 mm) Folio (210 x 330 мм) - Ledger (432 x 279 mm) Ledger (432 x 279 мм) - Tabloid (279 x 432 mm) Tabloid (279 x 432 мм) - US Common #10 Envelope (105 x 241 mm) Конверт US #10 (105x241 мм) - Print current page Текущая страница - A4 (210 x 297 mm, 8.26 x 11.7 inches) A4 (210 x 297 мм, 8.26 x 11.7 дюймов) - B5 (176 x 250 mm, 6.93 x 9.84 inches) B5 (176 x 250 мм, 6.93 x 9.84 дюймов) - Executive (7.5 x 10 inches, 191 x 254 mm) Executive (191 x 254 мм, 7.5 x 10 дюймов) - Legal (8.5 x 14 inches, 216 x 356 mm) Legal (216 x 356 мм, 8.5 x 14 дюймов) - Letter (8.5 x 11 inches, 216 x 279 mm) Letter (216 x 279 мм, 8.5 x 11 дюймов) - Print selection Выделенный фрагмент - - - Print Печать - Print To File ... Печать в файл ... - File %1 is not writable. Please choose a different file name. %1 недоступен для записи. Выберите другое имя файла. - %1 already exists. Do you want to overwrite it? %1 уже существует. Хотите заменить его? - File exists Файл существует - <qt>Do you want to overwrite it?</qt> <qt>Хотите заменить?</qt> - %1 is a directory. Please choose a different file name. %1 - это каталог. Выберите другое имя файла. - The 'From' value cannot be greater than the 'To' value. Значение "с" не может быть больше значения "по". - A0 A0 - A1 A1 - A2 A2 - A3 A3 - A4 A4 - A5 A5 - A6 A6 - A7 A7 - A8 A8 - A9 A9 - B0 B0 - B1 B1 - B2 B2 - B3 B3 - B4 B4 - B5 B5 - B6 B6 - B7 B7 - B8 B8 - B9 B9 - B10 B10 - C5E C5E - DLE DLE - Executive Executive - Folio Folio - Ledger Ledger - Legal Legal - Letter Letter - Tabloid Tabloid - US Common #10 Envelope US Common #10 Envelope - Custom Пользовательский - - &Options >> &Параметры >> - &Options << &Параметры << - Print to File (PDF) Печать в файл (PDF) - Print to File (Postscript) Печать в файл (Postscript) - Local file Локальный файл - Write %1 file Запись %1 файла - &Print &Печать @@ -5801,108 +4566,86 @@ Please choose a different file name. QPrintPreviewDialog - %1% %1% - Print Preview Просмотр печати - Next page Следующая страница - Previous page Предыдущая страница - First page Первая страница - Last page Последняя страница - Fit width По ширине - Fit page На всю страницу - Zoom in Увеличить - Zoom out Уменьшить - Portrait Книжная - Landscape Альбомная - Show single page Показать одну страницу - Show facing pages Показать титульные страницы - Show overview of all pages Показать обзор всех страниц - Print Печать - Page setup Параметры страницы - Close Закрыть - Export to PDF Экспорт в PDF - Export to PostScript Экспорт в Postscript - - Page Setup Параметры страницы @@ -5910,17 +4653,14 @@ Please choose a different file name. QPrintPropertiesWidget - Form Форма - Page Страница - Advanced Дополнительно @@ -5928,102 +4668,82 @@ Please choose a different file name. QPrintSettingsOutput - Form Форма - Copies Копии - Print range Диапазон печати - Print all Все - Pages from Страницы с - to по - Selection Выделенный фрагмент - Output Settings Настройки вывода - Copies: Количество копий: - Collate - Разобрать про копиям + Разобрать по копиям - Reverse Обратный порядок - Options Параметры - Color Mode Режим цвета - Color Цвет - Grayscale Оттенки серого - Duplex Printing Двусторонняя печать - None Нет - Long side По длинной стороне - Short side По короткой стороне - Current Page Текущая страница @@ -6031,47 +4751,38 @@ Please choose a different file name. QPrintWidget - Form Форма - Printer Принтер - &Name: &Название: - P&roperties С&войства - Location: Расположение: - Preview Просмотр - Type: Тип: - Output &file: Вывод в &файл: - ... ... @@ -6079,62 +4790,38 @@ Please choose a different file name. QProcess - - Could not open input redirection for reading Не удалось открыть перенаправление ввода для чтения - - Could not open output redirection for writing Не удалось открыть перенаправление вывода для записи - Resource error (fork failure): %1 Ошибка выделения ресурсов (сбой fork): %1 - - - - - - - - - Process operation timed out Время на операцию с процессом истекло - - - - Error reading from process Ошибка получения данных от процесса - - - Error writing to process Ошибка отправки данных процессу - Process crashed Процесс завершился с ошибкой - No program defined Программа не указана - Process failed to start: %1 Не удалось запустить процесс: %1 @@ -6142,7 +4829,6 @@ Please choose a different file name. QProgressDialog - Cancel Отмена @@ -6150,7 +4836,6 @@ Please choose a different file name. QPushButton - Open Открыть @@ -6158,7 +4843,6 @@ Please choose a different file name. QRadioButton - Check Отметить @@ -6166,57 +4850,46 @@ Please choose a different file name. QRegExp - no error occurred ошибки отсутствуют - disabled feature used использование отключённых возможностей - bad char class syntax неправильный синтаксис класса символов - bad lookahead syntax неправильный предварительный синтаксис - bad repetition syntax неправильный синтаксис повторения - invalid octal value некорректное восьмеричное значение - missing left delim отсутствует левый разделитель - unexpected end неожиданный конец - met internal limit достигнуто внутреннее ограничение - invalid interval некорректный интервал - invalid category некорректная категория @@ -6224,22 +4897,18 @@ Please choose a different file name. QSQLite2Driver - Error opening database Ошибка открытия базы данных - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -6247,12 +4916,10 @@ Please choose a different file name. QSQLite2Result - Unable to fetch results Невозможно получить результаты - Unable to execute statement Невозможно выполнить выражение @@ -6260,27 +4927,22 @@ Please choose a different file name. QSQLiteDriver - Error opening database Ошибка открытия базы данных - Error closing database Ошибка закрытия базы данных - Unable to begin transaction Невозможно начать транзакцию - Unable to commit transaction Невозможно завершить транзакцию - Unable to rollback transaction Невозможно отозвать транзакцию @@ -6288,34 +4950,26 @@ Please choose a different file name. QSQLiteResult - - - Unable to fetch row Невозможно получить строку - Unable to execute statement Невозможно выполнить выражение - Unable to reset statement Невозможно сбросить выражение - Unable to bind parameters Невозможно привязать параметр - Parameter count mismatch Количество параметров не совпадает - No query Отсутствует запрос @@ -6323,32 +4977,26 @@ Please choose a different file name. QScriptBreakpointsModel - ID ID - Location Размещение - Condition Условие - Ignore-count Пропущено - Single-shot Однократно - Hit-count Совпадений @@ -6356,12 +5004,10 @@ Please choose a different file name. QScriptBreakpointsWidget - New Новая - Delete Удалить @@ -6369,143 +5015,114 @@ Please choose a different file name. QScriptDebugger - - Go to Line Перейти к строке - Line: Строка: - Interrupt Прервать - Shift+F5 Shift+F5 - Continue Продолжить - F5 F5 - Step Into Войти в - F11 F11 - Step Over Перейти через - F10 F10 - Step Out Выйти из функции - Shift+F11 Shift+F11 - Run to Cursor Выполнить до курсора - Ctrl+F10 Ctrl+F10 - Run to New Script Выполнить до нового сценария - Toggle Breakpoint Установить/убрать точку останова - F9 F9 - Clear Debug Output Очистить отладочный вывод - Clear Error Log Очистить журнал ошибок - Clear Console Очистить консоль - &Find in Script... &Найти в сценарии... - Ctrl+F Ctrl+F - Find &Next Найти &следующее - F3 F3 - Find &Previous Найти &предыдущее - Shift+F3 Shift+F3 - Ctrl+G Ctrl+G - Debug Отладка @@ -6513,32 +5130,26 @@ Please choose a different file name. QScriptDebuggerCodeFinderWidget - Close Закрыть - Previous Предыдущий - Next Следующий - Case Sensitive Учитывать регистр - Whole words Слова целиком - <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Search wrapped <img src=":/qt/scripttools/debugging/images/wrap.png">&nbsp;Поиск с начала @@ -6546,12 +5157,10 @@ Please choose a different file name. QScriptDebuggerLocalsModel - Name Название - Value Значение @@ -6559,17 +5168,14 @@ Please choose a different file name. QScriptDebuggerStackModel - Level Уровень - Name Название - Location Размещение @@ -6577,22 +5183,18 @@ Please choose a different file name. QScriptEdit - Toggle Breakpoint Установить/убрать точку останова - Disable Breakpoint Убрать точку останова - Enable Breakpoint Установить точку останова - Breakpoint Condition: Условие точки останова: @@ -6600,52 +5202,42 @@ Please choose a different file name. QScriptEngineDebugger - Loaded Scripts Загруженные сценарии - Breakpoints Точки останова - Stack Стек - Locals Локальные переменные - Console Консоль - Debug Output Отладочный вывод - Error Log Журнал ошибок - Search Поиск - View Вид - Qt Script Debugger Отладчик сценариев Qt @@ -6653,7 +5245,6 @@ Please choose a different file name. QScriptNewBreakpointWidget - Close Закрыть @@ -6661,84 +5252,66 @@ Please choose a different file name. QScrollBar - Scroll here Прокрутить сюда - Left edge К левой границе - Top Вверх - Right edge К правой границе - Bottom Вниз - Page left На страницу влево - - Page up На страницу вверх - Page right На страницу вправо - - Page down На страницу вниз - Scroll left Прокрутить влево - Scroll up Прокрутить вверх - Scroll right Прокрутить вправо - Scroll down Прокрутить вниз - Line up На строку вверх - Position Положение - Line down На строку вниз @@ -6746,111 +5319,78 @@ Please choose a different file name. QSharedMemory - %1: create size is less then 0 %1: размер меньше нуля - - %1: unable to lock %1: невозможно заблокировать - %1: unable to unlock %1: невозможно разблокировать - - - %1: permission denied %1: доступ запрещён - - - %1: already exists %1: уже существует - %1: doesn't exists %1: не существует - - - %1: out of resources %1: недостаточно ресурсов - - - %1: unknown error %2 %1: неизвестная ошибка %2 - %1: key is empty %1: пустой ключ - %1: ftok failed %1: ошибка ftok - - - %1: unable to make key %1: невозможно создать ключ - - %1: doesn't exist %1: не существует - %1: UNIX key file doesn't exist %1: специфический ключ UNIX не существует - %1: system-imposed size restrictions %1: системой наложены ограничения на размер - %1: not attached %1: не приложенный - - %1: invalid size %1: некорректный размер - - %1: key error %1: некорректный ключ - %1: size query failed %1: не удалось запросить размер - %1: unable to set key on lock %1: невозможно установить ключ блокировки @@ -6858,1063 +5398,884 @@ Please choose a different file name. QShortcut - Space This and all following "incomprehensible" strings in QShortcut context are key names. Please use the localized names appearing on actual keyboards or whatever is commonly used. Пробел - Esc Esc - Tab Tab - Backtab Backtab - Backspace Backspace - Return Return - Enter Enter - Ins Ins - Del Del - Pause Pause - Print Print - SysReq SysReq - Home Home - End End - Left Влево - Up Вверх - Right Вправо - Down Вниз - PgUp PgUp - PgDown PgDown - CapsLock CapsLock - NumLock NumLock - ScrollLock ScrollLock - Menu Меню - Help Справка - Back Назад - Forward Вперёд - Stop Остановить - Refresh Обновить - Volume Down Тише - Volume Mute Выключить звук - Volume Up Громче - Bass Boost Усиление басов - Bass Up Басы выше - Bass Down Басы ниже - Treble Up ВЧ выше - Treble Down ВЧ ниже - Media Play - Воспроизведение + Начать воспроизведение - Media Stop Остановить воспроизведение - Media Previous Воспроизвести предыдущее - Media Next Воспроизвести следующее - Media Record - Запись + Начать запись + + + Media Pause + Media player pause button + Приостановить воспроизведение + + + Toggle Media Play/Pause + Media player button to toggle between playing and paused + Приостановить/продолжить воспроизведение - Favorites Избранное - Search Поиск - Standby Режим ожидания - Open URL Открыть URL - Launch Mail Почта - Launch Media Проигрыватель - Launch (0) Запустить (0) - Launch (1) Запустить (1) - Launch (2) Запустить (2) - Launch (3) Запустить (3) - Launch (4) Запустить (4) - Launch (5) Запустить (5) - Launch (6) Запустить (6) - Launch (7) Запустить (7) - Launch (8) Запустить (8) - Launch (9) Запустить (9) - Launch (A) Запустить (A) - Launch (B) Запустить (B) - Launch (C) Запустить (C) - Launch (D) Запустить (D) - Launch (E) Запустить (E) - Launch (F) Запустить (F) - Monitor Brightness Up Увеличить яркость монитора - Monitor Brightness Down Уменьшить яркость монитора - Keyboard Light On/Off Вкл./Откл. подсветку клавиатуры - Keyboard Brightness Up Увеличить яркость подсветки клавиатуры - Keyboard Brightness Down Уменьшить яркость подсветки клавиатуры - Power Off Отключение питания - Wake Up Пробуждение - Eject Извлечь - Screensaver Экранная заставка - WWW WWW - Sleep Спящий режим - LightBulb Лампочка - Shop Магазин - History История - Add Favorite Добавить в избранное - Hot Links Горячие ссылки - Adjust Brightness Настройка яркости - Finance Финансы - Community Сообщество - Audio Rewind Перемотка аудио назад - Back Forward - Application Left - Application Right - Book Книга - CD CD - Calculator Калькулятор - Clear Очистить - Clear Grab - Close Закрыть - Copy Копировать - Cut Вырезать - Display - DOS DOS - Documents Документы - Spreadsheet Электронная таблицы - Browser Обозреватель - Game Игра - Go Перейти - iTouch iTouch - Logoff Выйти из системы - Market Рынок - Meeting Встреча - Keyboard Menu Клавиатурное меню - Menu PB - My Sites Мои сайты - News Новости - Home Office Домашний офис - Option Опция - Paste Вставить - Phone Телефон - Reply Ответить - Reload Перезагрузить - Rotate Windows Повернуть окна - Rotation PB - Rotation KB - Save Сохранить - Send Отправить - Spellchecker Проверка орфографии - Split Screen Разделить экран - Support Поддержка - Task Panel Панель задач - Terminal Терминал - Tools Инструменты - Travel Путешествие - Video Видео - Word Processor Текстовый редактор - XFer - Zoom In Увеличить - Zoom Out Уменьшить - Away Ушёл - Messenger Клиент обмена мгновенными сообщениями - WebCam Вэб-камера - Mail Forward Переслать письмо - Pictures Изображения - Music Музыка - Battery Батарея - Bluetooth Bluetooth - Wireless Беспроводная сеть - Ultra Wide Band - + Сверхширокополосная связь - Audio Forward - + Последовательное воспроизведение - Audio Repeat - + Воспроизведение по кругу - Audio Random Play - + Случайное воспроизведение - Subtitle Субтитры - Audio Cycle Track - + Зацикленное воспроизведение дорожки - Time Время - View Вид - Top Menu Главное меню - Suspend - + Приостановить - Hibernate - + Усыпить - Print Screen Печать экрана - Page Up На страницу вверх - Page Down На страницу вниз - Caps Lock Верний регистр - Num Lock Цифровые клавиши - Number Lock Цифровые клавиши - Scroll Lock Scroll Lock - Insert Вставить - Delete Удалить - Escape Escape - System Request Системный запрос - + Toggle Call/Hangup + Button that will hang up if we're in call, or make a call if we're not. + Снять/положить трубку + + + Voice Dial + Button to trigger voice dialling + Голосовой вызов + + + Last Number Redial + Button to redial the last number called + Повторный набор + + + Camera Shutter + Button to trigger the camera shutter (take a picture) + Затвор камеры + + + Camera Focus + Button to focus the camera + Фокусировка камеры + + Kanji - Muhenkan - Henkan - Romaji - Hiragana - Katakana - Hiragana Katakana - Zenkaku - Hankaku - Zenkaku Hankaku - Touroku - Massyo - Kana Lock - Kana Shift - Eisu Shift - Eisu toggle - Code input - Multiple Candidate - Previous Candidate - Hangul - Hangul Start - Hangul End - Hangul Hanja - Hangul Jamo - Hangul Romaja - Hangul Jeonja - Hangul Banja - Hangul PreHanja - Hangul PostHanja - Hangul Special - - Select Выбрать - Yes Да - No Нет - Context1 - Context2 - Context3 - Context4 - Call + Button to start a call (note: a separate button is used to end the call) Позвонить - Hangup + Button to end a call (note: a separate button is used to start the call) Положить трубку - Flip - - Ctrl Ctrl - - Shift Shift - - Alt Alt - - Meta Meta - + + - F%1 F%1 - Home Page Домашняя страница @@ -7922,27 +6283,22 @@ Please choose a different file name. QSlider - Page left Страница влево - Page up Страница вверх - Position Положение - Page right Страница вправо - Page down Страница вниз @@ -7950,72 +6306,58 @@ Please choose a different file name. QSocks5SocketEngine - Connection to proxy refused В соединении с прокси-сервером отказано - Connection to proxy closed prematurely Соединение с прокси-сервером неожиданно закрыто - Proxy host not found Прокси-сервер не найден - Connection to proxy timed out Время на соединение с прокси-сервером истекло - Proxy authentication failed Не удалось авторизоваться на прокси-сервере - Proxy authentication failed: %1 Не удалось авторизоваться на прокси-сервере: %1 - SOCKS version 5 protocol error Ошибка протокола SOCKSv5 - General SOCKSv5 server failure Ошибка сервере SOCKSv5 - Connection not allowed by SOCKSv5 server Соединение не разрешено сервером SOCKSv5 - TTL expired TTL истекло - SOCKSv5 command not supported Команда SOCKSv5 не поддерживается - Address type not supported Тип адреса не поддерживается - Unknown SOCKSv5 proxy error code 0x%1 Неизвестная ошибка SOCKSv5 прокси (код 0x%1) - Network operation timed out Время на сетевую операцию истекло @@ -8023,32 +6365,26 @@ Please choose a different file name. QSoftKeyManager - Ok ОК - Select Выбрать - Done Готово - Options Параметры - Cancel Отмена - Exit Выход @@ -8056,12 +6392,10 @@ Please choose a different file name. QSpinBox - More Больше - Less Меньше @@ -8069,56 +6403,42 @@ Please choose a different file name. QSql - Delete Удалить - Delete this record? Удалить данную запись? - - - Yes Да - - - No Нет - Insert Вставить - Update Обновить - Save edits? Сохранить изменения? - Cancel Отмена - Confirm Подтверждение - Cancel your edits? Отменить изменения? @@ -8126,177 +6446,142 @@ Please choose a different file name. QSslSocket - Unable to write data: %1 Невозможно записать данные: %1 - Unable to decrypt data: %1 Невозможно расшифровать данные: %1 - Error while reading: %1 Ошибка чтения: %1 - Error during SSL handshake: %1 Ошибка квитирования SSL: %1 - Error creating SSL context (%1) Ошибка создания контекста SSL: (%1) - Invalid or empty cipher list (%1) Некорректный или пустой список шифров (%1) - Private key does not certify public key, %1 Закрытый ключ не соответствует открытому ключу, %1 - Error creating SSL session, %1 Ошибка создания сессии SSL, %1 - Error creating SSL session: %1 Ошибка создания сессии SSL: %1 - Cannot provide a certificate with no key, %1 Невозможно предоставить сертификат без ключа, %1 - Error loading local certificate, %1 Ошибка загрузки локального сертификата, %1 - Error loading private key, %1 Ошибка загрузки закрытого ключа, %1 - No error Нет ошибки - The issuer certificate could not be found Не удалось найти сертификат издателя - The certificate signature could not be decrypted Не удалось расшифровать подпись сертификата - The public key in the certificate could not be read Не удалось прочитать открытый ключ сертификата - The signature of the certificate is invalid Некорректная подпись сертификата - The certificate is not yet valid Срок действия сертификата ещё не наступил - The certificate has expired Срок действия сертификата истёк - The certificate's notBefore field contains an invalid time Поле notBefore сертификата содержит некорректное время - The certificate's notAfter field contains an invalid time Поле notAfter сертификата содержит некорректное время - The certificate is self-signed, and untrusted Сертификат самоподписанный и не является заверенным - The root certificate of the certificate chain is self-signed, and untrusted Корневой сертификат цепочки сертификатов самоподписанный и не является заверенным - The issuer certificate of a locally looked up certificate could not be found Не удалось найти сертификат издателя локального сертификата - No certificates could be verified Не удалось проверить сертификаты - One of the CA certificates is invalid Один из сертификатов центра сертификации некорректен - The basicConstraints path length parameter has been exceeded Превышено значение параметра длины пути поля basicConstraints сертификата - The supplied certificate is unsuitable for this purpose Представленный сертификат непригоден для данной цели - The root CA certificate is not trusted for this purpose Корневой сертификат центра сертификации не является заверенным для данной цели - The root CA certificate is marked to reject the specified purpose Корневой сертификат центра сертификации отмечен на отклонение для данной цели - The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate Текущий сертификат издателя был отклонён, так как название темы не совпадает с названием издателя сертификата - The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate Текущий сертификат издателя был отклонён, так как название издателя и серийный номер не совпадают с идентификатором ключа сертификата - The peer did not present any certificate Сертификат не был предоставлен - The host name did not match any of the valid hosts for this certificate Название узла не совпадает с допустимыми названиями узлов сертификата - Unknown error Неизвестная ошибка @@ -8304,22 +6589,18 @@ Please choose a different file name. QStateMachine - Missing initial state in compound state '%1' Отсутствует исходное состояние в составном состоянии "%1" - Missing default state in history state '%1' Отсутствует состояние по умолчанию в историческом состоянии "%1" - No common ancestor for targets and source of transition from state '%1' Нет общего предка у источника и цели перехода из состояния "%1" - Unknown error Неизвестная ошибка @@ -8327,30 +6608,22 @@ Please choose a different file name. QSystemSemaphore - %1: does not exist %1: не существует - - %1: out of resources %1: недостаточно ресурсов - - %1: permission denied %1: доступ запрещён - %1: already exists %1: уже существует - - %1: unknown error %2 %1: неизвестная ошибка %2 @@ -8358,12 +6631,10 @@ Please choose a different file name. QTDSDriver - Unable to open connection Невозможно открыть соединение - Unable to use database Невозможно использовать базу данных @@ -8371,12 +6642,10 @@ Please choose a different file name. QTabBar - Scroll Left Прокрутить влево - Scroll Right Прокрутить вправо @@ -8384,7 +6653,6 @@ Please choose a different file name. QTcpServer - Operation on socket is not supported Операция с сокетом не поддерживается @@ -8392,42 +6660,34 @@ Please choose a different file name. QTextControl - &Undo &Отменить действие - &Redo &Повторить действие - Cu&t &Вырезать - &Copy &Копировать - Copy &Link Location Скопировать &адрес ссылки - &Paste В&ставить - Delete Удалить - Select All Выделить всё @@ -8435,14 +6695,10 @@ Please choose a different file name. QToolButton - - Press Нажать - - Open Открыть @@ -8450,7 +6706,6 @@ Please choose a different file name. QUdpSocket - This platform does not support IPv6 Данная платформа не поддерживает IPv6 @@ -8458,12 +6713,10 @@ Please choose a different file name. QUndoGroup - Undo Отменить действие - Redo Повторить действие @@ -8471,7 +6724,6 @@ Please choose a different file name. QUndoModel - <empty> <пусто> @@ -8479,12 +6731,10 @@ Please choose a different file name. QUndoStack - Undo Отменить действие - Redo Повторить действие @@ -8492,57 +6742,46 @@ Please choose a different file name. QUnicodeControlCharacterMenu - LRM Left-to-right mark LRM Признак написания слева направо - RLM Right-to-left mark RLM Признак написания справа налево - ZWJ Zero width joiner ZWJ Объединяющий символ нулевой ширины - ZWNJ Zero width non-joiner ZWNJ Необъединяющий символ нулевой ширины - ZWSP Zero width space ZWSP Пробел нулевой ширины - LRE Start of left-to-right embedding LRE Начало встраивания написания слева направо - RLE Start of right-to-left embedding LRE Начало встраивания написания справа налево - LRO Start of left-to-right override LRO Начало замены написания слева направо - RLO Start of right-to-left override RLO Начало замены написания справа налево - PDF Pop directional formatting PDF Признак окончания написания с другим направлением - Insert Unicode control character Вставить управляющий символ Unicode @@ -8550,32 +6789,26 @@ Please choose a different file name. QWebFrame - Request cancelled Запрос отменён - Request blocked Запрос блокирован - Cannot show URL Невозможно отобразить URL - Frame load interrupted by policy change Загрузка фрейма прервана изменением политики - Cannot show mimetype Невозможно отобразить тип MIME - File does not exist Файл не существует @@ -8583,858 +6816,705 @@ Please choose a different file name. QWebPage - Web Inspector - %2 Web-инспектор - %2 - Redirection limit reached Достигнут предел переадресации - Bad HTTP request Некорректный HTTP-запрос - Scroll here Прокрутить сюда - Left edge К левой границе - Top Вверх - Right edge К правой границе - Bottom Вниз - Page left На страницу влево - Page up На страницу вверх - Page right На страницу вправо - Page down На страницу вниз - Scroll left Прокрутить влево - Scroll up Прокрутить вверх - Scroll right Прокрутить вправо - Scroll down Прокрутить вниз - JavaScript Alert - %1 JavaScript: Предупреждение - %1 - JavaScript Confirm - %1 JavaScript: Подтверждение - %1 - JavaScript Prompt - %1 JavaScript: Запрос - %1 - JavaScript Problem - %1 JavaScript: Проблема - %1 - The script on this page appears to have a problem. Do you want to stop the script? Сбой выполнения сценария на данной странице. Желаете остановить выполение сценария? - Move the cursor to the next character Переместить указатель к следующему символу - Move the cursor to the previous character Переместить указатель к предыдущему символу - Move the cursor to the next word Переместить указатель к следующему слову - Move the cursor to the previous word Переместить указатель к предыдущему слову - Move the cursor to the next line Переместить указатель на следующую строку - Move the cursor to the previous line Переместить указатель на предыдущую строку - Move the cursor to the start of the line Переместить указатель в начало строки - Move the cursor to the end of the line Переместить указатель в конец строки - Move the cursor to the start of the block Переместить указатель в начало блока - Move the cursor to the end of the block Переместить указатель в конец блока - Move the cursor to the start of the document Переместить указатель в начало документа - Move the cursor to the end of the document Переместить указатель в конец документа - Select all Выделить всё - Select to the next character Выделить до следующего символа - Select to the previous character Выделить до предыдущего символа - Select to the next word Выделить до следующего слова - Select to the previous word Выделить до предыдущего слова - Select to the next line Выделить до следующей строки - Select to the previous line Выделить до предыдущей строки - Select to the start of the line Выделить до начала строки - Select to the end of the line Выделить до конца строки - Select to the start of the block Выделить до начала блока - Select to the end of the block Выделить до конца блока - Select to the start of the document Выделить до начала документа - Select to the end of the document Выделить до конца документа - Delete to the start of the word Удалить до начала слова - Delete to the end of the word Удалить до конца слова - Insert a new paragraph Вставить новый параграф - Insert a new line Вставить новую строку - Paste and Match Style Вставить, сохранив стиль - Remove formatting Удалить форматирование - Strikethrough Зачёркнутый - Subscript Подстрочный - Superscript Надстрочный - Insert Bulleted List Вставить маркированный список - Insert Numbered List Вставить нумерованный список - Indent Увеличить отступ - Outdent Уменьшить отступ - Center По центру - Justify По ширине - Align Left По левому краю - Align Right По правому краю - Submit default label for Submit buttons in forms on web pages Отправить - Submit Submit (input element) alt text for <input> elements with no alt, title, or value Отправить - Reset default label for Reset buttons in forms on web pages Сбросить - This is a searchable index. Enter search keywords: text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' Индекс поиска. Введите ключевые слова для поиска: - Choose File title for file button used in HTML forms Обзор... - No file selected text to display in file button used in HTML forms when no file is selected Файл не указан - Open in New Window Open in New Window context menu item Открыть в новом окне - Save Link... Download Linked File context menu item Сохранить по ссылке как... - Copy Link Copy Link context menu item Копировать адрес ссылки - Open Image Open Image in New Window context menu item Открыть изображение - Save Image Download Image context menu item Сохранить изображение - Copy Image Copy Link context menu item - Копировать изображение в буффер обмена + Копировать изображение - Open Frame Open Frame in New Window context menu item Открыть фрейм - Copy Copy context menu item Копировать - Go Back Back context menu item Назад - Go Forward Forward context menu item Вперёд - Stop Stop context menu item Остановить - Reload Reload context menu item Обновить - Cut Cut context menu item Вырезать - Paste Paste context menu item Вставить - No Guesses Found No Guesses Found context menu item Совпадений не найдено - Ignore Ignore Spelling context menu item ?Пропускать Пропустить - Add To Dictionary Learn Spelling context menu item Добавить в словарь - Search The Web Search The Web context menu item Искать в Интернет - Look Up In Dictionary Look Up in Dictionary context menu item Искать в словаре - Open Link Open Link context menu item Открыть ссылку - Ignore Ignore Grammar context menu item ?Пропускать Пропустить - Spelling Spelling and Grammar context sub-menu item Орфография - Show Spelling and Grammar menu item title Показать панель проверки правописания - Hide Spelling and Grammar menu item title Скрыть панель проверки правописания - Check Spelling Check spelling context menu item Проверка орфографии - Check Spelling While Typing Check spelling while typing context menu item Проверять орфографию при наборе текста - Check Grammar With Spelling Check grammar with spelling context menu item Проверять грамматику с орфографией - Fonts Font context sub-menu item Шрифты - Bold Bold context menu item Жирный - Italic Italic context menu item Курсив - Underline Underline context menu item Подчёркнутый - Outline Outline context menu item Перечёркнутый - Direction Writing direction context sub-menu item Направление письма - Text Direction Text direction context sub-menu item Направление текста - Default Default writing direction context menu item По умолчанию - Left to Right Left to Right context menu item Слева направо - Right to Left Right to Left context menu item Справа налево - Inspect Inspect Element context menu item Проверить - No recent searches Label for only item in menu that appears when clicking on the search field image, when no searches have been performed История поиска пуста - Recent searches label for first item in the menu that appears when clicking on the search field image, used as embedded menu title История поиска - Clear recent searches menu item in Recent Searches menu that empties menu's contents Очистить историю поиска - Missing Plug-in Label text to be used when a plug-in is missing Модуль отсутствует - Unknown Unknown filesize FTP directory listing item Неизвестно - %1 (%2x%3 pixels) Title string for images %1 (%2x%3 px) - Loading... Media controller status message when the media is loading Загрузка... - Live Broadcast Media controller status message when watching a live broadcast Потоковое вещание - Audio Element Media controller element Аудио-элемент - Video Element Media controller element Видео-элемент - Mute Button Media controller element Кнопка "Отключить звук" - Unmute Button Media controller element Кнопка "Включить звук" - Play Button Media controller element Кнопка "Воспроизведение" - Pause Button Media controller element Кнопка "Пауза" - Slider Media controller element Регулятор - Slider Thumb Media controller element Указатель регулятора - Rewind Button Media controller element Кнопка "Перемотка назад" - Return to Real-time Button Media controller element Кнопка "Вернуть в реальное время" - Elapsed Time Media controller element Прошло времени - Remaining Time Media controller element Осталось времени - Status Display Media controller element Отображение состояния - Fullscreen Button Media controller element Кнопка "На весь экран" - Seek Forward Button Media controller element Кнопка "Перемотка вперёд" - Seek Back Button Media controller element Кнопка "Перемотка назад" - Audio element playback controls and status display Media controller element Элементы управления воспроизведением звука и отображением состояния - Video element playback controls and status display Media controller element Элементы управления воспроизведением видео и отображением состояния - Mute audio tracks Media controller element Отключить звуковые дорожки - Unmute audio tracks Media controller element Включить звуковые дорожки - Begin playback Media controller element Начать воспроизведение - Pause playback Media controller element Приостановить воспроизведение - Movie time scrubber Media controller element Перемотка - Movie time scrubber thumb Media controller element Позиция перемотки - Rewind movie Media controller element Перемотка в начало - Return streaming movie to real-time Media controller element Возвращает потоковое видео к воспроизведению в реальном времени - Current movie time Media controller element Текущее время фильма - Remaining movie time Media controller element Оставшееся время фильма - Current movie status Media controller element Текущее состояние фильма - Play movie in full-screen mode Media controller element - Воспроизведение фильма в режиме отображения на весь экран + Воспроизведение в режиме отображения на весь экран - Seek quickly back Media controller element Быстрая перемотка назад - Seek quickly forward Media controller element Быстрая перемотка вперёд - Indefinite time Media time description Время не определено - %1 days %2 hours %3 minutes %4 seconds Media time description %1 дней %2 часов %3 минут %4 секунд - %1 hours %2 minutes %3 seconds Media time description %1 часов %2 минут %3 секунд - %1 minutes %2 seconds Media time description %1 минут %2 секунд - %1 seconds Media time description %1 секунд - %n file(s) number of chosen file @@ -9447,7 +7527,6 @@ Please choose a different file name. QWhatsThisAction - What's This? Что это? @@ -9455,7 +7534,6 @@ Please choose a different file name. QWidget - * * @@ -9463,57 +7541,46 @@ Please choose a different file name. QWizard - Cancel Отмена - Help Справка - < &Back < &Назад - &Finish &Завершить - &Help &Справка - Go Back Назад - Continue Продолжить - Commit Передать - Done Готово - &Next &Далее - &Next > &Далее > @@ -9521,69 +7588,54 @@ Please choose a different file name. QWorkspace - &Restore &Восстановить - &Move &Переместить - &Size &Размер - Mi&nimize &Свернуть - Ma&ximize Р&аспахнуть - &Close &Закрыть - Stay on &Top Оставаться &сверху - Minimize Свернуть - Restore Down Восстановить - Close Закрыть - - Sh&ade Св&ернуть в заголовок - - %1 - [%2] %1 - [%2] - &Unshade В&осстановить из заголовка @@ -9591,117 +7643,94 @@ Please choose a different file name. QXml - no error occurred ошибки отсутствуют - error triggered by consumer ошибка вызвана пользователем - unexpected end of file неожиданный конец файла - more than one document type definition указано более одного типа документа - error occurred while parsing element ошибка разбора элемента - tag mismatch тэг не совпадает - error occurred while parsing content ошибка разбора документа - unexpected character неожиданный символ - invalid name for processing instruction некорректное имя директивы разбора - version expected while reading the XML declaration в объявлении XML ожидается параметр version - wrong value for standalone declaration некорректное значение параметра standalone - error occurred while parsing document type definition ошибка разбора объявления типа документа - letter is expected ожидалась буква - error occurred while parsing comment ошибка разбора комментария - error occurred while parsing reference ошибка разбора ссылки - internal general entity reference not allowed in DTD внутренняя ссылка на общий объект недопустима в DTD - external parsed general entity reference not allowed in attribute value внешняя ссылка на общий объект недопустима в значении атрибута - external parsed general entity reference not allowed in DTD внешняя ссылка на общий объект недопустима в DTD - unparsed entity reference in wrong context неразобранная ссылка на объект в неправильном контексте - recursive entities рекурсивные объекты - error in the text declaration of an external entity ошибка в объявлении внешнего объекта - encoding declaration or standalone declaration expected while reading the XML declaration в объявлении XML ожидаются параметры encoding или standalone - standalone declaration expected while reading the XML declaration в объявлении XML ожидается параметр standalone @@ -9709,27 +7738,22 @@ Please choose a different file name. QXmlPatternistCLI - Warning in %1, at line %2, column %3: %4 Предупреждение в %1, в строке %2, столбце %3: %4 - Warning in %1: %2 Предупреждение в %1: %2 - Unknown location Неизвестное расположение - Error %1 in %2, at line %3, column %4: %5 Ошибка %1 в %2, в строке %3, столбце %4: %5 - Error %1 in %2: %3 Ошибка %1 в %2: %3 @@ -9737,184 +7761,142 @@ Please choose a different file name. QXmlStream - - Extra content at end of document. Лишние данные в конце документа. - Invalid entity value. Некорректное значение объекта. - Invalid XML character. Некорректный символ XML. - Sequence ']]>' not allowed in content. Последовательность "]]>" недопустима в содержимом. - Namespace prefix '%1' not declared Префикс пространства имён "%1" не объявлен - Attribute redefined. Атрибут переопределён. - Unexpected character '%1' in public id literal. Неожиданный символ "%1" в литерале открытого идентификатора. - Invalid XML version string. Некорректная строка версии XML. - Unsupported XML version. Неподдерживаемая версия XML. - %1 is an invalid encoding name. %1 - не является корректным названием кодировки. - Encoding %1 is unsupported Кодировка %1 не поддерживается - Standalone accepts only yes or no. Псевдоатрибут "standalone" может принимать только значения "yes" или "no". - Invalid attribute in XML declaration. Некорректный атрибут в объявлении XML. - Premature end of document. Неожиданный конец документа. - Invalid document. Некорректный документ. - Expected Ожидалось - , but got ' , получили ' - Unexpected ' Неожиданное ' - Expected character data. Ожидаются символьные данные. - Recursive entity detected. Обнаружен рекурсивный объект. - Start tag expected. Ожидается открывающий тэг. - XML declaration not at start of document. Объявление XML находится не в начале документа. - NDATA in parameter entity declaration. NDATA в объявлении параметра. - %1 is an invalid processing instruction name. %1 не является корректным названием обрабатываемой инструкции. - Invalid processing instruction name. Некорректное название обрабатываемой инструкции. - - - - Illegal namespace declaration. Некорректное объявление пространства имён. - Invalid XML name. Некорректное имя XML. - Opening and ending tag mismatch. Открывающий тэг не совпадает с закрывающим. - Reference to unparsed entity '%1'. Ссылка на необработанный объект "%1". - - - Entity '%1' not declared. Объект "%1" не объявлен. - Reference to external entity '%1' in attribute value. Ссылка на внешний объект "%1" в значении атрибута. - Invalid character reference. Некорректная символьная ссылка. - - Encountered incorrectly encoded content. Обнаружено некорректно закодированное содержимое. - The standalone pseudo attribute must appear after the encoding. Псевдоатрибут "standalone" должен находиться после указания кодировки. - %1 is an invalid PUBLIC identifier. %1 - некорректный идентификатор PUBLIC. @@ -9922,702 +7904,558 @@ Please choose a different file name. QtXmlPatterns - - At least one component must be present. Должна присутствовать как минимум одна компонента. - %1 is not a valid value of type %2. %1 не является правильным значением типа %2. - When casting to %1 from %2, the source value cannot be %3. При преобразовании %2 в %1 исходное значение не может быть %3. - Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values. Булево значение не может быть вычислено для последовательностей, которые содержат два и более атомарных значения. - The data of a processing instruction cannot contain the string %1 Данные обрабатываемой инструкции не могут содержать строку "%1" - - %1 is an invalid %2 %1 некоррекно для %2 - %1 is not a valid XML 1.0 character. Символ %1 недопустим для XML 1.0. - %1 was called. %1 было вызвано. - In the replacement string, %1 must be followed by at least one digit when not escaped. В замещаемой строке "%1" должно сопровождаться как минимум одной цифрой, если неэкранировано. - In the replacement string, %1 can only be used to escape itself or %2, not %3 В замещаемой строке символ "%1" может использоваться только для экранирования самого себя или "%2", но не "%3" - %1 matches newline characters %1 соответствует символам конца строки - Matches are case insensitive Соответствия регистронезависимы - %1 is an invalid regular expression pattern: %2 %1 - некорректный шаблон регулярного выражения: %2 - It will not be possible to retrieve %1. Будет невозможно восстановить %1. - The default collection is undefined Набор по умолчанию не определён - %1 cannot be retrieved %1 не может быть восстановлен - The item %1 did not match the required type %2. Элемент %1 не соответствует необходимому типу %2. - - %1 is an unknown schema type. %1 является схемой неизвестного типа. - A template with name %1 has already been declared. Шаблон с именем %1 уже был объявлен. - Only one %1 declaration can occur in the query prolog. Только одно объявление %1 может присутствовать в прологе запроса. - The initialization of variable %1 depends on itself Инициализация переменной %1 зависит от себя самой - The variable %1 is unused Переменная %1 не используется - Version %1 is not supported. The supported XQuery version is 1.0. Версия %1 не поддерживается. Поддерживается XQuery версии 1.0. - No function with signature %1 is available Функция с сигнатурой %1 отсутствует - It is not possible to redeclare prefix %1. Невозможно переопределить префикс %1. - Prefix %1 is already declared in the prolog. Префикс %1 уже объявлен в прологе. - The name of an option must have a prefix. There is no default namespace for options. Название опции должно содержать префикс. Нет пространства имён по умолчанию для опций. - The Schema Import feature is not supported, and therefore %1 declarations cannot occur. Возможность импорта схем не поддерживается, следовательно, объявлений %1 быть не должно. - The target namespace of a %1 cannot be empty. Целевое пространство имён %1 не может быть пустым. - The module import feature is not supported Возможность импорта модулей не поддерживается - The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2 Пространство имён пользовательской функции в модуле библиотеки должен соответствовать пространству имён модуля. Другими словами, он должен быть %1 вместо %2 - A function already exists with the signature %1. Функция с сигнатурой %1 уже существует. - No external functions are supported. All supported functions can be used directly, without first declaring them as external Внешние функции не поддерживаются. Все поддерживаемые функции могут использоваться напрямую без первоначального объявления их в качестве внешних - The %1-axis is unsupported in XQuery Ось %1 не поддерживается в XQuery - The namespace URI cannot be the empty string when binding to a prefix, %1. URI пространства имён не может быть пустой строкой при связывании с префиксом %1. - %1 is an invalid namespace URI. %1 - некорректный URI пространства имён. - It is not possible to bind to the prefix %1 Невозможно связать с префиксом %1 - Two namespace declaration attributes have the same name: %1. Два атрибута объявления пространств имён имеют одинаковое имя: %1. - The namespace URI must be a constant and cannot use enclosed expressions. URI пространства имён должен быть константой и не может содержать выражений. - - %1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported. %1 является объявлением атрибута вне области объявлений. Имейте в виду, возможность импорта схем не поддерживается. - empty пусто - zero or one нуль или один - exactly one ровно один - one or more один или более - zero or more нуль или более - The focus is undefined. Фокус не определён. - An attribute by name %1 has already been created. Атрибут с именем %1 уже существует. - Network timeout. Время ожидания сети истекло. - Element %1 can't be serialized because it appears outside the document element. Элемент %1 не может быть сериализован, так как расположен вне документа. - Year %1 is invalid because it begins with %2. Год %1 неверен, так как начинается с %2. - Day %1 is outside the range %2..%3. День %1 вне диапазона %2..%3. - Month %1 is outside the range %2..%3. Месяц %1 вне диапазона %2..%3. - Overflow: Can't represent date %1. Переполнение: Не удаётся представить дату %1. - Day %1 is invalid for month %2. День %1 неверен для месяца %2. - Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; Время 24:%1:%2.%3 некорректно. 24 часа, но минуты, секунды и/или миллисекунды отличны от 0; - Time %1:%2:%3.%4 is invalid. Время %1:%2:%3.%4 некорректно. - Overflow: Date can't be represented. Переполнение: невозможно представить дату. - At least one time component must appear after the %1-delimiter. Как минимум одна компонента времени должна следовать за разделителем '%1'. - - Dividing a value of type %1 by %2 (not-a-number) is not allowed. Деление числа типа %1 на %2 (не числовое выражение) недопустимо. - Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed. Деление числа типа %1 на %2 или %3 (плюс или минус нуль) недопустимо. - Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed. Умножение числа типа %1 на %2 или %3 (плюс-минус бесконечность) недопустимо. - A value of type %1 cannot have an Effective Boolean Value. Значение типа %1 не может быть булевым значением. - Value %1 of type %2 exceeds maximum (%3). Значение %1 типа %2 больше максимума (%3). - Value %1 of type %2 is below minimum (%3). Значение %1 типа %2 меньше минимума (%3). - A value of type %1 must contain an even number of digits. The value %2 does not. Значение типа %1 должно содержать четное количество цифр. Значение %2 этому требованию не удовлетворяет. - %1 is not valid as a value of type %2. Значение %1 некорректно для типа %2. - Operator %1 cannot be used on type %2. Оператор %1 не может использоваться для типа %2. - Operator %1 cannot be used on atomic values of type %2 and %3. Оператор %1 не может использоваться для атомарных значений типов %2 и %3. - The namespace URI in the name for a computed attribute cannot be %1. URI пространства имён в названии рассчитываемого атрибута не может быть %1. - The name for a computed attribute cannot have the namespace URI %1 with the local name %2. Название расчитываемого атрибута не может иметь URI пространства имён %1 с локальным именем %2. - Type error in cast, expected %1, received %2. Ошибка типов в преобразовании, ожидалось %1, получено %2. - When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed. При преобразовании в %1 или производные от него типы исходное значение должно быть того же типа или строковым литералом. Тип %2 недопустим. - A comment cannot contain %1 Комментарий не может содержать %1 - A comment cannot end with a %1. Комментарий не может оканчиваться на %1. - An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place. Узел-атрибут не может быть потомком узла-документа. Атрибут %1 неуместен. - A library module cannot be evaluated directly. It must be imported from a main module. Модуль библиотеки не может использоваться напрямую. Он должен быть импортирован из основного модуля. - No template by name %1 exists. Шаблон с именем %1 отсутствует. - A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type. Значение типа %1 не может быть условием. Условием могут являться числовой и булевый типы. - A positional predicate must evaluate to a single numeric value. Позиционный предикат должен вычисляться как числовое выражение. - The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid. Целевое имя в обрабатываемой инструкции не может быть %1 в любой комбинации нижнего и верхнего регистров. Имя %2 некорректно. - %1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3. %1 некорректное целевое имя в обрабатываемой инструкции. Имя должно быть значением типа %2, например: %3. - The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two. Последняя часть пути должна содержать узлы или атомарные значения, но не может содержать и то, и другое одновременно. - No namespace binding exists for the prefix %1 Отсутствует привязка к пространству имён для префикса %1 - No namespace binding exists for the prefix %1 in %2 Отсутствует привязка к пространству имён для префикса %1 в %2 - The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration. Первый аргумент %1 не может быть типа %2. Он должен быть числового типа, типа xs:yearMonthDuration или типа xs:dayTimeDuration. - The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Первый аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5. - The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5. Второй аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5. - If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same. Если оба значения имеют региональные смещения, смещения должны быть одинаковы. %1 и %2 не одинаковы. - %1 must be followed by %2 or %3, not at the end of the replacement string. "%1" должно сопровождаться "%2" или "%3", но не в конце замещаемой строки. - %1 and %2 match the start and end of a line. %1 и %2 соответствуют началу и концу строки. - Whitespace characters are removed, except when they appear in character classes Символы пробелов удалены (за исключением тех, что были в символах классов) - %1 is an invalid flag for regular expressions. Valid flags are: %1 - некорректный флаг регулярного выражения. Допустимые флаги: - If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified. Префикс не должен быть указан, если первый параметр - пустая последовательность или пустая строка (вне пространства имён). Был указан префикс %1. - The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization). Форма нормализации %1 не поддерживается. Поддерживаются только %2, %3, %4, %5 и пустая, т.е. пустая строка (без нормализации). - A zone offset must be in the range %1..%2 inclusive. %3 is out of range. Региональное смещение должно быть в переделах от %1 до %2 включительно. %3 выходит за допустимые пределы. - Required cardinality is %1; got cardinality %2. Необходимо %1 элементов, получено %2. - The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2. Имя кодировки %1 некорректно. Имя кодировки должно содержать только символы латиницы без пробелов и должно удовлетворять регулярному выражению %2. - The keyword %1 cannot occur with any other mode name. Ключевое слово %1 не может встречаться с любым другим названием режима. - No variable with name %1 exists Переменная с именем %1 отсутствует - The value of attribute %1 must be of type %2, which %3 isn't. Значение атрибута %1 должно быть типа %2, но %3 не соответствует данному типу. - The prefix %1 cannot be bound. By default, it is already bound to the namespace %2. Не удаётся связать префикс %1. По умолчанию префикс связан с пространством имён %2. - A variable with name %1 has already been declared. Переменная с именем %1 уже объявлена. - No value is available for the external variable with name %1. Отсутствует значение для внешней переменной с именем %1. - A stylesheet function must have a prefixed name. Функция стилей должна иметь имя с префиксом. - The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases. Пространтсво имён %1 зарезервировано, поэтому пользовательские функции не могут его использовать. Попробуйте предопределённый префикс %2, который существует для подобных ситуаций. - An argument with name %1 has already been declared. Every argument name must be unique. Аргумент с именем %1 уже объявлен. Имя каждого аргумента должно быть уникальным. - When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal. Если функция %1 используется для сравнения внутри шаблона, аргумент должен быть ссылкой на переменную или строковым литералом. - In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching. В шаблоне XSL-T первый аргумент функции %1 должен быть строковым литералом, если функция используется для сравнения. - In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching. В шаблоне XSL-T первый аргумент функции %1 должен быть литералом или ссылкой на переменную, если функция используется для сравнения. - In an XSL-T pattern, function %1 cannot have a third argument. В шаблоне XSL-T у функции %1 не должно быть третьего аргумента. - In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching. В шаблоне XSL-T только функции %1 и %2 могут использоваться для сравнения, но не %3. - In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can. В шаблоне XSL-T не может быть использована ось %1 - только оси %2 или %3. - %1 is an invalid template mode name. %1 не является корректным шаблоном имени режима. - The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide. Имя переменной, связанной с выражением for, должно отличаться от позиционной переменной. Две переменные с именем %1 конфликтуют. - The Schema Validation Feature is not supported. Hence, %1-expressions may not be used. Возможность проверки по схеме не поддерживается. Выражения %1 не могут использоваться. - None of the pragma expressions are supported. Therefore, a fallback expression must be present Ни одно из выражений pragma не поддерживается. Должно существовать запасное выражение - Each name of a template parameter must be unique; %1 is duplicated. Имя каждого параметра шаблона должно быть уникальным, но %1 повторяется. - No function with name %1 is available. Функция с именем %1 отсутствует. - %1 is not a valid numeric literal. %1 не является корректным числовым литералом. - W3C XML Schema identity constraint selector - W3C XML Schema identity constraint field - A construct was encountered which is disallowed in the current language(%1). Встречена конструкция, запрещённая для текущего языка (%1). - Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared). Пространство имён %1 может быть связано только с %2 (в данном случае уже предопределено). - Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared). Префикс %1 может быть связан только с %2 (в данном случае уже предопределено). - An attribute with name %1 has already appeared on this element. Атрибут с именем %1 уже существует для данного элемента. - A direct element constructor is not well-formed. %1 is ended with %2. Прямой конструктор элемента составлен некорректно. %1 заканчивается на %2. - The name %1 does not refer to any schema type. Название %1 не соответствует ни одному типу схемы. - %1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works. %1 - сложный тип. Преобразование к сложным типам невозможно. Однако, преобразование к атомарным типам как %2 работает. - %1 is not an atomic type. Casting is only possible to atomic types. %1 - не атомарный тип. Преобразование возможно только к атомарным типам. - %1 is not a valid name for a processing-instruction. %1 не является корректным названием инструкции обработки. - The name of an extension expression must be in a namespace. Название выражения расширения должно быть в пространстве имён. - Required type is %1, but %2 was found. Требуется тип %1, но обнаружен %2. - Promoting %1 to %2 may cause loss of precision. Преобразование %1 к %2 может снизить точность. - It's not possible to add attributes after any other kind of node. Невозможно добавлять атрибуты после любого другого вида узла. - Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported. Поддерживается только Unicode Codepoint Collation (%1). %2 не поддерживается. - Integer division (%1) by zero (%2) is undefined. Целочисленное деление (%1) на нуль (%2) не определено. - Division (%1) by zero (%2) is undefined. Деление (%1) на нуль (%2) не определено. - Modulus division (%1) by zero (%2) is undefined. Деление по модулю (%1) на нуль (%2) не определено. - %1 takes at most %n argument(s). %2 is therefore invalid. %1 принимает не более %n аргумента. Следовательно, %2 некорректно. @@ -10626,7 +8464,6 @@ Please choose a different file name. - %1 requires at least %n argument(s). %2 is therefore invalid. %1 принимает не менее %n аргумента. Следовательно, %2 некорректно. @@ -10635,1655 +8472,1258 @@ Please choose a different file name. - The root node of the second argument to function %1 must be a document node. %2 is not a document node. Корневой узел второго аргумента функции %1 должен быть документом. %2 не является документом. - The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this) Пространство имён для пользовательских функций не может быть пустым (попробуйте предопределённый префикс %1, который существует для подобных ситуаций) - - A default namespace declaration must occur before function, variable, and option declarations. Объявление пространство имён по умолчанию должно быть до объявления функций, переменных и опций. - Namespace declarations must occur before function, variable, and option declarations. Объявление пространства имён должно быть до объявления функций, переменных и опций. - Module imports must occur before function, variable, and option declarations. Импортируемые модули должны быть указаны до объявления функций, переменных и опций. - %1 is not a whole number of minutes. %1 не является полным количеством минут. - Attribute %1 can't be serialized because it appears at the top level. Атрибут %1 не может быть сериализован, так как присутствует на верхнем уровне. - %1 is an unsupported encoding. Кодировка %1 не поддерживается. - %1 contains octets which are disallowed in the requested encoding %2. %1 содержит октеты, которые недопустимы в требуемой кодировке %2. - The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character. Символ с кодом %1, присутствующий в %2 при использовании кодировки %3, не является допустимым символом XML. - Ambiguous rule match. Неоднозначное соответствие правилу. - In a namespace constructor, the value for a namespace cannot be an empty string. В конструкторе пространства имён значение пространства имён не может быть пустой строкой. - The prefix must be a valid %1, which %2 is not. Префикс должен быть корректным %1, но %2 им не является. - The prefix %1 cannot be bound. Префикс%1 не может быть связан. - Only the prefix %1 can be bound to %2 and vice versa. Только префикс %1 может быть связан с %2 и наоборот. - The parameter %1 is required, but no corresponding %2 is supplied. Необходим параметр %1 , но соответствующего %2 не передано. - The parameter %1 is passed, but no corresponding %2 exists. Передан параметр %1 , но соответствующего %2 не существует. - The URI cannot have a fragment URI не может содержать фрагмент - Element %1 is not allowed at this location. Элемент %1 недопустим в этом месте. - Text nodes are not allowed at this location. Текстовые узлы недопустимы в этом месте. - Parse error: %1 Ошибка разбора: %1 - The value of the XSL-T version attribute must be a value of type %1, which %2 isn't. Значение атрибута версии XSL-T должно быть типа %1, но %2 им не является. - Running an XSL-T 1.0 stylesheet with a 2.0 processor. Выполняется таблица стилей XSL-T 1.0 с обработчиком версии 2.0. - Unknown XSL-T attribute %1. Неизвествный атрибут XSL-T %1. - Attribute %1 and %2 are mutually exclusive. Атрибуты %1 и %2 взаимоисключающие. - In a simplified stylesheet module, attribute %1 must be present. В модуле упрощённой таблицы стилей обязан присутствовать атрибут %1. - If element %1 has no attribute %2, it cannot have attribute %3 or %4. Если элемент %1 не имеет атрибут %2, у него не может быть атрибутов %3 и %4. - Element %1 must have at least one of the attributes %2 or %3. Элемент %1 должен иметь как минимум один из атрибутов %2 или %3. - At least one mode must be specified in the %1-attribute on element %2. Как минимум один режим должен быть указан в атрибуте %1 элемента %2. - Element %1 must come last. Элемент %1 должен идти последним. - At least one %1-element must occur before %2. Как минимум один элемент %1 должен быть перед %2. - Only one %1-element can appear. Должен быть только один элемент %1. - At least one %1-element must occur inside %2. Как минимум один элемент %1 должен быть внутри %2. - When attribute %1 is present on %2, a sequence constructor cannot be used. Если %2 содержит атрибут %1, конструктор последовательности не может быть использован. - Element %1 must have either a %2-attribute or a sequence constructor. Элемент %1 должен иметь атрибут %2 или конструктор последовательности. - When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor. Если параметр необходим, значение по умолчание не может быть передано через атрибут %1 или конструктор последовательности. - Element %1 cannot have children. Элемент %1 не может иметь потомков. - Element %1 cannot have a sequence constructor. Элемент %1 не может иметь конструктор последовательности. - - The attribute %1 cannot appear on %2, when it is a child of %3. У %2 не может быть атрибута %1, когда он является потомком %3. - A parameter in a function cannot be declared to be a tunnel. Параметр функции не может быть объявлен туннелем. - This processor is not Schema-aware and therefore %1 cannot be used. Данный обработчик не работает со схемами, следовательно, %1 не может использоваться. - Top level stylesheet elements must be in a non-null namespace, which %1 isn't. Элементы верхнего уровня таблицы стилей должны быть в пространстве имен, которым %1 не является. - The value for attribute %1 on element %2 must either be %3 or %4, not %5. Значение атрибута %1 элемента %2 должно быть или %3, или %4, но не %5. - Attribute %1 cannot have the value %2. Атрибут %1 не может принимать значение %2. - The attribute %1 can only appear on the first %2 element. Атрибут %1 может быть только у первого элемента %2. - At least one %1 element must appear as child of %2. Как минимум один элемент %1 должен быть в %2. - %1 has inheritance loop in its base type %2. - - Circular inheritance of base type %1. - Circular inheritance of union %1. - %1 is not allowed to derive from %2 by restriction as the latter defines it as final. - %1 is not allowed to derive from %2 by extension as the latter defines it as final. - Base type of simple type %1 cannot be complex type %2. - Simple type %1 cannot have direct base type %2. - - Simple type %1 is not allowed to have base type %2. - Simple type %1 can only have simple atomic type as base type. - Simple type %1 cannot derive from %2 as the latter defines restriction as final. - - Variety of item type of %1 must be either atomic or union. - - Variety of member types of %1 must be atomic. - - %1 is not allowed to derive from %2 by list as the latter defines it as final. - Simple type %1 is only allowed to have %2 facet. - Base type of simple type %1 must have variety of type list. - Base type of simple type %1 has defined derivation by restriction as final. - Item type of base type does not match item type of %1. - - Simple type %1 contains not allowed facet type %2. - - %1 is not allowed to derive from %2 by union as the latter defines it as final. - %1 is not allowed to have any facets. - Base type %1 of simple type %2 must have variety of union. - Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute. - Member type %1 cannot be derived from member type %2 of %3's base type %4. - Derivation method of %1 must be extension because the base type %2 is a simple type. - Complex type %1 has duplicated element %2 in its content model. - Complex type %1 has non-deterministic content. - Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3. - Content model of complex type %1 is not a valid extension of content model of %2. - Complex type %1 must have simple content. - Complex type %1 must have the same simple type as its base class %2. - Complex type %1 cannot be derived from base type %2%3. - Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3. - Complex type %1 with simple content cannot be derived from complex base type %2. - Item type of simple type %1 cannot be a complex type. - Member type of simple type %1 cannot be a complex type. - %1 is not allowed to have a member type with the same name as itself. - - - %1 facet collides with %2 facet. - %1 facet must have the same value as %2 facet of base type. - %1 facet must be equal or greater than %2 facet of base type. - - - - - - - - %1 facet must be less than or equal to %2 facet of base type. - %1 facet contains invalid regular expression - Unknown notation %1 used in %2 facet. - %1 facet contains invalid value %2: %3. - %1 facet cannot be %2 or %3 if %4 facet of base type is %5. - %1 facet cannot be %2 if %3 facet of base type is %4. - - - %1 facet must be less than or equal to %2 facet. - - - %1 facet must be less than %2 facet of base type. - - %1 facet and %2 facet cannot appear together. - - - %1 facet must be greater than %2 facet of base type. - - %1 facet must be less than %2 facet. - - %1 facet must be greater than or equal to %2 facet of base type. - Simple type contains not allowed facet %1. - %1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list. - Only %1 and %2 facets are allowed when derived by union. - - %1 contains %2 facet with invalid data: %3. - Attribute group %1 contains attribute %2 twice. - Attribute group %1 contains two different attributes that both have types derived from %2. - Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3. - Complex type %1 contains attribute %2 twice. - Complex type %1 contains two different attributes that both have types derived from %2. - Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3. - Element %1 is not allowed to have a value constraint if its base type is complex. - Element %1 is not allowed to have a value constraint if its type is derived from %2. - - Value constraint of element %1 is not of elements type: %2. - Element %1 is not allowed to have substitution group affiliation as it is no global element. - Type of element %1 cannot be derived from type of substitution group affiliation. - Value constraint of attribute %1 is not of attributes type: %2. - Attribute %1 has value constraint but has type derived from %2. - %1 attribute in derived complex type must be %2 like in base type. - Attribute %1 in derived complex type must have %2 value constraint like in base type. - Attribute %1 in derived complex type must have the same %2 value constraint like in base type. - Attribute %1 in derived complex type must have %2 value constraint. - processContent of base wildcard must be weaker than derived wildcard. - - Element %1 exists twice with different types. - Particle contains non-deterministic wildcards. - - Base attribute %1 is required but derived attribute is not. - Type of derived attribute %1 cannot be validly derived from type of base attribute. - Value constraint of derived attribute %1 does not match value constraint of base attribute. - Derived attribute %1 does not exist in the base definition. - Derived attribute %1 does not match the wildcard in the base definition. - Base attribute %1 is required but missing in derived definition. - Derived definition contains an %1 element that does not exists in the base definition - Derived wildcard is not a subset of the base wildcard. - %1 of derived wildcard is not a valid restriction of %2 of base wildcard - Attribute %1 from base type is missing in derived type. - Type of derived attribute %1 differs from type of base attribute. - Base definition contains an %1 element that is missing in the derived definition - %1 references unknown %2 or %3 element %4. - %1 references identity constraint %2 that is no %3 or %4 element. - %1 has a different number of fields from the identity constraint %2 that it references. - Base type %1 of %2 element cannot be resolved. - Item type %1 of %2 element cannot be resolved. - Member type %1 of %2 element cannot be resolved. - - - Type %1 of %2 element cannot be resolved. - Base type %1 of complex type cannot be resolved. - %1 cannot have complex base type that has a %2. - Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type. - Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model. - Type of %1 element must be a simple type, %2 is not. - Substitution group %1 of %2 element cannot be resolved. - Substitution group %1 has circular definition. - - Duplicated element names %1 in %2 element. - - - - Reference %1 of %2 element cannot be resolved. - Circular group reference for %1. - %1 element is not allowed in this scope - %1 element cannot have %2 attribute with value other than %3. - %1 element cannot have %2 attribute with value other than %3 or %4. - %1 or %2 attribute of reference %3 does not match with the attribute declaration %4. - Attribute group %1 has circular reference. - %1 attribute in %2 must have %3 use like in base type %4. - Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2. - %1 has attribute wildcard but its base type %2 has not. - Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible. - Enumeration facet contains invalid content: {%1} is not a value of type %2. - Namespace prefix of qualified name %1 is not defined. - - %1 element %2 is not a valid restriction of the %3 element it redefines: %4. - Empty particle cannot be derived from non-empty particle. - Derived particle is missing element %1. - Derived element %1 is missing value constraint as defined in base particle. - Derived element %1 has weaker value constraint than base particle. - Fixed value constraint of element %1 differs from value constraint in base particle. - Derived element %1 cannot be nillable as base element is not nillable. - Block constraints of derived element %1 must not be more weaker than in the base element. - Simple type of derived element %1 cannot be validly derived from base element. - Complex type of derived element %1 cannot be validly derived from base element. - Element %1 is missing in derived particle. - Element %1 does not match namespace constraint of wildcard in base particle. - Wildcard in derived particle is not a valid subset of wildcard in base particle. - processContent of wildcard in derived particle is weaker than wildcard in base particle. - Derived particle allows content that is not allowed in the base particle. - Can not process unknown element %1, expected elements are: %2. - Element %1 is not allowed in this scope, possible elements are: %2. - Child element is missing in that scope, possible child elements are: %1. - Document is not a XML schema. - %1 attribute of %2 element contains invalid content: {%3} is not a value of type %4. - %1 attribute of %2 element contains invalid content: {%3}. - Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema. - - Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema. - %1 element is not allowed to have the same %2 attribute value as the target namespace %3. - %1 element without %2 attribute is not allowed inside schema without target namespace. - - %1 element is not allowed inside %2 element if %3 attribute is present. - - - %1 element has neither %2 attribute nor %3 child element. - - - - - - - - - - - - - - %1 element with %2 child element must not have a %3 attribute. - %1 attribute of %2 element must be %3 or %4. - %1 attribute of %2 element must have a value of %3. - - %1 attribute of %2 element must have a value of %3 or %4. - - - - - - - - - - - - - - %1 element must not have %2 and %3 attribute together. - - Content of %1 attribute of %2 element must not be from namespace %3. - - %1 attribute of %2 element must not be %3. - %1 attribute of %2 element must have the value %3 because the %4 attribute is set. - Specifying use='prohibited' inside an attribute group has no effect. - %1 element must have either %2 or %3 attribute. - %1 element must have either %2 attribute or %3 or %4 as child element. - %1 element requires either %2 or %3 attribute. - Text or entity references not allowed inside %1 element Текст или ссылка на объект недопустимы в качестве содержимого элемента %1 - - %1 attribute of %2 element must contain %3, %4 or a list of URIs. - %1 element is not allowed in this context. - %1 attribute of %2 element has larger value than %3 attribute. - Prefix of qualified name %1 is not defined. - - %1 attribute of %2 element must either contain %3 or the other values. - Component with ID %1 has been defined previously. - Element %1 already defined. Элемент %1 уже определён. - Attribute %1 already defined. Атрибут %1 уже определён. - Type %1 already defined. Тип %1 уже определён. - Attribute group %1 already defined. - Element group %1 already defined. Группа элементов %1 уже определёна. - Notation %1 already defined. - Identity constraint %1 already defined. - Duplicated facets in simple type %1. - - - %1 is not valid according to %2. %1 некорректно в соответствии с %2. - String content does not match the length facet. - String content does not match the minLength facet. - String content does not match the maxLength facet. - String content does not match pattern facet. - String content is not listed in the enumeration facet. - Signed integer content does not match the maxInclusive facet. - Signed integer content does not match the maxExclusive facet. - Signed integer content does not match the minInclusive facet. - Signed integer content does not match the minExclusive facet. - Signed integer content is not listed in the enumeration facet. - Signed integer content does not match pattern facet. - Signed integer content does not match in the totalDigits facet. - Unsigned integer content does not match the maxInclusive facet. - Unsigned integer content does not match the maxExclusive facet. - Unsigned integer content does not match the minInclusive facet. - Unsigned integer content does not match the minExclusive facet. - Unsigned integer content is not listed in the enumeration facet. - Unsigned integer content does not match pattern facet. - Unsigned integer content does not match in the totalDigits facet. - Double content does not match the maxInclusive facet. - Double content does not match the maxExclusive facet. - Double content does not match the minInclusive facet. - Double content does not match the minExclusive facet. - Double content is not listed in the enumeration facet. - Double content does not match pattern facet. - Decimal content does not match in the fractionDigits facet. - Decimal content does not match in the totalDigits facet. - Date time content does not match the maxInclusive facet. - Date time content does not match the maxExclusive facet. - Date time content does not match the minInclusive facet. - Date time content does not match the minExclusive facet. - Date time content is not listed in the enumeration facet. - Date time content does not match pattern facet. - Duration content does not match the maxInclusive facet. - Duration content does not match the maxExclusive facet. - Duration content does not match the minInclusive facet. - Duration content does not match the minExclusive facet. - Duration content is not listed in the enumeration facet. - Duration content does not match pattern facet. - Boolean content does not match pattern facet. - Binary content does not match the length facet. - Binary content does not match the minLength facet. - Binary content does not match the maxLength facet. - Binary content is not listed in the enumeration facet. - Invalid QName content: %1. Некорректное содержимое QName: %1. - QName content is not listed in the enumeration facet. - QName content does not match pattern facet. - Notation content is not listed in the enumeration facet. - List content does not match length facet. - List content does not match minLength facet. - List content does not match maxLength facet. - List content is not listed in the enumeration facet. - List content does not match pattern facet. - Union content is not listed in the enumeration facet. - Union content does not match pattern facet. - Data of type %1 are not allowed to be empty. - Element %1 is missing child element. - There is one IDREF value with no corresponding ID: %1. - Loaded schema file is invalid. Загруженный файл схемы некорректен. - %1 contains invalid data. %1 содержит некорректные данные. - xsi:schemaLocation namespace %1 has already appeared earlier in the instance document. Пространство имён xsi:schemaLocation %1 уже встречалось ранее в данном документе. - xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute. xsi:noNamespaceSchemaLocation не может встречаться после первого не-`namespace` элемента или атрибута. - No schema defined for validation. Схема для проверки не определена. - No definition for element %1 available. Отсутствует определение элемента %1. - - - Specified type %1 is not known to the schema. - Element %1 is not defined in this scope. Элемент %1 не определён в данном контексте. - Declaration for element %1 does not exist. - Element %1 contains invalid content. - Element %1 is declared as abstract. - Element %1 is not nillable. Элемент %1 необнуляемый. - Attribute %1 contains invalid data: %2 - Element contains content although it is nillable. Элемент необнуляемый, т.к. имеет содержимое. - Fixed value constraint not allowed if element is nillable. - Element %1 cannot contain other elements, as it has a fixed content. Элемент %1 не может содержать другие элементы, т.к. имеет статическое содержимое. - Specified type %1 is not validly substitutable with element type %2. - Complex type %1 is not allowed to be abstract. - Element %1 contains not allowed attributes. - - Element %1 contains not allowed child element. - - Content of element %1 does not match its type definition: %2. - - - Content of element %1 does not match defined value constraint. - Element %1 contains not allowed child content. - Element %1 contains not allowed text content. - Element %1 is missing required attribute %2. - Attribute %1 does not match the attribute wildcard. - Declaration for attribute %1 does not exist. - Element %1 contains two attributes of type %2. - Attribute %1 contains invalid content. - Element %1 contains unknown attribute %2. - - Content of attribute %1 does not match its type definition: %2. - - Content of attribute %1 does not match defined value constraint. - Non-unique value found for constraint %1. - Key constraint %1 contains absent fields. - Key constraint %1 contains references nillable element %2. - No referenced value found for key reference %1. - More than one value found for field %1. Для поля %1 найдено более одного значения. - Field %1 has no simple type. - ID value '%1' is not unique. Значение ID "%1" неуникально. - '%1' attribute contains invalid QName content: %2. Атрибут `%1` имеет некорректное содержимое QName: %2. diff --git a/translations/qtconfig_ru.ts b/translations/qtconfig_ru.ts index 2d435e6..7137d21 100644 --- a/translations/qtconfig_ru.ts +++ b/translations/qtconfig_ru.ts @@ -4,151 +4,114 @@ MainWindow - Desktop Settings (Default) Настройки рабочего стола (по умолчанию) - Choose style and palette based on your desktop settings. Выбор стиля и палитры на основе настроек рабочего стола. - On The Spot - - - - Auto (default) Автоматически (по умолчанию) - Choose audio output automatically. Автоматический выбор звукового выхода. - - aRts aRts - Experimental aRts support for GStreamer. Экспериментальная поддержка aRts в GStreamer. - Phonon GStreamer backend not available. Модуль поддержки GStreamer недоступен. - Choose render method automatically Автоматический выбор метода отрисовки - - X11 X11 - Use X11 Overlays Использовать оверлеи X11 - - OpenGL OpenGL - Use OpenGL if available Использовать OpenGL, если возможно - - Software Программный - Use simple software rendering Использовать простую программную отрисовку - No changes to be saved. Нет изменений для сохранения. - Saving changes... Сохранение изменений... - Over The Spot - Off The Spot - Root - Select a Directory Выбор каталога - <h3>%1</h3><br/>Version %2<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). <h3>%1</h3><br/>Версия %2<br/><br/>Copyright (C) 2010 Корпорация Nokia и/или её дочерние подразделения. - - - Qt Configuration Конфигурация Qt - Save Changes Сохранение изменений - Save changes to settings? Сохранить изменения настроек? - &Yes &Да - &No &Нет - &Cancel От&мена @@ -156,347 +119,278 @@ MainWindowBase - Qt Configuration Конфигурация Qt - Appearance Внешний вид - GUI Style Стиль пользовательского графического интерфейса - Select GUI &Style: &Стиль интерфейса: - Build Palette Палитра - &3-D Effects: Эффекты &3D: - Window Back&ground: &Фон окна: - &Tune Palette... &Настроить палитру... - Please use the KDE Control Center to set the palette. Используйте Центр управления KDE для настройки цветов. - Preview Предпросмотр - Select &Palette: Выбор &палитры: - Active Palette Палитра активных элементов - Inactive Palette Палитра неактивных элементов - Disabled Palette Палитра выключенных элементов - Fonts Шрифты - Default Font Шрифт по умолчанию - &Style: &Начертание: - &Point Size: &Размер: - F&amily: &Шрифт: - Sample Text Текст для примера (Sample Text) - Font Substitution Подстановка шрифтов - S&elect or Enter a Family: &Выберите шрифт для замены: - Current Substitutions: Текущие замены: - Up Выше - Down Ниже - Remove Удалить - Select s&ubstitute Family: &Заменять на шрифт: - Add Добавить - Interface Интерфейс - Feel Settings Настройка указателя - ms мс - &Double Click Interval: &Интервал двойного щелчка: - No blinking Без мигания - &Cursor Flash Time: &Период мигания курсора: - lines строк - Wheel &Scroll Lines: &Прокручивать строк при повороте колёсика: - Resolve symlinks in URLs Разрешать символьные ссылки в URL-ах - GUI Effects Эффекты пользовательского интерфейса - &Enable &Включить - Alt+E Alt+D - &Menu Effect: Эффект &меню: - C&omboBox Effect: Эффект &выпадающего списка: - &ToolTip Effect: Эффект &подсказки: - Tool&Box Effect: Эффект панели &инструментов: - Disable Выключен - Animate Анимация - Fade Затухание - Global Strut Минимальные размеры - Minimum &Width: Минимальная &ширина: - Minimum Hei&ght: Минимальная в&ысота: - pixels пикселей - Enhanced support for languages written right-to-left Расширенная поддержка письма справа налево - XIM Input Style: Стиль ввода XIM: - On The Spot - Over The Spot - Off The Spot - Root - Default Input Method: Метод ввода по умолчанию: - Printer Принтер - Enable Font embedding Разрешить встраивание шрифтов - Font Paths Пути к шрифтам - Browse... Обзор... - Press the <b>Browse</b> button or enter a directory and press Enter to add them to the list. Нажмите кнопку <b>Обзор...</b> или укажите каталог и нажмите Ввод для добавления его в список. - Phonon Phonon - About Phonon О Phonon - Current Version: Текущая версия: - Not available Недоступно - Website: Вэб-сайт: - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -509,12 +403,10 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://phonon.kde.org"><span style=" text-decoration: underline; color:#0000ff;">http://phonon.kde.org</span></a></p></body></html> - About GStreamer О GStreamer - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -527,22 +419,18 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gstreamer.freedesktop.org/"><span style=" text-decoration: underline; color:#0000ff;">http://gstreamer.freedesktop.org/</span></a></p></body></html> - GStreamer backend settings Настройки модуля GStreamer - Preferred audio sink: Предпочитаемое звуковое устройство: - Preferred render method: Предпочитаемый метод отрисовки: - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -555,57 +443,46 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Внимание: Изменение данных настроек может повлечь невозможность корректного запуска приложений.</span></p></body></html> - &File &Файл - &Help &Справка - &Save &Сохранить - Save Сохранить - Ctrl+S Ctrl+S - E&xit В&ыход - Exit Выход - &About &О программе - About О программе - About &Qt О &Qt - About Qt О Qt @@ -613,207 +490,166 @@ p, li { white-space: pre-wrap; } PaletteEditorAdvancedBase - Tune Palette Настройка палитры - <b>Edit Palette</b><p>Change the palette of the current widget or form.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p> <b>Изменение палитры</b><p>Изменение палитры текущего виджета или формы.</p><p>Используйте сформированную палитру или выберите цвета для каждой группы цветов и каждой их роли.</p><p>Палитру можно проверить на виджетах в разных режимах отображения в разделе предпросмотра.</p> - Select &Palette: Выбор &палитры: - Active Palette Палитра активных элементов - Inactive Palette Палитра неактивных элементов - Disabled Palette Палитра выключенных элементов - Auto Автоматически - Build inactive palette from active Создать неактивную палитру из активной - Build disabled palette from active Создать выключенную палитру из активной - Central color &roles Роли &цветов - Choose central color role Выберите роль цвета - <b>Select a color role.</b><p>Available central roles are: <ul> <li>Window - general background color.</li> <li>WindowText - general foreground color. </li> <li>Base - used as background color for e.g. text entry widgets, usually white or another light color. </li> <li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. </li> <li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. </li> <li>ButtonText - a foreground color used with the Button color. </li> <li>Highlight - a color to indicate a selected or highlighted item. </li> <li>HighlightedText - a text color that contrasts to Highlight. </li> <li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. </li> </ul> </p> <b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul><li>Window - основной цвет фона.</li> <li>WindowText - основной цвет текста.</li> <li>Base - используется в качестве фона для, например, виджетов с текстовыми полями, обычно, белый или другой светлый цвет.</li> <li>Text - цвет текста используемый совместно с Base. Обычно, он совпадает с WindowText, так как в этом случае получается максимальный контраст и с Window, и с Base.</li> <li>Button - основной цвет фона кнопки, которой требуется цвет отличный от Window, например, в стиле Macintosh.</li> <li>ButtonText - цвет текста используемый совместно с Button.</li> <li>Highlight - цвет для обозначения выбранного или выделенного элемента.</li> <li>HighlightedText - цвет текста контрастирующий с Highlight.</li> <li>BrightText - цвет текста, который отличается от WindowText и хорошо контрастирует с черным.</li></ul></p> - Window - WindowText - Button - Base - Text - BrightText - ButtonText - Highlight - HighlightedText - &Select Color: &Выбор цвета: - Choose a color Выберите цвет - Choose a color for the selected central color role. Выберите цвет для указанной роли. - 3-D shadow &effects Эффекты т&рехмерной тени - Build &from button color Получ&ить из цвета кнопки - Generate shadings Создание полутонов - Check to let 3D-effect colors be calculated from button-color. Включите, чтобы цвета эффекта трёхмерности были получены из цвета кнопки. - Choose 3D-effect color role Выбор роли цвета дял эффекта трёхмерности - <b>Select a color role.</b><p>Available effect roles are: <ul> <li>Light - lighter than Button color. </li> <li>Midlight - between Button and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker than Button. </li> <li>Shadow - a very dark color. </li> </ul> <b>Выбор роли цвета.</b><p>Доступны следующие роли: <ul> <li>Light - светлее цвета Button. </li> <li>Midlight - среднее между Light и Button. </li> <li>Mid - среднее между Button и Dark. </li> <li>Dark - темнее цвета Button. </li> <li>Shadow - очень темный цвет. </li> </ul> - Light - Midlight - Mid - Dark - Shadow - Select Co&lor: Выбор &цвета: - Choose a color for the selected effect color role. Выбор цвета для указанной роли. - OK Принять - Close dialog and apply all changes. Закрыть окно с применением изменений. - Cancel Отмена - Close dialog and discard all changes. Закрыть окно с отменой изменений. @@ -821,7 +657,6 @@ p, li { white-space: pre-wrap; } PreviewFrame - Desktop settings will only take effect after an application restart. Настройки рабочего стола применятся после перезапуска приложения. @@ -829,62 +664,50 @@ p, li { white-space: pre-wrap; } PreviewWidgetBase - Preview Window Окно предпросмотра - ButtonGroup ButtonGroup - RadioButton1 RadioButton1 - RadioButton2 RadioButton2 - RadioButton3 RadioButton3 - ButtonGroup2 ButtonGroup2 - CheckBox1 CheckBox1 - CheckBox2 CheckBox2 - LineEdit LineEdit - ComboBox ComboBox - PushButton PushButton - <p> <a href="http://qt.nokia.com">http://qt.nokia.com</a> </p> diff --git a/translations/qvfb_ru.ts b/translations/qvfb_ru.ts index 28f7010..a1988de 100644 --- a/translations/qvfb_ru.ts +++ b/translations/qvfb_ru.ts @@ -4,71 +4,54 @@ AnimationSaveWidget - - Record Записать - Reset Сбросить - Save Сохранить - Save in MPEG format (requires netpbm package installed) Сохранить в формат MPEG (требуется установленный пакет netpbm) - - Click record to begin recording. Нажмите "Записать" для начала записи. - - Finished saving. Сохранение завершено. - Paused. Click record to resume, or save if done. Приостановлено. Нажмите "Записать" для продолжения или "Сохранить", если готово. - Pause Пауза - Recording... Идёт запись... - Saving... Сохранение... - - Save animation... Сохранение анимации... - Save canceled. Сохранение отменено. - Save failed! Сохранение не удалось! @@ -76,193 +59,155 @@ Config - Configure Настройка - Size Размер - 176x220 "SmartPhone" 176x220 "SmartPhone" - 240x320 "PDA" 240x320 "PDA" - 320x240 "TV" / "QVGA" 320x240 "TV" / "QVGA" - 640x480 "VGA" 640x480 "VGA" - 800x480 800x480 - 800x600 800x600 - 1024x768 1024x768 - Custom Особый - Depth Глубина - 1 bit monochrome 1 бит (монохромный) - 2 bit grayscale 2 бита (градации серого) - 4 bit grayscale 4 бита (градации серого) - 8 bit 8 бит - 12 (16) bit 12 (16) бит - 15 bit 15 бит - 16 bit 16 бит - 18 bit 18 бит - 24 bit 24 бита - 32 bit 32 бита - 32 bit ARGB 32 бита (ARGB) - Swap red and blue channels Поменять синий и красный каналы - BGR format Формат BGR - Skin Обложка - None Нет - Emulate touch screen (no mouse move) указателя? Эмулировать тачскрин (без перемещения мыши) - Emulate LCD screen (Only with fixed zoom of 3.0 times magnification) Эмулировать ж/к экран (только с 3-х кратным увеличением) - <p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>. <p>Имейте в виду, что программы, использующие фрэймбуфер, будут завершены, если изменится <i>размер</i> и/или <i>глубина</i> экрана. - Gamma Гамма - Blue Синий - 1.0 1.0 - Green Зеленый - All Все - Red Красный - Set all to 1.0 Выставить все в 1.0 - &OK &ОК - &Cancel От&мена @@ -270,57 +215,46 @@ DeviceSkin - The image file '%1' could not be loaded. Не удалось загрузить изображение '%1'. - The skin directory '%1' does not contain a configuration file. Каталог обложки '%1' не содержит файла настроек. - The skin configuration file '%1' could not be opened. Не удалось открыть файл настроек обложки '%1'. - The skin configuration file '%1' could not be read: %2 Не удалось прочитать файл настроек обложки '%1': %2 - Syntax error: %1 Синтаксическая ошибка: %1 - The skin "up" image file '%1' does not exist. Файл изображения "up" '%1' не существует. - The skin "down" image file '%1' does not exist. Файл изображения "down" '%1' не существует. - The skin "closed" image file '%1' does not exist. Файл изображения "closed" '%1' не существует. - The skin cursor image file '%1' does not exist. Файл изображения курсора '%1' не существует. - Syntax error in area definition: %1 Синтаксическая ошибка в определении области: %1 - Mismatch in number of areas, expected %1, got %2. Несовпадение количества зон: ожидается %1, указано %2. @@ -328,17 +262,14 @@ QVFb - Browse... Обзор... - Load Custom Skin... Загрузить обложку пользователя... - All QVFB Skins (*.skin) Все обложки QVFB (*.skin) -- cgit v0.12 From 87d8bd31efb2a41c7e95d22ec86904c3bb7fdd79 Mon Sep 17 00:00:00 2001 From: Trever Fischer Date: Wed, 11 Aug 2010 18:58:43 +0200 Subject: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported Merge-request: 2444 Reviewed-by: Oswald Buddenhagen --- src/gui/kernel/qapplication_win.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index ec26e81..0c48bfd 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -716,8 +716,10 @@ static void qt_set_windows_updateScrollBar(QWidget *widget) if (QWidget *w = static_cast(o)) qt_set_windows_updateScrollBar(w); } +#ifndef QT_NO_SCROLLBAR if (qobject_cast(widget)) widget->updateGeometry(); +#endif } @@ -1499,6 +1501,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa switch (message) { #ifndef Q_WS_WINCE +#ifndef QT_NO_SESSIONMANAGER case WM_QUERYENDSESSION: { if (sm_smActive) // bogus message from windows RETURN(true); @@ -1531,6 +1534,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa RETURN(0); } +#endif case WM_DISPLAYCHANGE: if (QApplication::type() == QApplication::Tty) break; @@ -2236,6 +2240,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa } break; +#ifndef QT_NO_CONTEXTMENU case WM_CONTEXTMENU: { // it's not VK_APPS or Shift+F10, but a click in the NC area @@ -2264,6 +2269,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa } break; #endif +#endif case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: -- cgit v0.12 From 59d36ea601aef6182cba0e0f5fc56cc102e29c59 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Thu, 12 Aug 2010 11:32:56 +1000 Subject: Fix broken example code Task-number: QTBUG-12839 --- src/declarative/qml/qdeclarativecontext.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index 3d25291..a58dc6c 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -80,10 +80,12 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate() \code QDeclarativeEngine engine; + QStringListModel modelData; QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); - context->setContextProperty("myModel", modelData); + context->setContextProperty("myModel", &modelData); - QDeclarativeComponent component(&engine, "ListView { model=myModel }"); + QDeclarativeComponent component(&engine); + component.setData("import Qt 4.7\nListView { model: myModel }", QUrl()); component.create(context); \endcode @@ -104,12 +106,13 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate() ... }; - MyDataSet *myDataSet = new MyDataSet; + MyDataSet myDataSet; QDeclarativeEngine engine; QDeclarativeContext *context = new QDeclarativeContext(engine.rootContext()); - context->setContextObject(myDataSet); + context->setContextObject(&myDataSet); - QDeclarativeComponent component(&engine, "ListView { model=myModel }"); + QDeclarativeComponent component(&engine); + component.setData("import Qt 4.7\nListView { model: myModel }", QUrl()); component.create(context); \endcode -- cgit v0.12 From ee7c3b576ced47d3b68da1913cdf6995144bddd2 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 12 Aug 2010 12:38:53 +1000 Subject: Only modify pixmap cache reply when protected by a mutex QTBUG-12729 --- src/declarative/util/qdeclarativepixmapcache.cpp | 2 +- .../qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 9ced14f..de2de21 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -525,6 +525,7 @@ void QDeclarativePixmapReader::cancel(QDeclarativePixmapReply *reply) mutex.lock(); if (reply->loading) { cancelled.append(reply); + reply->data = 0; // XXX if (threadObject) threadObject->processJobs(); } else { @@ -738,7 +739,6 @@ void QDeclarativePixmapData::release() if (refCount == 0) { if (reply) { - reply->data = 0; reply->reader->cancel(reply); reply = 0; } diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 16d2063..6b36224 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -71,6 +71,7 @@ private slots: void parallel(); void parallel_data(); void massive(); + void cancelcrash(); private: QDeclarativeEngine engine; @@ -316,6 +317,15 @@ void tst_qdeclarativepixmapcache::massive() } } +// QTBUG-12729 +void tst_qdeclarativepixmapcache::cancelcrash() +{ + QUrl url("http://127.0.0.1:14452/cancelcrash_notexist.png"); + for (int ii = 0; ii < 1000; ++ii) { + QDeclarativePixmap pix(&engine, url); + } +} + QTEST_MAIN(tst_qdeclarativepixmapcache) #include "tst_qdeclarativepixmapcache.moc" -- cgit v0.12 From 03d9d3cf641c8dde22a903870ac2b6e58ada6eec Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 12 Aug 2010 09:09:20 +0200 Subject: qdoc: All references to -assistant and -base were removed. Flags allowed are now -creator and -online. -creator is the default. --- doc/doc.pri | 2 +- tools/qdoc3/htmlgenerator.cpp | 18 +----------------- tools/qdoc3/htmlgenerator.h | 1 - tools/qdoc3/main.cpp | 15 ++++----------- 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/doc/doc.pri b/doc/doc.pri index e1efa21..a5db3c7 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -20,7 +20,7 @@ $$unixstyle { QDOC = $$replace(QDOC, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf -QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ +QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \ (cd $$QT_BUILD_TREE && \ $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \ diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 9e8d768..4603a40 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -293,12 +293,8 @@ void HtmlGenerator::initializeGenerator(const Config &config) application = Online; else if (app == "creator") application = Creator; - else if (app == "assistant") - application = Assistant; - else if (app == "base") - application = Assistant; else - application = Online; + application = Creator; projectDescription = config.getString(CONFIG_DESCRIPTION); if (projectDescription.isEmpty() && !project.isEmpty()) @@ -1841,10 +1837,6 @@ void HtmlGenerator::generateHeader(const QString& title, // CheckEmptyAndLoadList activating search out() << "\n"; break; - case Assistant: - out() << "\n"; - out() << "\n"; - break; case Creator: out() << "\n"; out() << "\n"; // offline narrow @@ -1866,11 +1858,6 @@ void HtmlGenerator::generateHeader(const QString& title, generateBreadCrumbs(title,node,marker); out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); break; - case Assistant: - out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); - generateBreadCrumbs(title,node,marker); - out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); - break; case Creator: out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version()); generateBreadCrumbs(title,node,marker); @@ -1988,9 +1975,6 @@ void HtmlGenerator::generateFooter(const Node *node) out() << " -->\n"; out() << "\n"; break; - case Assistant: - out() << "\n"; - break; case Creator: out() << "\n"; break; diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 07226f5..eab10c6 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -97,7 +97,6 @@ class HtmlGenerator : public PageGenerator enum Application { Online, - Assistant, Creator}; public: diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp index 38b76a4..fa7efee 100644 --- a/tools/qdoc3/main.cpp +++ b/tools/qdoc3/main.cpp @@ -194,10 +194,7 @@ static void processQdocconfFile(const QString &fileName) /* Set the application to which qdoc will create the output. - The three applications are: - - base or assistant: simple, basic html output - for offline viewing in the Assistant application. + The two applications are: creator: additional formatting for viewing in the Creator application. @@ -207,9 +204,9 @@ static void processQdocconfFile(const QString &fileName) */ if (appArg.isEmpty()) { qDebug() << "Warning: Application flag not specified on" - << "command line. Options are -assistant, -creator," - << "and -online (default)."; - appArg = "online"; + << "command line. Options are -creator (default)" + << "and -online."; + appArg = "creator"; } config.setStringList(CONFIG_APPLICATION, QStringList(appArg)); @@ -484,10 +481,6 @@ int main(int argc, char **argv) else if (opt == "-obsoletelinks") { obsoleteLinks = true; } - else if (opt == "-base") - appArg = "base"; - else if (opt == "-assistant") - appArg = "assistant"; else if (opt == "-creator") appArg = "creator"; else if (opt == "-online") -- cgit v0.12 From baf8eabd2c647d6ba2bf0a9dc5103f4726808c3d Mon Sep 17 00:00:00 2001 From: Justin McPherson Date: Thu, 12 Aug 2010 16:32:11 +1000 Subject: QAudioOutput(ALSA); Fix check for available devices. ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter --- src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 31 +++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp index f663dd2..633b309 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp @@ -431,21 +431,24 @@ QList QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode) while (*n != NULL) { name = snd_device_name_get_hint(*n, "NAME"); - descr = snd_device_name_get_hint(*n, "DESC"); - io = snd_device_name_get_hint(*n, "IOID"); - if((name != NULL) && (descr != NULL) && ((io == NULL) || (io == filter))) { - QString deviceName = QLatin1String(name); - QString deviceDescription = QLatin1String(descr); - allDevices.append(deviceName.toLocal8Bit().constData()); - if(deviceDescription.contains(QLatin1String("Default Audio Device"))) - devices.append(deviceName.toLocal8Bit().constData()); - } - if(name != NULL) + if (name != 0 && qstrcmp(name, "null") != 0) { + descr = snd_device_name_get_hint(*n, "DESC"); + io = snd_device_name_get_hint(*n, "IOID"); + + if ((descr != NULL) && ((io == NULL) || (io == filter))) { + QString deviceName = QLatin1String(name); + QString deviceDescription = QLatin1String(descr); + allDevices.append(deviceName.toLocal8Bit().constData()); + if (deviceDescription.contains(QLatin1String("Default Audio Device"))) + devices.append(deviceName.toLocal8Bit().constData()); + } + free(name); - if(descr != NULL) - free(descr); - if(io != NULL) - free(io); + if (descr != NULL) + free(descr); + if (io != NULL) + free(io); + } ++n; } snd_device_name_free_hint(hints); -- cgit v0.12 From 88a417b47b758d35ef67d7a73f9b9a8ef8a843e1 Mon Sep 17 00:00:00 2001 From: Sarah Smith Date: Thu, 12 Aug 2010 17:23:27 +1000 Subject: Fix memory leak. Mac only bug - run examples/opengl/overpainting under leak detect instrument on Mac OSX to see it. Memory leak in any application that called getProcAddress() - CFStrings have to be cleaned up if the name of the function you got them from contains the word "Create" - and we weren't doing that. Reviewed-by: Gunnar Sletta --- src/opengl/qgl_mac.mm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm index 4d7532e..66fe7d3 100644 --- a/src/opengl/qgl_mac.mm +++ b/src/opengl/qgl_mac.mm @@ -804,17 +804,22 @@ void QGLContext::generateFontDisplayLists(const QFont & /* fnt */, int /* listBa static CFBundleRef qt_getOpenGLBundle() { CFBundleRef bundle = 0; + CFStringRef urlString = QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")); QCFType url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")), kCFURLPOSIXPathStyle, false); + urlString, kCFURLPOSIXPathStyle, false); if (url) bundle = CFBundleCreate(kCFAllocatorDefault, url); + CFRelease(urlString); return bundle; } void *QGLContext::getProcAddress(const QString &proc) const { - return CFBundleGetFunctionPointerForName(QCFType(qt_getOpenGLBundle()), - QCFString(proc)); + CFStringRef procName = QCFString(proc).toCFStringRef(proc); + void *result = CFBundleGetFunctionPointerForName(QCFType(qt_getOpenGLBundle()), + procName); + CFRelease(procName); + return result; } #ifndef QT_MAC_USE_COCOA /***************************************************************************** -- cgit v0.12 From d32127afb9b1ec49d4dc5cc672eaea11ebe56b72 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 12 Aug 2010 10:25:41 +0200 Subject: QCoreApplication::library path, ensure mutex lock ordering Do not keep the libraryPathMutex locked while calling QFactoryLoader::refreshAll QFactoryLoader also lock a mutex, and recurse into QCoreApplication::libraryPath Reviewed-by: Brad Helgrind warning for reference: ==8442== Thread #1: lock order "0xDEBA470 before 0xDF63600" violated ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x8025A8E: QCoreApplication::libraryPaths() (qcoreapplication.cpp:2234) ==8442== by 0x8006FDC: QFactoryLoader::update() (qfactoryloader.cpp:109) ==8442== by 0x8006F32: QFactoryLoader::QFactoryLoader(char const*, QString const&, Qt::CaseSensitivity) (qfactoryloader.cpp:99) ==8442== by 0x6DE4351: qt_guiPlatformPlugin() (qguiplatformplugin.cpp:101) ==8442== by 0x6DE7A5B: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:934) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227) ==8442== Required order was established by acquisition of lock at 0xDEBA470 ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x8025FC3: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2335) ==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227) ==8442== followed by a later acquisition of lock at 0xDF63600 ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x80086A9: QFactoryLoader::refreshAll() (qfactoryloader.cpp:249) ==8442== by 0x802607E: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2344) ==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227)a --- src/corelib/kernel/qcoreapplication.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 0a5e06e..512e193 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2308,6 +2308,7 @@ void QCoreApplication::setLibraryPaths(const QStringList &paths) if (!coreappdata()->app_libpaths) coreappdata()->app_libpaths = new QStringList; *(coreappdata()->app_libpaths) = paths; + locker.unlock(); QFactoryLoader::refreshAll(); } @@ -2341,6 +2342,7 @@ void QCoreApplication::addLibraryPath(const QString &path) if (!canonicalPath.isEmpty() && !coreappdata()->app_libpaths->contains(canonicalPath)) { coreappdata()->app_libpaths->prepend(canonicalPath); + locker.unlock(); QFactoryLoader::refreshAll(); } } -- cgit v0.12 From dd916743ad6182b38db40226e82b46596942ba39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Thu, 12 Aug 2010 12:34:36 +0200 Subject: Added way to destroy the share widget in the GL graphics system. This lets us destroy the share widget temporarily if we want to free up OpenGL resources for a while. Reviewed-by: Gunnar Sletta --- src/opengl/qwindowsurface_gl.cpp | 19 +++++++++++++++++++ src/opengl/qwindowsurface_gl_p.h | 1 + 2 files changed, 20 insertions(+) diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 6b82ed3..b86fb78 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -199,6 +199,7 @@ public: return widget; } + // destroys the share widget and prevents recreation void cleanup() { QGLWidget *w = widget; cleanedUp = true; @@ -206,6 +207,20 @@ public: delete w; } + // destroys the share widget, but allows it to be recreated later on + void destroy() { + if (cleanedUp) + return; + + QGLWidget *w = widget; + + // prevent potential recursions + cleanedUp = true; + widget = 0; + delete w; + cleanedUp = false; + } + static bool cleanedUp; private: @@ -233,6 +248,10 @@ QGLWidget* qt_gl_share_widget() return _qt_gl_share_widget()->shareWidget(); } +void qt_destroy_gl_share_widget() +{ + _qt_gl_share_widget()->destroy(); +} struct QGLWindowSurfacePrivate { diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h index 5e670fe..ffc2e86 100644 --- a/src/opengl/qwindowsurface_gl_p.h +++ b/src/opengl/qwindowsurface_gl_p.h @@ -67,6 +67,7 @@ class QWidget; struct QGLWindowSurfacePrivate; Q_OPENGL_EXPORT QGLWidget* qt_gl_share_widget(); +Q_OPENGL_EXPORT void qt_destroy_gl_share_widget(); class QGLWindowSurfaceGLPaintDevice : public QGLPaintDevice { -- cgit v0.12 From e83842f99c5c76faad4a4e85ea5cecb375da1c9c Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Thu, 12 Aug 2010 11:55:29 +0100 Subject: Fixed build failure Task-number: QTBUG-12713 --- demos/spectrum/3rdparty/fftreal/fftreal.pro | 2 ++ demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h | 4 ---- demos/spectrum/app/app.pro | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro index c9da205..6305af4 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal.pro +++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro @@ -1,5 +1,7 @@ include(../../spectrum.pri) +static: error(This library cannot be built for static linkage) + TEMPLATE = lib TARGET = fftreal diff --git a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h index b8190a9..48d614e 100644 --- a/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -22,10 +22,6 @@ #include -#ifndef QT_DLL -# error This library is licensed under the LGPL and must be dynamically linked -#endif - #if defined(FFTREAL_LIBRARY) # define FFTREAL_EXPORT Q_DECL_EXPORT #else diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro index 1b419db..4fe8b6d 100644 --- a/demos/spectrum/app/app.pro +++ b/demos/spectrum/app/app.pro @@ -1,5 +1,7 @@ include(../spectrum.pri) +static: error(This application cannot be statically linked to the fftreal library) + TEMPLATE = app TARGET = spectrum -- cgit v0.12 From 142ce4d38094f1588b04758a6f9ff6787a784fe3 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 12 Aug 2010 15:03:06 +0300 Subject: Make bld.inf target in Symbian mkspecs to depend on .pro file Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns --- qmake/generators/symbian/symmake_abld.cpp | 12 ++++++++---- qmake/generators/symbian/symmake_sbsv2.cpp | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index c896ac6..85dcab4 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -249,13 +249,17 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool } else { t << "all: debug release" << endl; t << endl; + + QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); + t << "qmake:" << endl; - t << "\t$(QMAKE) -spec symbian-abld -o \"" << fileInfo(Option::output.fileName()).fileName() - << "\" \"" << project->projectFile() << "\"" << endl; + t << qmakeCmd << endl; t << endl; - t << BLD_INF_FILENAME ":" << endl; - t << "\t$(QMAKE)" << endl; + + t << BLD_INF_FILENAME ": " << project->projectFile() << endl; + t << qmakeCmd << endl; t << endl; + t << "$(ABLD): " BLD_INF_FILENAME << endl; t << "\tbldmake bldfiles" << endl; t << endl; diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index 534a080..036eb1d 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -278,12 +278,15 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo } else { t << "all: debug release" << endl; t << endl; + + QString qmakeCmd = "\t$(QMAKE) \"" + project->projectFile() + "\" " + buildArgs(); + t << "qmake:" << endl; - t << "\t$(QMAKE) -spec symbian-sbsv2 -o \"" << fileInfo(Option::output.fileName()).fileName() - << "\" \"" << project->projectFile() << "\"" << endl; + t << qmakeCmd << endl; t << endl; - t << BLD_INF_FILENAME ":" << endl; - t << "\t$(QMAKE)" << endl; + + t << BLD_INF_FILENAME ": " << project->projectFile() << endl; + t << qmakeCmd << endl; t << endl; QString currentClause; -- cgit v0.12 From 3ee89bc0830f69d44f272eff5a0c886bff33c92e Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Thu, 12 Aug 2010 14:31:24 +0200 Subject: Properly emit geometryChanged() when the position change. Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann --- src/gui/graphicsview/qgraphicswidget.cpp | 3 ++- tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index c486c45..0fabd18 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -385,12 +385,12 @@ void QGraphicsWidget::setGeometry(const QRectF &rect) if (wd->inSetPos) { //set the new pos d->geom.moveTopLeft(pos()); + emit geometryChanged(); return; } } QSizeF oldSize = size(); QGraphicsLayoutItem::setGeometry(newGeom); - emit geometryChanged(); // Send resize event bool resized = newGeom.size() != oldSize; if (resized) { @@ -403,6 +403,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect) emit heightChanged(); QApplication::sendEvent(this, &re); } + emit geometryChanged(); } /*! diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp index a771332..bda22eb 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp @@ -111,6 +111,7 @@ private slots: void fontPropagationSceneChange(); void geometry_data(); void geometry(); + void geometryChanged(); void width(); void height(); void getContentsMargins_data(); @@ -776,11 +777,28 @@ void tst_QGraphicsWidget::geometry() QFETCH(QSizeF, size); widget.setPos(pos); widget.resize(size); - if (!size.isNull()) + if (!size.isNull() && !pos.isNull()) + QCOMPARE(spy.count(), 2); + if (!size.isNull() && pos.isNull()) QCOMPARE(spy.count(), 1); QCOMPARE(widget.geometry(), QRectF(pos, size)); } +void tst_QGraphicsWidget::geometryChanged() +{ + QGraphicsWidget w; + w.setGeometry(0, 0, 200, 200); + QCOMPARE(w.geometry(), QRectF(0, 0, 200, 200)); + QSignalSpy spy(&w, SIGNAL(geometryChanged())); + w.setGeometry(0, 0, 100, 100); + QCOMPARE(spy.count(), 1); + QCOMPARE(w.geometry(), QRectF(0, 0, 100, 100)); + w.setPos(10, 10); + QCOMPARE(spy.count(), 2); + QCOMPARE(w.geometry(), QRectF(10, 10, 100, 100)); + +} + void tst_QGraphicsWidget::width() { QGraphicsWidget w; -- cgit v0.12 From c622cb1c9c11ef6b51f1e2da61f94b83650f6703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 10 Aug 2010 11:50:16 +0200 Subject: Fixed autotest failure in tst_qgl::clipTest. Change fb00d5003ac5d91953a95d8164180f8f56a2b0f2 introduced a slight behavioural change by leaving the surface handle dangling. We need to unset the surface handle even if we don't own it to make sure we don't access it again. Reviewed-by: Gunnar Sletta --- src/opengl/qgl_egl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index 3763926..a154325 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -240,6 +240,7 @@ void QGLContextPrivate::destroyEglSurfaceForDevice() if (QGLWidget *wgl = qobject_cast(w)) { if (wgl->d_func()->eglSurfaceWindowId != wgl->winId()) { qWarning("WARNING: Potential EGL surface leak! Not destroying surface."); + eglSurface = EGL_NO_SURFACE; return; } } -- cgit v0.12 From 2efd51c2808874c9217cdaea905754ae72d4e443 Mon Sep 17 00:00:00 2001 From: Michael Dominic K Date: Thu, 12 Aug 2010 15:32:23 +0200 Subject: Destroy the old runtime system only when existing pixmaps were migrated. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge-request: 2448 Reviewed-by: Samuel Rødal --- src/gui/painting/qgraphicssystem_runtime.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index e1e0ad0..2828e9d 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -366,7 +366,7 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) #ifdef QT_DEBUG qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( " << name << " )"; #endif - delete m_graphicsSystem; + QGraphicsSystem *oldSystem = m_graphicsSystem; m_graphicsSystem = QGraphicsSystemFactory::create(name); m_graphicsSystemName = name; @@ -393,6 +393,8 @@ void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name) proxy->m_windowSurface.reset(m_graphicsSystem->createWindowSurface(widget)); qt_widget_private(widget)->invalidateBuffer(widget->rect()); } + + delete oldSystem; } void QRuntimeGraphicsSystem::removePixmapData(QRuntimePixmapData *pixmapData) const -- cgit v0.12 From 677b96b3bfcbccae978f0d63f7e16a35783c0eec Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 12 Aug 2010 17:29:29 +0200 Subject: QNAM HTTP: Fix crash related to aborted uploads Task-number: QTBUG-12285 --- src/network/access/qhttpnetworkconnection.cpp | 2 ++ src/network/access/qhttpnetworkconnectionchannel.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 9e2b85e..ae4d257 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -653,6 +653,8 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply) // is the reply associated the currently processing of this channel? if (channels[i].reply == reply) { channels[i].reply = 0; + channels[i].request = QHttpNetworkRequest(); + channels[i].resendCurrent = false; if (!reply->isFinished() && !channels[i].alreadyPipelinedRequests.isEmpty()) { // the reply had to be prematurely removed, e.g. it was not finished diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index d3576dd..6437f6f 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -647,8 +647,10 @@ void QHttpNetworkConnectionChannel::allDone() // finished request. // Note that this may trigger a segfault at some other point. But then we can fix the underlying // problem. - if (!resendCurrent) + if (!resendCurrent) { + request = QHttpNetworkRequest(); reply = 0; + } // move next from pipeline to current request if (!alreadyPipelinedRequests.isEmpty()) { -- cgit v0.12 From 5478ba712afeb11768016d05bef975a5a48ae059 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Thu, 12 Aug 2010 18:43:51 +0000 Subject: Clean up rasterfallback mechanism in DirectFB Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken --- doc/src/platforms/emb-directfb-EmbLinux.qdoc | 11 ++ .../gfxdrivers/directfb/qdirectfbpaintengine.cpp | 187 +++++++++------------ 2 files changed, 95 insertions(+), 103 deletions(-) diff --git a/doc/src/platforms/emb-directfb-EmbLinux.qdoc b/doc/src/platforms/emb-directfb-EmbLinux.qdoc index 955258e..f416819 100644 --- a/doc/src/platforms/emb-directfb-EmbLinux.qdoc +++ b/doc/src/platforms/emb-directfb-EmbLinux.qdoc @@ -153,6 +153,17 @@ manufacturer to manufacture, different operations will be optimized. This require you to define the operations you want to warn about or disable. These are listed above in the DIRECTFB_DRAWINGOPERATIONS variable. +You can also customize this with environment variables. + +E.g. If you want to disable fallbacks for drawPixmap and fillRect and also get +a warning printed on stderr when a fallback would have happened. + +\code +$ export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="FILL_RECT|DRAW_PIXMAP" +$ export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="FILL_RECT|DRAW_PIXMAP" +$ ./app -qws -display directfb +\endcode + Following is a table showing which options you have. \table diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index e4a0135..d5f0d42 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -167,7 +167,6 @@ struct CachedImage static QCache imageCache(4*1024*1024); // 4 MB #endif -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS || defined QT_DEBUG #define VOID_ARG() static_cast(false) enum PaintOperation { DRAW_RECTS = 0x0001, DRAW_LINES = 0x0002, DRAW_IMAGE = 0x0004, @@ -178,88 +177,81 @@ enum PaintOperation { DRAW_STATICTEXT = 0x8000, ALL = 0xffff }; -#ifdef QT_DEBUG -static void initRasterFallbacksMasks(int *warningMask, int *disableMask) -{ - struct { - const char *name; - PaintOperation operation; - } const operations[] = { - { "DRAW_RECTS", DRAW_RECTS }, - { "DRAW_LINES", DRAW_LINES }, - { "DRAW_IMAGE", DRAW_IMAGE }, - { "DRAW_PIXMAP", DRAW_PIXMAP }, - { "DRAW_TILED_PIXMAP", DRAW_TILED_PIXMAP }, - { "STROKE_PATH", STROKE_PATH }, - { "DRAW_PATH", DRAW_PATH }, - { "DRAW_POINTS", DRAW_POINTS }, - { "DRAW_ELLIPSE", DRAW_ELLIPSE }, - { "DRAW_POLYGON", DRAW_POLYGON }, - { "DRAW_TEXT", DRAW_TEXT }, - { "FILL_PATH", FILL_PATH }, - { "FILL_RECT", FILL_RECT }, - { "DRAW_COLORSPANS", DRAW_COLORSPANS }, - { "DRAW_ROUNDED_RECT", DRAW_ROUNDED_RECT }, - { "ALL", ALL }, - { 0, ALL } - }; - - QStringList warning = QString::fromLatin1(qgetenv("QT_DIRECTFB_WARN_ON_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), - QString::SkipEmptyParts); - QStringList disable = QString::fromLatin1(qgetenv("QT_DIRECTFB_DISABLE_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), - QString::SkipEmptyParts); - *warningMask = 0; - *disableMask = 0; - if (!warning.isEmpty() || !disable.isEmpty()) { - for (int i=0; operations[i].name; ++i) { - const QString name = QString::fromLatin1(operations[i].name); - int idx = warning.indexOf(name); - if (idx != -1) { - *warningMask |= operations[i].operation; - warning.erase(warning.begin() + idx); - } - idx = disable.indexOf(name); - if (idx != -1) { - *disableMask |= operations[i].operation; - disable.erase(disable.begin() + idx); - } - } - } - if (!warning.isEmpty()) { - qWarning("QDirectFBPaintEngine QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Unknown operation(s): %s", - qPrintable(warning.join(QLatin1String("|")))); - } - if (!disable.isEmpty()) { - qWarning("QDirectFBPaintEngine QT_DIRECTFB_DISABLE_RASTERFALLBACKS Unknown operation(s): %s", - qPrintable(disable.join(QLatin1String("|")))); - } - -} -#endif - -static inline int rasterFallbacksMask(bool warn) +enum { RasterWarn = 1, RasterDisable = 2 }; +static inline uint rasterFallbacksMask(PaintOperation op) { + uint ret = 0; #ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS - if (warn) - return QT_DIRECTFB_WARN_ON_RASTERFALLBACKS; + if (op & QT_DIRECTFB_WARN_ON_RASTERFALLBACKS) + ret |= RasterWarn; #endif #ifdef QT_DIRECTFB_DISABLE_RASTERFALLBACKS - if (!warn) - return QT_DIRECTFB_DISABLE_RASTERFALLBACKS; + if (op & QT_DIRECTFB_DISABLE_RASTERFALLBACKS) + ret |= RasterDisable; #endif -#ifndef QT_DEBUG - return 0; -#else - static int warnMask = -1; + static int warningMask = -1; static int disableMask = -1; - if (warnMask == -1) - initRasterFallbacksMasks(&warnMask, &disableMask); - return warn ? warnMask : disableMask; -#endif + if (warningMask < 0) { + struct { + const char *name; + PaintOperation operation; + } const operations[] = { + { "DRAW_RECTS", DRAW_RECTS }, + { "DRAW_LINES", DRAW_LINES }, + { "DRAW_IMAGE", DRAW_IMAGE }, + { "DRAW_PIXMAP", DRAW_PIXMAP }, + { "DRAW_TILED_PIXMAP", DRAW_TILED_PIXMAP }, + { "STROKE_PATH", STROKE_PATH }, + { "DRAW_PATH", DRAW_PATH }, + { "DRAW_POINTS", DRAW_POINTS }, + { "DRAW_ELLIPSE", DRAW_ELLIPSE }, + { "DRAW_POLYGON", DRAW_POLYGON }, + { "DRAW_TEXT", DRAW_TEXT }, + { "FILL_PATH", FILL_PATH }, + { "FILL_RECT", FILL_RECT }, + { "DRAW_COLORSPANS", DRAW_COLORSPANS }, + { "DRAW_ROUNDED_RECT", DRAW_ROUNDED_RECT }, + { "ALL", ALL }, + { 0, ALL } + }; + + QStringList warning = QString::fromLatin1(qgetenv("QT_DIRECTFB_WARN_ON_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), + QString::SkipEmptyParts); + QStringList disable = QString::fromLatin1(qgetenv("QT_DIRECTFB_DISABLE_RASTERFALLBACKS")).toUpper().split(QLatin1Char('|'), + QString::SkipEmptyParts); + warningMask = 0; + disableMask = 0; + if (!warning.isEmpty() || !disable.isEmpty()) { + for (int i=0; operations[i].name; ++i) { + const QString name = QString::fromLatin1(operations[i].name); + int idx = warning.indexOf(name); + if (idx != -1) { + warningMask |= operations[i].operation; + warning.erase(warning.begin() + idx); + } + idx = disable.indexOf(name); + if (idx != -1) { + disableMask |= operations[i].operation; + disable.erase(disable.begin() + idx); + } + } + } + if (!warning.isEmpty()) { + qWarning("QDirectFBPaintEngine QT_DIRECTFB_WARN_ON_RASTERFALLBACKS Unknown operation(s): %s", + qPrintable(warning.join(QLatin1String("|")))); + } + if (!disable.isEmpty()) { + qWarning("QDirectFBPaintEngine QT_DIRECTFB_DISABLE_RASTERFALLBACKS Unknown operation(s): %s", + qPrintable(disable.join(QLatin1String("|")))); + } + } + if (op & warningMask) + ret |= RasterWarn; + if (op & disableMask) + ret |= RasterDisable; + return ret; } -#endif -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DEBUG template static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, uint transformationType, bool simplePen, @@ -267,16 +259,14 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * const char *nameOne, const T1 &one, const char *nameTwo, const T2 &two, const char *nameThree, const T3 &three); -#endif -#if defined QT_DEBUG || (defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS) #define RASTERFALLBACK(op, one, two, three) \ { \ - const bool disable = op & rasterFallbacksMask(false); \ - if (op & rasterFallbacksMask(true)) \ - rasterFallbackWarn(disable \ - ? "Disabled raster engine operation" \ - : "Falling back to raster engine for", \ + static const uint rasterFallbacks = rasterFallbacksMask(op); \ + switch (rasterFallbacks) { \ + case 0: break; \ + case RasterWarn: \ + rasterFallbackWarn("Falling back to raster engine for", \ __FUNCTION__, \ state()->painter->device(), \ d_func()->transformationType, \ @@ -284,26 +274,20 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * d_func()->clipType, \ d_func()->compositionModeStatus, \ #one, one, #two, two, #three, three); \ - if (disable) \ + break; \ + case RasterDisable|RasterWarn: \ + rasterFallbackWarn("Disabled raster engine operation", \ + __FUNCTION__, \ + state()->painter->device(), \ + d_func()->transformationType, \ + d_func()->simplePen, \ + d_func()->clipType, \ + d_func()->compositionModeStatus, \ + #one, one, #two, two, #three, three); \ + case RasterDisable: \ return; \ + } \ } -#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & rasterFallbacksMask(false)) \ - return; -#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS -#define RASTERFALLBACK(op, one, two, three) \ - if (op & rasterFallbacksMask(true)) \ - rasterFallbackWarn("Falling back to raster engine for", \ - __FUNCTION__, state()->painter->device(), \ - d_func()->transformationType, \ - d_func()->simplePen, \ - d_func()->clipType, \ - d_func()->compositionModeStatus, \ - #one, one, #two, two, #three, three); -#else -#define RASTERFALLBACK(op, one, two, three) -#endif template static inline void drawLines(const T *lines, int n, const QTransform &transform, IDirectFBSurface *surface); @@ -1362,7 +1346,6 @@ static inline void drawRects(const T *rects, int n, const QTransform &transform, } } -#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS || defined QT_DEBUG template inline const T *ptr(const T &t) { return &t; } template <> inline const bool* ptr(const bool &) { return 0; } template @@ -1403,8 +1386,6 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device * qWarning("%s", qPrintable(out)); } -#endif // QT_DIRECTFB_WARN_ON_RASTERFALLBACKS - QT_END_NAMESPACE #endif // QT_NO_QWS_DIRECTFB -- cgit v0.12 From d904fe2273be5d39b54b987eef6b9cc0d1b85c4b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 13 Aug 2010 10:10:38 +1000 Subject: Fix configure -help output. declarative module is built by default. Task-number: QTBUG-12840 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 35fe2eb..7c3f9a3 100755 --- a/configure +++ b/configure @@ -3677,8 +3677,8 @@ fi -no-scripttools .... Do not build the QtScriptTools module. + -scripttools ....... Build the QtScriptTools module. - + -no-declarative .....Do not build the declarative module. - -declarative ....... Build the declarative module. + -no-declarative .....Do not build the declarative module. + + -declarative ....... Build the declarative module. -platform target ... The operating system and compiler you are building on ($PLATFORM). -- cgit v0.12 From f9fe93e6e85294274d4e0ce81db09783cfacd733 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 13 Aug 2010 12:22:46 +1000 Subject: Clear previous animation data for non-triggering animations. We need to clear the data from the last run if the animation doesn't match any of the state actions (or if there are no actions). Task-number: QTBUG-12805 --- src/declarative/util/qdeclarativeanimation.cpp | 2 ++ .../data/nonTransitionBug.qml | 30 +++++++++++++++++++++ .../tst_qdeclarativeanimations.cpp | 31 ++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index a747706..2fca09d 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -2392,6 +2392,8 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions d->actions = &data->actions; } else { delete data; + d->va->setFromSourcedValue(0); //clear previous data + d->va->setAnimValue(0, QAbstractAnimation::DeleteWhenStopped); //clear previous data d->actions = 0; } } diff --git a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml new file mode 100644 index 0000000..e9dc36e --- /dev/null +++ b/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml @@ -0,0 +1,30 @@ +import Qt 4.7 + +Rectangle { + id: root + width: 200 + height: 200 + + Rectangle { + id: mover + objectName: "mover" + } + + states: [ + State { + name: "free" + }, + State { + name: "left" + PropertyChanges { + restoreEntryValues: false + target: mover + x: 0 + } + } + ] + + transitions: Transition { + PropertyAnimation { properties: "x"; duration: 50 } + } +} diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index ec867fe..e5943fb 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -48,6 +48,8 @@ #include #include +#include "../../../shared/util.h" + #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir #define SRCDIR "." @@ -82,6 +84,7 @@ private slots: void easingProperties(); void rotation(); void runningTrueBug(); + void nonTransitionBug(); }; #define QTIMED_COMPARE(lhs, rhs) do { \ @@ -762,6 +765,34 @@ void tst_qdeclarativeanimations::runningTrueBug() QVERIFY(cloud->x() > qreal(0)); } +//QTBUG-12805 +void tst_qdeclarativeanimations::nonTransitionBug() +{ + //tests that the animation values from the previous transition are properly cleared + //in the case where an animation in the transition doesn't match anything (but previously did) + QDeclarativeEngine engine; + + QDeclarativeComponent c(&engine, SRCDIR "/data/nonTransitionBug.qml"); + QDeclarativeRectangle *rect = qobject_cast(c.create()); + QVERIFY(rect != 0); + QDeclarativeItemPrivate *rectPrivate = QDeclarativeItemPrivate::get(rect); + QDeclarativeRectangle *mover = rect->findChild("mover"); + + mover->setX(100); + QCOMPARE(mover->x(), qreal(100)); + + rectPrivate->setState("left"); + QTRY_COMPARE(mover->x(), qreal(0)); + + mover->setX(100); + QCOMPARE(mover->x(), qreal(100)); + + //make sure we don't try to animate back to 0 + rectPrivate->setState("free"); + QTest::qWait(300); + QCOMPARE(mover->x(), qreal(100)); +} + QTEST_MAIN(tst_qdeclarativeanimations) #include "tst_qdeclarativeanimations.moc" -- cgit v0.12 From 7e4807fed07e4c96086af00338601223b3353d29 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Fri, 13 Aug 2010 13:58:46 +1000 Subject: Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Wrap new APIs in ifndef QT_MOBILITY_BEARER. --- src/network/bearer/qnetworkconfiguration.cpp | 7 ------- src/network/bearer/qnetworkconfiguration.h | 10 ++++++++-- src/s60installs/eabi/QtNetworku.def | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 60851ac..3190a30 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -406,13 +406,6 @@ QList QNetworkConfiguration::children() const This function is deprecated. It is equivalent to calling bearerTypeName(), however bearerType() should be used in preference. */ -QString QNetworkConfiguration::bearerName() const -{ - // This function cannot be inline as it would break Qt Mobility. - // Qt Mobility uses the Qt header as well and since the Mobility Bearer library - // does not provide bearerTypeName() we cannot use an inline function. - return bearerTypeName(); -} /*! Returns the type of bearer used by this network configuration. diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index 18b92a9..593dbbe 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -103,6 +103,7 @@ public: Q_DECLARE_FLAGS(StateFlags, StateFlag) +#ifndef QT_MOBILITY_BEARER enum BearerType { BearerUnknown, BearerEthernet, @@ -114,17 +115,22 @@ public: BearerBluetooth, BearerWiMAX }; +#endif StateFlags state() const; Type type() const; Purpose purpose() const; - // Required to maintain source compatibility with Qt Mobility. +#ifndef QT_MOBILITY_BEARER #ifdef QT_DEPRECATED - QT_DEPRECATED QString bearerName() const; + // Required to maintain source compatibility with Qt Mobility. + QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } #endif BearerType bearerType() const; QString bearerTypeName() const; +#else + QString bearerName() const; +#endif QString identifier() const; bool isRoamingAvailable() const; diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index 2442ee8..6b34a19 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -1131,7 +1131,7 @@ EXPORTS _ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME _ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME _ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME - _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME + _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME ABSENT _ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME _ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME _ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME -- cgit v0.12 From 167b63d2250e7923d7b660076a80e82af07d9cdb Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Fri, 13 Aug 2010 14:01:52 +1000 Subject: Make this constructor explicit in Qt too. --- src/network/bearer/qnetworksession.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index e7fffac..0b40147 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -89,11 +89,7 @@ public: OperationNotSupportedError, InvalidConfigurationError }; -#ifndef QT_MOBILITY_BEARER - QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); -#else explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0); -#endif virtual ~QNetworkSession(); bool isOpen() const; -- cgit v0.12 From ade18bab3a2c4c877baa9be2a0012d670dafb64a Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Fri, 13 Aug 2010 17:09:27 +1000 Subject: Add autotest that checks that copy and cut don't work when echomode is set to hide text/password mode Task-number: QTBUG-12086 Reviewed-by: Michael Brasser --- .../tst_qdeclarativetextinput.cpp | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 6e15a4a..ca9009d 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -741,6 +741,30 @@ void tst_qdeclarativetextinput::copyAndPaste() { textInput->paste(); QCOMPARE(textInput->text(), QString("Hello world!Hello world!")); QCOMPARE(textInput->text().length(), 24); + + // clear copy buffer + QClipboard *clipboard = QApplication::clipboard(); + QVERIFY(clipboard); + clipboard->clear(); + + // test that copy functionality is disabled + // when echo mode is set to hide text/password mode + int index = 0; + while (index < 4) { + QDeclarativeTextInput::EchoMode echoMode = QDeclarativeTextInput::EchoMode(index); + textInput->setEchoMode(echoMode); + textInput->setText("My password"); + textInput->select(0, textInput->text().length());; + textInput->copy(); + if (echoMode == QDeclarativeTextInput::Normal) { + QVERIFY(!clipboard->text().isEmpty()); + QCOMPARE(clipboard->text(), QString("My password")); + clipboard->clear(); + } else { + QVERIFY(clipboard->text().isEmpty()); + } + index++; + } #endif } -- cgit v0.12 From b52da4ab2179079a6aff95891786d2f6598048b5 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Fri, 13 Aug 2010 12:27:55 +0200 Subject: Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa) Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special Characters' item to the 'Edit' menu. Before adding a new entry it will make sure that menu items list doesn't contain an item with the selector 'orderFrontCharacterPalette' & a 'nil' target. We need to return the index for the first entry (we have QCocoaMenuLoader as target). Task-number: QTBUG-12842 Reviewed-by: Denis --- src/gui/kernel/qcocoamenuloader_mac.mm | 5 +++++ src/gui/kernel/qcocoamenuloader_mac_p.h | 1 + src/gui/widgets/qcocoamenu_mac.mm | 12 ++++++++++++ src/gui/widgets/qcocoamenu_mac_p.h | 1 + 4 files changed, 19 insertions(+) diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm index 8d65aa1..8d38f45 100644 --- a/src/gui/kernel/qcocoamenuloader_mac.mm +++ b/src/gui/kernel/qcocoamenuloader_mac.mm @@ -255,5 +255,10 @@ QT_USE_NAMESPACE qApp->quit(); } } + + - (void)orderFrontCharacterPalette:(id)sender + { + [NSApp orderFrontCharacterPalette:sender]; + } @end #endif // QT_MAC_USE_COCOA diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/kernel/qcocoamenuloader_mac_p.h index a75ad0a..edacfa5 100644 --- a/src/gui/kernel/qcocoamenuloader_mac_p.h +++ b/src/gui/kernel/qcocoamenuloader_mac_p.h @@ -88,6 +88,7 @@ - (IBAction)hide:(id)sender; - (IBAction)qtDispatcherToQAction:(id)sender; - (void)qtUpdateMenubar; +- (void)orderFrontCharacterPalette:(id)sender; @end #endif // QT_MAC_USE_COCOA diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index ce85919..15fae23 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -188,6 +188,18 @@ QT_USE_NAMESPACE return NO; } +- (NSInteger)indexOfItemWithTarget:(id)anObject andAction:(SEL)actionSelector +{ + NSInteger index = [super indexOfItemWithTarget:anObject andAction:actionSelector]; + static SEL selForOFCP = NSSelectorFromString(@"orderFrontCharacterPalette:"); + if (index == -1 && selForOFCP == actionSelector) { + // Check if the 'orderFrontCharacterPalette' SEL exists for QCocoaMenuLoader object + QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = [NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)]; + return [super indexOfItemWithTarget:loader andAction:actionSelector]; + } + return index; +} + @end QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h index d6ac8c5..1a42642 100644 --- a/src/gui/widgets/qcocoamenu_mac_p.h +++ b/src/gui/widgets/qcocoamenu_mac_p.h @@ -76,6 +76,7 @@ QT_FORWARD_DECLARE_CLASS(QAction) } - (id)initWithQMenu:(QMenu*)menu; - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action; +- (NSInteger)indexOfItemWithTarget:(id)anObject andAction:(SEL)actionSelector; @end #endif -- cgit v0.12 From 5dedcd3c4cac993949295d109804a8f7cc3a5b0a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 13 Aug 2010 12:23:46 +0200 Subject: diagramscene example: fix leak and crashes. In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753 --- doc/src/examples/diagramscene.qdoc | 3 ++- examples/graphicsview/diagramscene/mainwindow.cpp | 29 ++++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc index f4d6b0d..7c643c2 100644 --- a/doc/src/examples/diagramscene.qdoc +++ b/doc/src/examples/diagramscene.qdoc @@ -265,7 +265,8 @@ \snippet examples/graphicsview/diagramscene/mainwindow.cpp 3 - This slot deletes the selected item, if any, from the scene. If + This slot deletes the selected item, if any, from the scene. It + deletes the arrows first in order to avoid to delete them twice. If the item to be deleted is a \c DiagramItem, we also need to delete arrows connected to it; we don't want arrows in the scene that aren't connected to items in both ends. diff --git a/examples/graphicsview/diagramscene/mainwindow.cpp b/examples/graphicsview/diagramscene/mainwindow.cpp index f09c552..7d82df0 100644 --- a/examples/graphicsview/diagramscene/mainwindow.cpp +++ b/examples/graphicsview/diagramscene/mainwindow.cpp @@ -45,6 +45,7 @@ #include "diagramitem.h" #include "diagramscene.h" #include "diagramtextitem.h" +#include "arrow.h" const int InsertTextButton = 10; @@ -55,7 +56,7 @@ MainWindow::MainWindow() createToolBox(); createMenus(); - scene = new DiagramScene(itemMenu); + scene = new DiagramScene(itemMenu, this); scene->setSceneRect(QRectF(0, 0, 5000, 5000)); connect(scene, SIGNAL(itemInserted(DiagramItem*)), this, SLOT(itemInserted(DiagramItem*))); @@ -123,11 +124,22 @@ void MainWindow::buttonGroupClicked(int id) void MainWindow::deleteItem() { foreach (QGraphicsItem *item, scene->selectedItems()) { - if (item->type() == DiagramItem::Type) { - qgraphicsitem_cast(item)->removeArrows(); + if (item->type() == Arrow::Type) { + scene->removeItem(item); + Arrow *arrow = qgraphicsitem_cast(item); + arrow->startItem()->removeArrow(arrow); + arrow->endItem()->removeArrow(arrow); + delete item; } - scene->removeItem(item); } + + foreach (QGraphicsItem *item, scene->selectedItems()) { + if (item->type() == DiagramItem::Type) { + qgraphicsitem_cast(item)->removeArrows(); + } + scene->removeItem(item); + delete item; + } } //! [3] @@ -313,7 +325,7 @@ void MainWindow::about() //! [21] void MainWindow::createToolBox() { - buttonGroup = new QButtonGroup; + buttonGroup = new QButtonGroup(this); buttonGroup->setExclusive(false); connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(buttonGroupClicked(int))); @@ -345,7 +357,7 @@ void MainWindow::createToolBox() QWidget *itemWidget = new QWidget; itemWidget->setLayout(layout); - backgroundButtonGroup = new QButtonGroup; + backgroundButtonGroup = new QButtonGroup(this); connect(backgroundButtonGroup, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(backgroundButtonGroupClicked(QAbstractButton*))); @@ -460,7 +472,6 @@ void MainWindow::createToolbars() editToolBar->addAction(sendBackAction); fontCombo = new QFontComboBox(); - fontSizeCombo = new QComboBox(); connect(fontCombo, SIGNAL(currentFontChanged(QFont)), this, SLOT(currentFontChanged(QFont))); @@ -526,7 +537,7 @@ void MainWindow::createToolbars() linePointerButton->setCheckable(true); linePointerButton->setIcon(QIcon(":/images/linepointer.png")); - pointerTypeGroup = new QButtonGroup; + pointerTypeGroup = new QButtonGroup(this); pointerTypeGroup->addButton(pointerButton, int(DiagramScene::MoveItem)); pointerTypeGroup->addButton(linePointerButton, int(DiagramScene::InsertLine)); @@ -605,7 +616,7 @@ QMenu *MainWindow::createColorMenu(const char *slot, QColor defaultColor) names << tr("black") << tr("white") << tr("red") << tr("blue") << tr("yellow"); - QMenu *colorMenu = new QMenu; + QMenu *colorMenu = new QMenu(this); for (int i = 0; i < colors.count(); ++i) { QAction *action = new QAction(names.at(i), this); action->setData(colors.at(i)); -- cgit v0.12 From 448a8603bb0609bf880a2c1b92b26c2005e1cf63 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 13 Aug 2010 13:25:46 +0300 Subject: Fix check to remove unnecessary deployments in Symbian Previously check to remove files from deployment in case the deployment target location was the same as the source location was done using QFileInfo equality, which resolved to true when file didn't yet exist at the time qmake was run. Changed the check to compare absolute paths instead. Task-number: QTBUG-12879 Reviewed-by: Shane Kearns --- qmake/generators/symbian/initprojectdeploy_symbian.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index 382e012..776a646 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -353,7 +353,11 @@ void initProjectDeploySymbian(QMakeProject* project, CopyItem &item = i.next(); QFileInfo fromItem(item.from); QFileInfo toItem(item.to); - if (fromItem == toItem) +#if defined(Q_OS_WIN) + if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath(), Qt::CaseInsensitive)) +#else + if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath())) +#endif i.remove(); } } -- cgit v0.12 From 5d32b723332acab5fdf880aa0d555ab8e05d79dd Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 13 Aug 2010 12:59:55 +0100 Subject: Fix for memory leak in qt_init Reviewed-by: Miikka Heikkinen --- src/gui/kernel/qapplication_s60.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index e64ebb1..559bb6a 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1475,6 +1475,8 @@ void qt_init(QApplicationPrivate * /* priv */, int) S60->avkonComponentsSupportTransparency = (value==1) ? true : false; } } + delete repository; + repository = 0; #endif #ifdef QT_KEYPAD_NAVIGATION -- cgit v0.12 From 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 13 Aug 2010 14:01:49 +0200 Subject: qdoc: Added the fix to change qml-qml-file.name to qml-file.name --- tools/qdoc3/tree.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp index 56e3484..540ffa9 100644 --- a/tools/qdoc3/tree.cpp +++ b/tools/qdoc3/tree.cpp @@ -1963,8 +1963,8 @@ QString Tree::fullDocumentLocation(const Node *node) const if ((node->subType() == Node::QmlClass) || (node->subType() == Node::QmlBasicType)) { QString fb = node->fileBase(); - if (fb.startsWith(QLatin1String("QML:"))) - return node->fileBase() + ".html"; + if (fb.startsWith(QLatin1String("qml-"))) + return fb + ".html"; else return "qml-" + node->fileBase() + ".html"; } else @@ -1981,7 +1981,7 @@ QString Tree::fullDocumentLocation(const Node *node) const else if ((parentNode = node->parent())) { if (parentNode->subType() == Node::QmlPropertyGroup) { parentNode = parentNode->parent(); - parentName = "qml-" + parentNode->fileBase() + ".html"; + parentName = fullDocumentLocation(parentNode); } else parentName = fullDocumentLocation(node->parent()); -- cgit v0.12 From 6d0d767e63df3c997d6d7a8cb6cd4bf8c0dfc835 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Fri, 13 Aug 2010 14:05:17 +0200 Subject: Cocoa: Stacking order of modal dialogs is wrong Modal dialogs were sometimes hidden behind other normal windows on screen. The reason was that, upon going modal for a window, we actually resat the stacking level on the window in a faulty attempt to respect any stays-on-top window flags. This patch makes sure we avoid doing that, and at the same time, ensures we don't reintroduce the original bug as well. Task-number: QTBUG-12841 Reviewed-by: cduclos --- src/gui/kernel/qeventdispatcher_mac.mm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index e26fbde..89f01d8 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -785,7 +785,7 @@ void QEventDispatcherMacPrivate::temporarilyStopAllModalSessions() // the stacking order of the windows while doing so, we put // up a block that is used in QCocoaWindow and QCocoaPanel: int stackSize = cocoaModalSessionStack.size(); - for (int i=stackSize-1; i>=0; --i) { + for (int i=0; i [window level]) + [window setLevel:levelBeforeEnterModal]; } currentModalSessionCached = info.session; } -- cgit v0.12 From 434ce6748ea7f082357b6d7ab542c9fa2285bd4c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 13 Aug 2010 15:22:25 +0300 Subject: Fix "installer_sis" and "deploy" targets when TARGET has path Dependencies got generated wrong in Makefile because sis is always created in the .pro file directory but dependency included path that was in TARGET. Task-number: QTBUG-12884 Reviewed-by: Shane Kearns --- mkspecs/features/sis_targets.prf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 99f5910..abdf2d4 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -11,7 +11,6 @@ else:!equals(DEPLOYMENT, default_deployment) { equals(GENERATE_SIS_TARGETS, true) { symbian-abld|symbian-sbsv2 { - sis_destdir = make_cache_name = .make.cache sis_target.target = sis sis_target.commands = $(if $(wildcard $$basename(TARGET)_template.pkg), \ @@ -50,7 +49,7 @@ equals(GENERATE_SIS_TARGETS, true) { ok_unsigned_sis_target.target = ok_unsigned_sis ok_unsigned_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) -o $$basename(TARGET)_template.pkg $(QT_SIS_TARGET) - target_sis_target.target = $${sis_destdir}$${TARGET}.sis + target_sis_target.target = $$basename(TARGET).sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis installer_sis_target.target = installer_sis @@ -59,7 +58,7 @@ equals(GENERATE_SIS_TARGETS, true) { , \ $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \ ) - installer_sis_target.depends = $${sis_destdir}$${TARGET}.sis + installer_sis_target.depends = $$basename(TARGET).sis ok_installer_sis_target.target = ok_installer_sis ok_installer_sis_target.commands = createpackage.bat $(QT_SIS_OPTIONS) $$basename(TARGET)_installer.pkg - \ -- cgit v0.12 From 2dfd16e8a138da9d903b31ef461331016d16ec5b Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Fri, 13 Aug 2010 15:20:36 +0200 Subject: Doc: removed assistant style and reintroduced the index page icons. --- doc/src/template/style/narrow.css | 4 ++-- doc/src/template/style/style.css | 41 ++------------------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css index e4ad135..349048f 100644 --- a/doc/src/template/style/narrow.css +++ b/doc/src/template/style/narrow.css @@ -54,7 +54,7 @@ .narrow .header .qtref a { - color: #363534; + color: #00732F; } .narrow .header .qtref span @@ -103,7 +103,7 @@ } .narrow .header #shortCut ul li a { - color: #44a51c; + color: #00732F; } .narrow .wrapper .hd diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 6a32e53..190c60a 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -1283,43 +1283,6 @@ -/* start of offline spec*/ - .offline .wrapper .hd - { - background: url(../images/page.png) no-repeat 0 -15px; - } - .offline .wrapper .bd - { - background: url(../images/bg_l_blank.png) repeat-y 0 0; - } - .offline .wrapper .ft - { - background: url(../images/page.png) no-repeat 0 -90px; - } - .offline .sidebar, - .offline .feedback, - .offline .t_button, - .offline #narrowsearch, - .offline #narrowmenu - { - display: none; - } - .offline .wrap - { - margin: 0 5px 0 5px; - } - .offline .wrap .breadcrumb - { - } - - .offline .wrap .content - { - padding-top: 15px; - } - - -/* end of offline spec*/ - /* start of creator spec*/ .creator { @@ -1339,9 +1302,9 @@ .creator #feedbackBox, .creator #feedback, .creator #blurpage, - .creator .indexbox .indexIcon span, + /*.creator .indexbox .indexIcon span,*/ .creator .wrapper .hd, - .creator .indexbox .indexIcon, +/* .creator .indexbox .indexIcon,*/ .creator .header #nav-logo, .creator #offlinemenu, .creator #offlinesearch, -- cgit v0.12 From 7c413e92841c7a6010c4ba5748f6f54448f8643e Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Wed, 28 Jul 2010 15:13:49 +0300 Subject: Do not change the session configuration state because of changes in QNetworkConfigurationManager. The session state is only changed according to status messages sent by icd. Fixes: NB#182148 - QNetworkSession changes to disconnected state immediately after opening session --- src/plugins/bearer/icd/qnetworksession_impl.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp index 2583b28..0b35349 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp @@ -339,8 +339,6 @@ void QNetworkSessionPrivateImpl::syncStateWithInterface() isOpen = false; opened = false; - connect(&manager, SIGNAL(updateCompleted()), this, SLOT(networkConfigurationsChanged())); - connect(engine, SIGNAL(iapStateChanged(const QString&, uint)), this, SLOT(iapStateChanged(const QString&, uint))); -- cgit v0.12 From d4c8461db653e498b9369c2a36de5b699bcbf87d Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 12 Aug 2010 14:46:46 +1000 Subject: Release lock before calling into icd engine. --- src/plugins/bearer/icd/qnetworksession_impl.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp index 0b35349..3170bf6 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp @@ -458,14 +458,15 @@ void QNetworkSessionPrivateImpl::syncStateWithInterface() else ptr->name = ptr->id; + const QString identifier = ptr->id; + + configLocker.unlock(); + // Add the new active configuration to manager or update the old config - if (!engine->hasIdentifier(ptr->id)) { - configLocker.unlock(); + if (!engine->hasIdentifier(identifier)) engine->addSessionConfiguration(ptr); - } else { - configLocker.unlock(); + else engine->changedSessionConfiguration(ptr); - } } break; -- cgit v0.12 From f7c07892e927a6420bb64a7011312f0a4a5a1fc9 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 16 Aug 2010 11:17:56 +1000 Subject: emit countChanged where appropriate in Repeater Task-number: QTBUG-12905 Reviewed-by: Bea Lam --- src/declarative/graphicsitems/qdeclarativerepeater.cpp | 5 ++++- .../declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 68e7e9a..b4b6c02 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -245,8 +245,8 @@ void QDeclarativeRepeater::setModel(const QVariant &model) connect(d->model, SIGNAL(destroyingItem(QDeclarativeItem*)), this, SLOT(destroyingItem(QDeclarativeItem*))); */ regenerate(); - emit countChanged(); } + emit countChanged(); } /*! @@ -377,6 +377,7 @@ void QDeclarativeRepeater::itemsInserted(int index, int count) d->deletables.insert(modelIndex, item); } } + emit countChanged(); } void QDeclarativeRepeater::itemsRemoved(int index, int count) @@ -391,6 +392,7 @@ void QDeclarativeRepeater::itemsRemoved(int index, int count) else break; } + emit countChanged(); } void QDeclarativeRepeater::itemsMoved(int from, int to, int count) @@ -420,6 +422,7 @@ void QDeclarativeRepeater::modelReset() if (!isComponentComplete()) return; regenerate(); + emit countChanged(); } QT_END_NAMESPACE diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp index 623b3d7..360d90f 100644 --- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp +++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp @@ -309,11 +309,14 @@ void tst_QDeclarativeRepeater::dataModel() QCOMPARE(container->childItems().count(), 4); + QSignalSpy repeaterSpy(repeater, SIGNAL(countChanged())); testModel.addItem("four", "4"); QCOMPARE(container->childItems().count(), 5); + QCOMPARE(repeaterSpy.count(),1); testModel.removeItem(2); QCOMPARE(container->childItems().count(), 4); + QCOMPARE(repeaterSpy.count(),2); // Check that model changes are propagated QDeclarativeText *text = findItem(canvas->rootObject(), "myName", 1); -- cgit v0.12 From 8ae7f9508a94e37ceddd4c2b1b94dc43ff039cf3 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 16 Aug 2010 13:38:54 +1000 Subject: Make positioners work with QGraphicsWidgets also Task-number: QTBUG-12416 Reviewed-by: Alexis Menard --- .../graphicsitems/qdeclarativepositioners.cpp | 107 ++++++++++++--------- .../graphicsitems/qdeclarativepositioners_p.h | 8 +- .../graphicsitems/qdeclarativepositioners_p_p.h | 5 +- 3 files changed, 71 insertions(+), 49 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 179f13d..f32c532 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -61,16 +61,33 @@ static const QDeclarativeItemPrivate::ChangeTypes watchedChanges | QDeclarativeItemPrivate::Opacity | QDeclarativeItemPrivate::Destroyed; -void QDeclarativeBasePositionerPrivate::watchChanges(QDeclarativeItem *other) +void QDeclarativeBasePositionerPrivate::watchChanges(QGraphicsObject *other) { - QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); - otherPrivate->addItemChangeListener(this, watchedChanges); + if (QGraphicsItemPrivate::get(other)->isDeclarativeItem) { + QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); + otherPrivate->addItemChangeListener(this, watchedChanges); + } else { + Q_Q(QDeclarativeBasePositioner); + QObject::connect(other, SIGNAL(widthChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::connect(other, SIGNAL(heightChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + } } -void QDeclarativeBasePositionerPrivate::unwatchChanges(QDeclarativeItem* other) +void QDeclarativeBasePositionerPrivate::unwatchChanges(QGraphicsObject* other) { - QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); - otherPrivate->removeItemChangeListener(this, watchedChanges); + if (QGraphicsItemPrivate::get(other)->isDeclarativeItem) { + QDeclarativeItemPrivate *otherPrivate = static_cast(QGraphicsItemPrivate::get(other)); + otherPrivate->removeItemChangeListener(this, watchedChanges); + } else { + Q_Q(QDeclarativeBasePositioner); + QObject::disconnect(other, SIGNAL(widthChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::disconnect(other, SIGNAL(heightChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + } +} + +void QDeclarativeBasePositioner::graphicsWidgetGeometryChanged() +{ + prePositioning(); } /*! @@ -174,16 +191,16 @@ QVariant QDeclarativeBasePositioner::itemChange(GraphicsItemChange change, Q_D(QDeclarativeBasePositioner); if (change == ItemChildAddedChange){ QGraphicsItem* item = value.value(); - QDeclarativeItem* child = 0; + QGraphicsObject* child = 0; if(item) - child = qobject_cast(item->toGraphicsObject()); + child = item->toGraphicsObject(); if (child) prePositioning(); } else if (change == ItemChildRemovedChange) { QGraphicsItem* item = value.value(); - QDeclarativeItem* child = 0; + QGraphicsObject* child = 0; if(item) - child = qobject_cast(item->toGraphicsObject()); + child = item->toGraphicsObject(); if (child) { QDeclarativeBasePositioner::PositionedItem posItem(child); int idx = positionedItems.find(posItem); @@ -194,7 +211,6 @@ QVariant QDeclarativeBasePositioner::itemChange(GraphicsItemChange change, prePositioning(); } } - return QDeclarativeItem::itemChange(change, value); } @@ -216,7 +232,7 @@ void QDeclarativeBasePositioner::prePositioning() QPODVector oldItems; positionedItems.copyAndClear(oldItems); for (int ii = 0; ii < children.count(); ++ii) { - QDeclarativeItem *child = qobject_cast(children.at(ii)); + QGraphicsObject *child = children.at(ii)->toGraphicsObject(); if (!child) continue; QDeclarativeItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); @@ -302,10 +318,10 @@ void QDeclarativeBasePositioner::finishApplyTransitions() d->moveActions.clear(); } -static inline bool isInvisible(QDeclarativeItem *child) +static inline bool isInvisible(QGraphicsObject *child) { QDeclarativeItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); - return child->opacity() == 0.0 || childPrivate->explicitlyHidden || !child->width() || !child->height(); + return child->opacity() == 0.0 || childPrivate->explicitlyHidden || !childPrivate->width() || !childPrivate->height(); } /*! @@ -440,9 +456,9 @@ void QDeclarativeColumn::doPositioning(QSizeF *contentSize) if(child.item->y() != voffset) positionY(voffset, child); - contentSize->setWidth(qMax(contentSize->width(), child.item->width())); + contentSize->setWidth(qMax(contentSize->width(), QGraphicsItemPrivate::get(child.item)->width())); - voffset += child.item->height(); + voffset += QGraphicsItemPrivate::get(child.item)->height(); voffset += spacing(); } @@ -454,8 +470,8 @@ void QDeclarativeColumn::reportConflictingAnchors() QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this)); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors) { QDeclarativeAnchors::Anchors usedAnchors = anchors->usedAnchors(); if (usedAnchors & QDeclarativeAnchors::TopAnchor || @@ -579,9 +595,9 @@ void QDeclarativeRow::doPositioning(QSizeF *contentSize) if(child.item->x() != hoffset) positionX(hoffset, child); - contentSize->setHeight(qMax(contentSize->height(), child.item->height())); + contentSize->setHeight(qMax(contentSize->height(), QGraphicsItemPrivate::get(child.item)->height())); - hoffset += child.item->width(); + hoffset += QGraphicsItemPrivate::get(child.item)->width(); hoffset += spacing(); } @@ -593,8 +609,8 @@ void QDeclarativeRow::reportConflictingAnchors() QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this)); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors) { QDeclarativeAnchors::Anchors usedAnchors = anchors->usedAnchors(); if (usedAnchors & QDeclarativeAnchors::LeftAnchor || @@ -814,10 +830,11 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize) const PositionedItem &child = positionedItems.at(childIndex++); if (!child.item || isInvisible(child.item)) continue; - if (child.item->width() > maxColWidth[j]) - maxColWidth[j] = child.item->width(); - if (child.item->height() > maxRowHeight[i]) - maxRowHeight[i] = child.item->height(); + QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child.item); + if (childPrivate->width() > maxColWidth[j]) + maxColWidth[j] = childPrivate->width(); + if (childPrivate->height() > maxRowHeight[i]) + maxRowHeight[i] = childPrivate->height(); } } } else { @@ -833,10 +850,11 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize) const PositionedItem &child = positionedItems.at(childIndex++); if (!child.item || isInvisible(child.item)) continue; - if (child.item->width() > maxColWidth[j]) - maxColWidth[j] = child.item->width(); - if (child.item->height() > maxRowHeight[i]) - maxRowHeight[i] = child.item->height(); + QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child.item); + if (childPrivate->width() > maxColWidth[j]) + maxColWidth[j] = childPrivate->width(); + if (childPrivate->height() > maxRowHeight[i]) + maxRowHeight[i] = childPrivate->height(); } } } @@ -855,7 +873,7 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize) } if (m_flow == LeftToRight) { - contentSize->setWidth(qMax(contentSize->width(), xoffset + child.item->width())); + contentSize->setWidth(qMax(contentSize->width(), xoffset + QGraphicsItemPrivate::get(child.item)->width())); contentSize->setHeight(yoffset + maxRowHeight[curRow]); xoffset+=maxColWidth[curCol]+spacing(); @@ -869,7 +887,7 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize) break; } } else { - contentSize->setHeight(qMax(contentSize->height(), yoffset + child.item->height())); + contentSize->setHeight(qMax(contentSize->height(), yoffset + QGraphicsItemPrivate::get(child.item)->height())); contentSize->setWidth(xoffset + maxColWidth[curCol]); yoffset+=maxRowHeight[curRow]+spacing(); @@ -891,8 +909,8 @@ void QDeclarativeGrid::reportConflictingAnchors() QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this)); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) { d->anchorConflict = true; break; @@ -1026,14 +1044,15 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize) if (!child.item || isInvisible(child.item)) continue; + QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child.item); if (d->flow == LeftToRight) { - if (widthValid() && hoffset && hoffset + child.item->width() > width()) { + if (widthValid() && hoffset && hoffset + childPrivate->width() > width()) { hoffset = 0; voffset += linemax + spacing(); linemax = 0; } } else { - if (heightValid() && voffset && voffset + child.item->height() > height()) { + if (heightValid() && voffset && voffset + childPrivate->height() > height()) { voffset = 0; hoffset += linemax + spacing(); linemax = 0; @@ -1045,17 +1064,17 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize) positionY(voffset, child); } - contentSize->setWidth(qMax(contentSize->width(), hoffset + child.item->width())); - contentSize->setHeight(qMax(contentSize->height(), voffset + child.item->height())); + contentSize->setWidth(qMax(contentSize->width(), hoffset + childPrivate->width())); + contentSize->setHeight(qMax(contentSize->height(), voffset + childPrivate->height())); if (d->flow == LeftToRight) { - hoffset += child.item->width(); + hoffset += childPrivate->width(); hoffset += spacing(); - linemax = qMax(linemax, qCeil(child.item->height())); + linemax = qMax(linemax, qCeil(childPrivate->height())); } else { - voffset += child.item->height(); + voffset += childPrivate->height(); voffset += spacing(); - linemax = qMax(linemax, qCeil(child.item->width())); + linemax = qMax(linemax, qCeil(childPrivate->width())); } } } @@ -1065,8 +1084,8 @@ void QDeclarativeFlow::reportConflictingAnchors() Q_D(QDeclarativeFlow); for (int ii = 0; ii < positionedItems.count(); ++ii) { const PositionedItem &child = positionedItems.at(ii); - if (child.item) { - QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors; + if (child.item && QGraphicsItemPrivate::get(child.item)->isDeclarativeItem) { + QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(static_cast(child.item))->_anchors; if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) { d->anchorConflict = true; break; diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index c03e518..f9ecc0a 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -91,14 +91,16 @@ Q_SIGNALS: protected Q_SLOTS: void prePositioning(); + void graphicsWidgetGeometryChanged(); protected: virtual void doPositioning(QSizeF *contentSize)=0; virtual void reportConflictingAnchors()=0; - struct PositionedItem { - PositionedItem(QDeclarativeItem *i) : item(i), isNew(false), isVisible(true) {} + class PositionedItem { + public : + PositionedItem(QGraphicsObject *i) : item(i), isNew(false), isVisible(true) {} bool operator==(const PositionedItem &other) const { return other.item == item; } - QDeclarativeItem *item; + QGraphicsObject *item; bool isNew; bool isVisible; }; diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h index 822079b..35946e9 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h @@ -94,8 +94,8 @@ public: QDeclarativeTransitionManager addTransitionManager; QDeclarativeTransitionManager moveTransitionManager; - void watchChanges(QDeclarativeItem *other); - void unwatchChanges(QDeclarativeItem* other); + void watchChanges(QGraphicsObject *other); + void unwatchChanges(QGraphicsObject* other); bool queuedPositioning : 1; bool doingPositioning : 1; bool anchorConflict : 1; @@ -123,6 +123,7 @@ public: if (newGeometry.size() != oldGeometry.size()) q->prePositioning(); } + virtual void itemVisibilityChanged(QDeclarativeItem *) { schedulePositioning(); -- cgit v0.12 From b8505789fdf977fcdec91f94557fe13bcef1e7cc Mon Sep 17 00:00:00 2001 From: Tomasz Bursztyka Date: Thu, 29 Jul 2010 15:22:33 +0300 Subject: The QNetworkConfigurationManager did not get the online status correctly even when there was an active connection. Fixes: NB#181984 - QNetworkConfigurationManager reports offline even when connected. Signed-off-by: Tomasz Bursztyka Signed-off-by: Jukka Rissanen --- src/plugins/bearer/icd/qicdengine.cpp | 97 +++++++++++++++++++++++++---------- src/plugins/bearer/icd/qicdengine.h | 2 +- 2 files changed, 71 insertions(+), 28 deletions(-) diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp index 0900329..87b31da 100644 --- a/src/plugins/bearer/icd/qicdengine.cpp +++ b/src/plugins/bearer/icd/qicdengine.cpp @@ -275,6 +275,8 @@ void QIcdEngine::initialize() userChoiceConfigurations.insert(cpPriv->id, ptr); doRequestUpdate(); + + getIcdInitialState(); } static inline QString network_attrs_to_security(uint network_attrs) @@ -623,7 +625,11 @@ void QIcdEngine::doRequestUpdate(QList scanned) changed = true; } - if (ptr->state != QNetworkConfiguration::Discovered) { + /* If this config is the current active one, we do not set it + * to discovered. + */ + if ((ptr->state != QNetworkConfiguration::Discovered) && + (ptr->state != QNetworkConfiguration::Active)) { ptr->state = QNetworkConfiguration::Discovered; changed = true; } @@ -786,10 +792,50 @@ void QIcdEngine::startListeningStateSignalsForAllConnections() ICD_DBUS_API_INTERFACE, ICD_DBUS_API_STATE_SIG, this, SLOT(connectionStateSignalsSlot(QDBusMessage))); +} + +void QIcdEngine::getIcdInitialState() +{ + /* Instead of requesting ICD status asynchronously, we ask it synchronously. + * It ensures that we always get right icd status BEFORE initialize() ends. + * If not, initialize() might end before we got icd status and + * QNetworkConfigurationManager::updateConfigurations() + * call from user might also end before receiving icd status. + * In such case, we come up to a bug: + * QNetworkConfigurationManagerPrivate::isOnline() will be false even + * if we are connected. + */ + Maemo::Icd icd; + QList state_results; + QMutexLocker locker(&mutex); + QNetworkConfigurationPrivatePointer ptr; + + if (icd.state(state_results) && !state_results.isEmpty()) { + + if (!(state_results.first().params.network_attrs == 0 && + state_results.first().params.network_id.isEmpty())) { + + switch (state_results.first().state) { + case ICD_STATE_CONNECTED: + m_onlineIapId = state_results.first().params.network_id; + + ptr = accessPointConfigurations.value(m_onlineIapId); + if (ptr) { + ptr->state = QNetworkConfiguration::Active; + + QMutexLocker configLocker(&ptr->mutex); + configLocker.unlock(); - // Calling ICD_DBUS_API_STATE_REQ makes sure that initial state will be updated immediately - m_gettingInitialConnectionState = true; - m_dbusInterface->call(ICD_DBUS_API_STATE_REQ); + locker.unlock(); + emit configurationChanged(ptr); + locker.relock(); + } + break; + default: + break; + } + } + } } void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg) @@ -814,12 +860,12 @@ void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg) ptr->type = QNetworkConfiguration::InternetAccessPoint; if (ptr->state != QNetworkConfiguration::Active) { ptr->state = QNetworkConfiguration::Active; - if (!m_gettingInitialConnectionState) { - configLocker.unlock(); - locker.unlock(); - emit configurationChanged(ptr); - locker.relock(); - } + + configLocker.unlock(); + locker.unlock(); + emit configurationChanged(ptr); + locker.relock(); + m_onlineIapId = iapid; } } else { @@ -840,22 +886,21 @@ void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg) ptr->type = QNetworkConfiguration::InternetAccessPoint; if (ptr->state == QNetworkConfiguration::Active) { ptr->state = QNetworkConfiguration::Discovered; - if (!m_gettingInitialConnectionState) { - configLocker.unlock(); - locker.unlock(); - emit configurationChanged(ptr); - locker.relock(); - // Note: If ICD switches used IAP from one to another: - // 1) new IAP is reported to be online first - // 2) old IAP is reported to be offline then - // => Device can be reported to be offline only - // if last known online IAP is reported to be disconnected - if (iapid == m_onlineIapId) { - // It's known that there is only one global ICD connection - // => Because ICD state was reported to be DISCONNECTED, Device is offline - m_onlineIapId.clear(); - } + configLocker.unlock(); + locker.unlock(); + emit configurationChanged(ptr); + locker.relock(); + + // Note: If ICD switches used IAP from one to another: + // 1) new IAP is reported to be online first + // 2) old IAP is reported to be offline then + // => Device can be reported to be offline only + // if last known online IAP is reported to be disconnected + if (iapid == m_onlineIapId) { + // It's known that there is only one global ICD connection + // => Because ICD state was reported to be DISCONNECTED, Device is offline + m_onlineIapId.clear(); } } } else { @@ -876,8 +921,6 @@ void QIcdEngine::connectionStateSignalsSlot(QDBusMessage msg) locker.unlock(); emit iapStateChanged(iapid, icd_connection_state); locker.relock(); - - m_gettingInitialConnectionState = false; } void QIcdEngine::requestUpdate() diff --git a/src/plugins/bearer/icd/qicdengine.h b/src/plugins/bearer/icd/qicdengine.h index a768d84..0d5ba27 100644 --- a/src/plugins/bearer/icd/qicdengine.h +++ b/src/plugins/bearer/icd/qicdengine.h @@ -152,6 +152,7 @@ private: void startListeningStateSignalsForAllConnections(); void doRequestUpdate(QList scanned = QList()); void cancelAsyncConfigurationUpdate(); + void getIcdInitialState(); private: IapMonitor *iapMonitor; @@ -162,7 +163,6 @@ private: QList m_scanResult; bool firstUpdate; - bool m_gettingInitialConnectionState; bool m_scanGoingOn; }; -- cgit v0.12 From dbdbac99ef4ae5243a5f2571b66d4949dbfdc88c Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 16 Aug 2010 11:14:24 +1000 Subject: Fixed a typo when doing a lock. Conflicts: src/plugins/bearer/icd/qicdengine.cpp --- src/plugins/bearer/icd/qicdengine.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp index 87b31da..cae2b7c 100644 --- a/src/plugins/bearer/icd/qicdengine.cpp +++ b/src/plugins/bearer/icd/qicdengine.cpp @@ -821,9 +821,8 @@ void QIcdEngine::getIcdInitialState() ptr = accessPointConfigurations.value(m_onlineIapId); if (ptr) { - ptr->state = QNetworkConfiguration::Active; - QMutexLocker configLocker(&ptr->mutex); + ptr->state = QNetworkConfiguration::Active; configLocker.unlock(); locker.unlock(); -- cgit v0.12 From 6f911718ba51b84ea34b45baf7f8b16954c33371 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 16 Aug 2010 11:16:41 +1000 Subject: Mutex is already locked when private member function is called. Conflicts: src/plugins/bearer/icd/qicdengine.cpp --- src/plugins/bearer/icd/qicdengine.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp index cae2b7c..3264f15 100644 --- a/src/plugins/bearer/icd/qicdengine.cpp +++ b/src/plugins/bearer/icd/qicdengine.cpp @@ -807,7 +807,6 @@ void QIcdEngine::getIcdInitialState() */ Maemo::Icd icd; QList state_results; - QMutexLocker locker(&mutex); QNetworkConfigurationPrivatePointer ptr; if (icd.state(state_results) && !state_results.isEmpty()) { @@ -825,9 +824,9 @@ void QIcdEngine::getIcdInitialState() ptr->state = QNetworkConfiguration::Active; configLocker.unlock(); - locker.unlock(); + mutex.unlock(); emit configurationChanged(ptr); - locker.relock(); + mutex.lock(); } break; default: -- cgit v0.12 From a1deaf3227ed6bfc086f0142a057d76ccf735e76 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 12 Aug 2010 15:17:59 +1000 Subject: Register QNetworkConfigurationPrivatePointer metatype. --- src/network/bearer/qnetworkconfigmanager_p.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp index c4f7c00..dd174bf 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.cpp +++ b/src/network/bearer/qnetworkconfigmanager_p.cpp @@ -63,6 +63,7 @@ QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate() : pollTimer(0), mutex(QMutex::Recursive), forcedPolling(0), firstUpdate(true) { qRegisterMetaType("QNetworkConfiguration"); + qRegisterMetaType("QNetworkConfigurationPrivatePointer"); moveToThread(QCoreApplicationPrivate::mainThread()); updateConfigurations(); -- cgit v0.12 From d379b4b4d284a1fe5f7cd436d103fbede43b9ca3 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 12 Aug 2010 14:48:30 +1000 Subject: Remove version 0.41 of libconninet. --- src/3rdparty/libconninet/AUTHORS | 0 src/3rdparty/libconninet/COPYING | 510 ------ src/3rdparty/libconninet/ChangeLog | 0 src/3rdparty/libconninet/INSTALL | 229 --- src/3rdparty/libconninet/Makefile.am | 49 - src/3rdparty/libconninet/NEWS | 0 src/3rdparty/libconninet/README | 0 src/3rdparty/libconninet/autogen.sh | 3 - src/3rdparty/libconninet/config.guess | 1533 ------------------ src/3rdparty/libconninet/config.sub | 1693 -------------------- src/3rdparty/libconninet/configure.ac | 90 -- src/3rdparty/libconninet/conninet.pc.in | 11 - src/3rdparty/libconninet/debian/changelog | 285 ---- src/3rdparty/libconninet/debian/compat | 1 - src/3rdparty/libconninet/debian/control | 39 - src/3rdparty/libconninet/debian/copyright | 19 - .../libconninet/debian/libconninet0-dev.dirs | 2 - .../libconninet/debian/libconninet0-dev.files | 4 - src/3rdparty/libconninet/debian/libconninet0.dirs | 1 - src/3rdparty/libconninet/debian/libconninet0.files | 1 - src/3rdparty/libconninet/debian/rules | 123 -- src/3rdparty/libconninet/doxygen.cfg.in | 1147 ------------- src/3rdparty/libconninet/src/Makefile.am | 36 - src/3rdparty/libconninet/src/dbusdispatcher.cpp | 611 ------- src/3rdparty/libconninet/src/dbusdispatcher.h | 91 -- src/3rdparty/libconninet/src/iapconf.cpp | 299 ---- src/3rdparty/libconninet/src/iapconf.h | 84 - src/3rdparty/libconninet/src/iapmonitor.cpp | 110 -- src/3rdparty/libconninet/src/iapmonitor.h | 48 - src/3rdparty/libconninet/src/maemo_icd.cpp | 1277 --------------- src/3rdparty/libconninet/src/maemo_icd.h | 182 --- src/3rdparty/libconninet/src/proxyconf.cpp | 315 ---- src/3rdparty/libconninet/src/proxyconf.h | 53 - src/3rdparty/libconninet/tests/Makefile.am | 39 - .../libconninet/tests/ut_dbusdispatcher.cpp | 191 --- src/3rdparty/libconninet/tests/ut_iapconf.cpp | 186 --- src/3rdparty/libconninet/tests/ut_iapmonitor.cpp | 118 -- src/3rdparty/libconninet/tests/ut_maemo_icd.cpp | 274 ---- src/3rdparty/libconninet/tests/ut_proxyconf.cpp | 400 ----- 39 files changed, 10054 deletions(-) delete mode 100644 src/3rdparty/libconninet/AUTHORS delete mode 100644 src/3rdparty/libconninet/COPYING delete mode 100644 src/3rdparty/libconninet/ChangeLog delete mode 100644 src/3rdparty/libconninet/INSTALL delete mode 100644 src/3rdparty/libconninet/Makefile.am delete mode 100644 src/3rdparty/libconninet/NEWS delete mode 100644 src/3rdparty/libconninet/README delete mode 100755 src/3rdparty/libconninet/autogen.sh delete mode 100755 src/3rdparty/libconninet/config.guess delete mode 100755 src/3rdparty/libconninet/config.sub delete mode 100644 src/3rdparty/libconninet/configure.ac delete mode 100644 src/3rdparty/libconninet/conninet.pc.in delete mode 100644 src/3rdparty/libconninet/debian/changelog delete mode 100644 src/3rdparty/libconninet/debian/compat delete mode 100644 src/3rdparty/libconninet/debian/control delete mode 100644 src/3rdparty/libconninet/debian/copyright delete mode 100644 src/3rdparty/libconninet/debian/libconninet0-dev.dirs delete mode 100644 src/3rdparty/libconninet/debian/libconninet0-dev.files delete mode 100644 src/3rdparty/libconninet/debian/libconninet0.dirs delete mode 100644 src/3rdparty/libconninet/debian/libconninet0.files delete mode 100755 src/3rdparty/libconninet/debian/rules delete mode 100644 src/3rdparty/libconninet/doxygen.cfg.in delete mode 100644 src/3rdparty/libconninet/src/Makefile.am delete mode 100644 src/3rdparty/libconninet/src/dbusdispatcher.cpp delete mode 100644 src/3rdparty/libconninet/src/dbusdispatcher.h delete mode 100644 src/3rdparty/libconninet/src/iapconf.cpp delete mode 100644 src/3rdparty/libconninet/src/iapconf.h delete mode 100644 src/3rdparty/libconninet/src/iapmonitor.cpp delete mode 100644 src/3rdparty/libconninet/src/iapmonitor.h delete mode 100644 src/3rdparty/libconninet/src/maemo_icd.cpp delete mode 100644 src/3rdparty/libconninet/src/maemo_icd.h delete mode 100644 src/3rdparty/libconninet/src/proxyconf.cpp delete mode 100644 src/3rdparty/libconninet/src/proxyconf.h delete mode 100644 src/3rdparty/libconninet/tests/Makefile.am delete mode 100644 src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp delete mode 100644 src/3rdparty/libconninet/tests/ut_iapconf.cpp delete mode 100644 src/3rdparty/libconninet/tests/ut_iapmonitor.cpp delete mode 100644 src/3rdparty/libconninet/tests/ut_maemo_icd.cpp delete mode 100644 src/3rdparty/libconninet/tests/ut_proxyconf.cpp diff --git a/src/3rdparty/libconninet/AUTHORS b/src/3rdparty/libconninet/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/src/3rdparty/libconninet/COPYING b/src/3rdparty/libconninet/COPYING deleted file mode 100644 index b124cf5..0000000 --- a/src/3rdparty/libconninet/COPYING +++ /dev/null @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/src/3rdparty/libconninet/ChangeLog b/src/3rdparty/libconninet/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/src/3rdparty/libconninet/INSTALL b/src/3rdparty/libconninet/INSTALL deleted file mode 100644 index 54caf7c..0000000 --- a/src/3rdparty/libconninet/INSTALL +++ /dev/null @@ -1,229 +0,0 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/src/3rdparty/libconninet/Makefile.am b/src/3rdparty/libconninet/Makefile.am deleted file mode 100644 index 250637a..0000000 --- a/src/3rdparty/libconninet/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -SUBDIRS = src tests - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = conninet.pc - -MAINTAINERCLEANFILES = \ - Makefile.in config.h.in configure \ - install-sh ltmain.sh missing mkinstalldirs \ - config.log config.status config.guess config.sub \ - build-stamp compile depcomp acinclude.m4 aclocal.m4 \ - debian/files \ - debian/libconninet0.postinst.debhelper \ - debian/libconninet0.postrm.debhelper \ - debian/libconninet0.substvars - -EXTRA_DIST = \ - debian/changelog \ - debian/compat \ - debian/control \ - debian/copyright \ - debian/libconninet0-dev.dirs \ - debian/libconninet0-dev.files \ - debian/libconninet0.dirs \ - debian/libconninet0.files \ - debian/rules - -# get rid of debian build dirs -maintainer-clean-local: - -rm -rf debian/build debian/tmp \ - debian/libconninet0 \ - debian/libconninet0-dev \ - debian/libconninet0-dbg - -if DOXYGEN_DOCS_ENABLED - DOXYGEN_LINE = $(DOXYGEN) doxygen.cfg -else - DOXYGEN_LINE = -endif - -.PHONY : doc - -doc: - $(DOXYGEN_LINE) - -deb: dist - -mkdir $(top_builddir)/debian-build - cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz - cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot -sa -D - -rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) diff --git a/src/3rdparty/libconninet/NEWS b/src/3rdparty/libconninet/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/src/3rdparty/libconninet/README b/src/3rdparty/libconninet/README deleted file mode 100644 index e69de29..0000000 diff --git a/src/3rdparty/libconninet/autogen.sh b/src/3rdparty/libconninet/autogen.sh deleted file mode 100755 index a8fd885..0000000 --- a/src/3rdparty/libconninet/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -autoreconf --verbose --install --force diff --git a/src/3rdparty/libconninet/config.guess b/src/3rdparty/libconninet/config.guess deleted file mode 100755 index e3a2116..0000000 --- a/src/3rdparty/libconninet/config.guess +++ /dev/null @@ -1,1533 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-06-10' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/src/3rdparty/libconninet/config.sub b/src/3rdparty/libconninet/config.sub deleted file mode 100755 index eb0389a..0000000 --- a/src/3rdparty/libconninet/config.sub +++ /dev/null @@ -1,1693 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-06-11' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/src/3rdparty/libconninet/configure.ac b/src/3rdparty/libconninet/configure.ac deleted file mode 100644 index 2a383ee..0000000 --- a/src/3rdparty/libconninet/configure.ac +++ /dev/null @@ -1,90 +0,0 @@ -AC_INIT([libconninet], patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']), [ -]), [jukka.rissanen@nokia.com]) -AM_INIT_AUTOMAKE([foreign]) - -AC_PROG_CXX -AC_PROG_LIBTOOL - -AC_ARG_ENABLE(docs, [ --enable-docs Build DOXYGEN documentation (requires Doxygen)],enable_docs=$enableval,enable_docs=auto) - -AC_PATH_PROG(DOXYGEN, doxygen, no) -AC_MSG_CHECKING([whether to build Doxygen documentation]) - -if test x$DOXYGEN = xno ; then - have_doxygen=no -else - have_doxygen=yes -fi -if test x$enable_docs = xauto ; then - if test x$have_doxygen = xno ; then - enable_docs=no - else - enable_docs=yes - fi -fi -if test x$enable_docs = xyes; then - if test x$have_doxygen = xno; then - AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found]) - else - AC_MSG_RESULT(yes) - fi -else - AC_MSG_RESULT(no) -fi - -AM_CONDITIONAL(DOXYGEN_DOCS_ENABLED, test x$enable_docs = xyes) -AC_SUBST(DOXYGEN) - -PKG_CHECK_MODULES(GLIB, glib-2.0) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) - -PKG_CHECK_MODULES(QTCORE, QtCore) -AC_SUBST(QTCORE_CFLAGS) -AC_SUBST(QTCORE_LIBS) - -PKG_CHECK_MODULES(QTNETWORK, QtNetwork) -AC_SUBST(QTNETWORK_CFLAGS) -AC_SUBST(QTNETWORK_LIBS) - -PKG_CHECK_MODULES(QTDBUS, QtDBus) -AC_SUBST(QTDBUS_CFLAGS) -AC_SUBST(QTDBUS_LIBS) - -PKG_CHECK_MODULES(QTTEST, QtTest) -AC_SUBST(QTTEST_CFLAGS) -AC_SUBST(QTTEST_LIBS) - -PKG_CHECK_MODULES(DBUS, dbus-glib-1) -AC_SUBST(DBUS_CFLAGS) -AC_SUBST(DBUS_LIBS) - -PKG_CHECK_MODULES(CONNSETTINGS, connsettings) -AC_SUBST(CONNSETTINGS_CFLAGS) -AC_SUBST(CONNSETTINGS_LIBS) - -PKG_CHECK_MODULES(OSSO_IC, osso-ic) -AC_SUBST(OSSO_IC_CFLAGS) -AC_SUBST(OSSO_IC_LIBS) - -PKG_CHECK_MODULES(ICD_DEV, icd2) -AC_SUBST(ICD_DEV_CFLAGS) -AC_SUBST(ICD_DEV_LIBS) - -PKG_CHECK_MODULES(GCONF, gconf-2.0) -AC_SUBST(GCONF_CFLAGS) -AC_SUBST(GCONF_LIBS) - -PKG_CHECK_MODULES(QGCONF, gq-gconf) -AC_SUBST(QGCONF_CFLAGS) -AC_SUBST(QGCONF_LIBS) - -CONCFLAGS="-Wall -Werror -Wmissing-prototypes" -AC_SUBST(CONCFLAGS) - -AC_CONFIG_FILES([Makefile \ - src/Makefile \ - tests/Makefile \ - conninet.pc \ - doxygen.cfg]) -AC_OUTPUT diff --git a/src/3rdparty/libconninet/conninet.pc.in b/src/3rdparty/libconninet/conninet.pc.in deleted file mode 100644 index 68cdee0..0000000 --- a/src/3rdparty/libconninet/conninet.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libconninet -Description: Internet Connectivity support library -Version: @VERSION@ -Requires: dbus-1 >= 0.60 glib-2.0 QtCore QtDBus QtGui -Libs: -lconninet -Cflags: -I${includedir}/conninet diff --git a/src/3rdparty/libconninet/debian/changelog b/src/3rdparty/libconninet/debian/changelog deleted file mode 100644 index 436d318..0000000 --- a/src/3rdparty/libconninet/debian/changelog +++ /dev/null @@ -1,285 +0,0 @@ -libconninet (0.41+0m6) unstable; urgency=low - - * This entry has been added by BIFH queue processor - version has been changed to 0.41+0m6 - - -- Qing Jin Thu, 15 Jul 2010 15:56:38 +0300 - -libconninet (0.41) unstable; urgency=low - - * Fixes: NB#175098 - Qt4.7 Webkit crashes when bearer API QNetworkSession - constructor calls QNetworkSession::syncStateWithInterface() which in turn - calls Maemo::state() and Maemo::addrinfo() and webkit expects that event - loop is not run but those function process main loop events. - Now Maemo::state() and Maemo::addrinfo() are changed to be synchronous - and fully blocking functions. The old non-blocking versions are called - Maemo::state_non_blocking() and Maemo::addrinfo_non_blocking(). - - -- Jukka Rissanen Wed, 14 Jul 2010 10:12:47 +0300 - -libconninet (0.40) unstable; urgency=low - - * Fixes: NB#167465 - Unable to open network connection using libbearer - - -- Jukka Rissanen Tue, 11 May 2010 10:47:10 +0300 - -libconninet (0.39) unstable; urgency=low - - * Fixes: NB#167982 - initialize DBus vtable in DBusDispatcher. - - -- Aapo Makela Mon, 10 May 2010 14:42:39 +0300 - -libconninet (0.38) unstable; urgency=low - - * Changing icd2 connect_req to be synchronous as the check for - returned connect signal did not work correctly, this caused a - long timeout when connect() was called. - * Scan sometimes missed results and did not return them to caller. - * HTTP proxy settings were not set correctly. - - -- Jukka Rissanen Thu, 15 Apr 2010 11:25:06 +0300 - -libconninet (0.37) unstable; urgency=low - - * Make proxy config reference counting atomic. - - -- Jukka Rissanen Wed, 3 Mar 2010 13:23:08 +0200 - -libconninet (0.36) unstable; urgency=low - - * Fixes: NB#157586 - Cleanup dbus listener when WLAN scanning object is - deleted. - - -- Jukka Rissanen Fri, 26 Feb 2010 13:30:41 +0200 - -libconninet (0.35) unstable; urgency=low - - * Fixes: NB#156883 - libconninet fails to build under the Platform SDK (SB2) - - -- Jukka Rissanen Thu, 18 Feb 2010 12:14:40 +0200 - -libconninet (0.34) unstable; urgency=low - - * Coverity fix - - -- Jukka Rissanen Tue, 16 Feb 2010 16:38:00 +0200 - -libconninet (0.33) unstable; urgency=low - - * Added API to update Qt proxy config. - - -- Jukka Rissanen Tue, 26 Jan 2010 15:48:36 +0200 - -libconninet (0.32) unstable; urgency=low - - * Fixed IAPConf to unset value when set value is invalid. - * Updated IAPMonitor to use libconnsettings. - - -- Aapo Makela Wed, 03 Feb 2010 07:32:45 +0200 - -libconninet (0.31) unstable; urgency=low - - * Fixes: NB#154892 - Check nulls in IAPConf. - - -- Aapo Makela Mon, 01 Feb 2010 09:32:06 +0200 - -libconninet (0.30) unstable; urgency=low - - * Updated IAPConf to use libconnsettings. - - -- Aapo Makela Fri, 29 Jan 2010 12:58:03 +0200 - -libconninet (0.29) unstable; urgency=low - - * Fixed dependencies - - -- Jukka Rissanen Fri, 15 Jan 2010 10:16:07 +0200 - -libconninet (0.28) unstable; urgency=low - - * Get rid of libdui dependency - - -- Jukka Rissanen Wed, 13 Jan 2010 09:56:26 +0200 - -libconninet (0.27) unstable; urgency=low - - * Insert new pending calls to the list in DBusDispatcher. - - -- Aapo Makela Tue, 22 Dec 2009 14:27:32 +0200 - -libconninet (0.26) unstable; urgency=low - - * Added possibility to specify different signal path for DBusDispatcher. - - -- Aapo Makela Wed, 25 Nov 2009 14:27:34 +0200 - -libconninet (0.25) unstable; urgency=low - - * Fixes: NB#146450 - All scan results were not returned to the caller. - - -- Jukka Rissanen Mon, 16 Nov 2009 17:23:15 +0200 - -libconninet (0.24) unstable; urgency=low - - * Wait all scan results for all network types in Maemo::Icd::scan() - - -- Jukka Rissanen Fri, 6 Nov 2009 14:45:23 +0200 - -libconninet (0.23) unstable; urgency=low - - * Fixes: NB#143361 - Assert failure in session class for GPRS IAP. - - -- Jukka Rissanen Mon, 19 Oct 2009 16:00:14 +0300 - -libconninet (0.22) unstable; urgency=low - - * Fixed the error checking if scan returns 0 results. - - -- Jukka Rissanen Wed, 7 Oct 2009 13:50:27 +0300 - -libconninet (0.21) unstable; urgency=low - - * Support multiple DBusDispatcher classes at the same time. This is - required by Maemo::Icd class so that multiple instances of it can - be used the same time. - - -- Jukka Rissanen Mon, 5 Oct 2009 16:33:43 +0300 - -libconninet (0.20) unstable; urgency=low - - * Fixed memory leak in IAPConf::setValue() - - -- Jukka Rissanen Fri, 2 Oct 2009 13:02:21 +0300 - -libconninet (0.19) unstable; urgency=low - - * Fixed connect_req to one specific IAP in Icd class. - - -- Jukka Rissanen Tue, 29 Sep 2009 17:02:46 +0300 - -libconninet (0.18) unstable; urgency=low - - * Make sure the library will not abort in Icd class if scan does - not return any results. - - -- Jukka Rissanen Tue, 22 Sep 2009 17:00:12 +0300 - -libconninet (0.17) unstable; urgency=low - - * Added IAP monitoring support. - - -- Jukka Rissanen Mon, 21 Sep 2009 16:29:31 +0300 - -libconninet (0.16) unstable; urgency=low - - * Disabled the old osso-ic dbus interface as it is currently not used. - * Fixed the addrinfo request, now addresses are returned correctly to - the caller. - - -- Jukka Rissanen Thu, 17 Sep 2009 15:56:13 +0300 - -libconninet (0.15) unstable; urgency=low - - * Enabling state_req, statistics_req and addrinfo_req support - functions in Maemo::Icd as the corresponding DBUS API functions are - fixed in icd2 v0.89 - - -- Jukka Rissanen Fri, 24 Jul 2009 15:23:02 +0300 - -libconninet (0.14) unstable; urgency=low - - * Icd statistics support added. - * Icd address information support added. - * Icd scan method does not return the final (and empty) result any more. - * Added initial unit test implementation for Icd class. - * Some of the status functions in Icd class disabled because of issues - in icd2 and the dbus api. - - -- Jukka Rissanen Thu, 23 Jul 2009 11:03:05 +0300 - -libconninet (0.13) unstable; urgency=low - - * Added API to get all the configured IAPs. - - -- Jukka Rissanen Tue, 21 Jul 2009 09:47:18 +0300 - -libconninet (0.12) unstable; urgency=low - - * Replaced duivaluespace by Dui in pkg-config file because the - duivaluespace is deprecated. - - -- Jukka Rissanen Mon, 20 Jul 2009 16:00:10 +0300 - -libconninet (0.11) unstable; urgency=low - - * Using libdui instead of libduivaluespace because it is deprecated. - * The IAPConf::clear() uses native gconf API instead of launching gconftool - * Check that state_req call returned list and the list contains entries - before trying to access it. - - -- Jukka Rissanen Mon, 20 Jul 2009 14:55:15 +0300 - -libconninet (0.10) unstable; urgency=low - - * connect() did not return ok when connection succeeded. - - -- Jukka Rissanen Thu, 25 Jun 2009 09:31:21 +0300 - -libconninet (0.9) unstable; urgency=low - - * Connection timeout set to 2.5min, same as in fremantle. - - -- Jukka Rissanen Wed, 17 Jun 2009 13:36:40 +0300 - -libconninet (0.8) unstable; urgency=low - - * Fix state_req signal received from Icd - - -- Jukka Rissanen Thu, 11 Jun 2009 17:19:33 +0300 - -libconninet (0.7) unstable; urgency=low - - * Icd disconnect and select reqs are made synchronous as we do not - wait the return status. The previous async version was causing core - dumps if Icd class was destroyed too early. - - -- Jukka Rissanen Thu, 11 Jun 2009 11:52:36 +0300 - -libconninet (0.6) unstable; urgency=low - - * Fixed the libconninet0-dev dependencies. - - -- Jukka Rissanen Mon, 8 Jun 2009 10:47:56 +0300 - -libconninet (0.5) unstable; urgency=low - - * Fixed missing QObject connect functions. - * Fixed IAPConf to return invalid QVariant if the value does not exist. - - -- Jukka Rissanen Mon, 01 Jun 2009 13:58:53 +0300 - -libconninet (0.4) unstable; urgency=low - - * Fixed QObject signal setting for Maemo::Icd - - -- Jukka Rissanen Wed, 20 May 2009 13:51:11 +0300 - -libconninet (0.3) unstable; urgency=low - - * Refactoring classes - * Added IAPConf class. - - -- Jukka Rissanen Thu, 14 May 2009 13:24:11 +0300 - -libconninet (0.2) unstable; urgency=low - - * Fixed pkgconfig file which had wrong dependency - * Added DBus array and struct support to DBusDispatcher. - - -- Jukka Rissanen Wed, 13 May 2009 12:11:00 +0300 - -libconninet (0.1) unstable; urgency=low - - * Initial Release. - - -- Jukka Rissanen Tue, 12 May 2009 16:10:27 +0200 diff --git a/src/3rdparty/libconninet/debian/compat b/src/3rdparty/libconninet/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/src/3rdparty/libconninet/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/src/3rdparty/libconninet/debian/control b/src/3rdparty/libconninet/debian/control deleted file mode 100644 index 2db660f..0000000 --- a/src/3rdparty/libconninet/debian/control +++ /dev/null @@ -1,39 +0,0 @@ -Source: libconninet -Priority: optional -Maintainer: Jukka Rissanen -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib2.0-dev (>= 2.8), - libdbus-1-dev (>= 0.60), libconnsettings0-dev (>= 0.4), icd2-osso-ic-dev, - icd2-dev, libqt4-dev, libgconf2-dev (>> 2.6.4), libgq-gconf-dev -Standards-Version: 3.6.2 -Section: libs - -Package: libconninet0-dev -Section: libdevel -Architecture: any -Depends: libconninet0 (= ${Source-Version}), libdbus-1-dev (>= 0.60), - libglib2.0-dev (>= 2.8), libconnsettings0-dev (>= 0.4), libqt4-dev, - icd2-osso-ic-dev, icd2-dev, libgconf2-dev (>> 2.6.4), libgq-gconf-dev -Description: Internet Connectivity support library development files - Internet Connectivity support library (libconninet) provides common - support functions for connecting to icd2 and accessing configuration - data. - . - This package contains the header files. - -Package: libconninet0 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Internet Connectivity support library - Internet Connectivity support library (libconninet) provides common - support functions for connecting to icd2 and accessing configuration - data. - . - This package contains the shared libraries. - -Package: libconninet0-dbg -Section: libs -Architecture: any -Depends: libconninet0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} -Description: Debug symbols for the Internet Connectivity support library - Internet Connectivity support library (libconninet) debug symbols. diff --git a/src/3rdparty/libconninet/debian/copyright b/src/3rdparty/libconninet/debian/copyright deleted file mode 100644 index 97e8e68..0000000 --- a/src/3rdparty/libconninet/debian/copyright +++ /dev/null @@ -1,19 +0,0 @@ -libconninet - Internet Connectivity support library - -Copyright (C) 2009 Nokia Corporation. All rights reserved. - -Contact: Jukka Rissanen - -This library is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License version 2.1 -as published by the Free Software Foundation. - -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301 USA diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs b/src/3rdparty/libconninet/debian/libconninet0-dev.dirs deleted file mode 100644 index 4418816..0000000 --- a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.files b/src/3rdparty/libconninet/debian/libconninet0-dev.files deleted file mode 100644 index 78bbac8..0000000 --- a/src/3rdparty/libconninet/debian/libconninet0-dev.files +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/* -usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/share/pkgconfig/* diff --git a/src/3rdparty/libconninet/debian/libconninet0.dirs b/src/3rdparty/libconninet/debian/libconninet0.dirs deleted file mode 100644 index 6845771..0000000 --- a/src/3rdparty/libconninet/debian/libconninet0.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/src/3rdparty/libconninet/debian/libconninet0.files b/src/3rdparty/libconninet/debian/libconninet0.files deleted file mode 100644 index d0dbfd1..0000000 --- a/src/3rdparty/libconninet/debian/libconninet0.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/lib*.so.* diff --git a/src/3rdparty/libconninet/debian/rules b/src/3rdparty/libconninet/debian/rules deleted file mode 100755 index 2a3d395..0000000 --- a/src/3rdparty/libconninet/debian/rules +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# shared library versions, option 1 -#version=2.0.5 -#major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -version=`ls src/.libs/lib*.so.* | \ - awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -major=`ls src/.libs/lib*.so.* | \ - awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -configure: configure.ac debian/changelog - -./autogen.sh - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info - - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_movefiles - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip --dbg-package=libconninet0 - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/src/3rdparty/libconninet/doxygen.cfg.in b/src/3rdparty/libconninet/doxygen.cfg.in deleted file mode 100644 index 80a4c8d..0000000 --- a/src/3rdparty/libconninet/doxygen.cfg.in +++ /dev/null @@ -1,1147 +0,0 @@ -# Doxyfile 1.3.7 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = "Internet Connectivity Support Library" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = @VERSION@ - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = doc - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 2 levels of 10 sub-directories under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of source -# files, where putting all generated files in the same directory would otherwise -# cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, -# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en -# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, -# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is used -# as the annotated text. Otherwise, the brief description is used as-is. If left -# blank, the following values are used ("$name" is automatically replaced with the -# name of the entity): "The $name class" "The $name widget" "The $name file" -# "is" "provides" "specifies" "contains" "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited -# members of a class in the documentation of that class as if those members were -# ordinary class members. Constructors, destructors and assignment operators of -# the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. - -JAVADOC_AUTOBRIEF = YES - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = YES - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = YES - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = conic/conic.h \ - conic/conicconnection.h \ - conic/conicconnectionevent.h \ - conic/conicevent.h \ - conic/coniciap.h \ - conic/conicstatisticsevent.h - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp -# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm - -FILE_PATTERNS = - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories -# that are symbolic links (a Unix filesystem feature) are excluded from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. - -EXCLUDE_PATTERNS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. - -INPUT_FILTER = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = YES - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse the -# parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. Note that this -# option is superseded by the HAVE_DOT option below. This is only a fallback. It is -# recommended to install and use dot, since it yields more powerful graphs. - -CLASS_DIAGRAMS = YES - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes that -# lay further from the root node will be omitted. Note that setting this option to -# 1 or 2 may greatly reduce the computation time needed for large code bases. Also -# note that a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). -# If 0 is used for the depth value (the default), the graph is not depth-constrained. - -MAX_DOT_GRAPH_DEPTH = 0 - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/src/3rdparty/libconninet/src/Makefile.am b/src/3rdparty/libconninet/src/Makefile.am deleted file mode 100644 index be7a1e5..0000000 --- a/src/3rdparty/libconninet/src/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -DEFS = -DDBUS_API_SUBJECT_TO_CHANGE -DGCONF_DISABLE_DEPRECATED -INCLUDES = @GLIB_CFLAGS@ @DBUS_CFLAGS@ @GCONF_CFLAGS@ @OSSO_IC_CFLAGS@ @ICD_DEV_CFLAGS@ @QTCORE_CFLAGS@ @QTNETWORK_CFLAGS@ @QTDBUS_CFLAGS@ @QGCONF_CFLAGS@ @CONNSETTINGS_CFLAGS@ -LIBS = @GLIB_LIBS@ @DBUS_LIBS@ @GCONF_LIBS@ @OSSO_IC_LIBS@ @ICD_DEV_LIBS@ @QTCORE_LIBS@ @QTDBUS_LIBS@ @QTNETWORK_CFLAGS@ @QGCONF_LIBS@ @CONNSETTINGS_LIBS@ - -AM_CFLAGS = $(CONCFLAGS) - -lib_LTLIBRARIES = libconninet.la -libconninet_la_SOURCES = \ - maemo_icd.cpp \ - dbusdispatcher.cpp \ - iapconf.cpp \ - iapmonitor.cpp \ - proxyconf.cpp - -#libconninet_la_LDFLAGS = -version-info 0:0:0 - -conninetincludedir = $(includedir)/conninet -conninetinclude_HEADERS = \ - maemo_icd.h \ - dbusdispatcher.h \ - iapconf.h \ - iapmonitor.h \ - proxyconf.h - -nodist_libconninet_la_SOURCES = \ - moc_maemo_icd.cpp \ - moc_dbusdispatcher.cpp - -MAINTAINERCLEANFILES = Makefile.in - -# This rule lets GNU make create any moc_*.cpp from the equivalent *.h -moc_%.cpp: %.h - moc $< -o $@ - -# This line ensures that generated moc files are deleted when we make clean. -CLEANFILES = *_moc.cpp *.loT diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.cpp b/src/3rdparty/libconninet/src/dbusdispatcher.cpp deleted file mode 100644 index f5b830a..0000000 --- a/src/3rdparty/libconninet/src/dbusdispatcher.cpp +++ /dev/null @@ -1,611 +0,0 @@ -/* * This file is part of conninet * - * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * - * Contact: Aapo Makela - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include -#include "dbusdispatcher.h" - -namespace Maemo { - -/*! - \class Maemo::DBusDispatcher - - \brief DBusDispatcher is a class, which is able to send DBUS method call - messages and receive unicast signals from DBUS object. -*/ - -class DBusDispatcherPrivate -{ -public: - DBusDispatcherPrivate(const QString& service, - const QString& path, - const QString& interface, - const QString& signalPath) - : service(service), path(path), interface(interface), - signalPath(signalPath), connection(0) - { - memset(&signal_vtable, 0, sizeof(signal_vtable)); - } - - ~DBusDispatcherPrivate() - { - foreach(DBusPendingCall *call, pending_calls) { - dbus_pending_call_cancel(call); - dbus_pending_call_unref(call); - } - } - - QString service; - QString path; - QString interface; - QString signalPath; - struct DBusConnection *connection; - QList pending_calls; - struct DBusObjectPathVTable signal_vtable; -}; - -static bool constantVariantList(const QVariantList& variantList) { - // Special case, empty list == empty struct - if (variantList.isEmpty()) { - return false; - } else { - QVariant::Type type = variantList[0].type(); - // Iterate items in the list and check if they are same type - foreach(QVariant variant, variantList) { - if (variant.type() != type) { - return false; - } - } - } - return true; -} - -static QString variantToSignature(const QVariant& argument, - bool constantList = true) { - switch (argument.type()) { - case QVariant::Bool: - return "b"; - case QVariant::ByteArray: - return "ay"; - case QVariant::Char: - return "y"; - case QVariant::Int: - return "i"; - case QVariant::UInt: - return "u"; - case QVariant::StringList: - return "as"; - case QVariant::String: - return "s"; - case QVariant::LongLong: - return "x"; - case QVariant::ULongLong: - return "t"; - case QVariant::List: - { - QString signature; - QVariantList variantList = argument.toList(); - if (!constantList) { - signature += DBUS_STRUCT_BEGIN_CHAR_AS_STRING; - foreach(QVariant listItem, variantList) { - signature += variantToSignature(listItem); - } - signature += DBUS_STRUCT_END_CHAR_AS_STRING; - } else { - if (variantList.isEmpty()) - return ""; - signature = "a" + variantToSignature(variantList[0]); - } - - return signature; - } - default: - qDebug() << "Unsupported variant type: " << argument.type(); - break; - } - - return ""; -} - -static bool appendVariantToDBusMessage(const QVariant& argument, - DBusMessageIter *dbus_iter) { - int idx = 0; - DBusMessageIter array_iter; - QStringList str_list; - dbus_bool_t bool_data; - dbus_int32_t int32_data; - dbus_uint32_t uint32_data; - dbus_int64_t int64_data; - dbus_uint64_t uint64_data; - char *str_data; - char char_data; - - switch (argument.type()) { - - case QVariant::Bool: - bool_data = argument.toBool(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BOOLEAN, - &bool_data); - break; - - case QVariant::ByteArray: - str_data = argument.toByteArray().data(); - dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_BYTE_AS_STRING, &array_iter); - dbus_message_iter_append_fixed_array(&array_iter, - DBUS_TYPE_BYTE, - &str_data, - argument.toByteArray().size()); - dbus_message_iter_close_container(dbus_iter, &array_iter); - break; - - case QVariant::Char: - char_data = argument.toChar().toAscii(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BYTE, - &char_data); - break; - - case QVariant::Int: - int32_data = argument.toInt(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT32, - &int32_data); - break; - - case QVariant::String: - str_data = argument.toString().toLatin1().data(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING, - &str_data); - break; - - case QVariant::StringList: - str_list = argument.toStringList(); - dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, - "s", &array_iter); - for (idx = 0; idx < str_list.size(); idx++) { - str_data = str_list.at(idx).toLatin1().data(); - dbus_message_iter_append_basic(&array_iter, - DBUS_TYPE_STRING, - &str_data); - } - dbus_message_iter_close_container(dbus_iter, &array_iter); - break; - - case QVariant::UInt: - uint32_data = argument.toUInt(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT32, - &uint32_data); - break; - - case QVariant::ULongLong: - uint64_data = argument.toULongLong(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT64, - &uint64_data); - break; - - case QVariant::LongLong: - int64_data = argument.toLongLong(); - dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT64, - &int64_data); - break; - - case QVariant::List: - { - QVariantList variantList = argument.toList(); - bool constantList = constantVariantList(variantList); - DBusMessageIter array_iter; - - // List is mapped either as an DBUS array (all items same type) - // DBUS struct (variable types) depending on constantList - if (constantList) { - // Resolve the signature for the first item - QString signature = ""; - if (!variantList.isEmpty()) { - signature = variantToSignature( - variantList[0], - constantVariantList(variantList[0].toList())); - } - - // Mapped as DBUS array - dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, - signature.toAscii(), - &array_iter); - - foreach(QVariant listItem, variantList) { - appendVariantToDBusMessage(listItem, &array_iter); - } - - dbus_message_iter_close_container(dbus_iter, &array_iter); - } else { - // Mapped as DBUS struct - dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_STRUCT, - NULL, - &array_iter); - - foreach(QVariant listItem, variantList) { - appendVariantToDBusMessage(listItem, &array_iter); - } - - dbus_message_iter_close_container(dbus_iter, &array_iter); - } - - break; - } - default: - qDebug() << "Unsupported variant type: " << argument.type(); - break; - } - - return true; -} - -static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) { - dbus_bool_t bool_data; - dbus_int32_t int32_data; - dbus_uint32_t uint32_data; - dbus_int64_t int64_data; - dbus_uint64_t uint64_data; - char *str_data; - char char_data; - int argtype = dbus_message_iter_get_arg_type(iter); - - switch (argtype) { - - case DBUS_TYPE_BOOLEAN: - { - dbus_message_iter_get_basic(iter, &bool_data); - QVariant variant((bool)bool_data); - return variant; - } - - case DBUS_TYPE_ARRAY: - { - // Handle all arrays here - int elem_type = dbus_message_iter_get_element_type(iter); - DBusMessageIter array_iter; - - dbus_message_iter_recurse(iter, &array_iter); - - if (elem_type == DBUS_TYPE_BYTE) { - QByteArray byte_array; - do { - dbus_message_iter_get_basic(&array_iter, &char_data); - byte_array.append(char_data); - } while (dbus_message_iter_next(&array_iter)); - QVariant variant(byte_array); - return variant; - } else if (elem_type == DBUS_TYPE_STRING) { - QStringList str_list; - do { - dbus_message_iter_get_basic(&array_iter, &str_data); - str_list.append(str_data); - } while (dbus_message_iter_next(&array_iter)); - QVariant variant(str_list); - return variant; - } else { - QVariantList variantList; - do { - variantList << getVariantFromDBusMessage(&array_iter); - } while (dbus_message_iter_next(&array_iter)); - QVariant variant(variantList); - return variant; - } - break; - } - - case DBUS_TYPE_BYTE: - { - dbus_message_iter_get_basic(iter, &char_data); - QChar ch(char_data); - QVariant variant(ch); - return variant; - } - - case DBUS_TYPE_INT32: - { - dbus_message_iter_get_basic(iter, &int32_data); - QVariant variant((int)int32_data); - return variant; - } - - case DBUS_TYPE_UINT32: - { - dbus_message_iter_get_basic(iter, &uint32_data); - QVariant variant((uint)uint32_data); - return variant; - } - - case DBUS_TYPE_STRING: - { - dbus_message_iter_get_basic(iter, &str_data); - QString str(str_data); - QVariant variant(str); - return variant; - } - - case DBUS_TYPE_INT64: - { - dbus_message_iter_get_basic(iter, &int64_data); - QVariant variant((qlonglong)int64_data); - return variant; - } - - case DBUS_TYPE_UINT64: - { - dbus_message_iter_get_basic(iter, &uint64_data); - QVariant variant((qulonglong)uint64_data); - return variant; - } - - case DBUS_TYPE_STRUCT: - { - // Handle all structs here - DBusMessageIter struct_iter; - dbus_message_iter_recurse(iter, &struct_iter); - - QVariantList variantList; - do { - variantList << getVariantFromDBusMessage(&struct_iter); - } while (dbus_message_iter_next(&struct_iter)); - QVariant variant(variantList); - return variant; - } - - default: - qDebug() << "Unsupported DBUS type: " << argtype; - } - - return QVariant(); -} - -static DBusHandlerResult signalHandler (DBusConnection *connection, - DBusMessage *message, - void *object_ref) { - (void)connection; - QString interface; - QString signal; - DBusDispatcher *dispatcher = (DBusDispatcher *)object_ref; - - if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) { - interface = dbus_message_get_interface(message); - signal = dbus_message_get_member(message); - - QList arglist; - DBusMessageIter dbus_iter; - - if (dbus_message_iter_init(message, &dbus_iter)) { - // Read return arguments - while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { - arglist << getVariantFromDBusMessage(&dbus_iter); - dbus_message_iter_next(&dbus_iter); - } - } - - dispatcher->emitSignalReceived(interface, signal, arglist); - return DBUS_HANDLER_RESULT_HANDLED; - } - (void)message; - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -DBusDispatcher::DBusDispatcher(const QString& service, - const QString& path, - const QString& interface, - QObject *parent) - : QObject(parent), - d_ptr(new DBusDispatcherPrivate(service, path, interface, path)) { - setupDBus(); -} - -DBusDispatcher::DBusDispatcher(const QString& service, - const QString& path, - const QString& interface, - const QString& signalPath, - QObject *parent) - : QObject(parent), - d_ptr(new DBusDispatcherPrivate(service, path, interface, signalPath)) { - setupDBus(); -} - -DBusDispatcher::~DBusDispatcher() -{ - if (d_ptr->connection) { - dbus_connection_close(d_ptr->connection); - dbus_connection_unref(d_ptr->connection); - } - delete d_ptr; -} - -void DBusDispatcher::setupDBus() -{ - d_ptr->connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL); - - if (d_ptr->connection == NULL) - qDebug() << "Unable to get DBUS connection!"; - else { - d_ptr->signal_vtable.message_function = signalHandler; - - dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE); - dbus_connection_setup_with_g_main(d_ptr->connection, NULL); - dbus_connection_register_object_path(d_ptr->connection, - d_ptr->signalPath.toLatin1(), - &d_ptr->signal_vtable, - this); - } -} - -static DBusMessage *prepareDBusCall(const QString& service, - const QString& path, - const QString& interface, - const QString& method, - const QVariant& arg1 = QVariant(), - const QVariant& arg2 = QVariant(), - const QVariant& arg3 = QVariant(), - const QVariant& arg4 = QVariant(), - const QVariant& arg5 = QVariant(), - const QVariant& arg6 = QVariant(), - const QVariant& arg7 = QVariant(), - const QVariant& arg8 = QVariant()) -{ - DBusMessage *message = dbus_message_new_method_call(service.toLatin1(), - path.toLatin1(), - interface.toLatin1(), - method.toLatin1()); - DBusMessageIter dbus_iter; - - // Append variants to DBUS message - QList arglist; - if (arg1.isValid()) arglist << arg1; - if (arg2.isValid()) arglist << arg2; - if (arg3.isValid()) arglist << arg3; - if (arg4.isValid()) arglist << arg4; - if (arg5.isValid()) arglist << arg5; - if (arg6.isValid()) arglist << arg6; - if (arg7.isValid()) arglist << arg7; - if (arg8.isValid()) arglist << arg8; - - dbus_message_iter_init_append (message, &dbus_iter); - - while (!arglist.isEmpty()) { - QVariant argument = arglist.takeFirst(); - appendVariantToDBusMessage(argument, &dbus_iter); - } - - return message; -} - -QList DBusDispatcher::call(const QString& method, - const QVariant& arg1, - const QVariant& arg2, - const QVariant& arg3, - const QVariant& arg4, - const QVariant& arg5, - const QVariant& arg6, - const QVariant& arg7, - const QVariant& arg8) { - DBusMessageIter dbus_iter; - DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path, - d_ptr->interface, method, - arg1, arg2, arg3, arg4, arg5, - arg6, arg7, arg8); - DBusMessage *reply = dbus_connection_send_with_reply_and_block( - d_ptr->connection, - message, -1, NULL); - dbus_message_unref(message); - - QList replylist; - if (reply != NULL && dbus_message_iter_init(reply, &dbus_iter)) { - // Read return arguments - while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { - replylist << getVariantFromDBusMessage(&dbus_iter); - dbus_message_iter_next(&dbus_iter); - } - } - if (reply != NULL) dbus_message_unref(reply); - return replylist; -} - -class PendingCallInfo { -public: - QString method; - DBusDispatcher *dispatcher; - DBusDispatcherPrivate *priv; -}; - -static void freePendingCallInfo(void *memory) { - PendingCallInfo *info = (PendingCallInfo *)memory; - delete info; -} - -static void pendingCallFunction (DBusPendingCall *pending, - void *memory) { - PendingCallInfo *info = (PendingCallInfo *)memory; - QString errorStr; - QList replyList; - DBusMessage *reply = dbus_pending_call_steal_reply (pending); - - Q_ASSERT(reply != NULL); - - if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { - errorStr = dbus_message_get_error_name (reply); - } else { - DBusMessageIter dbus_iter; - dbus_message_iter_init(reply, &dbus_iter); - // Read return arguments - while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { - replyList << getVariantFromDBusMessage(&dbus_iter); - dbus_message_iter_next(&dbus_iter); - } - } - - info->priv->pending_calls.removeOne(pending); - info->dispatcher->emitCallReply(info->method, replyList, errorStr); - dbus_message_unref(reply); - dbus_pending_call_unref(pending); -} - -bool DBusDispatcher::callAsynchronous(const QString& method, - const QVariant& arg1, - const QVariant& arg2, - const QVariant& arg3, - const QVariant& arg4, - const QVariant& arg5, - const QVariant& arg6, - const QVariant& arg7, - const QVariant& arg8) { - DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path, - d_ptr->interface, method, - arg1, arg2, arg3, arg4, arg5, - arg6, arg7, arg8); - DBusPendingCall *call = NULL; - dbus_bool_t ret = dbus_connection_send_with_reply(d_ptr->connection, - message, &call, -1); - PendingCallInfo *info = new PendingCallInfo; - info->method = method; - info->dispatcher = this; - info->priv = d_ptr; - - dbus_pending_call_set_notify(call, pendingCallFunction, info, freePendingCallInfo); - d_ptr->pending_calls.append(call); - return (bool)ret; -} - -void DBusDispatcher::emitSignalReceived(const QString& interface, - const QString& signal, - const QList& args) { - emit signalReceived(interface, signal, args); } - -void DBusDispatcher::emitCallReply(const QString& method, - const QList& args, - const QString& error) { - emit callReply(method, args, error); } - -void DBusDispatcher::synchronousDispatch(int timeout_ms) -{ - dbus_connection_read_write_dispatch(d_ptr->connection, timeout_ms); -} - -} // Maemo namespace - diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.h b/src/3rdparty/libconninet/src/dbusdispatcher.h deleted file mode 100644 index 2f71b6f..0000000 --- a/src/3rdparty/libconninet/src/dbusdispatcher.h +++ /dev/null @@ -1,91 +0,0 @@ -/* * This file is part of conn-dui-settings-inet * - * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * - * Contact: Aapo Makela - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - -#ifndef DBUSDISPATCHER_H -#define DBUSDISPATCHER_H - -#include -#include - -namespace Maemo { - -class DBusDispatcherPrivate; -class DBusDispatcher : public QObject -{ - Q_OBJECT - -public: - DBusDispatcher(const QString& service, - const QString& path, - const QString& interface, - QObject *parent = 0); - DBusDispatcher(const QString& service, - const QString& path, - const QString& interface, - const QString& signalPath, - QObject *parent = 0); - ~DBusDispatcher(); - - QList call(const QString& method, - const QVariant& arg1 = QVariant(), - const QVariant& arg2 = QVariant(), - const QVariant& arg3 = QVariant(), - const QVariant& arg4 = QVariant(), - const QVariant& arg5 = QVariant(), - const QVariant& arg6 = QVariant(), - const QVariant& arg7 = QVariant(), - const QVariant& arg8 = QVariant()); - bool callAsynchronous(const QString& method, - const QVariant& arg1 = QVariant(), - const QVariant& arg2 = QVariant(), - const QVariant& arg3 = QVariant(), - const QVariant& arg4 = QVariant(), - const QVariant& arg5 = QVariant(), - const QVariant& arg6 = QVariant(), - const QVariant& arg7 = QVariant(), - const QVariant& arg8 = QVariant()); - void emitSignalReceived(const QString& interface, - const QString& signal, - const QList& args); - void emitCallReply(const QString& method, - const QList& args, - const QString& error = ""); - void synchronousDispatch(int timeout_ms); - -Q_SIGNALS: - void signalReceived(const QString& interface, - const QString& signal, - const QList& args); - void callReply(const QString& method, - const QList& args, - const QString& error); - -protected: - void setupDBus(); - -private: - DBusDispatcherPrivate *d_ptr; -}; - -} // Maemo namespace - -#endif diff --git a/src/3rdparty/libconninet/src/iapconf.cpp b/src/3rdparty/libconninet/src/iapconf.cpp deleted file mode 100644 index 2e77fa5..0000000 --- a/src/3rdparty/libconninet/src/iapconf.cpp +++ /dev/null @@ -1,299 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. - - Contact: Aapo Makela - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include -#include -#include - -#include "iapconf.h" - -#define QSTRING_TO_CONST_CSTR(str) \ - str.toUtf8().constData() - -namespace Maemo { - -class IAPConfPrivate { -public: - ConnSettings *settings; - - ConnSettingsValue *variantToValue(const QVariant &variant); - QVariant valueToVariant(ConnSettingsValue *value); -}; - -ConnSettingsValue *IAPConfPrivate::variantToValue(const QVariant &variant) -{ - // Convert variant to ConnSettingsValue - ConnSettingsValue *value = conn_settings_value_new(); - if (value == 0) { - qWarning("IAPConf: Unable to create new ConnSettingsValue"); - return 0; - } - - switch(variant.type()) { - - case QVariant::Invalid: - value->type = CONN_SETTINGS_VALUE_INVALID; - break; - - case QVariant::String: { - char *valueStr = strdup(QSTRING_TO_CONST_CSTR(variant.toString())); - value->type = CONN_SETTINGS_VALUE_STRING; - value->value.string_val = valueStr; - break; - } - - case QVariant::Int: - value->type = CONN_SETTINGS_VALUE_INT; - value->value.int_val = variant.toInt(); - break; - - case QMetaType::Float: - case QVariant::Double: - value->type = CONN_SETTINGS_VALUE_DOUBLE; - value->value.double_val = variant.toDouble(); - break; - - case QVariant::Bool: - value->type = CONN_SETTINGS_VALUE_BOOL; - value->value.bool_val = variant.toBool() ? 1 : 0; - break; - - case QVariant::ByteArray: { - QByteArray array = variant.toByteArray(); - value->type = CONN_SETTINGS_VALUE_BYTE_ARRAY; - value->value.byte_array.len = array.size(); - value->value.byte_array.val = (unsigned char *)malloc(array.size()); - memcpy(value->value.byte_array.val, array.constData(), array.size()); - break; - } - - case QVariant::List: { - QVariantList list = variant.toList(); - ConnSettingsValue **list_val = (ConnSettingsValue **)malloc( - (list.size() + 1) * sizeof(ConnSettingsValue *)); - - for (int idx = 0; idx < list.size(); idx++) { - list_val[idx] = variantToValue(list.at(idx)); - } - list_val[list.size()] = 0; - - value->type = CONN_SETTINGS_VALUE_LIST; - value->value.list_val = list_val; - break; - } - - default: - qWarning("IAPConf: Can not handle QVariant of type %d", - variant.type()); - conn_settings_value_destroy(value); - return 0; - } - - return value; -} - -QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value) -{ - if (value == 0 || value->type == CONN_SETTINGS_VALUE_INVALID) { - return QVariant(); - } - - switch(value->type) { - - case CONN_SETTINGS_VALUE_BOOL: - return QVariant(value->value.bool_val ? true : false); - - case CONN_SETTINGS_VALUE_STRING: - return QVariant(QString(value->value.string_val)); - - case CONN_SETTINGS_VALUE_DOUBLE: - return QVariant(value->value.double_val); - - case CONN_SETTINGS_VALUE_INT: - return QVariant(value->value.int_val); - - case CONN_SETTINGS_VALUE_LIST: { - // At least with GConf backend connsettings returns byte array as list - // of ints, first check for that case - if (value->value.list_val && value->value.list_val[0]) { - bool canBeConvertedToByteArray = true; - for (int idx = 0; value->value.list_val[idx]; idx++) { - ConnSettingsValue *val = value->value.list_val[idx]; - if (val->type != CONN_SETTINGS_VALUE_INT - || val->value.int_val > 255 - || val->value.int_val < 0) { - canBeConvertedToByteArray = false; - break; - } - } - - if (canBeConvertedToByteArray) { - QByteArray array; - for (int idx = 0; value->value.list_val[idx]; idx++) { - array.append(value->value.list_val[idx]->value.int_val); - } - return array; - } - - // Create normal list - QVariantList list; - for (int idx = 0; value->value.list_val[idx]; idx++) { - list.append(valueToVariant(value->value.list_val[idx])); - } - return list; - } - } - - case CONN_SETTINGS_VALUE_BYTE_ARRAY: - return QByteArray::fromRawData((char *)value->value.byte_array.val, - value->value.byte_array.len); - - default: - return QVariant(); - } -} - -// Public class implementation - -IAPConf::IAPConf(const QString &iap_id) - : d_ptr(new IAPConfPrivate) -{ - d_ptr->settings = conn_settings_open(CONN_SETTINGS_CONNECTION, - QSTRING_TO_CONST_CSTR(iap_id)); - if (d_ptr->settings == 0) { - qWarning("IAPConf: Unable to open ConnSettings for %s", - QSTRING_TO_CONST_CSTR(iap_id)); - } -} - -IAPConf::~IAPConf() -{ - conn_settings_close(d_ptr->settings); - delete d_ptr; -} - -void IAPConf::setValue(const QString& key, const QVariant& value) -{ - // Invalid value means unsetting the given key - if (!value.isValid()) { - int err = conn_settings_unset(d_ptr->settings, - QSTRING_TO_CONST_CSTR(key)); - if (err != CONN_SETTINGS_E_NO_ERROR) { - qWarning("IAPConf: unable to unset key %s: %s", - QSTRING_TO_CONST_CSTR(key), - conn_settings_error_text((ConnSettingsError)err)); - } - return; - } - - // Convert value to ConnSettingsValue - ConnSettingsValue *val = d_ptr->variantToValue(value); - if (val == 0) return; - - // Set value and handle errors - int error = conn_settings_set(d_ptr->settings, - QSTRING_TO_CONST_CSTR(key), - val); - if (error != CONN_SETTINGS_E_NO_ERROR) { - qWarning("IAPConf: error in setting key %s: %s", - QSTRING_TO_CONST_CSTR(key), - conn_settings_error_text((ConnSettingsError)error)); - } - - // Destroy value - conn_settings_value_destroy(val); - return; -} - -void IAPConf::set(const QString& key1, const QVariant& value1, - const QString& key2, const QVariant& value2, - const QString& key3, const QVariant& value3, - const QString& key4, const QVariant& value4, - const QString& key5, const QVariant& value5, - const QString& key6, const QVariant& value6, - const QString& key7, const QVariant& value7, - const QString& key8, const QVariant& value8, - const QString& key9, const QVariant& value9, - const QString& key10, const QVariant& value10) -{ - if (!key1.isEmpty()) setValue(key1, value1); - if (!key2.isEmpty()) setValue(key2, value2); - if (!key3.isEmpty()) setValue(key3, value3); - if (!key4.isEmpty()) setValue(key4, value4); - if (!key5.isEmpty()) setValue(key5, value5); - if (!key6.isEmpty()) setValue(key6, value6); - if (!key7.isEmpty()) setValue(key7, value7); - if (!key8.isEmpty()) setValue(key8, value8); - if (!key9.isEmpty()) setValue(key9, value9); - if (!key10.isEmpty()) setValue(key10, value10); -} - -QVariant IAPConf::value(const QString& key) const -{ - ConnSettingsValue *val = conn_settings_get(d_ptr->settings, - QSTRING_TO_CONST_CSTR(key)); - - QVariant variant = d_ptr->valueToVariant(val); - conn_settings_value_destroy(val); - return variant; -} - -void IAPConf::clear(const char *default_path) -{ - Q_UNUSED(default_path); // default path is unused - - int error = conn_settings_remove(d_ptr->settings); - if (error != CONN_SETTINGS_E_NO_ERROR) { - qWarning("IAPConf: Error when removing IAP: %s", - conn_settings_error_text((ConnSettingsError)error)); - } -} - -void IAPConf::clearAll() -{ - ConnSettings *settings = conn_settings_open(CONN_SETTINGS_CONNECTION, - NULL); - conn_settings_remove(settings); - conn_settings_close(settings); -} - - -void IAPConf::getAll(QList &all_iaps, bool return_path) -{ - Q_UNUSED(return_path); // We don't use return path currently - - // Go through all available connections and add them to the list - char **ids = conn_settings_list_ids(CONN_SETTINGS_CONNECTION); - if (ids == 0) { - // No ids found - nothing to do - return; - } - - for (int idx = 0; ids[idx]; idx++) { - all_iaps.append(QString(ids[idx])); - free(ids[idx]); - } - free(ids); -} - - -} // namespace Maemo diff --git a/src/3rdparty/libconninet/src/iapconf.h b/src/3rdparty/libconninet/src/iapconf.h deleted file mode 100644 index 57c0856..0000000 --- a/src/3rdparty/libconninet/src/iapconf.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009 Nokia Corporation. All rights reserved. - - Contact: Aapo Makela - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef IAPCONF_H -#define IAPCONF_H - -#include -#include - -namespace Maemo { - -class IAPConfPrivate; -class IAPConf { -public: - IAPConf(const QString &iap_id); - virtual ~IAPConf(); - - /** - Convenience method for setting multiple IAP values with one call. - */ - void set(const QString& key1, const QVariant& value1, - const QString& key2 = "", const QVariant& value2 = QVariant(), - const QString& key3 = "", const QVariant& value3 = QVariant(), - const QString& key4 = "", const QVariant& value4 = QVariant(), - const QString& key5 = "", const QVariant& value5 = QVariant(), - const QString& key6 = "", const QVariant& value6 = QVariant(), - const QString& key7 = "", const QVariant& value7 = QVariant(), - const QString& key8 = "", const QVariant& value8 = QVariant(), - const QString& key9 = "", const QVariant& value9 = QVariant(), - const QString& key10 = "", const QVariant& value10 = QVariant()); - - /** - Set one IAP value. - */ - void setValue(const QString& key, const QVariant& value); - - /** - Get one IAP value. - */ - QVariant value(const QString& key) const; - - /** - Clear this IAP from GConf - */ - void clear(const char *default_path=0); - - /** - Clear all IAP specific information from GConf (including all IAPs). - DO NOT USE THIS FUNCTION IN ANYWHERE ELSE EXCEPT IN TEST CODE! - */ - void clearAll(); - - /** - Return all the IAPs found in the system. If return_path is true, - then do not strip the IAP path away. - */ - static void getAll(QList &all_iaps, bool return_path=false); - -private: - IAPConfPrivate *d_ptr; -}; - -} // namespace Maemo - -#endif diff --git a/src/3rdparty/libconninet/src/iapmonitor.cpp b/src/3rdparty/libconninet/src/iapmonitor.cpp deleted file mode 100644 index c44cbc8..0000000 --- a/src/3rdparty/libconninet/src/iapmonitor.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include - -#include -#include "iapmonitor.h" - -namespace Maemo { - - -void conn_settings_notify_func (ConnSettingsType type, - const char *id, - const char *key, - ConnSettingsValue *value, - void *user_data); - -class IAPMonitorPrivate { -private: - IAPMonitor *monitor; - ConnSettings *settings; - -public: - - IAPMonitorPrivate(IAPMonitor *monitor) - : monitor(monitor) - { - settings = conn_settings_open(CONN_SETTINGS_CONNECTION, NULL); - conn_settings_add_notify( - settings, - (ConnSettingsNotifyFunc *)conn_settings_notify_func, - this); - } - - ~IAPMonitorPrivate() - { - conn_settings_del_notify(settings); - conn_settings_close(settings); - } - - void iapAdded(const QString &iap) - { - monitor->iapAdded(iap); - } - - void iapRemoved(const QString &iap) - { - monitor->iapRemoved(iap); - } -}; - -void conn_settings_notify_func (ConnSettingsType type, - const char *id, - const char *key, - ConnSettingsValue *value, - void *user_data) -{ - if (type != CONN_SETTINGS_CONNECTION) return; - IAPMonitorPrivate *priv = (IAPMonitorPrivate *)user_data; - - QString iapId(key); - iapId = iapId.split("/")[0]; - if (value != 0) { - priv->iapAdded(iapId); - } else if (iapId == QString(key)) { - // IAP is removed only when the directory gets removed - priv->iapRemoved(iapId); - } -} - -IAPMonitor::IAPMonitor() - : d_ptr(new IAPMonitorPrivate(this)) -{ -} - -IAPMonitor::~IAPMonitor() -{ - delete d_ptr; -} - -void IAPMonitor::iapAdded(const QString &id) -{ - // By default do nothing -} - -void IAPMonitor::iapRemoved(const QString &id) -{ - // By default do nothing -} - -} // namespace Maemo diff --git a/src/3rdparty/libconninet/src/iapmonitor.h b/src/3rdparty/libconninet/src/iapmonitor.h deleted file mode 100644 index 558f23e..0000000 --- a/src/3rdparty/libconninet/src/iapmonitor.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef IAPMONITOR_H -#define IAPMONITOR_H - -#include - -namespace Maemo { - -class IAPMonitorPrivate; -class IAPMonitor { -public: - IAPMonitor(); - ~IAPMonitor(); - -protected: - virtual void iapAdded(const QString &id); - virtual void iapRemoved(const QString &id); - -private: - IAPMonitorPrivate *d_ptr; - Q_DECLARE_PRIVATE(IAPMonitor); -}; - -} // namespace Maemo - -#endif // IAPMONITOR_H - diff --git a/src/3rdparty/libconninet/src/maemo_icd.cpp b/src/3rdparty/libconninet/src/maemo_icd.cpp deleted file mode 100644 index bc84fbc..0000000 --- a/src/3rdparty/libconninet/src/maemo_icd.cpp +++ /dev/null @@ -1,1277 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include -#include "maemo_icd.h" -#include -#include -#include -#include -#include -#include -#include - - -namespace Maemo { - -/* Reference counting singleton class that creates a single connection - * to icd so that icd reference counting works as expected. This is - * needed because DBusDispatcher uses private dbus connections - * which come and go and icd cannot use that information to - * determine whether application quit or not. So we create one - * persistent connection that is only teared down when application - * quits or calls disconnect() - */ -class IcdRefCounting -{ -public: - IcdRefCounting() : first_call(true) { } - void setup(enum icd_connection_flags flag); - void cleanup(); - -private: - bool first_call; - struct DBusConnection *connection; -}; - -Q_GLOBAL_STATIC(IcdRefCounting, icdRefCounting); - - -void IcdRefCounting::setup(enum icd_connection_flags flag) -{ - if (first_call) { - DBusMessage *msg = NULL; - - connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL); - dbus_connection_set_exit_on_disconnect(connection, FALSE); - dbus_connection_setup_with_g_main(connection, NULL); - - msg = dbus_message_new_method_call(ICD_DBUS_API_INTERFACE, - ICD_DBUS_API_PATH, - ICD_DBUS_API_INTERFACE, - ICD_DBUS_API_CONNECT_REQ); - if (msg == NULL) - goto out; - - if (!dbus_message_append_args(msg, - DBUS_TYPE_UINT32, &flag, - DBUS_TYPE_INVALID)) - goto out; - - if (!dbus_connection_send_with_reply(connection, msg, - NULL, 60*1000)) - goto out; - - first_call = false; - return; - - out: - dbus_connection_close(connection); - dbus_connection_unref(connection); - } -} - -void IcdRefCounting::cleanup() -{ - if (!first_call) { - dbus_connection_close(connection); - dbus_connection_unref(connection); - first_call = true; - } -} - - -class IcdPrivate -{ -public: - IcdPrivate(Icd *myfriend) - { - init(10000, IcdNewDbusInterface, myfriend); - } - - IcdPrivate(unsigned int timeout, Icd *myfriend) - { - init(timeout, IcdNewDbusInterface, myfriend); - } - - IcdPrivate(unsigned int timeout, IcdDbusInterfaceVer ver, Icd *myfriend) - { - /* Note that the old Icd interface is currently disabled and - * the new one is always used. - */ - init(timeout, IcdNewDbusInterface, myfriend); - } - - ~IcdPrivate() - { - QObject::disconnect(mDBus, - SIGNAL(signalReceived(const QString&, - const QString&, - const QList&)), - icd, - SLOT(icdSignalReceived(const QString&, - const QString&, - const QList&))); - - QObject::disconnect(mDBus, - SIGNAL(callReply(const QString&, - const QList&, - const QString&)), - icd, - SLOT(icdCallReply(const QString&, - const QList&, - const QString&))); - - delete mDBus; - mDBus = 0; - } - - /* Icd2 dbus API functions */ - QStringList scan(icd_scan_request_flags flags, - QStringList &network_types, - QList& scan_results, - QString& error); - void scanCancel(); - bool connect(icd_connection_flags flags, IcdConnectResult& result); - bool connect(icd_connection_flags flags, QList& params, - IcdConnectResult& result); - bool connect(icd_connection_flags flags, QString& iap, QString& result); - void select(uint flags); - void disconnect(uint connect_flags, QString& service_type, - uint service_attrs, QString& service_id, - QString& network_type, uint network_attrs, - QByteArray& network_id); - void disconnect(uint connect_flags); - - uint state(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStateResult &state_result); - uint statistics(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStatisticsResult& stats_result); - uint addrinfo(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdAddressInfoResult& addr_result); - - uint state(QList& state_results); - uint state_non_blocking(QList& state_results); - uint statistics(QList& stats_results); - uint addrinfo(QList& addr_results); - uint addrinfo_non_blocking(QList& addr_results); - - void signalReceived(const QString& interface, - const QString& signal, - const QList& args); - void callReply(const QString& method, - const QList& args, - const QString& error); - - QString error() { return mError; } - -public: - DBusDispatcher *mDBus; - QString mMethod; - QString mInterface; - QString mSignal; - QString mError; - QList mArgs; - QList receivedSignals; - unsigned int timeout; - IcdDbusInterfaceVer icd_dbus_version; - Icd *icd; - - void init(unsigned int dbus_timeout, IcdDbusInterfaceVer ver, - Icd *myfriend) - { - if (ver == IcdNewDbusInterface) { - mDBus = new DBusDispatcher(ICD_DBUS_API_INTERFACE, - ICD_DBUS_API_PATH, - ICD_DBUS_API_INTERFACE); - } else { - mDBus = new DBusDispatcher(ICD_DBUS_SERVICE, - ICD_DBUS_PATH, - ICD_DBUS_INTERFACE); - } - icd_dbus_version = ver; - - /* This connect has a side effect as it means that only one - * Icd object can exists in one time. This should be fixed! - */ - QObject::connect(mDBus, - SIGNAL(signalReceived(const QString&, - const QString&, - const QList&)), - myfriend, - SLOT(icdSignalReceived(const QString&, - const QString&, - const QList&))); - - QObject::connect(mDBus, - SIGNAL(callReply(const QString&, - const QList&, - const QString&)), - myfriend, - SLOT(icdCallReply(const QString&, - const QList&, - const QString&))); - - icd = myfriend; - timeout = dbus_timeout; - } - - void clearState() - { - mMethod.clear(); - mInterface.clear(); - mSignal.clear(); - mError.clear(); - mArgs.clear(); - receivedSignals.clear(); - } - - bool doConnect(IcdConnectResult& result); - bool doConnect(QString& result); - bool doState(); -}; - - -void IcdPrivate::signalReceived(const QString& interface, - const QString& signal, - const QList& args) -{ - // Signal handler, which simply records what has been signalled - mInterface = interface; - mSignal = signal; - mArgs = args; - - //qDebug() << "signal" << signal << "received:" << args; - receivedSignals << QVariant(interface) << QVariant(signal) << QVariant(args); -} - - -void IcdPrivate::callReply(const QString& method, - const QList& /*args*/, - const QString& error) -{ - mMethod = method; - mError = error; -} - - -static void get_scan_result(QList& args, - IcdScanResult& ret) -{ - int i=0; - - if (args.isEmpty()) - return; - - ret.status = args[i++].toUInt(); - ret.timestamp = args[i++].toUInt(); - ret.scan.service_type = args[i++].toString(); - ret.service_name = args[i++].toString(); - ret.scan.service_attrs = args[i++].toUInt(); - ret.scan.service_id = args[i++].toString(); - ret.service_priority = args[i++].toInt(); - ret.scan.network_type = args[i++].toString(); - ret.network_name = args[i++].toString(); - ret.scan.network_attrs = args[i++].toUInt(); - ret.scan.network_id = args[i++].toByteArray(); - ret.network_priority = args[i++].toInt(); - ret.signal_strength = args[i++].toInt(); - ret.station_id = args[i++].toString(); - ret.signal_dB = args[i++].toInt(); -} - - -static void get_connect_result(QList& args, - IcdConnectResult& ret) -{ - int i=0; - - if (args.isEmpty()) - return; - - ret.connect.service_type = args[i++].toString(); - ret.connect.service_attrs = args[i++].toInt(); - ret.connect.service_id = args[i++].toString(); - ret.connect.network_type = args[i++].toString(); - ret.connect.network_attrs = args[i++].toInt(); - ret.connect.network_id = args[i++].toByteArray(); - ret.status = args[i++].toInt(); -} - - -QStringList IcdPrivate::scan(icd_scan_request_flags flags, - QStringList &network_types, - QList& scan_results, - QString& error) -{ - QStringList scanned_types; - QTimer timer; - QVariant reply; - QVariantList vl; - bool last_result = false; - IcdScanResult result; - int all_waited; - - clearState(); - reply = mDBus->call(ICD_DBUS_API_SCAN_REQ, (uint)flags); - if (reply.type() != QVariant::List) - return scanned_types; - vl = reply.toList(); - if (vl.isEmpty()) { - error = "Scan did not return anything."; - return scanned_types; - } - reply = vl.first(); - scanned_types = reply.toStringList(); - //qDebug() << "Scanning:" << scanned_types; - all_waited = scanned_types.size(); - - timer.setSingleShot(true); - timer.start(timeout); - - scan_results.clear(); - while (!last_result) { - while (timer.isActive() && mInterface.isEmpty() && mError.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } - - if (!timer.isActive()) { - //qDebug() << "Timeout happened"; - break; - } - - if (mSignal != ICD_DBUS_API_SCAN_SIG) { - //qDebug() << "Received" << mSignal << "while waiting" << ICD_DBUS_API_SCAN_SIG << ", ignoring"; - mInterface.clear(); - continue; - } - - if (mError.isEmpty()) { - QString msgInterface = receivedSignals.takeFirst().toString(); - QString msgSignal = receivedSignals.takeFirst().toString(); - QList msgArgs = receivedSignals.takeFirst().toList(); - //qDebug() << "Signal" << msgSignal << "received."; - //qDebug() << "Params:" << msgArgs; - - while (!msgSignal.isEmpty()) { - get_scan_result(msgArgs, result); - -#if 0 - qDebug() << "Received: " << - "status =" << result.status << - ", timestamp =" << result.timestamp << - ", service_type =" << result.scan.service_type << - ", service_name =" << result.service_name << - ", service_attrs =" << result.scan.service_attrs << - ", service_id =" << result.scan.service_id << - ", service_priority =" << result.service_priority << - ", network_type =" << result.scan.network_type << - ", network_name =" << result.network_name << - ", network_attrs =" << result.scan.network_attrs << - ", network_id =" << "-" << - ", network_priority =" << result.network_priority << - ", signal_strength =" << result.signal_strength << - ", station_id =" << result.station_id << - ", signal_dB =" << result.signal_dB; -#endif - - if (result.status == ICD_SCAN_COMPLETE) { - //qDebug() << "waited =" << all_waited; - if (--all_waited == 0) { - last_result = true; - break; - } - } else - scan_results << result; - - if (receivedSignals.isEmpty()) - break; - - msgInterface = receivedSignals.takeFirst().toString(); - msgSignal = receivedSignals.takeFirst().toString(); - msgArgs = receivedSignals.takeFirst().toList(); - } - mInterface.clear(); - - } else { - qWarning() << "Error while scanning:" << mError; - break; - } - } - timer.stop(); - - error = mError; - return scanned_types; -} - - -void IcdPrivate::scanCancel() -{ - mDBus->call(ICD_DBUS_API_SCAN_CANCEL); -} - - -bool IcdPrivate::doConnect(IcdConnectResult& result) -{ - QTimer timer; - bool status = false; - - timer.setSingleShot(true); - timer.start(timeout); - - //qDebug() << "Waiting" << ICD_DBUS_API_CONNECT_SIG << "signal"; - - while (timer.isActive() && mInterface.isEmpty() && - mSignal != ICD_DBUS_API_CONNECT_SIG && - mError.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } - - timer.stop(); - - if (mError.isEmpty()) { - if (!mArgs.isEmpty()) { - get_connect_result(mArgs, result); - status = true; - } else - status = false; - } else - status = false; - - return status; -} - - -bool IcdPrivate::connect(icd_connection_flags flags, IcdConnectResult& result) -{ - clearState(); - //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags); - mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags); - icdRefCounting()->setup(flags); - return doConnect(result); -} - - -bool IcdPrivate::connect(icd_connection_flags flags, QList& params, - IcdConnectResult& result) -{ - QVariantList varlist; - QVariantList varlist2; - - foreach (ConnectParams param, params) { - QVariantList items; - - items.append(QVariant(param.connect.service_type)); - items.append(QVariant(param.connect.service_attrs)); - items.append(QVariant(param.connect.service_id)); - items.append(QVariant(param.connect.network_type)); - items.append(QVariant(param.connect.network_attrs)); - items.append(QVariant(param.connect.network_id)); - - varlist.append(items); - } - - varlist2.append(QVariant(varlist)); - - clearState(); - //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2); - mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2); - icdRefCounting()->setup(flags); - return doConnect(result); -} - - -bool IcdPrivate::doConnect(QString& ret) -{ - QTimer timer; - bool status = false; - - timer.setSingleShot(true); - timer.start(timeout); - - while (timer.isActive() && mInterface.isEmpty() && - mError.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } - - timer.stop(); - - if (mError.isEmpty()) { - if (!mArgs.isEmpty()) { - status = true; - //ret = mArgs[0]; // TODO correctly - } else - status = false; - } else - status = false; - - return status; -} - - -bool IcdPrivate::connect(icd_connection_flags flags, QString& iap, QString& result) -{ - clearState(); - //mDBus->callAsynchronous(ICD_CONNECT_REQ, iap, (uint)flags); - mDBus->call(ICD_CONNECT_REQ, iap, (uint)flags); - icdRefCounting()->setup(flags); - return doConnect(result); -} - - -void IcdPrivate::select(uint flags) -{ - mDBus->call(ICD_DBUS_API_SELECT_REQ, flags); -} - - -void IcdPrivate::disconnect(uint flags, QString& service_type, - uint service_attrs, QString& service_id, - QString& network_type, uint network_attrs, - QByteArray& network_id) -{ - clearState(); - mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags, - service_type, service_attrs, service_id, - network_type, network_attrs, network_id); - icdRefCounting()->cleanup(); -} - - -void IcdPrivate::disconnect(uint flags) -{ - clearState(); - mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags); - icdRefCounting()->cleanup(); -} - - -static void get_state_all_result(QList& args, - IcdStateResult& ret) -{ - int i=0; - - ret.params.service_type = args[i++].toString(); - ret.params.service_attrs = args[i++].toUInt(); - ret.params.service_id = args[i++].toString(); - ret.params.network_type = args[i++].toString(); - ret.params.network_attrs = args[i++].toUInt(); - ret.params.network_id = args[i++].toByteArray(); - ret.error = args[i++].toString(); - ret.state = args[i++].toInt(); -} - - -static void get_state_all_result2(QList& args, - IcdStateResult& ret) -{ - int i=0; - - ret.params.network_type = args[i++].toString(); - ret.state = args[i++].toInt(); - - // Initialize the other values so that the caller can - // notice we only returned partial status - ret.params.service_type = QString(); - ret.params.service_attrs = 0; - ret.params.service_id = QString(); - ret.params.network_attrs = 0; - ret.params.network_id = QByteArray(); - ret.error = QString(); -} - - -uint IcdPrivate::state(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStateResult& state_result) -{ - QTimer timer; - QVariant reply; - uint total_signals; - QVariantList vl; - - clearState(); - - reply = mDBus->call(ICD_DBUS_API_STATE_REQ, - service_type, service_attrs, service_id, - network_type, network_attrs, network_id); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - total_signals = reply.toUInt(); - if (!total_signals) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - if (mSignal != ICD_DBUS_API_STATE_SIG) { - mInterface.clear(); - continue; - } - } - - timer.stop(); - - if (mError.isEmpty()) { - if (!mArgs.isEmpty()) { - if (mArgs.size()>2) - get_state_all_result(mArgs, state_result); - else { - // We are not connected as we did not get the status we asked - return 0; - } - } - } else { - qWarning() << "Error:" << mError; - } - - // The returned value should be one because we asked for one state - return total_signals; -} - - -uint IcdPrivate::state_non_blocking(QList& state_results) -{ - QTimer timer; - QVariant reply; - QVariantList vl; - uint signals_left, total_signals; - IcdStateResult result; - - clearState(); - reply = mDBus->call(ICD_DBUS_API_STATE_REQ); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - signals_left = total_signals = reply.toUInt(); - if (!signals_left) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - state_results.clear(); - mError.clear(); - while (signals_left) { - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } - - if (!timer.isActive()) { - total_signals = 0; - break; - } - - if (mSignal != ICD_DBUS_API_STATE_SIG) { - continue; - } - - if (mError.isEmpty()) { - if (!mArgs.isEmpty()) { - if (mArgs.size()==2) - get_state_all_result2(mArgs, result); - else - get_state_all_result(mArgs, result); - state_results << result; - } - signals_left--; - } else { - qWarning() << "Error:" << mError; - break; - } - } - timer.stop(); - - return total_signals; -} - - -/* Special version of the state() call which does not call event loop. - * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event - * loop is run when webkit does not expect it. This function is called from - * bearer management API syncStateWithInterface() in QNetworkSession - * constructor. - */ -uint IcdPrivate::state(QList& state_results) -{ - QTimer timer; - QVariant reply; - QVariantList vl; - uint signals_left, total_signals; - IcdStateResult result; - - clearState(); - reply = mDBus->call(ICD_DBUS_API_STATE_REQ); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - signals_left = total_signals = reply.toUInt(); - if (!signals_left) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - state_results.clear(); - mError.clear(); - while (signals_left) { - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - mDBus->synchronousDispatch(1000); - } - - if (!timer.isActive()) { - total_signals = 0; - break; - } - - if (mSignal != ICD_DBUS_API_STATE_SIG) { - continue; - } - - if (mError.isEmpty()) { - if (!mArgs.isEmpty()) { - if (mArgs.size()==2) - get_state_all_result2(mArgs, result); - else - get_state_all_result(mArgs, result); - state_results << result; - } - signals_left--; - } else { - qWarning() << "Error:" << mError; - break; - } - } - timer.stop(); - - return total_signals; -} - - -static void get_statistics_all_result(QList& args, - IcdStatisticsResult& ret) -{ - int i=0; - - if (args.isEmpty()) - return; - - ret.params.service_type = args[i++].toString(); - ret.params.service_attrs = args[i++].toUInt(); - ret.params.service_id = args[i++].toString(); - ret.params.network_type = args[i++].toString(); - ret.params.network_attrs = args[i++].toUInt(); - ret.params.network_id = args[i++].toByteArray(); - ret.time_active = args[i++].toUInt(); - ret.signal_strength = (enum icd_nw_levels)args[i++].toUInt(); - ret.bytes_sent = args[i++].toUInt(); - ret.bytes_received = args[i++].toUInt(); -} - - -uint IcdPrivate::statistics(QList& stats_results) -{ - QTimer timer; - QVariant reply; - QVariantList vl; - uint signals_left, total_signals; - IcdStatisticsResult result; - - clearState(); - reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - if (reply.type() != QVariant::UInt) - return 0; - signals_left = total_signals = reply.toUInt(); - - if (!signals_left) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - stats_results.clear(); - while (signals_left) { - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } - - if (!timer.isActive()) { - total_signals = 0; - break; - } - - if (mSignal != ICD_DBUS_API_STATISTICS_SIG) { - continue; - } - - if (mError.isEmpty()) { - get_statistics_all_result(mArgs, result); - stats_results << result; - signals_left--; - } else { - qWarning() << "Error:" << mError; - break; - } - } - timer.stop(); - - return total_signals; -} - - -uint IcdPrivate::statistics(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStatisticsResult& stats_result) -{ - QTimer timer; - QVariant reply; - uint total_signals; - QVariantList vl; - - clearState(); - - reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ, - service_type, service_attrs, service_id, - network_type, network_attrs, network_id); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - total_signals = reply.toUInt(); - if (!total_signals) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - if (mSignal != ICD_DBUS_API_STATISTICS_SIG) { - mInterface.clear(); - continue; - } - } - - timer.stop(); - - if (mError.isEmpty()) { - get_statistics_all_result(mArgs, stats_result); - } else { - qWarning() << "Error:" << mError; - } - - // The returned value should be one because we asked for one statistics - return total_signals; -} - - -static void get_addrinfo_all_result(QList& args, - IcdAddressInfoResult& ret) -{ - int i=0; - - if (args.isEmpty()) - return; - - ret.params.service_type = args[i++].toString(); - ret.params.service_attrs = args[i++].toUInt(); - ret.params.service_id = args[i++].toString(); - ret.params.network_type = args[i++].toString(); - ret.params.network_attrs = args[i++].toUInt(); - ret.params.network_id = args[i++].toByteArray(); - - QVariantList vl = args[i].toList(); - QVariant reply = vl.first(); - QList lst = reply.toList(); - for (int k=0; k& addr_results) -{ - QTimer timer; - QVariant reply; - QVariantList vl; - uint signals_left, total_signals; - IcdAddressInfoResult result; - - clearState(); - reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - if (reply.type() != QVariant::UInt) - return 0; - signals_left = total_signals = reply.toUInt(); - if (!signals_left) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - addr_results.clear(); - while (signals_left) { - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - mDBus->synchronousDispatch(1000); - } - - if (!timer.isActive()) { - total_signals = 0; - break; - } - - if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { - continue; - } - - if (mError.isEmpty()) { - get_addrinfo_all_result(mArgs, result); - addr_results << result; - signals_left--; - } else { - qWarning() << "Error:" << mError; - break; - } - } - timer.stop(); - return total_signals; -} - -uint IcdPrivate::addrinfo_non_blocking(QList& addr_results) -{ - QTimer timer; - QVariant reply; - QVariantList vl; - uint signals_left, total_signals; - IcdAddressInfoResult result; - - clearState(); - reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - if (reply.type() != QVariant::UInt) - return 0; - signals_left = total_signals = reply.toUInt(); - if (!signals_left) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - addr_results.clear(); - while (signals_left) { - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - } - - if (!timer.isActive()) { - total_signals = 0; - break; - } - - if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { - continue; - } - - if (mError.isEmpty()) { - get_addrinfo_all_result(mArgs, result); - addr_results << result; - signals_left--; - } else { - qWarning() << "Error:" << mError; - break; - } - } - timer.stop(); - return total_signals; -} - - -uint IcdPrivate::addrinfo(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdAddressInfoResult& addr_result) -{ - QTimer timer; - QVariant reply; - uint total_signals; - QVariantList vl; - - clearState(); - - reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ, - service_type, service_attrs, service_id, - network_type, network_attrs, network_id); - if (reply.type() != QVariant::List) - return 0; - vl = reply.toList(); - if (vl.isEmpty()) - return 0; - reply = vl.first(); - total_signals = reply.toUInt(); - - if (!total_signals) - return 0; - - timer.setSingleShot(true); - timer.start(timeout); - - mInterface.clear(); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { - mInterface.clear(); - continue; - } - } - - timer.stop(); - - if (mError.isEmpty()) { - get_addrinfo_all_result(mArgs, addr_result); - } else { - qWarning() << "Error:" << mError; - } - - // The returned value should be one because we asked for one addrinfo - return total_signals; -} - - -Icd::Icd(QObject *parent) - : QObject(parent), d(new IcdPrivate(this)) -{ -} - -Icd::Icd(unsigned int timeout, QObject *parent) - : QObject(parent), d(new IcdPrivate(timeout, this)) -{ -} - -Icd::Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent) - : QObject(parent), d(new IcdPrivate(timeout, ver, this)) -{ -} - -Icd::~Icd() -{ - delete d; -} - - -QStringList Icd::scan(icd_scan_request_flags flags, - QStringList &network_types, - QList& scan_results, - QString& error) -{ - return d->scan(flags, network_types, scan_results, error); -} - - -void Icd::scanCancel() -{ - d->scanCancel(); -} - - -bool Icd::connect(icd_connection_flags flags, IcdConnectResult& result) -{ - return d->connect(flags, result); -} - - -bool Icd::connect(icd_connection_flags flags, QList& params, - IcdConnectResult& result) -{ - return d->connect(flags, params, result); -} - - -bool Icd::connect(icd_connection_flags flags, QString& iap, QString& result) -{ - return d->connect(flags, iap, result); -} - - -void Icd::select(uint flags) -{ - d->select(flags); -} - - -void Icd::disconnect(uint connect_flags, QString& service_type, - uint service_attrs, QString& service_id, - QString& network_type, uint network_attrs, - QByteArray& network_id) -{ - d->disconnect(connect_flags, service_type, - service_attrs, service_id, - network_type, network_attrs, - network_id); -} - - -void Icd::disconnect(uint connect_flags) -{ - d->disconnect(connect_flags); -} - - -uint Icd::state(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStateResult &state_result) -{ - return d->state(service_type, service_attrs, service_id, - network_type, network_attrs, network_id, - state_result); -} - - -uint Icd::statistics(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStatisticsResult& stats_result) -{ - return d->statistics(service_type, service_attrs, service_id, - network_type, network_attrs, network_id, - stats_result); -} - - -uint Icd::addrinfo(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdAddressInfoResult& addr_result) -{ - return d->addrinfo(service_type, service_attrs, service_id, - network_type, network_attrs, network_id, - addr_result); -} - - -uint Icd::state(QList& state_results) -{ - return d->state(state_results); -} - -uint Icd::state_non_blocking(QList& state_results) -{ - return d->state_non_blocking(state_results); -} - -uint Icd::statistics(QList& stats_results) -{ - return d->statistics(stats_results); -} - - -uint Icd::addrinfo(QList& addr_results) -{ - return d->addrinfo(addr_results); -} - -uint Icd::addrinfo_non_blocking(QList& addr_results) -{ - return d->addrinfo_non_blocking(addr_results); -} - -void Icd::icdSignalReceived(const QString& interface, - const QString& signal, - const QList& args) -{ - d->signalReceived(interface, signal, args); -} - - -void Icd::icdCallReply(const QString& method, - const QList& args, - const QString& error) -{ - d->callReply(method, args, error); -} - - -QString Icd::error() -{ - return d->error(); -} - -} // Maemo namespace - - diff --git a/src/3rdparty/libconninet/src/maemo_icd.h b/src/3rdparty/libconninet/src/maemo_icd.h deleted file mode 100644 index d7a8d5b..0000000 --- a/src/3rdparty/libconninet/src/maemo_icd.h +++ /dev/null @@ -1,182 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef MAEMO_ICD_H -#define MAEMO_ICD_H - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "dbusdispatcher.h" -#include - -#define ICD_LONG_SCAN_TIMEOUT (30*1000) /* 30sec */ -#define ICD_SHORT_SCAN_TIMEOUT (10*1000) /* 10sec */ -#define ICD_SHORT_CONNECT_TIMEOUT (10*1000) /* 10sec */ -#define ICD_LONG_CONNECT_TIMEOUT (150*1000) /* 2.5min */ - -namespace Maemo { - -struct CommonParams { - QString service_type; - uint service_attrs; - QString service_id; - QString network_type; - uint network_attrs; - QByteArray network_id; -}; - -struct ConnectParams { - struct CommonParams connect; -}; - -struct IcdScanResult { - uint status; // see #icd_scan_status - uint timestamp; // when last seen - QString service_name; - uint service_priority; // within a service type - QString network_name; - uint network_priority; - struct CommonParams scan; - uint signal_strength; // quality, 0 (none) - 10 (good) - QString station_id; // e.g. MAC address or similar id - uint signal_dB; // use signal strength above unless you know what you are doing - - IcdScanResult() { - status = timestamp = scan.service_attrs = service_priority = - scan.network_attrs = network_priority = signal_strength = - signal_dB = 0; - } -}; - -struct IcdConnectResult { - struct CommonParams connect; - uint status; -}; - -struct IcdStateResult { - struct CommonParams params; - QString error; - uint state; -}; - -struct IcdStatisticsResult { - struct CommonParams params; - uint time_active; // in seconds - enum icd_nw_levels signal_strength; // see network_api_defines.h in icd2-dev package - uint bytes_sent; - uint bytes_received; -}; - -struct IcdIPInformation { - QString address; - QString netmask; - QString default_gateway; - QString dns1; - QString dns2; - QString dns3; -}; - -struct IcdAddressInfoResult { - struct CommonParams params; - QList ip_info; -}; - -enum IcdDbusInterfaceVer { - IcdOldDbusInterface = 0, // use the old OSSO-IC interface - IcdNewDbusInterface // use the new Icd2 interface (default) -}; - - -class IcdPrivate; -class Icd : public QObject -{ - Q_OBJECT - -public: - Icd(QObject *parent = 0); - Icd(unsigned int timeout, QObject *parent = 0); - Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent = 0); - ~Icd(); - QString error(); // returns last error string - - /* Icd2 dbus API functions */ - QStringList scan(icd_scan_request_flags flags, - QStringList &network_types, - QList& scan_results, - QString& error); - void scanCancel(); - bool connect(icd_connection_flags flags, IcdConnectResult& result); - bool connect(icd_connection_flags flags, QList& params, - IcdConnectResult& result); - bool connect(icd_connection_flags flags, QString& iap, QString& result); - void select(uint flags); - void disconnect(uint connect_flags, QString& service_type, - uint service_attrs, QString& service_id, - QString& network_type, uint network_attrs, - QByteArray& network_id); - void disconnect(uint connect_flags); - - uint state(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStateResult &state_result); - uint statistics(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdStatisticsResult& stats_result); - uint addrinfo(QString& service_type, uint service_attrs, - QString& service_id, QString& network_type, - uint network_attrs, QByteArray& network_id, - IcdAddressInfoResult& addr_result); - - uint state(QList& state_results); - uint state_non_blocking(QList& state_results); - uint statistics(QList& stats_results); - uint addrinfo(QList& addr_results); - uint addrinfo_non_blocking(QList& addr_results); - -private Q_SLOTS: - void icdSignalReceived(const QString& interface, - const QString& signal, - const QList& args); - void icdCallReply(const QString& method, - const QList& args, - const QString& error); - -private: - IcdPrivate *d; - friend class IcdPrivate; -}; - -} // Maemo namespace - -#endif diff --git a/src/3rdparty/libconninet/src/proxyconf.cpp b/src/3rdparty/libconninet/src/proxyconf.cpp deleted file mode 100644 index 5b27565..0000000 --- a/src/3rdparty/libconninet/src/proxyconf.cpp +++ /dev/null @@ -1,315 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2010 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#include -#include -#include -#include -#include -#include -#include "proxyconf.h" - -#define CONF_PROXY "/system/proxy" -#define HTTP_PROXY "/system/http_proxy" - - -namespace Maemo { - -class NetworkProxyFactory : QNetworkProxyFactory { -public: - NetworkProxyFactory() { } - QList queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()); -}; - - -QList NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query) -{ - ProxyConf proxy_conf; - - QList result = proxy_conf.flush(query); - if (result.isEmpty()) - result << QNetworkProxy::NoProxy; - - return result; -} - - -class ProxyConfPrivate { -private: - // proxy values from gconf - QString mode; - bool use_http_host; - QString autoconfig_url; - QString http_proxy; - quint16 http_port; - QList ignore_hosts; - QString secure_host; - quint16 secure_port; - QString ftp_host; - quint16 ftp_port; - QString socks_host; - quint16 socks_port; - QString rtsp_host; - quint16 rtsp_port; - - QVariant getValue(QString& name); - QVariant getHttpValue(QString& name); - QVariant getValue(const char *name); - QVariant getHttpValue(const char *name); - bool isHostExcluded(const QString &host); - -public: - QString prefix; - QString http_prefix; - - void readProxyData(); - QList flush(const QNetworkProxyQuery &query); -}; - - -QVariant ProxyConfPrivate::getValue(QString& name) -{ - GConfItem item(prefix + name); - return item.value(); -} - -QVariant ProxyConfPrivate::getHttpValue(QString& name) -{ - GConfItem item(http_prefix + name); - return item.value(); -} - - -QVariant ProxyConfPrivate::getValue(const char *name) -{ - QString n = QString(name); - return getValue(n); -} - -QVariant ProxyConfPrivate::getHttpValue(const char *name) -{ - QString n = QString(name); - return getHttpValue(n); -} - - -#define GET(var, type) \ - do { \ - var = getValue(#var).to##type (); \ - /*qDebug()<<"var="<prefix = CONF_PROXY "/"; - d_ptr->http_prefix = HTTP_PROXY "/"; -} - -ProxyConf::~ProxyConf() -{ - delete d_ptr; -} - - -QList ProxyConf::flush(const QNetworkProxyQuery &query) -{ - d_ptr->readProxyData(); - return d_ptr->flush(query); -} - - -static int refcount = 0; -static QReadWriteLock lock; - -void ProxyConf::update() -{ - QWriteLocker locker(&lock); - NetworkProxyFactory *factory = new NetworkProxyFactory(); - QNetworkProxyFactory::setApplicationProxyFactory((QNetworkProxyFactory*)factory); - refcount++; -} - - -void ProxyConf::clear(void) -{ - QWriteLocker locker(&lock); - refcount--; - if (refcount == 0) - QNetworkProxyFactory::setApplicationProxyFactory(NULL); - - if (refcount<0) - refcount = 0; -} - - -} // namespace Maemo diff --git a/src/3rdparty/libconninet/src/proxyconf.h b/src/3rdparty/libconninet/src/proxyconf.h deleted file mode 100644 index 7711c49..0000000 --- a/src/3rdparty/libconninet/src/proxyconf.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2010 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - -#ifndef PROXYCONF_H -#define PROXYCONF_H - -#include -#include - -namespace Maemo { - -class ProxyConfPrivate; -class ProxyConf { -private: - ProxyConfPrivate *d_ptr; - -public: - ProxyConf(); - virtual ~ProxyConf(); - - QList flush(const QNetworkProxyQuery &query = QNetworkProxyQuery()); // read the proxies from db - - /* Note that for each update() call there should be corresponding - * clear() call because the ProxyConf class implements a reference - * counting mechanism. The factory is removed only when there is - * no one using the factory any more. - */ - static void update(void); // this builds QNetworkProxy factory - static void clear(void); // this removes QNetworkProxy factory -}; - -} // namespace Maemo - -#endif diff --git a/src/3rdparty/libconninet/tests/Makefile.am b/src/3rdparty/libconninet/tests/Makefile.am deleted file mode 100644 index f6f41ea..0000000 --- a/src/3rdparty/libconninet/tests/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -DEFS = -DDBUS_API_SUBJECT_TO_CHANGE -INCLUDES = @GLIB_CFLAGS@ @DBUS_CFLAGS@ @CONNSETTINGS_CFLAGS@ @OSSO_IC_CFLAGS@ @ICD_DEV_CFLAGS@ \ - @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ @QTCORE_CFLAGS@ @QTNETWORK_CFLAGS@ @QTTEST_CFLAGS@ \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src - -LIBS = @GLIB_LIBS@ @DBUS_LIBS@ @CONNSETTINGS_LIBS@ @OSSO_IC_LIBS@ @ICD_DEV_LIBS@ \ - @QTCORE_LIBS@ @QTDBUS_LIBS@ @QTCORE_LIBS@ @QTNETWORK_LIBS@ @QTTEST_LIBS@ \ - $(top_builddir)/src/libconninet.la - -AM_CFLAGS = $(CONCFLAGS) -AM_LDFLAGS = -static - -bin_PROGRAMS = test_dbusdispatcher test_iapconf test_maemo_icd test_iapmonitor test_proxyconf - -test_dbusdispatcher_SOURCES = ut_dbusdispatcher.cpp -ut_dbusdispatcher.o: ut_dbusdispatcher.moc - -test_iapconf_SOURCES = ut_iapconf.cpp -ut_iapconf.o: ut_iapconf.moc - -test_maemo_icd_SOURCES = ut_maemo_icd.cpp -ut_maemo_icd.o: ut_maemo_icd.moc - -test_iapmonitor_SOURCES = ut_iapmonitor.cpp -ut_iapmonitor.o: ut_iapmonitor.moc - -test_proxyconf_SOURCES = ut_proxyconf.cpp -ut_proxyconf.o: ut_proxyconf.moc - - -MAINTAINERCLEANFILES = Makefile.in - -# This rule lets GNU make create any *.moc from the equivalent *.cpp -%.moc: %.cpp - moc $< -o $@ - -# This line ensures that generated moc files are deleted when we make clean. -CLEANFILES = *.moc diff --git a/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp b/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp deleted file mode 100644 index 70deb3f..0000000 --- a/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp +++ /dev/null @@ -1,191 +0,0 @@ -/* * This file is part of conn-dui-settings-inet * - * - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * - * Contact: Aapo Makela - * - * This software, including documentation, is protected by copyright - * controlled by Nokia Corporation. All rights are reserved. Copying, - * including reproducing, storing, adapting or translating, any or all of - * this material requires the prior written consent of Nokia Corporation. - * This material also contains confidential information which may not be - * disclosed to others without the prior written consent of Nokia. - */ - -#include -#include -#include -#include -#include - -#include - -class Ut_DBusDispatcher : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void init(); - void cleanup(); - void initTestCase(); - void cleanupTestCase(); - - void simpleSignalReceived(const QString& interface, - const QString& signal, - const QList& args); - void simpleCallReply(const QString& method, - const QList& args, - const QString& error); - void simpleCall(); - - void complexCallReply(const QString& method, - const QList& args, - const QString& error); - void complexCall(); - -private: - Maemo::DBusDispatcher *mSubject; - QProcess *icd_stub; - - QString mMethod; - QString mInterface; - QString mSignal; - QList mArgs; -}; - -void Ut_DBusDispatcher::init() -{ - mSubject = new Maemo::DBusDispatcher("com.nokia.icd2", "/com/nokia/icd2", - "com.nokia.icd2"); - - // Start icd2 stub - icd_stub = new QProcess(this); - icd_stub->start("/usr/bin/icd2_stub.py"); - QTest::qWait(1000); -} - -void Ut_DBusDispatcher::cleanup() -{ - // Terminate icd2 stub - icd_stub->terminate(); - icd_stub->waitForFinished(); - - delete mSubject; - mSubject = 0; -} - -void Ut_DBusDispatcher::initTestCase() -{ -} - -void Ut_DBusDispatcher::cleanupTestCase() -{ -} - -void Ut_DBusDispatcher::simpleSignalReceived(const QString& interface, - const QString& signal, - const QList& args) -{ - // Signal handler, which simply records what has been signalled - mInterface = interface; - mSignal = signal; - mArgs = args; -} - -void Ut_DBusDispatcher::simpleCallReply(const QString& method, - const QList& args, - const QString& error) -{ - mMethod = method; - - // Check that method matches and at least WLAN_INFRA is returned - QVERIFY(error.isEmpty()); - QVERIFY(args[0].toStringList().contains("WLAN_INFRA")); -} - -void Ut_DBusDispatcher::simpleCall() -{ - uint flags = 0; - QList reply; - int idx = 0; - QTimer timer; - - // Connect signals - connect(mSubject, SIGNAL(signalReceived(const QString&, - const QString&, - const QList&)), - this, SLOT(simpleSignalReceived(const QString&, - const QString&, - const QList&))); - connect(mSubject, SIGNAL(callReply(const QString&, - const QList&, - const QString&)), - this, SLOT(simpleCallReply(const QString&, - const QList&, - const QString&))); - - // Request scan and verify the call starts succesfully - QVERIFY(mSubject->callAsynchronous("scan_req", flags)); - - // Wait 1st scan signal for 10 secs - timer.setSingleShot(true); - timer.start(10000); - while (timer.isActive() && mInterface.isEmpty()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - idx++; - } - timer.stop(); - - // Sanity checks for the scan result - QVERIFY(mInterface == "com.nokia.icd2"); // interface is icd2 - QVERIFY(mMethod == "scan_req"); // method is scan_req - QVERIFY(mSignal == "scan_result_sig"); // signal is scan result - QVERIFY(mArgs[0] == QVariant(0) || - mArgs[0] == QVariant(4)); // First argument is status - // (0 == NEW, 4 == COMPLETED) - //QVERIFY(mArgs.contains(QVariant("WLAN_INFRA"))); // WLAN scan result -} - -void Ut_DBusDispatcher::complexCallReply(const QString& method, - const QList& args, - const QString& error) -{ - mMethod = method; - - // Check that method has not return arguments and error is not set - QVERIFY(error.isEmpty()); - QVERIFY(args.isEmpty()); -} - -void Ut_DBusDispatcher::complexCall() -{ - uint flags = ICD_CONNECTION_FLAG_UI_EVENT; - QList reply; - QVariantList networks; - QVariantList network1; - - network1 << "" << (uint)0 << "" << "WLAN_INFRA" << (uint)0x05000011 << QByteArray("osso@46@net"); - networks << QVariant(network1); - - // Connect signal - connect(mSubject, SIGNAL(callReply(const QString&, - const QList&, - const QString&)), - this, SLOT(complexCallReply(const QString&, - const QList&, - const QString&))); - - // Request connect and verify the call starts succesfully - QVERIFY(mSubject->callAsynchronous("connect_req", flags, networks)); - - QTest::qWait(1000); - - // Sanity checks for the scan result - QVERIFY(mInterface == "com.nokia.icd2"); // interface is icd2 - QVERIFY(mMethod == "connect_req"); // method connect_req -} - -QTEST_MAIN(Ut_DBusDispatcher) - -#include "ut_dbusdispatcher.moc" diff --git a/src/3rdparty/libconninet/tests/ut_iapconf.cpp b/src/3rdparty/libconninet/tests/ut_iapconf.cpp deleted file mode 100644 index 6a91d61..0000000 --- a/src/3rdparty/libconninet/tests/ut_iapconf.cpp +++ /dev/null @@ -1,186 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009 Nokia Corporation. All rights reserved. - - Contact: Aapo Makela - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - - -#include -#include - -#include - -class Ut_IAPConf : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void init(); - void cleanup(); - void initTestCase(); - void cleanupTestCase(); - - void setupIAP(); - void setupIAPContainingDot(); - void unsetIAPValueIsNotValid(); - void verifyAllIAPs(); - void allForEmptyConfReturnsEmptyList(); - void settingInvalidValueUnsetsKey(); - -private: - Maemo::IAPConf *mSubject; -}; - -void Ut_IAPConf::init() -{ - mSubject = new Maemo::IAPConf("test_iap"); -} - -void Ut_IAPConf::cleanup() -{ - // Clear made settings - mSubject->clear(); - - delete mSubject; - mSubject = 0; -} - -void Ut_IAPConf::initTestCase() -{ -} - -void Ut_IAPConf::cleanupTestCase() -{ -} - -void Ut_IAPConf::setupIAP() -{ - // Set bunch of values - mSubject->set("ipv4_type", "AUTO", - "wlan_wepkey1", "connt", - "wlan_wepdefkey", 1, - "wlan_ssid", QByteArray("CONNTEST-1")); - - // Set one value - mSubject->setValue("type", "WLAN_INFRA"); - - // Check all values that they were set correctly - QVERIFY(mSubject->value("ipv4_type").toString() == "AUTO"); - QVERIFY(mSubject->value("wlan_wepkey1").toString() == "connt"); - QVERIFY(mSubject->value("wlan_wepdefkey").toInt() == 1); - QVERIFY(mSubject->value("wlan_ssid").toByteArray() == QByteArray("CONNTEST-1")); - QVERIFY(mSubject->value("type").toString() == "WLAN_INFRA"); -} - -void Ut_IAPConf::setupIAPContainingDot() -{ - delete mSubject; - mSubject = new Maemo::IAPConf("test.iap"); - - // Set and check one value - mSubject->setValue("type", "DUMMY"); - QVERIFY(mSubject->value("type").toString() == "DUMMY"); -} - -void Ut_IAPConf::unsetIAPValueIsNotValid() -{ - QVariant invalidValue = mSubject->value("this_value_does_not_exist"); - QVERIFY(invalidValue.isValid() == false); -} - -void Ut_IAPConf::verifyAllIAPs() -{ - int count = 0, extras = 0; - QRegExp regexp("iap[1-3]"); - Maemo::IAPConf iap1("iap1"); - Maemo::IAPConf iap2("iap2"); - Maemo::IAPConf iap3("iap3"); - - iap1.clear(); - iap2.clear(); - iap3.clear(); - - iap1.setValue("name", "iap1"); - iap2.setValue("name", "iap2"); - iap3.setValue("name", "iap3"); - - count = extras = 0; - QList iaps; - Maemo::IAPConf::getAll(iaps, true); - foreach (QString iap_path, iaps) { - QString iap_id = iap_path.section('/', 5); /* This is the IAP id */ - if (!iap_id.contains(regexp)) { - extras++; - continue; - } - Maemo::IAPConf iap(iap_id); - QString name = iap.value("name").toString(); - QVERIFY(name == iap_id); - count++; - } - QCOMPARE(count, iaps.size()-extras); - - iap1.clear(); - iap2.clear(); - iap3.clear(); - - iap1.setValue("name", "iap1"); - iap2.setValue("name", "iap2"); - iap3.setValue("name", "iap3"); - - count = extras = 0; - Maemo::IAPConf::getAll(iaps); - foreach (QString iap_id, iaps) { - if (!iap_id.contains(regexp)) { - extras++; - continue; - } - Maemo::IAPConf iap(iap_id); - QString name = iap.value("name").toString(); - QVERIFY(name == iap_id); - count++; - } - QCOMPARE(count, iaps.size()-extras); -} - -void Ut_IAPConf::allForEmptyConfReturnsEmptyList() -{ - // Clear everything in configuration - mSubject->clearAll(); - - // Get all for a list and check that it is empty - QStringList iaps; - mSubject->getAll(iaps); - QVERIFY(iaps.isEmpty()); -} - -void Ut_IAPConf::settingInvalidValueUnsetsKey() -{ - // Setup some IAP - setupIAP(); - - // Set invalid value to unset "wlan_wepdefkey" key and verify that the - // value is unset - mSubject->setValue("wlan_wepdefkey", QVariant()); - QVERIFY(!mSubject->value("wlan_wepdefkey").isValid()); -} - -QTEST_MAIN(Ut_IAPConf) - -#include "ut_iapconf.moc" diff --git a/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp b/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp deleted file mode 100644 index f14f623..0000000 --- a/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - - -#include -#include - -#include -#include - -static const char *iap_id = "test_monitor_1"; - -class TestIAPMonitor : public Maemo::IAPMonitor -{ -public: - QString addedIap; - QString removedIap; - -protected: - virtual void iapAdded(const QString &id) - { - addedIap = id; - } - - virtual void iapRemoved(const QString &id) - { - removedIap = id; - } -}; - -class Ut_IAPMonitor : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void init(); - void cleanup(); - void initTestCase(); - void cleanupTestCase(); - - void check(); - -private: - TestIAPMonitor *mon; - Maemo::IAPConf *iap; -}; - -void Ut_IAPMonitor::init() -{ - mon = new TestIAPMonitor; -} - -void Ut_IAPMonitor::cleanup() -{ - delete mon; - mon = 0; -} - -void Ut_IAPMonitor::initTestCase() -{ -} - -void Ut_IAPMonitor::cleanupTestCase() -{ -} - -void Ut_IAPMonitor::check() -{ - QVERIFY(mon->addedIap.isEmpty()); - - iap = new Maemo::IAPConf(iap_id); - iap->set("ipv4_type", "AUTO", - "wlan_wepkey1", "connt", - "wlan_wepdefkey", 1, - "wlan_ssid", QByteArray(iap_id)); - - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QVERIFY(mon->addedIap == iap_id); - mon->addedIap.clear(); - - QVERIFY(mon->removedIap.isEmpty()); - - // Unset only one value and verify that IAP is not removed - iap->set("ipv4_type", QVariant()); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - QVERIFY(mon->removedIap.isEmpty()); - - // Clear the whole IAP and check that it is removed - iap->clear(); - delete iap; - - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QVERIFY(mon->removedIap == iap_id); -} - -QTEST_MAIN(Ut_IAPMonitor) - -#include "ut_iapmonitor.moc" diff --git a/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp b/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp deleted file mode 100644 index 494829d..0000000 --- a/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp +++ /dev/null @@ -1,274 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. - * - * Contact: Jukka Rissanen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - - -// !!!! -// !!!! NOTE: THESE TEST DO NOT REALLY WORK YET BECAUSE OF MISSING -// !!!! FUNCTIONALITY IN ICD2 STUB. YOU HAVE BEEN WARNED. -// !!!! - - -#include -#include -#include -#include -#include - -#include "maemo_icd.h" - -class Ut_MaemoIcd : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void init(); - void cleanup(); - void initTestCase(); - void cleanupTestCase(); - - void scan_req(); - void scan_cancel_req(); - void connect_req_default(); - void state_req_all(); - void state_req(); - void statistics_req_all(); - void statistics_req(); - void addrinfo_req_all(); - void addrinfo_req(); - -private: - void disconnect_req_default(); // this is currently not run - void connect_req_specific(); // this is currently not run - QProcess *icd_stub; - bool connect_iap(Maemo::IcdConnectResult &connect_result, - QString &result, - QString &error, - QString iap=QString()); -}; - - -QString create_error_str(Maemo::Icd &icd) -{ - return icd.error(); -} - - -void Ut_MaemoIcd::init() -{ - icd_stub = new QProcess(this); - icd_stub->setStandardOutputFile("/tmp/ut_maemo_icd.log"); - icd_stub->start("/usr/bin/icd2_stub.py"); - QTest::qWait(1000); - - // Set the statistics - QProcess dbus_send; - dbus_send.start("dbus-send --type=method_call --system " - "--dest=com.nokia.icd2 /com/nokia/icd2 " - "com.nokia.icd2.testing.set_statistics " - "uint32:1024 uint32:256"); - dbus_send.waitForFinished(); - -} - -void Ut_MaemoIcd::cleanup() -{ - icd_stub->terminate(); - icd_stub->waitForFinished(); -} - -void Ut_MaemoIcd::initTestCase() -{ -} - -void Ut_MaemoIcd::cleanupTestCase() -{ -} - -void Ut_MaemoIcd::scan_req() -{ - QList scanned; - QStringList scannedNetworkTypes; - QStringList networkTypesToScan; - QString error; - Maemo::Icd icd(ICD_SHORT_SCAN_TIMEOUT); - - scannedNetworkTypes = icd.scan(ICD_SCAN_REQUEST_ACTIVE, - networkTypesToScan, - scanned, - error); - QVERIFY(error.isEmpty()); - QCOMPARE(scanned.size(), 3); - QVERIFY(scannedNetworkTypes[0] == "WLAN_INFRA"); - QVERIFY(scannedNetworkTypes[1] == "DUN_GSM_PS"); -} - -void Ut_MaemoIcd::scan_cancel_req() -{ - Maemo::Icd icd; - icd.scanCancel(); - // Not much to verify here -} - -bool Ut_MaemoIcd::connect_iap(Maemo::IcdConnectResult &connect_result, - QString &result, - QString &error, - QString iap) -{ - icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT; - bool st; - Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT); - - if (iap.isEmpty()) { - qDebug() << "connecting to default IAP"; - st = icd.connect(flags, connect_result); - } else { - qDebug() << "connecting to" << iap; - st = icd.connect(flags, iap, result); - } - - error = create_error_str(icd); - return st; -} - -void Ut_MaemoIcd::connect_req_default() -{ - Maemo::IcdConnectResult connect_result; - QString result, error; - bool st; - st = connect_iap(connect_result, result, error); - QVERIFY2(st, error.toAscii().data()); - result = connect_result.connect.network_id.data(); - qDebug() << result; -} - - -void Ut_MaemoIcd::disconnect_req_default() -{ - icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT; - bool st; - Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT); - icd.disconnect(flags); -} - - -void Ut_MaemoIcd::connect_req_specific() -{ - Maemo::IcdConnectResult connect_result; - QString result; - QString error; - bool st; - st = connect_iap(connect_result, result, error, "wpa2gx2.osso.net"); - QVERIFY2(st, error.toAscii().data()); - qDebug() << result; -} - - -void Ut_MaemoIcd::state_req_all() -{ - QList state_results; - Maemo::Icd icd; - int sig; - sig = icd.state(state_results); - QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); -} - - -void Ut_MaemoIcd::state_req() -{ - Maemo::IcdStateResult state_result; - Maemo::Icd icd; - int sig; - QString service_type, service_id; - QString network_type("WLAN_INFRA"); - QByteArray network_id("wpa2gx2.osso.net"); - sig = icd.state(service_type, 0, service_id, - network_type, (uint)0x17a1, network_id, - state_result); - QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); -} - - -void Ut_MaemoIcd::statistics_req_all() -{ - QList stats_results; - Maemo::Icd icd; - int sig; - QString err; - sig = icd.statistics(stats_results); - err = create_error_str(icd); - if (!err.isEmpty()) - QVERIFY2(sig==1, err.toAscii().data()); - else - QCOMPARE(sig, 1); - - for(int i=0; i addr_results; - Maemo::Icd icd; - int sig; - sig = icd.addrinfo(addr_results); - QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); -} - - -void Ut_MaemoIcd::addrinfo_req() -{ - Maemo::IcdAddressInfoResult addr_result; - Maemo::Icd icd; - int sig; - QString service_type, service_id; - QString network_type("WLAN_INFRA"); - QByteArray network_id("wpa2gx2.osso.net"); - sig = icd.addrinfo(service_type, 0, service_id, - network_type, (uint)0x17a1, network_id, - addr_result); - QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); -} - - -QTEST_MAIN(Ut_MaemoIcd) - -#include "ut_maemo_icd.moc" diff --git a/src/3rdparty/libconninet/tests/ut_proxyconf.cpp b/src/3rdparty/libconninet/tests/ut_proxyconf.cpp deleted file mode 100644 index 1f407f0..0000000 --- a/src/3rdparty/libconninet/tests/ut_proxyconf.cpp +++ /dev/null @@ -1,400 +0,0 @@ -/* - libconninet - Internet Connectivity support library - - Copyright (C) 2010 Nokia Corporation. All rights reserved. - - Contact: Jukka Rissanen - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License - version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - - -#include -#include -#include -#include - -#include "../src/proxyconf.h" - -class Ut_ProxyConf : public QObject -{ - Q_OBJECT - -private Q_SLOTS: - void init(); - void cleanup(); - void initTestCase(); - void cleanupTestCase(); - - // tests without the factory - void proxy_ftp_no_factory_ok_auto(); - void proxy_ftp_no_factory_ok_manual(); - void proxy_http_no_factory_ok_manual(); - void proxy_https_no_factory_ok_manual(); - void proxy_socks_no_factory_ok_manual(); - void proxy_default_no_factory_ok_manual(); - - // tests using the factory - void proxy_ftp_factory_ok_auto(); - void proxy_ftp_factory_ok_manual(); - void proxy_http_factory_ok_manual(); - void proxy_https_factory_ok_manual(); - void proxy_socks_factory_ok_manual(); - void proxy_http_factory_ok_manual_clear(); - void proxy_default_factory_ok_manual(); - void proxy_http_factory_ok_manual_ignore_list(); - void proxy_default_factory_ok_manual_system(); - -private: - Maemo::ProxyConf *pc; -}; - - -void put(QString var, QString type, QString value) -{ - QProcess gconf; - if (value.isEmpty()) - gconf.start(QString("gconftool-2 -u /system/proxy/"+var)); - else - gconf.start(QString("gconftool-2 -s /system/proxy/"+var+" -t "+type+" "+value)); - gconf.waitForFinished(); -} - -void put_http(QString var, QString type, QString value) -{ - QProcess gconf; - if (value.isEmpty()) - gconf.start(QString("gconftool-2 -u /system/http_proxy/"+var)); - else - gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t "+type+" "+value)); - gconf.waitForFinished(); -} - -void put_list(QString var, QString type, QList value) -{ - QProcess gconf; - QString values = "["; - foreach (QString str, value) - values = values + str + ","; - values.chop(1); - values = values + "]"; - - gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t list --list-type="+type+" "+values)); - gconf.waitForFinished(); -} - - -void Ut_ProxyConf::init() -{ - put_http("host", "string", "my.proxy.com"); - put_http("port", "int", "8080"); - - QList list; - list.append("foo.bar.com"); - list.append("192.168.19.69"); - list.append("192.168.20.0/24"); - list.append("bar.foo.com"); - put_list("ignore_hosts", "string", list); - put_http("use_http_host", "boolean", "true"); - - put("mode", "string", "auto"); - put("autoconfig_url", "string", "http://foo.bar.com/autoconf"); - put("secure_host", "string", "secure_host.com"); - put("secure_port", "int", "112"); - - put("ftp_host", "string", "ftp.nuukia.com"); - put("ftp_port", "int", "2000"); - put("socks_host", "string", "socks.host.com"); - put("socks_port", "int", "10080"); - put("rtsp_host", "string", "rtsp.voice.com"); - put("rtsp_port", "int", "1554"); - - pc = new Maemo::ProxyConf(); -} - -void Ut_ProxyConf::cleanup() -{ - delete pc; - pc = 0; -} - -void Ut_ProxyConf::initTestCase() -{ -} - -void Ut_ProxyConf::cleanupTestCase() -{ -} - - -void Ut_ProxyConf::proxy_ftp_no_factory_ok_auto() -{ - QList nplist; - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); - - nplist = pc->flush(query); - QVERIFY(nplist.length()==0); -} - - -void Ut_ProxyConf::proxy_ftp_no_factory_ok_manual() -{ - QList nplist; - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); - - put("mode", "string", "manual"); - - nplist = pc->flush(query); - foreach (QNetworkProxy proxy, nplist) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(nplist.length()==3); - QVERIFY(nplist.first().type() == QNetworkProxy::FtpCachingProxy); -} - - -void Ut_ProxyConf::proxy_http_no_factory_ok_manual() -{ - QList nplist; - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); - - put("mode", "string", "manual"); - - nplist = pc->flush(query); - foreach (QNetworkProxy proxy, nplist) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(nplist.length()==3); - QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy); -} - - -void Ut_ProxyConf::proxy_https_no_factory_ok_manual() -{ - QList nplist; - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/")); - - put("mode", "string", "manual"); - - nplist = pc->flush(query); - foreach (QNetworkProxy proxy, nplist) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(nplist.length()==2); - QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy); -} - - -void Ut_ProxyConf::proxy_socks_no_factory_ok_manual() -{ - QList nplist; - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); - - put("mode", "string", "manual"); - put_http("host", "string", ""); - - nplist = pc->flush(query); - foreach (QNetworkProxy proxy, nplist) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(nplist.length()==2); - QVERIFY(nplist.first().type() == QNetworkProxy::Socks5Proxy); -} - - -void Ut_ProxyConf::proxy_default_no_factory_ok_manual() -{ - QList nplist; - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/")); - - put("mode", "string", "manual"); - put("socks_host", "string", ""); - put("secure_host", "string", ""); - - nplist = pc->flush(query); - foreach (QNetworkProxy proxy, nplist) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(nplist.length()==0); -} - - -void Ut_ProxyConf::proxy_ftp_factory_ok_auto() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); - Maemo::ProxyConf::update(); - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - QVERIFY(listOfProxies.length()==1); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_ftp_factory_ok_manual() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - foreach (QNetworkProxy proxy, listOfProxies) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(listOfProxies.length()==3); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::FtpCachingProxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_http_factory_ok_manual() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - foreach (QNetworkProxy proxy, listOfProxies) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(listOfProxies.length()==3); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_https_factory_ok_manual() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - foreach (QNetworkProxy proxy, listOfProxies) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(listOfProxies.length()==2); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_socks_factory_ok_manual() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - put_http("host", "string", ""); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - foreach (QNetworkProxy proxy, listOfProxies) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(listOfProxies.length()==2); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::Socks5Proxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_http_factory_ok_manual_clear() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - put_http("host", "string", "192.168.1.1"); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - foreach (QNetworkProxy proxy, listOfProxies) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(listOfProxies.length()==3); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); - - Maemo::ProxyConf::clear(); - listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - QVERIFY(listOfProxies.length()==1); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); -} - - -void Ut_ProxyConf::proxy_default_factory_ok_manual() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - put("socks_host", "string", ""); - put("secure_host", "string", ""); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - QVERIFY(listOfProxies.length()==1); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_http_factory_ok_manual_ignore_list() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://192.168.19.70/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - - QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - - foreach (QNetworkProxy proxy, listOfProxies) { - qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); - } - QVERIFY(listOfProxies.length()==3); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); - - query = QNetworkProxyQuery(QUrl("http://192.168.20.10/")); - listOfProxies = QNetworkProxyFactory::proxyForQuery(query); - QVERIFY(listOfProxies.length()==1); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); - Maemo::ProxyConf::clear(); -} - - -void Ut_ProxyConf::proxy_default_factory_ok_manual_system() -{ - QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); - Maemo::ProxyConf::update(); - - put("mode", "string", "manual"); - - QList listOfProxies = QNetworkProxyFactory::systemProxyForQuery(query); - - QVERIFY(listOfProxies.length()==1); - QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); - Maemo::ProxyConf::clear(); -} - - - - -QTEST_MAIN(Ut_ProxyConf) - -#include "ut_proxyconf.moc" -- cgit v0.12 From ab11576ca4987c7da9fcffb9cab286c1b227b74d Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 12 Aug 2010 14:49:35 +1000 Subject: Add version 0.42 of libconninet. Minor update. Fixes infinite loops. --- src/3rdparty/libconninet/AUTHORS | 0 src/3rdparty/libconninet/COPYING | 510 ++++++ src/3rdparty/libconninet/ChangeLog | 0 src/3rdparty/libconninet/INSTALL | 229 +++ src/3rdparty/libconninet/NEWS | 0 src/3rdparty/libconninet/README | 0 src/3rdparty/libconninet/autogen.sh | 3 + src/3rdparty/libconninet/config.guess | 1533 ++++++++++++++++++ src/3rdparty/libconninet/config.sub | 1693 ++++++++++++++++++++ src/3rdparty/libconninet/configure.ac | 90 ++ src/3rdparty/libconninet/conninet.pc.in | 11 + src/3rdparty/libconninet/debian/changelog | 293 ++++ src/3rdparty/libconninet/debian/compat | 1 + src/3rdparty/libconninet/debian/control | 39 + src/3rdparty/libconninet/debian/copyright | 19 + .../libconninet/debian/libconninet0-dev.dirs | 2 + .../libconninet/debian/libconninet0-dev.files | 4 + src/3rdparty/libconninet/debian/libconninet0.dirs | 1 + src/3rdparty/libconninet/debian/libconninet0.files | 1 + src/3rdparty/libconninet/debian/rules | 123 ++ src/3rdparty/libconninet/doxygen.cfg.in | 1147 +++++++++++++ src/3rdparty/libconninet/src/dbusdispatcher.cpp | 611 +++++++ src/3rdparty/libconninet/src/dbusdispatcher.h | 91 ++ src/3rdparty/libconninet/src/iapconf.cpp | 299 ++++ src/3rdparty/libconninet/src/iapconf.h | 84 + src/3rdparty/libconninet/src/iapmonitor.cpp | 110 ++ src/3rdparty/libconninet/src/iapmonitor.h | 48 + src/3rdparty/libconninet/src/maemo_icd.cpp | 1316 +++++++++++++++ src/3rdparty/libconninet/src/maemo_icd.h | 182 +++ src/3rdparty/libconninet/src/proxyconf.cpp | 315 ++++ src/3rdparty/libconninet/src/proxyconf.h | 53 + .../libconninet/tests/ut_dbusdispatcher.cpp | 191 +++ src/3rdparty/libconninet/tests/ut_iapconf.cpp | 186 +++ src/3rdparty/libconninet/tests/ut_iapmonitor.cpp | 118 ++ src/3rdparty/libconninet/tests/ut_maemo_icd.cpp | 274 ++++ src/3rdparty/libconninet/tests/ut_proxyconf.cpp | 400 +++++ 36 files changed, 9977 insertions(+) create mode 100644 src/3rdparty/libconninet/AUTHORS create mode 100644 src/3rdparty/libconninet/COPYING create mode 100644 src/3rdparty/libconninet/ChangeLog create mode 100644 src/3rdparty/libconninet/INSTALL create mode 100644 src/3rdparty/libconninet/NEWS create mode 100644 src/3rdparty/libconninet/README create mode 100755 src/3rdparty/libconninet/autogen.sh create mode 100755 src/3rdparty/libconninet/config.guess create mode 100755 src/3rdparty/libconninet/config.sub create mode 100644 src/3rdparty/libconninet/configure.ac create mode 100644 src/3rdparty/libconninet/conninet.pc.in create mode 100644 src/3rdparty/libconninet/debian/changelog create mode 100644 src/3rdparty/libconninet/debian/compat create mode 100644 src/3rdparty/libconninet/debian/control create mode 100644 src/3rdparty/libconninet/debian/copyright create mode 100644 src/3rdparty/libconninet/debian/libconninet0-dev.dirs create mode 100644 src/3rdparty/libconninet/debian/libconninet0-dev.files create mode 100644 src/3rdparty/libconninet/debian/libconninet0.dirs create mode 100644 src/3rdparty/libconninet/debian/libconninet0.files create mode 100755 src/3rdparty/libconninet/debian/rules create mode 100644 src/3rdparty/libconninet/doxygen.cfg.in create mode 100644 src/3rdparty/libconninet/src/dbusdispatcher.cpp create mode 100644 src/3rdparty/libconninet/src/dbusdispatcher.h create mode 100644 src/3rdparty/libconninet/src/iapconf.cpp create mode 100644 src/3rdparty/libconninet/src/iapconf.h create mode 100644 src/3rdparty/libconninet/src/iapmonitor.cpp create mode 100644 src/3rdparty/libconninet/src/iapmonitor.h create mode 100644 src/3rdparty/libconninet/src/maemo_icd.cpp create mode 100644 src/3rdparty/libconninet/src/maemo_icd.h create mode 100644 src/3rdparty/libconninet/src/proxyconf.cpp create mode 100644 src/3rdparty/libconninet/src/proxyconf.h create mode 100644 src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp create mode 100644 src/3rdparty/libconninet/tests/ut_iapconf.cpp create mode 100644 src/3rdparty/libconninet/tests/ut_iapmonitor.cpp create mode 100644 src/3rdparty/libconninet/tests/ut_maemo_icd.cpp create mode 100644 src/3rdparty/libconninet/tests/ut_proxyconf.cpp diff --git a/src/3rdparty/libconninet/AUTHORS b/src/3rdparty/libconninet/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/src/3rdparty/libconninet/COPYING b/src/3rdparty/libconninet/COPYING new file mode 100644 index 0000000..b124cf5 --- /dev/null +++ b/src/3rdparty/libconninet/COPYING @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/src/3rdparty/libconninet/ChangeLog b/src/3rdparty/libconninet/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/src/3rdparty/libconninet/INSTALL b/src/3rdparty/libconninet/INSTALL new file mode 100644 index 0000000..54caf7c --- /dev/null +++ b/src/3rdparty/libconninet/INSTALL @@ -0,0 +1,229 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/src/3rdparty/libconninet/NEWS b/src/3rdparty/libconninet/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/src/3rdparty/libconninet/README b/src/3rdparty/libconninet/README new file mode 100644 index 0000000..e69de29 diff --git a/src/3rdparty/libconninet/autogen.sh b/src/3rdparty/libconninet/autogen.sh new file mode 100755 index 0000000..a8fd885 --- /dev/null +++ b/src/3rdparty/libconninet/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf --verbose --install --force diff --git a/src/3rdparty/libconninet/config.guess b/src/3rdparty/libconninet/config.guess new file mode 100755 index 0000000..e3a2116 --- /dev/null +++ b/src/3rdparty/libconninet/config.guess @@ -0,0 +1,1533 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. + +timestamp='2009-06-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/src/3rdparty/libconninet/config.sub b/src/3rdparty/libconninet/config.sub new file mode 100755 index 0000000..eb0389a --- /dev/null +++ b/src/3rdparty/libconninet/config.sub @@ -0,0 +1,1693 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. + +timestamp='2009-06-11' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/src/3rdparty/libconninet/configure.ac b/src/3rdparty/libconninet/configure.ac new file mode 100644 index 0000000..2a383ee --- /dev/null +++ b/src/3rdparty/libconninet/configure.ac @@ -0,0 +1,90 @@ +AC_INIT([libconninet], patsubst(esyscmd([dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}']), [ +]), [jukka.rissanen@nokia.com]) +AM_INIT_AUTOMAKE([foreign]) + +AC_PROG_CXX +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(docs, [ --enable-docs Build DOXYGEN documentation (requires Doxygen)],enable_docs=$enableval,enable_docs=auto) + +AC_PATH_PROG(DOXYGEN, doxygen, no) +AC_MSG_CHECKING([whether to build Doxygen documentation]) + +if test x$DOXYGEN = xno ; then + have_doxygen=no +else + have_doxygen=yes +fi +if test x$enable_docs = xauto ; then + if test x$have_doxygen = xno ; then + enable_docs=no + else + enable_docs=yes + fi +fi +if test x$enable_docs = xyes; then + if test x$have_doxygen = xno; then + AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found]) + else + AC_MSG_RESULT(yes) + fi +else + AC_MSG_RESULT(no) +fi + +AM_CONDITIONAL(DOXYGEN_DOCS_ENABLED, test x$enable_docs = xyes) +AC_SUBST(DOXYGEN) + +PKG_CHECK_MODULES(GLIB, glib-2.0) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +PKG_CHECK_MODULES(QTCORE, QtCore) +AC_SUBST(QTCORE_CFLAGS) +AC_SUBST(QTCORE_LIBS) + +PKG_CHECK_MODULES(QTNETWORK, QtNetwork) +AC_SUBST(QTNETWORK_CFLAGS) +AC_SUBST(QTNETWORK_LIBS) + +PKG_CHECK_MODULES(QTDBUS, QtDBus) +AC_SUBST(QTDBUS_CFLAGS) +AC_SUBST(QTDBUS_LIBS) + +PKG_CHECK_MODULES(QTTEST, QtTest) +AC_SUBST(QTTEST_CFLAGS) +AC_SUBST(QTTEST_LIBS) + +PKG_CHECK_MODULES(DBUS, dbus-glib-1) +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) + +PKG_CHECK_MODULES(CONNSETTINGS, connsettings) +AC_SUBST(CONNSETTINGS_CFLAGS) +AC_SUBST(CONNSETTINGS_LIBS) + +PKG_CHECK_MODULES(OSSO_IC, osso-ic) +AC_SUBST(OSSO_IC_CFLAGS) +AC_SUBST(OSSO_IC_LIBS) + +PKG_CHECK_MODULES(ICD_DEV, icd2) +AC_SUBST(ICD_DEV_CFLAGS) +AC_SUBST(ICD_DEV_LIBS) + +PKG_CHECK_MODULES(GCONF, gconf-2.0) +AC_SUBST(GCONF_CFLAGS) +AC_SUBST(GCONF_LIBS) + +PKG_CHECK_MODULES(QGCONF, gq-gconf) +AC_SUBST(QGCONF_CFLAGS) +AC_SUBST(QGCONF_LIBS) + +CONCFLAGS="-Wall -Werror -Wmissing-prototypes" +AC_SUBST(CONCFLAGS) + +AC_CONFIG_FILES([Makefile \ + src/Makefile \ + tests/Makefile \ + conninet.pc \ + doxygen.cfg]) +AC_OUTPUT diff --git a/src/3rdparty/libconninet/conninet.pc.in b/src/3rdparty/libconninet/conninet.pc.in new file mode 100644 index 0000000..68cdee0 --- /dev/null +++ b/src/3rdparty/libconninet/conninet.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libconninet +Description: Internet Connectivity support library +Version: @VERSION@ +Requires: dbus-1 >= 0.60 glib-2.0 QtCore QtDBus QtGui +Libs: -lconninet +Cflags: -I${includedir}/conninet diff --git a/src/3rdparty/libconninet/debian/changelog b/src/3rdparty/libconninet/debian/changelog new file mode 100644 index 0000000..4063317 --- /dev/null +++ b/src/3rdparty/libconninet/debian/changelog @@ -0,0 +1,293 @@ +libconninet (0.42+0m6) unstable; urgency=low + + * This entry has been added by BIFH queue processor + version has been changed to 0.42+0m6 + + -- Qing Jin Thu, 22 Jul 2010 14:04:58 +0300 + +libconninet (0.42) unstable; urgency=low + + * Fixes: NB#180536 - Uploads to online services are not working. + This is a regression caused by fix to bug 175098, the timeout was never + expiring when waiting reply from icd. + + -- Jukka Rissanen Mon, 19 Jul 2010 12:23:30 +0300 + +libconninet (0.41) unstable; urgency=low + + * Fixes: NB#175098 - Qt4.7 Webkit crashes when bearer API QNetworkSession + constructor calls QNetworkSession::syncStateWithInterface() which in turn + calls Maemo::state() and Maemo::addrinfo() and webkit expects that event + loop is not run but those function process main loop events. + Now Maemo::state() and Maemo::addrinfo() are changed to be synchronous + and fully blocking functions. The old non-blocking versions are called + Maemo::state_non_blocking() and Maemo::addrinfo_non_blocking(). + + -- Jukka Rissanen Wed, 14 Jul 2010 10:12:47 +0300 + +libconninet (0.40) unstable; urgency=low + + * Fixes: NB#167465 - Unable to open network connection using libbearer + + -- Jukka Rissanen Tue, 11 May 2010 10:47:10 +0300 + +libconninet (0.39) unstable; urgency=low + + * Fixes: NB#167982 - initialize DBus vtable in DBusDispatcher. + + -- Aapo Makela Mon, 10 May 2010 14:42:39 +0300 + +libconninet (0.38) unstable; urgency=low + + * Changing icd2 connect_req to be synchronous as the check for + returned connect signal did not work correctly, this caused a + long timeout when connect() was called. + * Scan sometimes missed results and did not return them to caller. + * HTTP proxy settings were not set correctly. + + -- Jukka Rissanen Thu, 15 Apr 2010 11:25:06 +0300 + +libconninet (0.37) unstable; urgency=low + + * Make proxy config reference counting atomic. + + -- Jukka Rissanen Wed, 3 Mar 2010 13:23:08 +0200 + +libconninet (0.36) unstable; urgency=low + + * Fixes: NB#157586 - Cleanup dbus listener when WLAN scanning object is + deleted. + + -- Jukka Rissanen Fri, 26 Feb 2010 13:30:41 +0200 + +libconninet (0.35) unstable; urgency=low + + * Fixes: NB#156883 - libconninet fails to build under the Platform SDK (SB2) + + -- Jukka Rissanen Thu, 18 Feb 2010 12:14:40 +0200 + +libconninet (0.34) unstable; urgency=low + + * Coverity fix + + -- Jukka Rissanen Tue, 16 Feb 2010 16:38:00 +0200 + +libconninet (0.33) unstable; urgency=low + + * Added API to update Qt proxy config. + + -- Jukka Rissanen Tue, 26 Jan 2010 15:48:36 +0200 + +libconninet (0.32) unstable; urgency=low + + * Fixed IAPConf to unset value when set value is invalid. + * Updated IAPMonitor to use libconnsettings. + + -- Aapo Makela Wed, 03 Feb 2010 07:32:45 +0200 + +libconninet (0.31) unstable; urgency=low + + * Fixes: NB#154892 - Check nulls in IAPConf. + + -- Aapo Makela Mon, 01 Feb 2010 09:32:06 +0200 + +libconninet (0.30) unstable; urgency=low + + * Updated IAPConf to use libconnsettings. + + -- Aapo Makela Fri, 29 Jan 2010 12:58:03 +0200 + +libconninet (0.29) unstable; urgency=low + + * Fixed dependencies + + -- Jukka Rissanen Fri, 15 Jan 2010 10:16:07 +0200 + +libconninet (0.28) unstable; urgency=low + + * Get rid of libdui dependency + + -- Jukka Rissanen Wed, 13 Jan 2010 09:56:26 +0200 + +libconninet (0.27) unstable; urgency=low + + * Insert new pending calls to the list in DBusDispatcher. + + -- Aapo Makela Tue, 22 Dec 2009 14:27:32 +0200 + +libconninet (0.26) unstable; urgency=low + + * Added possibility to specify different signal path for DBusDispatcher. + + -- Aapo Makela Wed, 25 Nov 2009 14:27:34 +0200 + +libconninet (0.25) unstable; urgency=low + + * Fixes: NB#146450 - All scan results were not returned to the caller. + + -- Jukka Rissanen Mon, 16 Nov 2009 17:23:15 +0200 + +libconninet (0.24) unstable; urgency=low + + * Wait all scan results for all network types in Maemo::Icd::scan() + + -- Jukka Rissanen Fri, 6 Nov 2009 14:45:23 +0200 + +libconninet (0.23) unstable; urgency=low + + * Fixes: NB#143361 - Assert failure in session class for GPRS IAP. + + -- Jukka Rissanen Mon, 19 Oct 2009 16:00:14 +0300 + +libconninet (0.22) unstable; urgency=low + + * Fixed the error checking if scan returns 0 results. + + -- Jukka Rissanen Wed, 7 Oct 2009 13:50:27 +0300 + +libconninet (0.21) unstable; urgency=low + + * Support multiple DBusDispatcher classes at the same time. This is + required by Maemo::Icd class so that multiple instances of it can + be used the same time. + + -- Jukka Rissanen Mon, 5 Oct 2009 16:33:43 +0300 + +libconninet (0.20) unstable; urgency=low + + * Fixed memory leak in IAPConf::setValue() + + -- Jukka Rissanen Fri, 2 Oct 2009 13:02:21 +0300 + +libconninet (0.19) unstable; urgency=low + + * Fixed connect_req to one specific IAP in Icd class. + + -- Jukka Rissanen Tue, 29 Sep 2009 17:02:46 +0300 + +libconninet (0.18) unstable; urgency=low + + * Make sure the library will not abort in Icd class if scan does + not return any results. + + -- Jukka Rissanen Tue, 22 Sep 2009 17:00:12 +0300 + +libconninet (0.17) unstable; urgency=low + + * Added IAP monitoring support. + + -- Jukka Rissanen Mon, 21 Sep 2009 16:29:31 +0300 + +libconninet (0.16) unstable; urgency=low + + * Disabled the old osso-ic dbus interface as it is currently not used. + * Fixed the addrinfo request, now addresses are returned correctly to + the caller. + + -- Jukka Rissanen Thu, 17 Sep 2009 15:56:13 +0300 + +libconninet (0.15) unstable; urgency=low + + * Enabling state_req, statistics_req and addrinfo_req support + functions in Maemo::Icd as the corresponding DBUS API functions are + fixed in icd2 v0.89 + + -- Jukka Rissanen Fri, 24 Jul 2009 15:23:02 +0300 + +libconninet (0.14) unstable; urgency=low + + * Icd statistics support added. + * Icd address information support added. + * Icd scan method does not return the final (and empty) result any more. + * Added initial unit test implementation for Icd class. + * Some of the status functions in Icd class disabled because of issues + in icd2 and the dbus api. + + -- Jukka Rissanen Thu, 23 Jul 2009 11:03:05 +0300 + +libconninet (0.13) unstable; urgency=low + + * Added API to get all the configured IAPs. + + -- Jukka Rissanen Tue, 21 Jul 2009 09:47:18 +0300 + +libconninet (0.12) unstable; urgency=low + + * Replaced duivaluespace by Dui in pkg-config file because the + duivaluespace is deprecated. + + -- Jukka Rissanen Mon, 20 Jul 2009 16:00:10 +0300 + +libconninet (0.11) unstable; urgency=low + + * Using libdui instead of libduivaluespace because it is deprecated. + * The IAPConf::clear() uses native gconf API instead of launching gconftool + * Check that state_req call returned list and the list contains entries + before trying to access it. + + -- Jukka Rissanen Mon, 20 Jul 2009 14:55:15 +0300 + +libconninet (0.10) unstable; urgency=low + + * connect() did not return ok when connection succeeded. + + -- Jukka Rissanen Thu, 25 Jun 2009 09:31:21 +0300 + +libconninet (0.9) unstable; urgency=low + + * Connection timeout set to 2.5min, same as in fremantle. + + -- Jukka Rissanen Wed, 17 Jun 2009 13:36:40 +0300 + +libconninet (0.8) unstable; urgency=low + + * Fix state_req signal received from Icd + + -- Jukka Rissanen Thu, 11 Jun 2009 17:19:33 +0300 + +libconninet (0.7) unstable; urgency=low + + * Icd disconnect and select reqs are made synchronous as we do not + wait the return status. The previous async version was causing core + dumps if Icd class was destroyed too early. + + -- Jukka Rissanen Thu, 11 Jun 2009 11:52:36 +0300 + +libconninet (0.6) unstable; urgency=low + + * Fixed the libconninet0-dev dependencies. + + -- Jukka Rissanen Mon, 8 Jun 2009 10:47:56 +0300 + +libconninet (0.5) unstable; urgency=low + + * Fixed missing QObject connect functions. + * Fixed IAPConf to return invalid QVariant if the value does not exist. + + -- Jukka Rissanen Mon, 01 Jun 2009 13:58:53 +0300 + +libconninet (0.4) unstable; urgency=low + + * Fixed QObject signal setting for Maemo::Icd + + -- Jukka Rissanen Wed, 20 May 2009 13:51:11 +0300 + +libconninet (0.3) unstable; urgency=low + + * Refactoring classes + * Added IAPConf class. + + -- Jukka Rissanen Thu, 14 May 2009 13:24:11 +0300 + +libconninet (0.2) unstable; urgency=low + + * Fixed pkgconfig file which had wrong dependency + * Added DBus array and struct support to DBusDispatcher. + + -- Jukka Rissanen Wed, 13 May 2009 12:11:00 +0300 + +libconninet (0.1) unstable; urgency=low + + * Initial Release. + + -- Jukka Rissanen Tue, 12 May 2009 16:10:27 +0200 diff --git a/src/3rdparty/libconninet/debian/compat b/src/3rdparty/libconninet/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/src/3rdparty/libconninet/debian/compat @@ -0,0 +1 @@ +4 diff --git a/src/3rdparty/libconninet/debian/control b/src/3rdparty/libconninet/debian/control new file mode 100644 index 0000000..2db660f --- /dev/null +++ b/src/3rdparty/libconninet/debian/control @@ -0,0 +1,39 @@ +Source: libconninet +Priority: optional +Maintainer: Jukka Rissanen +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib2.0-dev (>= 2.8), + libdbus-1-dev (>= 0.60), libconnsettings0-dev (>= 0.4), icd2-osso-ic-dev, + icd2-dev, libqt4-dev, libgconf2-dev (>> 2.6.4), libgq-gconf-dev +Standards-Version: 3.6.2 +Section: libs + +Package: libconninet0-dev +Section: libdevel +Architecture: any +Depends: libconninet0 (= ${Source-Version}), libdbus-1-dev (>= 0.60), + libglib2.0-dev (>= 2.8), libconnsettings0-dev (>= 0.4), libqt4-dev, + icd2-osso-ic-dev, icd2-dev, libgconf2-dev (>> 2.6.4), libgq-gconf-dev +Description: Internet Connectivity support library development files + Internet Connectivity support library (libconninet) provides common + support functions for connecting to icd2 and accessing configuration + data. + . + This package contains the header files. + +Package: libconninet0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Internet Connectivity support library + Internet Connectivity support library (libconninet) provides common + support functions for connecting to icd2 and accessing configuration + data. + . + This package contains the shared libraries. + +Package: libconninet0-dbg +Section: libs +Architecture: any +Depends: libconninet0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Debug symbols for the Internet Connectivity support library + Internet Connectivity support library (libconninet) debug symbols. diff --git a/src/3rdparty/libconninet/debian/copyright b/src/3rdparty/libconninet/debian/copyright new file mode 100644 index 0000000..97e8e68 --- /dev/null +++ b/src/3rdparty/libconninet/debian/copyright @@ -0,0 +1,19 @@ +libconninet - Internet Connectivity support library + +Copyright (C) 2009 Nokia Corporation. All rights reserved. + +Contact: Jukka Rissanen + +This library is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License version 2.1 +as published by the Free Software Foundation. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs b/src/3rdparty/libconninet/debian/libconninet0-dev.dirs new file mode 100644 index 0000000..4418816 --- /dev/null +++ b/src/3rdparty/libconninet/debian/libconninet0-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.files b/src/3rdparty/libconninet/debian/libconninet0-dev.files new file mode 100644 index 0000000..78bbac8 --- /dev/null +++ b/src/3rdparty/libconninet/debian/libconninet0-dev.files @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/share/pkgconfig/* diff --git a/src/3rdparty/libconninet/debian/libconninet0.dirs b/src/3rdparty/libconninet/debian/libconninet0.dirs new file mode 100644 index 0000000..6845771 --- /dev/null +++ b/src/3rdparty/libconninet/debian/libconninet0.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/src/3rdparty/libconninet/debian/libconninet0.files b/src/3rdparty/libconninet/debian/libconninet0.files new file mode 100644 index 0000000..d0dbfd1 --- /dev/null +++ b/src/3rdparty/libconninet/debian/libconninet0.files @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff --git a/src/3rdparty/libconninet/debian/rules b/src/3rdparty/libconninet/debian/rules new file mode 100755 index 0000000..2a3d395 --- /dev/null +++ b/src/3rdparty/libconninet/debian/rules @@ -0,0 +1,123 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# shared library versions, option 1 +#version=2.0.5 +#major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +version=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +configure: configure.ac debian/changelog + -./autogen.sh + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_movefiles + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip --dbg-package=libconninet0 + dh_compress + dh_fixperms +# dh_perl +# dh_python + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/src/3rdparty/libconninet/doxygen.cfg.in b/src/3rdparty/libconninet/doxygen.cfg.in new file mode 100644 index 0000000..80a4c8d --- /dev/null +++ b/src/3rdparty/libconninet/doxygen.cfg.in @@ -0,0 +1,1147 @@ +# Doxyfile 1.3.7 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "Internet Connectivity Support Library" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doc + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 2 levels of 10 sub-directories under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of source +# files, where putting all generated files in the same directory would otherwise +# cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, +# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en +# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, +# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for +# all platforms other than Windows). + +USE_WINDOWS_ENCODING = NO + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is used +# as the annotated text. Otherwise, the brief description is used as-is. If left +# blank, the following values are used ("$name" is automatically replaced with the +# name of the entity): "The $name class" "The $name widget" "The $name file" +# "is" "provides" "specifies" "contains" "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited +# members of a class in the documentation of that class as if those members were +# ordinary class members. Constructors, destructors and assignment operators of +# the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + +JAVADOC_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = YES + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources +# only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = conic/conic.h \ + conic/conicconnection.h \ + conic/conicconnectionevent.h \ + conic/conicevent.h \ + conic/coniciap.h \ + conic/conicstatisticsevent.h + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp +# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories +# that are symbolic links (a Unix filesystem feature) are excluded from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. + +EXCLUDE_PATTERNS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. + +INPUT_FILTER = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_PREDEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse the +# parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or +# super classes. Setting the tag to NO turns the diagrams off. Note that this +# option is superseded by the HAVE_DOT option below. This is only a fallback. It is +# recommended to install and use dot, since it yields more powerful graphs. + +CLASS_DIAGRAMS = YES + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found on the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes that +# lay further from the root node will be omitted. Note that setting this option to +# 1 or 2 may greatly reduce the computation time needed for large code bases. Also +# note that a graph may be further truncated if the graph's image dimensions are +# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). +# If 0 is used for the depth value (the default), the graph is not depth-constrained. + +MAX_DOT_GRAPH_DEPTH = 0 + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.cpp b/src/3rdparty/libconninet/src/dbusdispatcher.cpp new file mode 100644 index 0000000..7581982 --- /dev/null +++ b/src/3rdparty/libconninet/src/dbusdispatcher.cpp @@ -0,0 +1,611 @@ +/* * This file is part of conninet * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Aapo Makela + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include +#include "dbusdispatcher.h" + +namespace Maemo { + +/*! + \class DBusDispatcher + + \brief DBusDispatcher is a class, which is able to send DBUS method call + messages and receive unicast signals from DBUS object. +*/ + +class DBusDispatcherPrivate +{ +public: + DBusDispatcherPrivate(const QString& service, + const QString& path, + const QString& interface, + const QString& signalPath) + : service(service), path(path), interface(interface), + signalPath(signalPath), connection(0) + { + memset(&signal_vtable, 0, sizeof(signal_vtable)); + } + + ~DBusDispatcherPrivate() + { + foreach(DBusPendingCall *call, pending_calls) { + dbus_pending_call_cancel(call); + dbus_pending_call_unref(call); + } + } + + QString service; + QString path; + QString interface; + QString signalPath; + struct DBusConnection *connection; + QList pending_calls; + struct DBusObjectPathVTable signal_vtable; +}; + +static bool constantVariantList(const QVariantList& variantList) { + // Special case, empty list == empty struct + if (variantList.isEmpty()) { + return false; + } else { + QVariant::Type type = variantList[0].type(); + // Iterate items in the list and check if they are same type + foreach(QVariant variant, variantList) { + if (variant.type() != type) { + return false; + } + } + } + return true; +} + +static QString variantToSignature(const QVariant& argument, + bool constantList = true) { + switch (argument.type()) { + case QVariant::Bool: + return "b"; + case QVariant::ByteArray: + return "ay"; + case QVariant::Char: + return "y"; + case QVariant::Int: + return "i"; + case QVariant::UInt: + return "u"; + case QVariant::StringList: + return "as"; + case QVariant::String: + return "s"; + case QVariant::LongLong: + return "x"; + case QVariant::ULongLong: + return "t"; + case QVariant::List: + { + QString signature; + QVariantList variantList = argument.toList(); + if (!constantList) { + signature += DBUS_STRUCT_BEGIN_CHAR_AS_STRING; + foreach(QVariant listItem, variantList) { + signature += variantToSignature(listItem); + } + signature += DBUS_STRUCT_END_CHAR_AS_STRING; + } else { + if (variantList.isEmpty()) + return ""; + signature = "a" + variantToSignature(variantList[0]); + } + + return signature; + } + default: + qDebug() << "Unsupported variant type: " << argument.type(); + break; + } + + return ""; +} + +static bool appendVariantToDBusMessage(const QVariant& argument, + DBusMessageIter *dbus_iter) { + int idx = 0; + DBusMessageIter array_iter; + QStringList str_list; + dbus_bool_t bool_data; + dbus_int32_t int32_data; + dbus_uint32_t uint32_data; + dbus_int64_t int64_data; + dbus_uint64_t uint64_data; + char *str_data; + char char_data; + + switch (argument.type()) { + + case QVariant::Bool: + bool_data = argument.toBool(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BOOLEAN, + &bool_data); + break; + + case QVariant::ByteArray: + str_data = argument.toByteArray().data(); + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, + DBUS_TYPE_BYTE_AS_STRING, &array_iter); + dbus_message_iter_append_fixed_array(&array_iter, + DBUS_TYPE_BYTE, + &str_data, + argument.toByteArray().size()); + dbus_message_iter_close_container(dbus_iter, &array_iter); + break; + + case QVariant::Char: + char_data = argument.toChar().toAscii(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_BYTE, + &char_data); + break; + + case QVariant::Int: + int32_data = argument.toInt(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT32, + &int32_data); + break; + + case QVariant::String: + str_data = argument.toString().toLatin1().data(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING, + &str_data); + break; + + case QVariant::StringList: + str_list = argument.toStringList(); + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, + "s", &array_iter); + for (idx = 0; idx < str_list.size(); idx++) { + str_data = str_list.at(idx).toLatin1().data(); + dbus_message_iter_append_basic(&array_iter, + DBUS_TYPE_STRING, + &str_data); + } + dbus_message_iter_close_container(dbus_iter, &array_iter); + break; + + case QVariant::UInt: + uint32_data = argument.toUInt(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT32, + &uint32_data); + break; + + case QVariant::ULongLong: + uint64_data = argument.toULongLong(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_UINT64, + &uint64_data); + break; + + case QVariant::LongLong: + int64_data = argument.toLongLong(); + dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_INT64, + &int64_data); + break; + + case QVariant::List: + { + QVariantList variantList = argument.toList(); + bool constantList = constantVariantList(variantList); + DBusMessageIter array_iter; + + // List is mapped either as an DBUS array (all items same type) + // DBUS struct (variable types) depending on constantList + if (constantList) { + // Resolve the signature for the first item + QString signature = ""; + if (!variantList.isEmpty()) { + signature = variantToSignature( + variantList[0], + constantVariantList(variantList[0].toList())); + } + + // Mapped as DBUS array + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_ARRAY, + signature.toAscii(), + &array_iter); + + foreach(QVariant listItem, variantList) { + appendVariantToDBusMessage(listItem, &array_iter); + } + + dbus_message_iter_close_container(dbus_iter, &array_iter); + } else { + // Mapped as DBUS struct + dbus_message_iter_open_container(dbus_iter, DBUS_TYPE_STRUCT, + NULL, + &array_iter); + + foreach(QVariant listItem, variantList) { + appendVariantToDBusMessage(listItem, &array_iter); + } + + dbus_message_iter_close_container(dbus_iter, &array_iter); + } + + break; + } + default: + qDebug() << "Unsupported variant type: " << argument.type(); + break; + } + + return true; +} + +static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) { + dbus_bool_t bool_data; + dbus_int32_t int32_data; + dbus_uint32_t uint32_data; + dbus_int64_t int64_data; + dbus_uint64_t uint64_data; + char *str_data; + char char_data; + int argtype = dbus_message_iter_get_arg_type(iter); + + switch (argtype) { + + case DBUS_TYPE_BOOLEAN: + { + dbus_message_iter_get_basic(iter, &bool_data); + QVariant variant((bool)bool_data); + return variant; + } + + case DBUS_TYPE_ARRAY: + { + // Handle all arrays here + int elem_type = dbus_message_iter_get_element_type(iter); + DBusMessageIter array_iter; + + dbus_message_iter_recurse(iter, &array_iter); + + if (elem_type == DBUS_TYPE_BYTE) { + QByteArray byte_array; + do { + dbus_message_iter_get_basic(&array_iter, &char_data); + byte_array.append(char_data); + } while (dbus_message_iter_next(&array_iter)); + QVariant variant(byte_array); + return variant; + } else if (elem_type == DBUS_TYPE_STRING) { + QStringList str_list; + do { + dbus_message_iter_get_basic(&array_iter, &str_data); + str_list.append(str_data); + } while (dbus_message_iter_next(&array_iter)); + QVariant variant(str_list); + return variant; + } else { + QVariantList variantList; + do { + variantList << getVariantFromDBusMessage(&array_iter); + } while (dbus_message_iter_next(&array_iter)); + QVariant variant(variantList); + return variant; + } + break; + } + + case DBUS_TYPE_BYTE: + { + dbus_message_iter_get_basic(iter, &char_data); + QChar ch(char_data); + QVariant variant(ch); + return variant; + } + + case DBUS_TYPE_INT32: + { + dbus_message_iter_get_basic(iter, &int32_data); + QVariant variant((int)int32_data); + return variant; + } + + case DBUS_TYPE_UINT32: + { + dbus_message_iter_get_basic(iter, &uint32_data); + QVariant variant((uint)uint32_data); + return variant; + } + + case DBUS_TYPE_STRING: + { + dbus_message_iter_get_basic(iter, &str_data); + QString str(str_data); + QVariant variant(str); + return variant; + } + + case DBUS_TYPE_INT64: + { + dbus_message_iter_get_basic(iter, &int64_data); + QVariant variant((qlonglong)int64_data); + return variant; + } + + case DBUS_TYPE_UINT64: + { + dbus_message_iter_get_basic(iter, &uint64_data); + QVariant variant((qulonglong)uint64_data); + return variant; + } + + case DBUS_TYPE_STRUCT: + { + // Handle all structs here + DBusMessageIter struct_iter; + dbus_message_iter_recurse(iter, &struct_iter); + + QVariantList variantList; + do { + variantList << getVariantFromDBusMessage(&struct_iter); + } while (dbus_message_iter_next(&struct_iter)); + QVariant variant(variantList); + return variant; + } + + default: + qDebug() << "Unsupported DBUS type: " << argtype; + } + + return QVariant(); +} + +static DBusHandlerResult signalHandler (DBusConnection *connection, + DBusMessage *message, + void *object_ref) { + (void)connection; + QString interface; + QString signal; + DBusDispatcher *dispatcher = (DBusDispatcher *)object_ref; + + if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL) { + interface = dbus_message_get_interface(message); + signal = dbus_message_get_member(message); + + QList arglist; + DBusMessageIter dbus_iter; + + if (dbus_message_iter_init(message, &dbus_iter)) { + // Read return arguments + while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { + arglist << getVariantFromDBusMessage(&dbus_iter); + dbus_message_iter_next(&dbus_iter); + } + } + + dispatcher->emitSignalReceived(interface, signal, arglist); + return DBUS_HANDLER_RESULT_HANDLED; + } + (void)message; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +DBusDispatcher::DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + QObject *parent) + : QObject(parent), + d_ptr(new DBusDispatcherPrivate(service, path, interface, path)) { + setupDBus(); +} + +DBusDispatcher::DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + const QString& signalPath, + QObject *parent) + : QObject(parent), + d_ptr(new DBusDispatcherPrivate(service, path, interface, signalPath)) { + setupDBus(); +} + +DBusDispatcher::~DBusDispatcher() +{ + if (d_ptr->connection) { + dbus_connection_close(d_ptr->connection); + dbus_connection_unref(d_ptr->connection); + } + delete d_ptr; +} + +void DBusDispatcher::setupDBus() +{ + d_ptr->connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL); + + if (d_ptr->connection == NULL) + qDebug() << "Unable to get DBUS connection!"; + else { + d_ptr->signal_vtable.message_function = signalHandler; + + dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE); + dbus_connection_setup_with_g_main(d_ptr->connection, NULL); + dbus_connection_register_object_path(d_ptr->connection, + d_ptr->signalPath.toLatin1(), + &d_ptr->signal_vtable, + this); + } +} + +static DBusMessage *prepareDBusCall(const QString& service, + const QString& path, + const QString& interface, + const QString& method, + const QVariant& arg1 = QVariant(), + const QVariant& arg2 = QVariant(), + const QVariant& arg3 = QVariant(), + const QVariant& arg4 = QVariant(), + const QVariant& arg5 = QVariant(), + const QVariant& arg6 = QVariant(), + const QVariant& arg7 = QVariant(), + const QVariant& arg8 = QVariant()) +{ + DBusMessage *message = dbus_message_new_method_call(service.toLatin1(), + path.toLatin1(), + interface.toLatin1(), + method.toLatin1()); + DBusMessageIter dbus_iter; + + // Append variants to DBUS message + QList arglist; + if (arg1.isValid()) arglist << arg1; + if (arg2.isValid()) arglist << arg2; + if (arg3.isValid()) arglist << arg3; + if (arg4.isValid()) arglist << arg4; + if (arg5.isValid()) arglist << arg5; + if (arg6.isValid()) arglist << arg6; + if (arg7.isValid()) arglist << arg7; + if (arg8.isValid()) arglist << arg8; + + dbus_message_iter_init_append (message, &dbus_iter); + + while (!arglist.isEmpty()) { + QVariant argument = arglist.takeFirst(); + appendVariantToDBusMessage(argument, &dbus_iter); + } + + return message; +} + +QList DBusDispatcher::call(const QString& method, + const QVariant& arg1, + const QVariant& arg2, + const QVariant& arg3, + const QVariant& arg4, + const QVariant& arg5, + const QVariant& arg6, + const QVariant& arg7, + const QVariant& arg8) { + DBusMessageIter dbus_iter; + DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path, + d_ptr->interface, method, + arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8); + DBusMessage *reply = dbus_connection_send_with_reply_and_block( + d_ptr->connection, + message, -1, NULL); + dbus_message_unref(message); + + QList replylist; + if (reply != NULL && dbus_message_iter_init(reply, &dbus_iter)) { + // Read return arguments + while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { + replylist << getVariantFromDBusMessage(&dbus_iter); + dbus_message_iter_next(&dbus_iter); + } + } + if (reply != NULL) dbus_message_unref(reply); + return replylist; +} + +class PendingCallInfo { +public: + QString method; + DBusDispatcher *dispatcher; + DBusDispatcherPrivate *priv; +}; + +static void freePendingCallInfo(void *memory) { + PendingCallInfo *info = (PendingCallInfo *)memory; + delete info; +} + +static void pendingCallFunction (DBusPendingCall *pending, + void *memory) { + PendingCallInfo *info = (PendingCallInfo *)memory; + QString errorStr; + QList replyList; + DBusMessage *reply = dbus_pending_call_steal_reply (pending); + + Q_ASSERT(reply != NULL); + + if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { + errorStr = dbus_message_get_error_name (reply); + } else { + DBusMessageIter dbus_iter; + dbus_message_iter_init(reply, &dbus_iter); + // Read return arguments + while (dbus_message_iter_get_arg_type (&dbus_iter) != DBUS_TYPE_INVALID) { + replyList << getVariantFromDBusMessage(&dbus_iter); + dbus_message_iter_next(&dbus_iter); + } + } + + info->priv->pending_calls.removeOne(pending); + info->dispatcher->emitCallReply(info->method, replyList, errorStr); + dbus_message_unref(reply); + dbus_pending_call_unref(pending); +} + +bool DBusDispatcher::callAsynchronous(const QString& method, + const QVariant& arg1, + const QVariant& arg2, + const QVariant& arg3, + const QVariant& arg4, + const QVariant& arg5, + const QVariant& arg6, + const QVariant& arg7, + const QVariant& arg8) { + DBusMessage *message = prepareDBusCall(d_ptr->service, d_ptr->path, + d_ptr->interface, method, + arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8); + DBusPendingCall *call = NULL; + dbus_bool_t ret = dbus_connection_send_with_reply(d_ptr->connection, + message, &call, -1); + PendingCallInfo *info = new PendingCallInfo; + info->method = method; + info->dispatcher = this; + info->priv = d_ptr; + + dbus_pending_call_set_notify(call, pendingCallFunction, info, freePendingCallInfo); + d_ptr->pending_calls.append(call); + return (bool)ret; +} + +void DBusDispatcher::emitSignalReceived(const QString& interface, + const QString& signal, + const QList& args) { + emit signalReceived(interface, signal, args); } + +void DBusDispatcher::emitCallReply(const QString& method, + const QList& args, + const QString& error) { + emit callReply(method, args, error); } + +void DBusDispatcher::synchronousDispatch(int timeout_ms) +{ + dbus_connection_read_write_dispatch(d_ptr->connection, timeout_ms); +} + +} // Maemo namespace + diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.h b/src/3rdparty/libconninet/src/dbusdispatcher.h new file mode 100644 index 0000000..2f71b6f --- /dev/null +++ b/src/3rdparty/libconninet/src/dbusdispatcher.h @@ -0,0 +1,91 @@ +/* * This file is part of conn-dui-settings-inet * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Aapo Makela + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#ifndef DBUSDISPATCHER_H +#define DBUSDISPATCHER_H + +#include +#include + +namespace Maemo { + +class DBusDispatcherPrivate; +class DBusDispatcher : public QObject +{ + Q_OBJECT + +public: + DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + QObject *parent = 0); + DBusDispatcher(const QString& service, + const QString& path, + const QString& interface, + const QString& signalPath, + QObject *parent = 0); + ~DBusDispatcher(); + + QList call(const QString& method, + const QVariant& arg1 = QVariant(), + const QVariant& arg2 = QVariant(), + const QVariant& arg3 = QVariant(), + const QVariant& arg4 = QVariant(), + const QVariant& arg5 = QVariant(), + const QVariant& arg6 = QVariant(), + const QVariant& arg7 = QVariant(), + const QVariant& arg8 = QVariant()); + bool callAsynchronous(const QString& method, + const QVariant& arg1 = QVariant(), + const QVariant& arg2 = QVariant(), + const QVariant& arg3 = QVariant(), + const QVariant& arg4 = QVariant(), + const QVariant& arg5 = QVariant(), + const QVariant& arg6 = QVariant(), + const QVariant& arg7 = QVariant(), + const QVariant& arg8 = QVariant()); + void emitSignalReceived(const QString& interface, + const QString& signal, + const QList& args); + void emitCallReply(const QString& method, + const QList& args, + const QString& error = ""); + void synchronousDispatch(int timeout_ms); + +Q_SIGNALS: + void signalReceived(const QString& interface, + const QString& signal, + const QList& args); + void callReply(const QString& method, + const QList& args, + const QString& error); + +protected: + void setupDBus(); + +private: + DBusDispatcherPrivate *d_ptr; +}; + +} // Maemo namespace + +#endif diff --git a/src/3rdparty/libconninet/src/iapconf.cpp b/src/3rdparty/libconninet/src/iapconf.cpp new file mode 100644 index 0000000..2e77fa5 --- /dev/null +++ b/src/3rdparty/libconninet/src/iapconf.cpp @@ -0,0 +1,299 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Aapo Makela + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include +#include +#include + +#include "iapconf.h" + +#define QSTRING_TO_CONST_CSTR(str) \ + str.toUtf8().constData() + +namespace Maemo { + +class IAPConfPrivate { +public: + ConnSettings *settings; + + ConnSettingsValue *variantToValue(const QVariant &variant); + QVariant valueToVariant(ConnSettingsValue *value); +}; + +ConnSettingsValue *IAPConfPrivate::variantToValue(const QVariant &variant) +{ + // Convert variant to ConnSettingsValue + ConnSettingsValue *value = conn_settings_value_new(); + if (value == 0) { + qWarning("IAPConf: Unable to create new ConnSettingsValue"); + return 0; + } + + switch(variant.type()) { + + case QVariant::Invalid: + value->type = CONN_SETTINGS_VALUE_INVALID; + break; + + case QVariant::String: { + char *valueStr = strdup(QSTRING_TO_CONST_CSTR(variant.toString())); + value->type = CONN_SETTINGS_VALUE_STRING; + value->value.string_val = valueStr; + break; + } + + case QVariant::Int: + value->type = CONN_SETTINGS_VALUE_INT; + value->value.int_val = variant.toInt(); + break; + + case QMetaType::Float: + case QVariant::Double: + value->type = CONN_SETTINGS_VALUE_DOUBLE; + value->value.double_val = variant.toDouble(); + break; + + case QVariant::Bool: + value->type = CONN_SETTINGS_VALUE_BOOL; + value->value.bool_val = variant.toBool() ? 1 : 0; + break; + + case QVariant::ByteArray: { + QByteArray array = variant.toByteArray(); + value->type = CONN_SETTINGS_VALUE_BYTE_ARRAY; + value->value.byte_array.len = array.size(); + value->value.byte_array.val = (unsigned char *)malloc(array.size()); + memcpy(value->value.byte_array.val, array.constData(), array.size()); + break; + } + + case QVariant::List: { + QVariantList list = variant.toList(); + ConnSettingsValue **list_val = (ConnSettingsValue **)malloc( + (list.size() + 1) * sizeof(ConnSettingsValue *)); + + for (int idx = 0; idx < list.size(); idx++) { + list_val[idx] = variantToValue(list.at(idx)); + } + list_val[list.size()] = 0; + + value->type = CONN_SETTINGS_VALUE_LIST; + value->value.list_val = list_val; + break; + } + + default: + qWarning("IAPConf: Can not handle QVariant of type %d", + variant.type()); + conn_settings_value_destroy(value); + return 0; + } + + return value; +} + +QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value) +{ + if (value == 0 || value->type == CONN_SETTINGS_VALUE_INVALID) { + return QVariant(); + } + + switch(value->type) { + + case CONN_SETTINGS_VALUE_BOOL: + return QVariant(value->value.bool_val ? true : false); + + case CONN_SETTINGS_VALUE_STRING: + return QVariant(QString(value->value.string_val)); + + case CONN_SETTINGS_VALUE_DOUBLE: + return QVariant(value->value.double_val); + + case CONN_SETTINGS_VALUE_INT: + return QVariant(value->value.int_val); + + case CONN_SETTINGS_VALUE_LIST: { + // At least with GConf backend connsettings returns byte array as list + // of ints, first check for that case + if (value->value.list_val && value->value.list_val[0]) { + bool canBeConvertedToByteArray = true; + for (int idx = 0; value->value.list_val[idx]; idx++) { + ConnSettingsValue *val = value->value.list_val[idx]; + if (val->type != CONN_SETTINGS_VALUE_INT + || val->value.int_val > 255 + || val->value.int_val < 0) { + canBeConvertedToByteArray = false; + break; + } + } + + if (canBeConvertedToByteArray) { + QByteArray array; + for (int idx = 0; value->value.list_val[idx]; idx++) { + array.append(value->value.list_val[idx]->value.int_val); + } + return array; + } + + // Create normal list + QVariantList list; + for (int idx = 0; value->value.list_val[idx]; idx++) { + list.append(valueToVariant(value->value.list_val[idx])); + } + return list; + } + } + + case CONN_SETTINGS_VALUE_BYTE_ARRAY: + return QByteArray::fromRawData((char *)value->value.byte_array.val, + value->value.byte_array.len); + + default: + return QVariant(); + } +} + +// Public class implementation + +IAPConf::IAPConf(const QString &iap_id) + : d_ptr(new IAPConfPrivate) +{ + d_ptr->settings = conn_settings_open(CONN_SETTINGS_CONNECTION, + QSTRING_TO_CONST_CSTR(iap_id)); + if (d_ptr->settings == 0) { + qWarning("IAPConf: Unable to open ConnSettings for %s", + QSTRING_TO_CONST_CSTR(iap_id)); + } +} + +IAPConf::~IAPConf() +{ + conn_settings_close(d_ptr->settings); + delete d_ptr; +} + +void IAPConf::setValue(const QString& key, const QVariant& value) +{ + // Invalid value means unsetting the given key + if (!value.isValid()) { + int err = conn_settings_unset(d_ptr->settings, + QSTRING_TO_CONST_CSTR(key)); + if (err != CONN_SETTINGS_E_NO_ERROR) { + qWarning("IAPConf: unable to unset key %s: %s", + QSTRING_TO_CONST_CSTR(key), + conn_settings_error_text((ConnSettingsError)err)); + } + return; + } + + // Convert value to ConnSettingsValue + ConnSettingsValue *val = d_ptr->variantToValue(value); + if (val == 0) return; + + // Set value and handle errors + int error = conn_settings_set(d_ptr->settings, + QSTRING_TO_CONST_CSTR(key), + val); + if (error != CONN_SETTINGS_E_NO_ERROR) { + qWarning("IAPConf: error in setting key %s: %s", + QSTRING_TO_CONST_CSTR(key), + conn_settings_error_text((ConnSettingsError)error)); + } + + // Destroy value + conn_settings_value_destroy(val); + return; +} + +void IAPConf::set(const QString& key1, const QVariant& value1, + const QString& key2, const QVariant& value2, + const QString& key3, const QVariant& value3, + const QString& key4, const QVariant& value4, + const QString& key5, const QVariant& value5, + const QString& key6, const QVariant& value6, + const QString& key7, const QVariant& value7, + const QString& key8, const QVariant& value8, + const QString& key9, const QVariant& value9, + const QString& key10, const QVariant& value10) +{ + if (!key1.isEmpty()) setValue(key1, value1); + if (!key2.isEmpty()) setValue(key2, value2); + if (!key3.isEmpty()) setValue(key3, value3); + if (!key4.isEmpty()) setValue(key4, value4); + if (!key5.isEmpty()) setValue(key5, value5); + if (!key6.isEmpty()) setValue(key6, value6); + if (!key7.isEmpty()) setValue(key7, value7); + if (!key8.isEmpty()) setValue(key8, value8); + if (!key9.isEmpty()) setValue(key9, value9); + if (!key10.isEmpty()) setValue(key10, value10); +} + +QVariant IAPConf::value(const QString& key) const +{ + ConnSettingsValue *val = conn_settings_get(d_ptr->settings, + QSTRING_TO_CONST_CSTR(key)); + + QVariant variant = d_ptr->valueToVariant(val); + conn_settings_value_destroy(val); + return variant; +} + +void IAPConf::clear(const char *default_path) +{ + Q_UNUSED(default_path); // default path is unused + + int error = conn_settings_remove(d_ptr->settings); + if (error != CONN_SETTINGS_E_NO_ERROR) { + qWarning("IAPConf: Error when removing IAP: %s", + conn_settings_error_text((ConnSettingsError)error)); + } +} + +void IAPConf::clearAll() +{ + ConnSettings *settings = conn_settings_open(CONN_SETTINGS_CONNECTION, + NULL); + conn_settings_remove(settings); + conn_settings_close(settings); +} + + +void IAPConf::getAll(QList &all_iaps, bool return_path) +{ + Q_UNUSED(return_path); // We don't use return path currently + + // Go through all available connections and add them to the list + char **ids = conn_settings_list_ids(CONN_SETTINGS_CONNECTION); + if (ids == 0) { + // No ids found - nothing to do + return; + } + + for (int idx = 0; ids[idx]; idx++) { + all_iaps.append(QString(ids[idx])); + free(ids[idx]); + } + free(ids); +} + + +} // namespace Maemo diff --git a/src/3rdparty/libconninet/src/iapconf.h b/src/3rdparty/libconninet/src/iapconf.h new file mode 100644 index 0000000..57c0856 --- /dev/null +++ b/src/3rdparty/libconninet/src/iapconf.h @@ -0,0 +1,84 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Aapo Makela + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef IAPCONF_H +#define IAPCONF_H + +#include +#include + +namespace Maemo { + +class IAPConfPrivate; +class IAPConf { +public: + IAPConf(const QString &iap_id); + virtual ~IAPConf(); + + /** + Convenience method for setting multiple IAP values with one call. + */ + void set(const QString& key1, const QVariant& value1, + const QString& key2 = "", const QVariant& value2 = QVariant(), + const QString& key3 = "", const QVariant& value3 = QVariant(), + const QString& key4 = "", const QVariant& value4 = QVariant(), + const QString& key5 = "", const QVariant& value5 = QVariant(), + const QString& key6 = "", const QVariant& value6 = QVariant(), + const QString& key7 = "", const QVariant& value7 = QVariant(), + const QString& key8 = "", const QVariant& value8 = QVariant(), + const QString& key9 = "", const QVariant& value9 = QVariant(), + const QString& key10 = "", const QVariant& value10 = QVariant()); + + /** + Set one IAP value. + */ + void setValue(const QString& key, const QVariant& value); + + /** + Get one IAP value. + */ + QVariant value(const QString& key) const; + + /** + Clear this IAP from GConf + */ + void clear(const char *default_path=0); + + /** + Clear all IAP specific information from GConf (including all IAPs). + DO NOT USE THIS FUNCTION IN ANYWHERE ELSE EXCEPT IN TEST CODE! + */ + void clearAll(); + + /** + Return all the IAPs found in the system. If return_path is true, + then do not strip the IAP path away. + */ + static void getAll(QList &all_iaps, bool return_path=false); + +private: + IAPConfPrivate *d_ptr; +}; + +} // namespace Maemo + +#endif diff --git a/src/3rdparty/libconninet/src/iapmonitor.cpp b/src/3rdparty/libconninet/src/iapmonitor.cpp new file mode 100644 index 0000000..c44cbc8 --- /dev/null +++ b/src/3rdparty/libconninet/src/iapmonitor.cpp @@ -0,0 +1,110 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include + +#include +#include "iapmonitor.h" + +namespace Maemo { + + +void conn_settings_notify_func (ConnSettingsType type, + const char *id, + const char *key, + ConnSettingsValue *value, + void *user_data); + +class IAPMonitorPrivate { +private: + IAPMonitor *monitor; + ConnSettings *settings; + +public: + + IAPMonitorPrivate(IAPMonitor *monitor) + : monitor(monitor) + { + settings = conn_settings_open(CONN_SETTINGS_CONNECTION, NULL); + conn_settings_add_notify( + settings, + (ConnSettingsNotifyFunc *)conn_settings_notify_func, + this); + } + + ~IAPMonitorPrivate() + { + conn_settings_del_notify(settings); + conn_settings_close(settings); + } + + void iapAdded(const QString &iap) + { + monitor->iapAdded(iap); + } + + void iapRemoved(const QString &iap) + { + monitor->iapRemoved(iap); + } +}; + +void conn_settings_notify_func (ConnSettingsType type, + const char *id, + const char *key, + ConnSettingsValue *value, + void *user_data) +{ + if (type != CONN_SETTINGS_CONNECTION) return; + IAPMonitorPrivate *priv = (IAPMonitorPrivate *)user_data; + + QString iapId(key); + iapId = iapId.split("/")[0]; + if (value != 0) { + priv->iapAdded(iapId); + } else if (iapId == QString(key)) { + // IAP is removed only when the directory gets removed + priv->iapRemoved(iapId); + } +} + +IAPMonitor::IAPMonitor() + : d_ptr(new IAPMonitorPrivate(this)) +{ +} + +IAPMonitor::~IAPMonitor() +{ + delete d_ptr; +} + +void IAPMonitor::iapAdded(const QString &id) +{ + // By default do nothing +} + +void IAPMonitor::iapRemoved(const QString &id) +{ + // By default do nothing +} + +} // namespace Maemo diff --git a/src/3rdparty/libconninet/src/iapmonitor.h b/src/3rdparty/libconninet/src/iapmonitor.h new file mode 100644 index 0000000..558f23e --- /dev/null +++ b/src/3rdparty/libconninet/src/iapmonitor.h @@ -0,0 +1,48 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef IAPMONITOR_H +#define IAPMONITOR_H + +#include + +namespace Maemo { + +class IAPMonitorPrivate; +class IAPMonitor { +public: + IAPMonitor(); + ~IAPMonitor(); + +protected: + virtual void iapAdded(const QString &id); + virtual void iapRemoved(const QString &id); + +private: + IAPMonitorPrivate *d_ptr; + Q_DECLARE_PRIVATE(IAPMonitor); +}; + +} // namespace Maemo + +#endif // IAPMONITOR_H + diff --git a/src/3rdparty/libconninet/src/maemo_icd.cpp b/src/3rdparty/libconninet/src/maemo_icd.cpp new file mode 100644 index 0000000..026241c --- /dev/null +++ b/src/3rdparty/libconninet/src/maemo_icd.cpp @@ -0,0 +1,1316 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include +#include "maemo_icd.h" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +namespace Maemo { + +#undef PRINT_DEBUGINFO +#ifdef PRINT_DEBUGINFO + static FILE *fdebug = NULL; +#define PDEBUG(fmt, args...) \ + do { \ + struct timeval tv; \ + gettimeofday(&tv, 0); \ + fprintf(fdebug, "DEBUG[%d]:%ld.%ld:%s:%s():%d: " fmt, \ + getpid(), \ + tv.tv_sec, tv.tv_usec, \ + __FILE__, __FUNCTION__, __LINE__, args); \ + fflush(fdebug); \ + } while(0) +#else +#define PDEBUG(fmt...) +#endif + + +/* Reference counting singleton class that creates a single connection + * to icd so that icd reference counting works as expected. This is + * needed because DBusDispatcher uses private dbus connections + * which come and go and icd cannot use that information to + * determine whether application quit or not. So we create one + * persistent connection that is only teared down when application + * quits or calls disconnect() + */ +class IcdRefCounting +{ +public: + IcdRefCounting() : first_call(true) { } + void setup(enum icd_connection_flags flag); + void cleanup(); + +private: + bool first_call; + struct DBusConnection *connection; +}; + +Q_GLOBAL_STATIC(IcdRefCounting, icdRefCounting); + + +void IcdRefCounting::setup(enum icd_connection_flags flag) +{ + if (first_call) { + DBusMessage *msg = NULL; + + connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, NULL); + dbus_connection_set_exit_on_disconnect(connection, FALSE); + dbus_connection_setup_with_g_main(connection, NULL); + + msg = dbus_message_new_method_call(ICD_DBUS_API_INTERFACE, + ICD_DBUS_API_PATH, + ICD_DBUS_API_INTERFACE, + ICD_DBUS_API_CONNECT_REQ); + if (msg == NULL) + goto out; + + if (!dbus_message_append_args(msg, + DBUS_TYPE_UINT32, &flag, + DBUS_TYPE_INVALID)) + goto out; + + if (!dbus_connection_send_with_reply(connection, msg, + NULL, 60*1000)) + goto out; + + first_call = false; + return; + + out: + dbus_connection_close(connection); + dbus_connection_unref(connection); + } +} + +void IcdRefCounting::cleanup() +{ + if (!first_call) { + dbus_connection_close(connection); + dbus_connection_unref(connection); + first_call = true; + } +} + + +class IcdPrivate +{ +public: + IcdPrivate(Icd *myfriend) + { + init(10000, IcdNewDbusInterface, myfriend); + } + + IcdPrivate(unsigned int timeout, Icd *myfriend) + { + init(timeout, IcdNewDbusInterface, myfriend); + } + + IcdPrivate(unsigned int timeout, IcdDbusInterfaceVer ver, Icd *myfriend) + { + /* Note that the old Icd interface is currently disabled and + * the new one is always used. + */ + init(timeout, IcdNewDbusInterface, myfriend); + } + + ~IcdPrivate() + { + QObject::disconnect(mDBus, + SIGNAL(signalReceived(const QString&, + const QString&, + const QList&)), + icd, + SLOT(icdSignalReceived(const QString&, + const QString&, + const QList&))); + + QObject::disconnect(mDBus, + SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + icd, + SLOT(icdCallReply(const QString&, + const QList&, + const QString&))); + + delete mDBus; + mDBus = 0; + } + + /* Icd2 dbus API functions */ + QStringList scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error); + void scanCancel(); + bool connect(icd_connection_flags flags, IcdConnectResult& result); + bool connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result); + bool connect(icd_connection_flags flags, QString& iap, QString& result); + void select(uint flags); + void disconnect(uint connect_flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id); + void disconnect(uint connect_flags); + + uint state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult &state_result); + uint statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result); + uint addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result); + + uint state(QList& state_results); + uint state_non_blocking(QList& state_results); + uint statistics(QList& stats_results); + uint addrinfo(QList& addr_results); + uint addrinfo_non_blocking(QList& addr_results); + + void signalReceived(const QString& interface, + const QString& signal, + const QList& args); + void callReply(const QString& method, + const QList& args, + const QString& error); + + QString error() { return mError; } + +public: + DBusDispatcher *mDBus; + QString mMethod; + QString mInterface; + QString mSignal; + QString mError; + QList mArgs; + QList receivedSignals; + unsigned int timeout; + IcdDbusInterfaceVer icd_dbus_version; + Icd *icd; + + void init(unsigned int dbus_timeout, IcdDbusInterfaceVer ver, + Icd *myfriend) + { + if (ver == IcdNewDbusInterface) { + mDBus = new DBusDispatcher(ICD_DBUS_API_INTERFACE, + ICD_DBUS_API_PATH, + ICD_DBUS_API_INTERFACE); + } else { + mDBus = new DBusDispatcher(ICD_DBUS_SERVICE, + ICD_DBUS_PATH, + ICD_DBUS_INTERFACE); + } + icd_dbus_version = ver; + + /* This connect has a side effect as it means that only one + * Icd object can exists in one time. This should be fixed! + */ + QObject::connect(mDBus, + SIGNAL(signalReceived(const QString&, + const QString&, + const QList&)), + myfriend, + SLOT(icdSignalReceived(const QString&, + const QString&, + const QList&))); + + QObject::connect(mDBus, + SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + myfriend, + SLOT(icdCallReply(const QString&, + const QList&, + const QString&))); + + icd = myfriend; + timeout = dbus_timeout; + +#ifdef PRINT_DEBUGINFO + if (!fdebug) { + fdebug = fopen("/tmp/maemoicd.log", "a+"); + } + PDEBUG("created %s\n", "IcdPrivate"); +#endif + } + + void clearState() + { + mMethod.clear(); + mInterface.clear(); + mSignal.clear(); + mError.clear(); + mArgs.clear(); + receivedSignals.clear(); + } + + bool doConnect(IcdConnectResult& result); + bool doConnect(QString& result); + bool doState(); +}; + + +void IcdPrivate::signalReceived(const QString& interface, + const QString& signal, + const QList& args) +{ + // Signal handler, which simply records what has been signalled + mInterface = interface; + mSignal = signal; + mArgs = args; + + //qDebug() << "signal" << signal << "received:" << args; + receivedSignals << QVariant(interface) << QVariant(signal) << QVariant(args); +} + + +void IcdPrivate::callReply(const QString& method, + const QList& /*args*/, + const QString& error) +{ + mMethod = method; + mError = error; +} + + +static void get_scan_result(QList& args, + IcdScanResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.status = args[i++].toUInt(); + ret.timestamp = args[i++].toUInt(); + ret.scan.service_type = args[i++].toString(); + ret.service_name = args[i++].toString(); + ret.scan.service_attrs = args[i++].toUInt(); + ret.scan.service_id = args[i++].toString(); + ret.service_priority = args[i++].toInt(); + ret.scan.network_type = args[i++].toString(); + ret.network_name = args[i++].toString(); + ret.scan.network_attrs = args[i++].toUInt(); + ret.scan.network_id = args[i++].toByteArray(); + ret.network_priority = args[i++].toInt(); + ret.signal_strength = args[i++].toInt(); + ret.station_id = args[i++].toString(); + ret.signal_dB = args[i++].toInt(); +} + + +static void get_connect_result(QList& args, + IcdConnectResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.connect.service_type = args[i++].toString(); + ret.connect.service_attrs = args[i++].toInt(); + ret.connect.service_id = args[i++].toString(); + ret.connect.network_type = args[i++].toString(); + ret.connect.network_attrs = args[i++].toInt(); + ret.connect.network_id = args[i++].toByteArray(); + ret.status = args[i++].toInt(); +} + + +QStringList IcdPrivate::scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error) +{ + QStringList scanned_types; + QTimer timer; + QVariant reply; + QVariantList vl; + bool last_result = false; + IcdScanResult result; + int all_waited; + + clearState(); + reply = mDBus->call(ICD_DBUS_API_SCAN_REQ, (uint)flags); + if (reply.type() != QVariant::List) + return scanned_types; + vl = reply.toList(); + if (vl.isEmpty()) { + error = "Scan did not return anything."; + return scanned_types; + } + reply = vl.first(); + scanned_types = reply.toStringList(); + //qDebug() << "Scanning:" << scanned_types; + all_waited = scanned_types.size(); + + timer.setSingleShot(true); + timer.start(timeout); + + scan_results.clear(); + while (!last_result) { + while (timer.isActive() && mInterface.isEmpty() && mError.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + //qDebug() << "Timeout happened"; + break; + } + + if (mSignal != ICD_DBUS_API_SCAN_SIG) { + //qDebug() << "Received" << mSignal << "while waiting" << ICD_DBUS_API_SCAN_SIG << ", ignoring"; + mInterface.clear(); + continue; + } + + if (mError.isEmpty()) { + QString msgInterface = receivedSignals.takeFirst().toString(); + QString msgSignal = receivedSignals.takeFirst().toString(); + QList msgArgs = receivedSignals.takeFirst().toList(); + //qDebug() << "Signal" << msgSignal << "received."; + //qDebug() << "Params:" << msgArgs; + + while (!msgSignal.isEmpty()) { + get_scan_result(msgArgs, result); + +#if 0 + qDebug() << "Received: " << + "status =" << result.status << + ", timestamp =" << result.timestamp << + ", service_type =" << result.scan.service_type << + ", service_name =" << result.service_name << + ", service_attrs =" << result.scan.service_attrs << + ", service_id =" << result.scan.service_id << + ", service_priority =" << result.service_priority << + ", network_type =" << result.scan.network_type << + ", network_name =" << result.network_name << + ", network_attrs =" << result.scan.network_attrs << + ", network_id =" << "-" << + ", network_priority =" << result.network_priority << + ", signal_strength =" << result.signal_strength << + ", station_id =" << result.station_id << + ", signal_dB =" << result.signal_dB; +#endif + + if (result.status == ICD_SCAN_COMPLETE) { + //qDebug() << "waited =" << all_waited; + if (--all_waited == 0) { + last_result = true; + break; + } + } else + scan_results << result; + + if (receivedSignals.isEmpty()) + break; + + msgInterface = receivedSignals.takeFirst().toString(); + msgSignal = receivedSignals.takeFirst().toString(); + msgArgs = receivedSignals.takeFirst().toList(); + } + mInterface.clear(); + + } else { + qWarning() << "Error while scanning:" << mError; + break; + } + } + timer.stop(); + + error = mError; + return scanned_types; +} + + +void IcdPrivate::scanCancel() +{ + mDBus->call(ICD_DBUS_API_SCAN_CANCEL); +} + + +bool IcdPrivate::doConnect(IcdConnectResult& result) +{ + QTimer timer; + bool status = false; + + timer.setSingleShot(true); + timer.start(timeout); + + //qDebug() << "Waiting" << ICD_DBUS_API_CONNECT_SIG << "signal"; + + while (timer.isActive() && mInterface.isEmpty() && + mSignal != ICD_DBUS_API_CONNECT_SIG && + mError.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + timer.stop(); + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + get_connect_result(mArgs, result); + status = true; + } else + status = false; + } else + status = false; + + return status; +} + + +bool IcdPrivate::connect(icd_connection_flags flags, IcdConnectResult& result) +{ + clearState(); + //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags); + mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags); + icdRefCounting()->setup(flags); + return doConnect(result); +} + + +bool IcdPrivate::connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result) +{ + QVariantList varlist; + QVariantList varlist2; + + foreach (ConnectParams param, params) { + QVariantList items; + + items.append(QVariant(param.connect.service_type)); + items.append(QVariant(param.connect.service_attrs)); + items.append(QVariant(param.connect.service_id)); + items.append(QVariant(param.connect.network_type)); + items.append(QVariant(param.connect.network_attrs)); + items.append(QVariant(param.connect.network_id)); + + varlist.append(items); + } + + varlist2.append(QVariant(varlist)); + + clearState(); + //mDBus->callAsynchronous(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2); + mDBus->call(ICD_DBUS_API_CONNECT_REQ, (uint)flags, varlist2); + icdRefCounting()->setup(flags); + return doConnect(result); +} + + +bool IcdPrivate::doConnect(QString& ret) +{ + QTimer timer; + bool status = false; + + timer.setSingleShot(true); + timer.start(timeout); + + while (timer.isActive() && mInterface.isEmpty() && + mError.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + timer.stop(); + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + status = true; + //ret = mArgs[0]; // TODO correctly + } else + status = false; + } else + status = false; + + return status; +} + + +bool IcdPrivate::connect(icd_connection_flags flags, QString& iap, QString& result) +{ + clearState(); + //mDBus->callAsynchronous(ICD_CONNECT_REQ, iap, (uint)flags); + mDBus->call(ICD_CONNECT_REQ, iap, (uint)flags); + icdRefCounting()->setup(flags); + return doConnect(result); +} + + +void IcdPrivate::select(uint flags) +{ + mDBus->call(ICD_DBUS_API_SELECT_REQ, flags); +} + + +void IcdPrivate::disconnect(uint flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id) +{ + clearState(); + mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + icdRefCounting()->cleanup(); +} + + +void IcdPrivate::disconnect(uint flags) +{ + clearState(); + mDBus->call(ICD_DBUS_API_DISCONNECT_REQ, flags); + icdRefCounting()->cleanup(); +} + + +static void get_state_all_result(QList& args, + IcdStateResult& ret) +{ + int i=0; + + ret.params.service_type = args[i++].toString(); + ret.params.service_attrs = args[i++].toUInt(); + ret.params.service_id = args[i++].toString(); + ret.params.network_type = args[i++].toString(); + ret.params.network_attrs = args[i++].toUInt(); + ret.params.network_id = args[i++].toByteArray(); + ret.error = args[i++].toString(); + ret.state = args[i++].toInt(); +} + + +static void get_state_all_result2(QList& args, + IcdStateResult& ret) +{ + int i=0; + + ret.params.network_type = args[i++].toString(); + ret.state = args[i++].toInt(); + + // Initialize the other values so that the caller can + // notice we only returned partial status + ret.params.service_type = QString(); + ret.params.service_attrs = 0; + ret.params.service_id = QString(); + ret.params.network_attrs = 0; + ret.params.network_id = QByteArray(); + ret.error = QString(); +} + + +uint IcdPrivate::state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult& state_result) +{ + QTimer timer; + QVariant reply; + uint total_signals; + QVariantList vl; + + clearState(); + + reply = mDBus->call(ICD_DBUS_API_STATE_REQ, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + total_signals = reply.toUInt(); + if (!total_signals) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + if (mSignal != ICD_DBUS_API_STATE_SIG) { + mInterface.clear(); + continue; + } + } + + timer.stop(); + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + if (mArgs.size()>2) + get_state_all_result(mArgs, state_result); + else { + // We are not connected as we did not get the status we asked + return 0; + } + } + } else { + qWarning() << "Error:" << mError; + } + + // The returned value should be one because we asked for one state + return total_signals; +} + + +uint IcdPrivate::state_non_blocking(QList& state_results) +{ + QTimer timer; + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdStateResult result; + + PDEBUG("%s\n", "non blocking state"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_STATE_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + state_results.clear(); + mError.clear(); + while (signals_left) { + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_STATE_SIG) { + continue; + } + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + if (mArgs.size()==2) + get_state_all_result2(mArgs, result); + else + get_state_all_result(mArgs, result); + state_results << result; + } + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + timer.stop(); + + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + + +/* Special version of the state() call which does not call event loop. + * Needed in order to fix NB#175098 where Qt4.7 webkit crashes because event + * loop is run when webkit does not expect it. This function is called from + * bearer management API syncStateWithInterface() in QNetworkSession + * constructor. + */ +uint IcdPrivate::state(QList& state_results) +{ + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdStateResult result; + time_t started; + int timeout_secs = timeout / 1000; + + PDEBUG("%s\n", "state_results"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_STATE_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + started = time(0); + state_results.clear(); + mError.clear(); + while (signals_left) { + mInterface.clear(); + while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) { + mDBus->synchronousDispatch(1000); + } + + if (time(0)>(started+timeout_secs)) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_STATE_SIG) { + continue; + } + + if (mError.isEmpty()) { + if (!mArgs.isEmpty()) { + if (mArgs.size()==2) + get_state_all_result2(mArgs, result); + else + get_state_all_result(mArgs, result); + state_results << result; + } + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + + +static void get_statistics_all_result(QList& args, + IcdStatisticsResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.params.service_type = args[i++].toString(); + ret.params.service_attrs = args[i++].toUInt(); + ret.params.service_id = args[i++].toString(); + ret.params.network_type = args[i++].toString(); + ret.params.network_attrs = args[i++].toUInt(); + ret.params.network_id = args[i++].toByteArray(); + ret.time_active = args[i++].toUInt(); + ret.signal_strength = (enum icd_nw_levels)args[i++].toUInt(); + ret.bytes_sent = args[i++].toUInt(); + ret.bytes_received = args[i++].toUInt(); +} + + +uint IcdPrivate::statistics(QList& stats_results) +{ + QTimer timer; + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdStatisticsResult result; + + clearState(); + reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + if (reply.type() != QVariant::UInt) + return 0; + signals_left = total_signals = reply.toUInt(); + + if (!signals_left) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + stats_results.clear(); + while (signals_left) { + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_STATISTICS_SIG) { + continue; + } + + if (mError.isEmpty()) { + get_statistics_all_result(mArgs, result); + stats_results << result; + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + timer.stop(); + + return total_signals; +} + + +uint IcdPrivate::statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result) +{ + QTimer timer; + QVariant reply; + uint total_signals; + QVariantList vl; + + clearState(); + + reply = mDBus->call(ICD_DBUS_API_STATISTICS_REQ, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + total_signals = reply.toUInt(); + if (!total_signals) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + if (mSignal != ICD_DBUS_API_STATISTICS_SIG) { + mInterface.clear(); + continue; + } + } + + timer.stop(); + + if (mError.isEmpty()) { + get_statistics_all_result(mArgs, stats_result); + } else { + qWarning() << "Error:" << mError; + } + + // The returned value should be one because we asked for one statistics + return total_signals; +} + + +static void get_addrinfo_all_result(QList& args, + IcdAddressInfoResult& ret) +{ + int i=0; + + if (args.isEmpty()) + return; + + ret.params.service_type = args[i++].toString(); + ret.params.service_attrs = args[i++].toUInt(); + ret.params.service_id = args[i++].toString(); + ret.params.network_type = args[i++].toString(); + ret.params.network_attrs = args[i++].toUInt(); + ret.params.network_id = args[i++].toByteArray(); + + QVariantList vl = args[i].toList(); + QVariant reply = vl.first(); + QList lst = reply.toList(); + for (int k=0; k& addr_results) +{ + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdAddressInfoResult result; + time_t started; + int timeout_secs = timeout / 1000; + + PDEBUG("%s\n", "addr_results"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + if (reply.type() != QVariant::UInt) + return 0; + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + started = time(0); + addr_results.clear(); + while (signals_left) { + mInterface.clear(); + while ((time(0)<=(started+timeout_secs)) && mInterface.isEmpty()) { + mDBus->synchronousDispatch(1000); + } + + if (time(0)>(started+timeout_secs)) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { + continue; + } + + if (mError.isEmpty()) { + get_addrinfo_all_result(mArgs, result); + addr_results << result; + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + +uint IcdPrivate::addrinfo_non_blocking(QList& addr_results) +{ + QTimer timer; + QVariant reply; + QVariantList vl; + uint signals_left, total_signals; + IcdAddressInfoResult result; + + PDEBUG("%s\n", "non blocking addrinfo"); + + clearState(); + reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + if (reply.type() != QVariant::UInt) + return 0; + signals_left = total_signals = reply.toUInt(); + if (!signals_left) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + addr_results.clear(); + while (signals_left) { + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + } + + if (!timer.isActive()) { + total_signals = 0; + break; + } + + if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { + continue; + } + + if (mError.isEmpty()) { + get_addrinfo_all_result(mArgs, result); + addr_results << result; + signals_left--; + } else { + qWarning() << "Error:" << mError; + break; + } + } + timer.stop(); + PDEBUG("total_signals=%d\n", total_signals); + return total_signals; +} + + +uint IcdPrivate::addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result) +{ + QTimer timer; + QVariant reply; + uint total_signals; + QVariantList vl; + + clearState(); + + reply = mDBus->call(ICD_DBUS_API_ADDRINFO_REQ, + service_type, service_attrs, service_id, + network_type, network_attrs, network_id); + if (reply.type() != QVariant::List) + return 0; + vl = reply.toList(); + if (vl.isEmpty()) + return 0; + reply = vl.first(); + total_signals = reply.toUInt(); + + if (!total_signals) + return 0; + + timer.setSingleShot(true); + timer.start(timeout); + + mInterface.clear(); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + if (mSignal != ICD_DBUS_API_ADDRINFO_SIG) { + mInterface.clear(); + continue; + } + } + + timer.stop(); + + if (mError.isEmpty()) { + get_addrinfo_all_result(mArgs, addr_result); + } else { + qWarning() << "Error:" << mError; + } + + // The returned value should be one because we asked for one addrinfo + return total_signals; +} + + +Icd::Icd(QObject *parent) + : QObject(parent), d(new IcdPrivate(this)) +{ +} + +Icd::Icd(unsigned int timeout, QObject *parent) + : QObject(parent), d(new IcdPrivate(timeout, this)) +{ +} + +Icd::Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent) + : QObject(parent), d(new IcdPrivate(timeout, ver, this)) +{ +} + +Icd::~Icd() +{ + delete d; +} + + +QStringList Icd::scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error) +{ + return d->scan(flags, network_types, scan_results, error); +} + + +void Icd::scanCancel() +{ + d->scanCancel(); +} + + +bool Icd::connect(icd_connection_flags flags, IcdConnectResult& result) +{ + return d->connect(flags, result); +} + + +bool Icd::connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result) +{ + return d->connect(flags, params, result); +} + + +bool Icd::connect(icd_connection_flags flags, QString& iap, QString& result) +{ + return d->connect(flags, iap, result); +} + + +void Icd::select(uint flags) +{ + d->select(flags); +} + + +void Icd::disconnect(uint connect_flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id) +{ + d->disconnect(connect_flags, service_type, + service_attrs, service_id, + network_type, network_attrs, + network_id); +} + + +void Icd::disconnect(uint connect_flags) +{ + d->disconnect(connect_flags); +} + + +uint Icd::state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult &state_result) +{ + return d->state(service_type, service_attrs, service_id, + network_type, network_attrs, network_id, + state_result); +} + + +uint Icd::statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result) +{ + return d->statistics(service_type, service_attrs, service_id, + network_type, network_attrs, network_id, + stats_result); +} + + +uint Icd::addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result) +{ + return d->addrinfo(service_type, service_attrs, service_id, + network_type, network_attrs, network_id, + addr_result); +} + + +uint Icd::state(QList& state_results) +{ + return d->state(state_results); +} + +uint Icd::state_non_blocking(QList& state_results) +{ + return d->state_non_blocking(state_results); +} + +uint Icd::statistics(QList& stats_results) +{ + return d->statistics(stats_results); +} + + +uint Icd::addrinfo(QList& addr_results) +{ + return d->addrinfo(addr_results); +} + +uint Icd::addrinfo_non_blocking(QList& addr_results) +{ + return d->addrinfo_non_blocking(addr_results); +} + +void Icd::icdSignalReceived(const QString& interface, + const QString& signal, + const QList& args) +{ + d->signalReceived(interface, signal, args); +} + + +void Icd::icdCallReply(const QString& method, + const QList& args, + const QString& error) +{ + d->callReply(method, args, error); +} + + +QString Icd::error() +{ + return d->error(); +} + +} // Maemo namespace + + diff --git a/src/3rdparty/libconninet/src/maemo_icd.h b/src/3rdparty/libconninet/src/maemo_icd.h new file mode 100644 index 0000000..d7a8d5b --- /dev/null +++ b/src/3rdparty/libconninet/src/maemo_icd.h @@ -0,0 +1,182 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef MAEMO_ICD_H +#define MAEMO_ICD_H + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "dbusdispatcher.h" +#include + +#define ICD_LONG_SCAN_TIMEOUT (30*1000) /* 30sec */ +#define ICD_SHORT_SCAN_TIMEOUT (10*1000) /* 10sec */ +#define ICD_SHORT_CONNECT_TIMEOUT (10*1000) /* 10sec */ +#define ICD_LONG_CONNECT_TIMEOUT (150*1000) /* 2.5min */ + +namespace Maemo { + +struct CommonParams { + QString service_type; + uint service_attrs; + QString service_id; + QString network_type; + uint network_attrs; + QByteArray network_id; +}; + +struct ConnectParams { + struct CommonParams connect; +}; + +struct IcdScanResult { + uint status; // see #icd_scan_status + uint timestamp; // when last seen + QString service_name; + uint service_priority; // within a service type + QString network_name; + uint network_priority; + struct CommonParams scan; + uint signal_strength; // quality, 0 (none) - 10 (good) + QString station_id; // e.g. MAC address or similar id + uint signal_dB; // use signal strength above unless you know what you are doing + + IcdScanResult() { + status = timestamp = scan.service_attrs = service_priority = + scan.network_attrs = network_priority = signal_strength = + signal_dB = 0; + } +}; + +struct IcdConnectResult { + struct CommonParams connect; + uint status; +}; + +struct IcdStateResult { + struct CommonParams params; + QString error; + uint state; +}; + +struct IcdStatisticsResult { + struct CommonParams params; + uint time_active; // in seconds + enum icd_nw_levels signal_strength; // see network_api_defines.h in icd2-dev package + uint bytes_sent; + uint bytes_received; +}; + +struct IcdIPInformation { + QString address; + QString netmask; + QString default_gateway; + QString dns1; + QString dns2; + QString dns3; +}; + +struct IcdAddressInfoResult { + struct CommonParams params; + QList ip_info; +}; + +enum IcdDbusInterfaceVer { + IcdOldDbusInterface = 0, // use the old OSSO-IC interface + IcdNewDbusInterface // use the new Icd2 interface (default) +}; + + +class IcdPrivate; +class Icd : public QObject +{ + Q_OBJECT + +public: + Icd(QObject *parent = 0); + Icd(unsigned int timeout, QObject *parent = 0); + Icd(unsigned int timeout, IcdDbusInterfaceVer ver, QObject *parent = 0); + ~Icd(); + QString error(); // returns last error string + + /* Icd2 dbus API functions */ + QStringList scan(icd_scan_request_flags flags, + QStringList &network_types, + QList& scan_results, + QString& error); + void scanCancel(); + bool connect(icd_connection_flags flags, IcdConnectResult& result); + bool connect(icd_connection_flags flags, QList& params, + IcdConnectResult& result); + bool connect(icd_connection_flags flags, QString& iap, QString& result); + void select(uint flags); + void disconnect(uint connect_flags, QString& service_type, + uint service_attrs, QString& service_id, + QString& network_type, uint network_attrs, + QByteArray& network_id); + void disconnect(uint connect_flags); + + uint state(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStateResult &state_result); + uint statistics(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdStatisticsResult& stats_result); + uint addrinfo(QString& service_type, uint service_attrs, + QString& service_id, QString& network_type, + uint network_attrs, QByteArray& network_id, + IcdAddressInfoResult& addr_result); + + uint state(QList& state_results); + uint state_non_blocking(QList& state_results); + uint statistics(QList& stats_results); + uint addrinfo(QList& addr_results); + uint addrinfo_non_blocking(QList& addr_results); + +private Q_SLOTS: + void icdSignalReceived(const QString& interface, + const QString& signal, + const QList& args); + void icdCallReply(const QString& method, + const QList& args, + const QString& error); + +private: + IcdPrivate *d; + friend class IcdPrivate; +}; + +} // Maemo namespace + +#endif diff --git a/src/3rdparty/libconninet/src/proxyconf.cpp b/src/3rdparty/libconninet/src/proxyconf.cpp new file mode 100644 index 0000000..5b27565 --- /dev/null +++ b/src/3rdparty/libconninet/src/proxyconf.cpp @@ -0,0 +1,315 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#include +#include +#include +#include +#include +#include +#include "proxyconf.h" + +#define CONF_PROXY "/system/proxy" +#define HTTP_PROXY "/system/http_proxy" + + +namespace Maemo { + +class NetworkProxyFactory : QNetworkProxyFactory { +public: + NetworkProxyFactory() { } + QList queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()); +}; + + +QList NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query) +{ + ProxyConf proxy_conf; + + QList result = proxy_conf.flush(query); + if (result.isEmpty()) + result << QNetworkProxy::NoProxy; + + return result; +} + + +class ProxyConfPrivate { +private: + // proxy values from gconf + QString mode; + bool use_http_host; + QString autoconfig_url; + QString http_proxy; + quint16 http_port; + QList ignore_hosts; + QString secure_host; + quint16 secure_port; + QString ftp_host; + quint16 ftp_port; + QString socks_host; + quint16 socks_port; + QString rtsp_host; + quint16 rtsp_port; + + QVariant getValue(QString& name); + QVariant getHttpValue(QString& name); + QVariant getValue(const char *name); + QVariant getHttpValue(const char *name); + bool isHostExcluded(const QString &host); + +public: + QString prefix; + QString http_prefix; + + void readProxyData(); + QList flush(const QNetworkProxyQuery &query); +}; + + +QVariant ProxyConfPrivate::getValue(QString& name) +{ + GConfItem item(prefix + name); + return item.value(); +} + +QVariant ProxyConfPrivate::getHttpValue(QString& name) +{ + GConfItem item(http_prefix + name); + return item.value(); +} + + +QVariant ProxyConfPrivate::getValue(const char *name) +{ + QString n = QString(name); + return getValue(n); +} + +QVariant ProxyConfPrivate::getHttpValue(const char *name) +{ + QString n = QString(name); + return getHttpValue(n); +} + + +#define GET(var, type) \ + do { \ + var = getValue(#var).to##type (); \ + /*qDebug()<<"var="<prefix = CONF_PROXY "/"; + d_ptr->http_prefix = HTTP_PROXY "/"; +} + +ProxyConf::~ProxyConf() +{ + delete d_ptr; +} + + +QList ProxyConf::flush(const QNetworkProxyQuery &query) +{ + d_ptr->readProxyData(); + return d_ptr->flush(query); +} + + +static int refcount = 0; +static QReadWriteLock lock; + +void ProxyConf::update() +{ + QWriteLocker locker(&lock); + NetworkProxyFactory *factory = new NetworkProxyFactory(); + QNetworkProxyFactory::setApplicationProxyFactory((QNetworkProxyFactory*)factory); + refcount++; +} + + +void ProxyConf::clear(void) +{ + QWriteLocker locker(&lock); + refcount--; + if (refcount == 0) + QNetworkProxyFactory::setApplicationProxyFactory(NULL); + + if (refcount<0) + refcount = 0; +} + + +} // namespace Maemo diff --git a/src/3rdparty/libconninet/src/proxyconf.h b/src/3rdparty/libconninet/src/proxyconf.h new file mode 100644 index 0000000..7711c49 --- /dev/null +++ b/src/3rdparty/libconninet/src/proxyconf.h @@ -0,0 +1,53 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + +#ifndef PROXYCONF_H +#define PROXYCONF_H + +#include +#include + +namespace Maemo { + +class ProxyConfPrivate; +class ProxyConf { +private: + ProxyConfPrivate *d_ptr; + +public: + ProxyConf(); + virtual ~ProxyConf(); + + QList flush(const QNetworkProxyQuery &query = QNetworkProxyQuery()); // read the proxies from db + + /* Note that for each update() call there should be corresponding + * clear() call because the ProxyConf class implements a reference + * counting mechanism. The factory is removed only when there is + * no one using the factory any more. + */ + static void update(void); // this builds QNetworkProxy factory + static void clear(void); // this removes QNetworkProxy factory +}; + +} // namespace Maemo + +#endif diff --git a/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp b/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp new file mode 100644 index 0000000..70deb3f --- /dev/null +++ b/src/3rdparty/libconninet/tests/ut_dbusdispatcher.cpp @@ -0,0 +1,191 @@ +/* * This file is part of conn-dui-settings-inet * + * + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Aapo Makela + * + * This software, including documentation, is protected by copyright + * controlled by Nokia Corporation. All rights are reserved. Copying, + * including reproducing, storing, adapting or translating, any or all of + * this material requires the prior written consent of Nokia Corporation. + * This material also contains confidential information which may not be + * disclosed to others without the prior written consent of Nokia. + */ + +#include +#include +#include +#include +#include + +#include + +class Ut_DBusDispatcher : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void simpleSignalReceived(const QString& interface, + const QString& signal, + const QList& args); + void simpleCallReply(const QString& method, + const QList& args, + const QString& error); + void simpleCall(); + + void complexCallReply(const QString& method, + const QList& args, + const QString& error); + void complexCall(); + +private: + Maemo::DBusDispatcher *mSubject; + QProcess *icd_stub; + + QString mMethod; + QString mInterface; + QString mSignal; + QList mArgs; +}; + +void Ut_DBusDispatcher::init() +{ + mSubject = new Maemo::DBusDispatcher("com.nokia.icd2", "/com/nokia/icd2", + "com.nokia.icd2"); + + // Start icd2 stub + icd_stub = new QProcess(this); + icd_stub->start("/usr/bin/icd2_stub.py"); + QTest::qWait(1000); +} + +void Ut_DBusDispatcher::cleanup() +{ + // Terminate icd2 stub + icd_stub->terminate(); + icd_stub->waitForFinished(); + + delete mSubject; + mSubject = 0; +} + +void Ut_DBusDispatcher::initTestCase() +{ +} + +void Ut_DBusDispatcher::cleanupTestCase() +{ +} + +void Ut_DBusDispatcher::simpleSignalReceived(const QString& interface, + const QString& signal, + const QList& args) +{ + // Signal handler, which simply records what has been signalled + mInterface = interface; + mSignal = signal; + mArgs = args; +} + +void Ut_DBusDispatcher::simpleCallReply(const QString& method, + const QList& args, + const QString& error) +{ + mMethod = method; + + // Check that method matches and at least WLAN_INFRA is returned + QVERIFY(error.isEmpty()); + QVERIFY(args[0].toStringList().contains("WLAN_INFRA")); +} + +void Ut_DBusDispatcher::simpleCall() +{ + uint flags = 0; + QList reply; + int idx = 0; + QTimer timer; + + // Connect signals + connect(mSubject, SIGNAL(signalReceived(const QString&, + const QString&, + const QList&)), + this, SLOT(simpleSignalReceived(const QString&, + const QString&, + const QList&))); + connect(mSubject, SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + this, SLOT(simpleCallReply(const QString&, + const QList&, + const QString&))); + + // Request scan and verify the call starts succesfully + QVERIFY(mSubject->callAsynchronous("scan_req", flags)); + + // Wait 1st scan signal for 10 secs + timer.setSingleShot(true); + timer.start(10000); + while (timer.isActive() && mInterface.isEmpty()) { + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + idx++; + } + timer.stop(); + + // Sanity checks for the scan result + QVERIFY(mInterface == "com.nokia.icd2"); // interface is icd2 + QVERIFY(mMethod == "scan_req"); // method is scan_req + QVERIFY(mSignal == "scan_result_sig"); // signal is scan result + QVERIFY(mArgs[0] == QVariant(0) || + mArgs[0] == QVariant(4)); // First argument is status + // (0 == NEW, 4 == COMPLETED) + //QVERIFY(mArgs.contains(QVariant("WLAN_INFRA"))); // WLAN scan result +} + +void Ut_DBusDispatcher::complexCallReply(const QString& method, + const QList& args, + const QString& error) +{ + mMethod = method; + + // Check that method has not return arguments and error is not set + QVERIFY(error.isEmpty()); + QVERIFY(args.isEmpty()); +} + +void Ut_DBusDispatcher::complexCall() +{ + uint flags = ICD_CONNECTION_FLAG_UI_EVENT; + QList reply; + QVariantList networks; + QVariantList network1; + + network1 << "" << (uint)0 << "" << "WLAN_INFRA" << (uint)0x05000011 << QByteArray("osso@46@net"); + networks << QVariant(network1); + + // Connect signal + connect(mSubject, SIGNAL(callReply(const QString&, + const QList&, + const QString&)), + this, SLOT(complexCallReply(const QString&, + const QList&, + const QString&))); + + // Request connect and verify the call starts succesfully + QVERIFY(mSubject->callAsynchronous("connect_req", flags, networks)); + + QTest::qWait(1000); + + // Sanity checks for the scan result + QVERIFY(mInterface == "com.nokia.icd2"); // interface is icd2 + QVERIFY(mMethod == "connect_req"); // method connect_req +} + +QTEST_MAIN(Ut_DBusDispatcher) + +#include "ut_dbusdispatcher.moc" diff --git a/src/3rdparty/libconninet/tests/ut_iapconf.cpp b/src/3rdparty/libconninet/tests/ut_iapconf.cpp new file mode 100644 index 0000000..6a91d61 --- /dev/null +++ b/src/3rdparty/libconninet/tests/ut_iapconf.cpp @@ -0,0 +1,186 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009 Nokia Corporation. All rights reserved. + + Contact: Aapo Makela + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + + +#include +#include + +#include + +class Ut_IAPConf : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void setupIAP(); + void setupIAPContainingDot(); + void unsetIAPValueIsNotValid(); + void verifyAllIAPs(); + void allForEmptyConfReturnsEmptyList(); + void settingInvalidValueUnsetsKey(); + +private: + Maemo::IAPConf *mSubject; +}; + +void Ut_IAPConf::init() +{ + mSubject = new Maemo::IAPConf("test_iap"); +} + +void Ut_IAPConf::cleanup() +{ + // Clear made settings + mSubject->clear(); + + delete mSubject; + mSubject = 0; +} + +void Ut_IAPConf::initTestCase() +{ +} + +void Ut_IAPConf::cleanupTestCase() +{ +} + +void Ut_IAPConf::setupIAP() +{ + // Set bunch of values + mSubject->set("ipv4_type", "AUTO", + "wlan_wepkey1", "connt", + "wlan_wepdefkey", 1, + "wlan_ssid", QByteArray("CONNTEST-1")); + + // Set one value + mSubject->setValue("type", "WLAN_INFRA"); + + // Check all values that they were set correctly + QVERIFY(mSubject->value("ipv4_type").toString() == "AUTO"); + QVERIFY(mSubject->value("wlan_wepkey1").toString() == "connt"); + QVERIFY(mSubject->value("wlan_wepdefkey").toInt() == 1); + QVERIFY(mSubject->value("wlan_ssid").toByteArray() == QByteArray("CONNTEST-1")); + QVERIFY(mSubject->value("type").toString() == "WLAN_INFRA"); +} + +void Ut_IAPConf::setupIAPContainingDot() +{ + delete mSubject; + mSubject = new Maemo::IAPConf("test.iap"); + + // Set and check one value + mSubject->setValue("type", "DUMMY"); + QVERIFY(mSubject->value("type").toString() == "DUMMY"); +} + +void Ut_IAPConf::unsetIAPValueIsNotValid() +{ + QVariant invalidValue = mSubject->value("this_value_does_not_exist"); + QVERIFY(invalidValue.isValid() == false); +} + +void Ut_IAPConf::verifyAllIAPs() +{ + int count = 0, extras = 0; + QRegExp regexp("iap[1-3]"); + Maemo::IAPConf iap1("iap1"); + Maemo::IAPConf iap2("iap2"); + Maemo::IAPConf iap3("iap3"); + + iap1.clear(); + iap2.clear(); + iap3.clear(); + + iap1.setValue("name", "iap1"); + iap2.setValue("name", "iap2"); + iap3.setValue("name", "iap3"); + + count = extras = 0; + QList iaps; + Maemo::IAPConf::getAll(iaps, true); + foreach (QString iap_path, iaps) { + QString iap_id = iap_path.section('/', 5); /* This is the IAP id */ + if (!iap_id.contains(regexp)) { + extras++; + continue; + } + Maemo::IAPConf iap(iap_id); + QString name = iap.value("name").toString(); + QVERIFY(name == iap_id); + count++; + } + QCOMPARE(count, iaps.size()-extras); + + iap1.clear(); + iap2.clear(); + iap3.clear(); + + iap1.setValue("name", "iap1"); + iap2.setValue("name", "iap2"); + iap3.setValue("name", "iap3"); + + count = extras = 0; + Maemo::IAPConf::getAll(iaps); + foreach (QString iap_id, iaps) { + if (!iap_id.contains(regexp)) { + extras++; + continue; + } + Maemo::IAPConf iap(iap_id); + QString name = iap.value("name").toString(); + QVERIFY(name == iap_id); + count++; + } + QCOMPARE(count, iaps.size()-extras); +} + +void Ut_IAPConf::allForEmptyConfReturnsEmptyList() +{ + // Clear everything in configuration + mSubject->clearAll(); + + // Get all for a list and check that it is empty + QStringList iaps; + mSubject->getAll(iaps); + QVERIFY(iaps.isEmpty()); +} + +void Ut_IAPConf::settingInvalidValueUnsetsKey() +{ + // Setup some IAP + setupIAP(); + + // Set invalid value to unset "wlan_wepdefkey" key and verify that the + // value is unset + mSubject->setValue("wlan_wepdefkey", QVariant()); + QVERIFY(!mSubject->value("wlan_wepdefkey").isValid()); +} + +QTEST_MAIN(Ut_IAPConf) + +#include "ut_iapconf.moc" diff --git a/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp b/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp new file mode 100644 index 0000000..f14f623 --- /dev/null +++ b/src/3rdparty/libconninet/tests/ut_iapmonitor.cpp @@ -0,0 +1,118 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2009-2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + + +#include +#include + +#include +#include + +static const char *iap_id = "test_monitor_1"; + +class TestIAPMonitor : public Maemo::IAPMonitor +{ +public: + QString addedIap; + QString removedIap; + +protected: + virtual void iapAdded(const QString &id) + { + addedIap = id; + } + + virtual void iapRemoved(const QString &id) + { + removedIap = id; + } +}; + +class Ut_IAPMonitor : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void check(); + +private: + TestIAPMonitor *mon; + Maemo::IAPConf *iap; +}; + +void Ut_IAPMonitor::init() +{ + mon = new TestIAPMonitor; +} + +void Ut_IAPMonitor::cleanup() +{ + delete mon; + mon = 0; +} + +void Ut_IAPMonitor::initTestCase() +{ +} + +void Ut_IAPMonitor::cleanupTestCase() +{ +} + +void Ut_IAPMonitor::check() +{ + QVERIFY(mon->addedIap.isEmpty()); + + iap = new Maemo::IAPConf(iap_id); + iap->set("ipv4_type", "AUTO", + "wlan_wepkey1", "connt", + "wlan_wepdefkey", 1, + "wlan_ssid", QByteArray(iap_id)); + + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + QVERIFY(mon->addedIap == iap_id); + mon->addedIap.clear(); + + QVERIFY(mon->removedIap.isEmpty()); + + // Unset only one value and verify that IAP is not removed + iap->set("ipv4_type", QVariant()); + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + QVERIFY(mon->removedIap.isEmpty()); + + // Clear the whole IAP and check that it is removed + iap->clear(); + delete iap; + + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); + + QVERIFY(mon->removedIap == iap_id); +} + +QTEST_MAIN(Ut_IAPMonitor) + +#include "ut_iapmonitor.moc" diff --git a/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp b/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp new file mode 100644 index 0000000..494829d --- /dev/null +++ b/src/3rdparty/libconninet/tests/ut_maemo_icd.cpp @@ -0,0 +1,274 @@ +/* + * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * + * Contact: Jukka Rissanen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + + +// !!!! +// !!!! NOTE: THESE TEST DO NOT REALLY WORK YET BECAUSE OF MISSING +// !!!! FUNCTIONALITY IN ICD2 STUB. YOU HAVE BEEN WARNED. +// !!!! + + +#include +#include +#include +#include +#include + +#include "maemo_icd.h" + +class Ut_MaemoIcd : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + void scan_req(); + void scan_cancel_req(); + void connect_req_default(); + void state_req_all(); + void state_req(); + void statistics_req_all(); + void statistics_req(); + void addrinfo_req_all(); + void addrinfo_req(); + +private: + void disconnect_req_default(); // this is currently not run + void connect_req_specific(); // this is currently not run + QProcess *icd_stub; + bool connect_iap(Maemo::IcdConnectResult &connect_result, + QString &result, + QString &error, + QString iap=QString()); +}; + + +QString create_error_str(Maemo::Icd &icd) +{ + return icd.error(); +} + + +void Ut_MaemoIcd::init() +{ + icd_stub = new QProcess(this); + icd_stub->setStandardOutputFile("/tmp/ut_maemo_icd.log"); + icd_stub->start("/usr/bin/icd2_stub.py"); + QTest::qWait(1000); + + // Set the statistics + QProcess dbus_send; + dbus_send.start("dbus-send --type=method_call --system " + "--dest=com.nokia.icd2 /com/nokia/icd2 " + "com.nokia.icd2.testing.set_statistics " + "uint32:1024 uint32:256"); + dbus_send.waitForFinished(); + +} + +void Ut_MaemoIcd::cleanup() +{ + icd_stub->terminate(); + icd_stub->waitForFinished(); +} + +void Ut_MaemoIcd::initTestCase() +{ +} + +void Ut_MaemoIcd::cleanupTestCase() +{ +} + +void Ut_MaemoIcd::scan_req() +{ + QList scanned; + QStringList scannedNetworkTypes; + QStringList networkTypesToScan; + QString error; + Maemo::Icd icd(ICD_SHORT_SCAN_TIMEOUT); + + scannedNetworkTypes = icd.scan(ICD_SCAN_REQUEST_ACTIVE, + networkTypesToScan, + scanned, + error); + QVERIFY(error.isEmpty()); + QCOMPARE(scanned.size(), 3); + QVERIFY(scannedNetworkTypes[0] == "WLAN_INFRA"); + QVERIFY(scannedNetworkTypes[1] == "DUN_GSM_PS"); +} + +void Ut_MaemoIcd::scan_cancel_req() +{ + Maemo::Icd icd; + icd.scanCancel(); + // Not much to verify here +} + +bool Ut_MaemoIcd::connect_iap(Maemo::IcdConnectResult &connect_result, + QString &result, + QString &error, + QString iap) +{ + icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT; + bool st; + Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT); + + if (iap.isEmpty()) { + qDebug() << "connecting to default IAP"; + st = icd.connect(flags, connect_result); + } else { + qDebug() << "connecting to" << iap; + st = icd.connect(flags, iap, result); + } + + error = create_error_str(icd); + return st; +} + +void Ut_MaemoIcd::connect_req_default() +{ + Maemo::IcdConnectResult connect_result; + QString result, error; + bool st; + st = connect_iap(connect_result, result, error); + QVERIFY2(st, error.toAscii().data()); + result = connect_result.connect.network_id.data(); + qDebug() << result; +} + + +void Ut_MaemoIcd::disconnect_req_default() +{ + icd_connection_flags flags = ICD_CONNECTION_FLAG_USER_EVENT; + bool st; + Maemo::Icd icd(ICD_SHORT_CONNECT_TIMEOUT); + icd.disconnect(flags); +} + + +void Ut_MaemoIcd::connect_req_specific() +{ + Maemo::IcdConnectResult connect_result; + QString result; + QString error; + bool st; + st = connect_iap(connect_result, result, error, "wpa2gx2.osso.net"); + QVERIFY2(st, error.toAscii().data()); + qDebug() << result; +} + + +void Ut_MaemoIcd::state_req_all() +{ + QList state_results; + Maemo::Icd icd; + int sig; + sig = icd.state(state_results); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +void Ut_MaemoIcd::state_req() +{ + Maemo::IcdStateResult state_result; + Maemo::Icd icd; + int sig; + QString service_type, service_id; + QString network_type("WLAN_INFRA"); + QByteArray network_id("wpa2gx2.osso.net"); + sig = icd.state(service_type, 0, service_id, + network_type, (uint)0x17a1, network_id, + state_result); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +void Ut_MaemoIcd::statistics_req_all() +{ + QList stats_results; + Maemo::Icd icd; + int sig; + QString err; + sig = icd.statistics(stats_results); + err = create_error_str(icd); + if (!err.isEmpty()) + QVERIFY2(sig==1, err.toAscii().data()); + else + QCOMPARE(sig, 1); + + for(int i=0; i addr_results; + Maemo::Icd icd; + int sig; + sig = icd.addrinfo(addr_results); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +void Ut_MaemoIcd::addrinfo_req() +{ + Maemo::IcdAddressInfoResult addr_result; + Maemo::Icd icd; + int sig; + QString service_type, service_id; + QString network_type("WLAN_INFRA"); + QByteArray network_id("wpa2gx2.osso.net"); + sig = icd.addrinfo(service_type, 0, service_id, + network_type, (uint)0x17a1, network_id, + addr_result); + QVERIFY2(sig==1, create_error_str(icd).toAscii().data()); +} + + +QTEST_MAIN(Ut_MaemoIcd) + +#include "ut_maemo_icd.moc" diff --git a/src/3rdparty/libconninet/tests/ut_proxyconf.cpp b/src/3rdparty/libconninet/tests/ut_proxyconf.cpp new file mode 100644 index 0000000..1f407f0 --- /dev/null +++ b/src/3rdparty/libconninet/tests/ut_proxyconf.cpp @@ -0,0 +1,400 @@ +/* + libconninet - Internet Connectivity support library + + Copyright (C) 2010 Nokia Corporation. All rights reserved. + + Contact: Jukka Rissanen + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + version 2.1 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA +*/ + + +#include +#include +#include +#include + +#include "../src/proxyconf.h" + +class Ut_ProxyConf : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void init(); + void cleanup(); + void initTestCase(); + void cleanupTestCase(); + + // tests without the factory + void proxy_ftp_no_factory_ok_auto(); + void proxy_ftp_no_factory_ok_manual(); + void proxy_http_no_factory_ok_manual(); + void proxy_https_no_factory_ok_manual(); + void proxy_socks_no_factory_ok_manual(); + void proxy_default_no_factory_ok_manual(); + + // tests using the factory + void proxy_ftp_factory_ok_auto(); + void proxy_ftp_factory_ok_manual(); + void proxy_http_factory_ok_manual(); + void proxy_https_factory_ok_manual(); + void proxy_socks_factory_ok_manual(); + void proxy_http_factory_ok_manual_clear(); + void proxy_default_factory_ok_manual(); + void proxy_http_factory_ok_manual_ignore_list(); + void proxy_default_factory_ok_manual_system(); + +private: + Maemo::ProxyConf *pc; +}; + + +void put(QString var, QString type, QString value) +{ + QProcess gconf; + if (value.isEmpty()) + gconf.start(QString("gconftool-2 -u /system/proxy/"+var)); + else + gconf.start(QString("gconftool-2 -s /system/proxy/"+var+" -t "+type+" "+value)); + gconf.waitForFinished(); +} + +void put_http(QString var, QString type, QString value) +{ + QProcess gconf; + if (value.isEmpty()) + gconf.start(QString("gconftool-2 -u /system/http_proxy/"+var)); + else + gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t "+type+" "+value)); + gconf.waitForFinished(); +} + +void put_list(QString var, QString type, QList value) +{ + QProcess gconf; + QString values = "["; + foreach (QString str, value) + values = values + str + ","; + values.chop(1); + values = values + "]"; + + gconf.start(QString("gconftool-2 -s /system/http_proxy/"+var+" -t list --list-type="+type+" "+values)); + gconf.waitForFinished(); +} + + +void Ut_ProxyConf::init() +{ + put_http("host", "string", "my.proxy.com"); + put_http("port", "int", "8080"); + + QList list; + list.append("foo.bar.com"); + list.append("192.168.19.69"); + list.append("192.168.20.0/24"); + list.append("bar.foo.com"); + put_list("ignore_hosts", "string", list); + put_http("use_http_host", "boolean", "true"); + + put("mode", "string", "auto"); + put("autoconfig_url", "string", "http://foo.bar.com/autoconf"); + put("secure_host", "string", "secure_host.com"); + put("secure_port", "int", "112"); + + put("ftp_host", "string", "ftp.nuukia.com"); + put("ftp_port", "int", "2000"); + put("socks_host", "string", "socks.host.com"); + put("socks_port", "int", "10080"); + put("rtsp_host", "string", "rtsp.voice.com"); + put("rtsp_port", "int", "1554"); + + pc = new Maemo::ProxyConf(); +} + +void Ut_ProxyConf::cleanup() +{ + delete pc; + pc = 0; +} + +void Ut_ProxyConf::initTestCase() +{ +} + +void Ut_ProxyConf::cleanupTestCase() +{ +} + + +void Ut_ProxyConf::proxy_ftp_no_factory_ok_auto() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + + nplist = pc->flush(query); + QVERIFY(nplist.length()==0); +} + + +void Ut_ProxyConf::proxy_ftp_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + + put("mode", "string", "manual"); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==3); + QVERIFY(nplist.first().type() == QNetworkProxy::FtpCachingProxy); +} + + +void Ut_ProxyConf::proxy_http_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + + put("mode", "string", "manual"); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==3); + QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy); +} + + +void Ut_ProxyConf::proxy_https_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/")); + + put("mode", "string", "manual"); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==2); + QVERIFY(nplist.first().type() == QNetworkProxy::HttpProxy); +} + + +void Ut_ProxyConf::proxy_socks_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + + put("mode", "string", "manual"); + put_http("host", "string", ""); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==2); + QVERIFY(nplist.first().type() == QNetworkProxy::Socks5Proxy); +} + + +void Ut_ProxyConf::proxy_default_no_factory_ok_manual() +{ + QList nplist; + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/")); + + put("mode", "string", "manual"); + put("socks_host", "string", ""); + put("secure_host", "string", ""); + + nplist = pc->flush(query); + foreach (QNetworkProxy proxy, nplist) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(nplist.length()==0); +} + + +void Ut_ProxyConf::proxy_ftp_factory_ok_auto() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + Maemo::ProxyConf::update(); + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_ftp_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("ftp://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::FtpCachingProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_http_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_https_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("https://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==2); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_socks_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + put_http("host", "string", ""); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==2); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::Socks5Proxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_http_factory_ok_manual_clear() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + put_http("host", "string", "192.168.1.1"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + + Maemo::ProxyConf::clear(); + listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); +} + + +void Ut_ProxyConf::proxy_default_factory_ok_manual() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("foobar://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + put("socks_host", "string", ""); + put("secure_host", "string", ""); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_http_factory_ok_manual_ignore_list() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://192.168.19.70/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + + foreach (QNetworkProxy proxy, listOfProxies) { + qDebug() << "proxy: " << proxy.hostName() << "port" << proxy.port(); + } + QVERIFY(listOfProxies.length()==3); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::HttpProxy); + + query = QNetworkProxyQuery(QUrl("http://192.168.20.10/")); + listOfProxies = QNetworkProxyFactory::proxyForQuery(query); + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + +void Ut_ProxyConf::proxy_default_factory_ok_manual_system() +{ + QNetworkProxyQuery query = QNetworkProxyQuery(QUrl("http://maps.google.com/")); + Maemo::ProxyConf::update(); + + put("mode", "string", "manual"); + + QList listOfProxies = QNetworkProxyFactory::systemProxyForQuery(query); + + QVERIFY(listOfProxies.length()==1); + QVERIFY(listOfProxies.first().type() == QNetworkProxy::NoProxy); + Maemo::ProxyConf::clear(); +} + + + + +QTEST_MAIN(Ut_ProxyConf) + +#include "ut_proxyconf.moc" -- cgit v0.12 From 7fcc1daf1762d345ca39f9599a8de2567bb8e788 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 16 Aug 2010 15:17:27 +1000 Subject: More positioners with QGraphicsWidgets fixes. Task-number: QTBUG-12416 Reviewed-by: Michael Brasser --- .../graphicsitems/qdeclarativepositioners.cpp | 8 +++- .../tst_qdeclarativepositioners.cpp | 44 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index f32c532..1a5c42d 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -70,6 +70,8 @@ void QDeclarativeBasePositionerPrivate::watchChanges(QGraphicsObject *other) Q_Q(QDeclarativeBasePositioner); QObject::connect(other, SIGNAL(widthChanged()), q, SLOT(graphicsWidgetGeometryChanged())); QObject::connect(other, SIGNAL(heightChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::connect(other, SIGNAL(opacityChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::connect(other, SIGNAL(visibleChanged()), q, SLOT(graphicsWidgetGeometryChanged())); } } @@ -82,6 +84,8 @@ void QDeclarativeBasePositionerPrivate::unwatchChanges(QGraphicsObject* other) Q_Q(QDeclarativeBasePositioner); QObject::disconnect(other, SIGNAL(widthChanged()), q, SLOT(graphicsWidgetGeometryChanged())); QObject::disconnect(other, SIGNAL(heightChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::disconnect(other, SIGNAL(opacityChanged()), q, SLOT(graphicsWidgetGeometryChanged())); + QObject::disconnect(other, SIGNAL(visibleChanged()), q, SLOT(graphicsWidgetGeometryChanged())); } } @@ -235,7 +239,7 @@ void QDeclarativeBasePositioner::prePositioning() QGraphicsObject *child = children.at(ii)->toGraphicsObject(); if (!child) continue; - QDeclarativeItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); + QGraphicsItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); PositionedItem *item = 0; PositionedItem posItem(child); int wIdx = oldItems.find(posItem); @@ -320,7 +324,7 @@ void QDeclarativeBasePositioner::finishApplyTransitions() static inline bool isInvisible(QGraphicsObject *child) { - QDeclarativeItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); + QGraphicsItemPrivate *childPrivate = static_cast(QGraphicsItemPrivate::get(child)); return child->opacity() == 0.0 || childPrivate->explicitlyHidden || !childPrivate->width() || !childPrivate->height(); } diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp index 0663991..887be50 100644 --- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp +++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN @@ -77,6 +78,7 @@ private slots: void test_flow_resize(); void test_flow_implicit_resize(); void test_conflictinganchors(); + void test_vertical_qgraphicswidget(); private: QDeclarativeView *createView(const QString &filename); }; @@ -771,6 +773,48 @@ void tst_QDeclarativePositioners::test_conflictinganchors() QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow")); } +void tst_QDeclarativePositioners::test_vertical_qgraphicswidget() +{ + QDeclarativeView *canvas = createView(SRCDIR "/data/verticalqgraphicswidget.qml"); + + QGraphicsWidget *one = canvas->rootObject()->findChild("one"); + QVERIFY(one != 0); + + QGraphicsWidget *two = canvas->rootObject()->findChild("two"); + QVERIFY(two != 0); + + QGraphicsWidget *three = canvas->rootObject()->findChild("three"); + QVERIFY(three != 0); + + QCOMPARE(one->x(), 0.0); + QCOMPARE(one->y(), 0.0); + QCOMPARE(two->x(), 0.0); + QCOMPARE(two->y(), 50.0); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 60.0); + + QDeclarativeItem *column = canvas->rootObject()->findChild("column"); + QVERIFY(column); + QCOMPARE(column->height(), 80.0); + QCOMPARE(column->width(), 50.0); + + two->resize(QSizeF(two->size().width(), 20.0)); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 70.0); + + two->setOpacity(0.0); + QCOMPARE(one->x(), 0.0); + QCOMPARE(one->y(), 0.0); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 50.0); + + one->setVisible(false); + QCOMPARE(three->x(), 0.0); + QCOMPARE(three->y(), 0.0); + + delete canvas; +} + QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename) { QDeclarativeView *canvas = new QDeclarativeView(0); -- cgit v0.12 From b83c295650b3f28bc9da542acf4652f4ce2d168b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 16 Aug 2010 15:38:15 +1000 Subject: Handle QGraphicsWidgets in Flickable Task-number: QTBUG-12830 Reviewed-by: Michael Brasser --- .../graphicsitems/qdeclarativeflickable.cpp | 2 +- .../tst_qdeclarativeflickable.cpp | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 19cabdd..9bcadd2 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1027,7 +1027,7 @@ void QDeclarativeFlickable::cancelFlick() void QDeclarativeFlickablePrivate::data_append(QDeclarativeListProperty *prop, QObject *o) { - QDeclarativeItem *i = qobject_cast(o); + QGraphicsObject *i = qobject_cast(o); if (i) i->setParentItem(static_cast(prop->data)->contentItem); else diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index 678996b..e7ded8a 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include #ifdef Q_OS_SYMBIAN @@ -67,9 +68,13 @@ private slots: void flickDeceleration(); void pressDelay(); void flickableDirection(); + void qgraphicswidget(); private: QDeclarativeEngine engine; + + template + T *findItem(QGraphicsObject *parent, const QString &objectName); }; tst_qdeclarativeflickable::tst_qdeclarativeflickable() @@ -261,6 +266,38 @@ void tst_qdeclarativeflickable::flickableDirection() QCOMPARE(spy.count(),3); } +void tst_qdeclarativeflickable::qgraphicswidget() +{ + QDeclarativeEngine engine; + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickableqgraphicswidget.qml")); + QDeclarativeFlickable *flickable = qobject_cast(c.create()); + + QVERIFY(flickable != 0); + QGraphicsWidget *widget = findItem(flickable->contentItem(), "widget1"); + QVERIFY(widget); +} + +template +T *tst_qdeclarativeflickable::findItem(QGraphicsObject *parent, const QString &objectName) +{ + const QMetaObject &mo = T::staticMetaObject; + //qDebug() << parent->childItems().count() << "children"; + for (int i = 0; i < parent->childItems().count(); ++i) { + QGraphicsObject *item = qobject_cast(parent->childItems().at(i)); + if(!item) + continue; + //qDebug() << "try" << item; + if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) { + return static_cast(item); + } + item = findItem(item, objectName); + if (item) + return static_cast(item); + } + + return 0; +} + QTEST_MAIN(tst_qdeclarativeflickable) #include "tst_qdeclarativeflickable.moc" -- cgit v0.12 From af675cf96d4d13b066a669eae847ad56485927d0 Mon Sep 17 00:00:00 2001 From: mae Date: Mon, 16 Aug 2010 10:11:20 +0200 Subject: Fix game could not be restarted Task-number: QT-3668 --- demos/declarative/snake/content/snake.js | 5 ++++- demos/declarative/snake/snake.qml | 16 +--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js index 0f0dbf7..fab7834 100644 --- a/demos/declarative/snake/content/snake.js +++ b/demos/declarative/snake/content/snake.js @@ -35,9 +35,12 @@ function startNewGame() if (heartbeat.running) { endGame(); startNewGameTimer.running = true; + state = "starting"; return; } + state = "starting"; + numRows = numRowsAvailable; numColumns = numColumnsAvailable; board = new Array(numRows * numColumns); @@ -80,7 +83,6 @@ function startNewGame() waitForCookie = 5; score = 0; startHeartbeatTimer.running = true; - heartbeat.running = true; } function endGame() @@ -94,6 +96,7 @@ function endGame() } lastScore = score; highScores.saveScore(lastScore); + state = ""; } function move() { diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml index b1344af..ed3bac9 100644 --- a/demos/declarative/snake/snake.qml +++ b/demos/declarative/snake/snake.qml @@ -94,6 +94,7 @@ Rectangle { Timer { id: startHeartbeatTimer; interval: 1000 ; + onTriggered: { state = "running"; heartbeat.running = true; } } @@ -208,21 +209,6 @@ Rectangle { Keys.onUpPressed: if (state == "starting" || direction != 2) Logic.scheduleDirection(0); Keys.onDownPressed: if (state == "starting" || direction != 0) Logic.scheduleDirection(2); - Connections { - target: startHeartbeatTimer - onRunningChanged: { - if (startHeartbeatTimer.running) - screen.state = "starting"; - else - screen.state = "running" - } - } - Connections { - target: heartbeat - onRunningChanged: if (!heartbeat.running) screen.state = ""; - } - - states: [ State { name: "starting" -- cgit v0.12 From aebac76abbc5ed617d5998009afb06f07b9e237f Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Mon, 16 Aug 2010 12:15:52 +0200 Subject: Fix compilation: QT_NO_LINEEDIT Merge-request: 774 Reviewed-by: Oswald Buddenhagen --- src/gui/util/qcompleter.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index 04d6de9..e718212 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -921,10 +921,12 @@ void QCompleterPrivate::showPopup(const QRect& rect) void QCompleterPrivate::_q_fileSystemModelDirectoryLoaded(const QString &path) { Q_Q(QCompleter); +#ifndef QT_NO_LINEEDIT QLineEdit *lineEdit = qobject_cast(widget); //the path given by QFileSystemModel does not end with / if (lineEdit && !lineEdit->text().isEmpty() && !q->completionPrefix().isEmpty() && q->completionPrefix() != path + QLatin1Char('/')) q->complete(); +#endif } /*! -- cgit v0.12 From f7a501515fcf1dafecb88a40e18721ea14fd0a13 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 16 Aug 2010 13:33:16 +0200 Subject: QtDeclarative debugging: Add an option not to stream the properties of an object. Streaming all the properties is too slow, and we do not need them in the debugger of creator. Reviewed-by: Lasse Holmstedt --- src/declarative/debugger/qdeclarativedebug.cpp | 4 ++-- src/declarative/qml/qdeclarativeenginedebug.cpp | 16 ++++++++++++---- src/declarative/qml/qdeclarativeenginedebug_p.h | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp index b950aef..154df51 100644 --- a/src/declarative/debugger/qdeclarativedebug.cpp +++ b/src/declarative/debugger/qdeclarativedebug.cpp @@ -507,7 +507,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclar QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() - << false; + << false << true; d->client->sendMessage(message); } else { query->m_state = QDeclarativeDebugQuery::Error; @@ -530,7 +530,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(cons QByteArray message; QDataStream ds(&message, QIODevice::WriteOnly); ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId() - << true; + << true << true; d->client->sendMessage(message); } else { query->m_state = QDeclarativeDebugQuery::Error; diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index 1837366..ed98e3c 100644 --- a/src/declarative/qml/qdeclarativeenginedebug.cpp +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp @@ -182,7 +182,7 @@ QVariant QDeclarativeEngineDebugServer::valueContents(const QVariant &value) con } void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message, - QObject *object, bool recur) + QObject *object, bool recur, bool dumpProperties) { message << objectData(object); @@ -209,6 +209,8 @@ void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message, continue; QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child); if (signal) { + if (!dumpProperties) + continue; QDeclarativeObjectProperty prop; prop.type = QDeclarativeObjectProperty::SignalProperty; prop.hasNotifySignal = false; @@ -229,12 +231,17 @@ void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message, fakeProperties << prop; } else { if (recur) - buildObjectDump(message, child, recur); + buildObjectDump(message, child, recur, dumpProperties); else message << objectData(child); } } + if (!dumpProperties) { + message << 0; + return; + } + message << (object->metaObject()->propertyCount() + fakeProperties.count()); for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) @@ -372,8 +379,9 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message) int queryId; int objectId; bool recurse; + bool dumpProperties = true; - ds >> queryId >> objectId >> recurse; + ds >> queryId >> objectId >> recurse >> dumpProperties; QObject *object = QDeclarativeDebugService::objectForId(objectId); @@ -382,7 +390,7 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message) rs << QByteArray("FETCH_OBJECT_R") << queryId; if (object) - buildObjectDump(rs, object, recurse); + buildObjectDump(rs, object, recurse, dumpProperties); sendMessage(reply); } else if (type == "WATCH_OBJECT") { diff --git a/src/declarative/qml/qdeclarativeenginedebug_p.h b/src/declarative/qml/qdeclarativeenginedebug_p.h index ea35b40..aa450f3 100644 --- a/src/declarative/qml/qdeclarativeenginedebug_p.h +++ b/src/declarative/qml/qdeclarativeenginedebug_p.h @@ -103,7 +103,7 @@ private Q_SLOTS: private: void buildObjectList(QDataStream &, QDeclarativeContext *); - void buildObjectDump(QDataStream &, QObject *, bool); + void buildObjectDump(QDataStream &, QObject *, bool, bool); QDeclarativeObjectData objectData(QObject *); QDeclarativeObjectProperty propertyData(QObject *, int); QVariant valueContents(const QVariant &defaultValue) const; -- cgit v0.12 From a9c0fbd5e946ae6e90b6db6dd4aea64c824a4066 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 16 Aug 2010 04:33:03 +0200 Subject: qgrayraster: Speed up rendering of small cubic splines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on these upstream freetype2 commits: 7fb3ef64a24489189113f693696eaf935f500c3f e419f48b40a746465a6c8e1d446b407b8677bfed Reviewed-by: Samuel Rødal --- src/gui/painting/qgrayraster.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c index 5e7c67a..539a33c 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.c @@ -956,53 +956,49 @@ const QT_FT_Vector* control2, const QT_FT_Vector* to ) { - TPos dx, dy, da, db; int top, level; int* levels; QT_FT_Vector* arc; + int mid_x = ( DOWNSCALE( ras.x ) + to->x + + 3 * (control1->x + control2->x ) ) / 8; + int mid_y = ( DOWNSCALE( ras.y ) + to->y + + 3 * (control1->y + control2->y ) ) / 8; + TPos dx = DOWNSCALE( ras.x ) + to->x - ( mid_x << 1 ); + TPos dy = DOWNSCALE( ras.y ) + to->y - ( mid_y << 1 ); - dx = DOWNSCALE( ras.x ) + to->x - ( control1->x << 1 ); if ( dx < 0 ) dx = -dx; - dy = DOWNSCALE( ras.y ) + to->y - ( control1->y << 1 ); if ( dy < 0 ) dy = -dy; if ( dx < dy ) dx = dy; - da = dx; - - dx = DOWNSCALE( ras.x ) + to->x - 3 * ( control1->x + control2->x ); - if ( dx < 0 ) - dx = -dx; - dy = DOWNSCALE( ras.y ) + to->y - 3 * ( control1->x + control2->y ); - if ( dy < 0 ) - dy = -dy; - if ( dx < dy ) - dx = dy; - db = dx; level = 1; - da = da / ras.cubic_level; - db = db / ras.conic_level; - while ( da > 0 || db > 0 ) + dx /= ras.cubic_level; + while ( dx > 0 ) { - da >>= 2; - db >>= 3; + dx >>= 2; level++; } if ( level <= 1 ) { - TPos to_x, to_y, mid_x, mid_y; + TPos to_x, to_y; to_x = UPSCALE( to->x ); to_y = UPSCALE( to->y ); + + /* Recalculation of midpoint is needed only if */ + /* UPSCALE and DOWNSCALE have any effect. */ + +#if ( PIXEL_BITS != 6 ) mid_x = ( ras.x + to_x + 3 * UPSCALE( control1->x + control2->x ) ) / 8; mid_y = ( ras.y + to_y + 3 * UPSCALE( control1->y + control2->y ) ) / 8; +#endif gray_render_line( RAS_VAR_ mid_x, mid_y ); gray_render_line( RAS_VAR_ to_x, to_y ); -- cgit v0.12 From 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 16 Aug 2010 16:09:34 +0300 Subject: Fix QProcessManager destruction If QProcessManager destructor is ran as part of global static cleanup, manager thread will most likely be terminated by kernel at that point, so trying to delete QProcessActives and QProcessMediators will panic as they will still be active. They can also no longer be properly canceled as the thread is already gone. In case manager thread has already died, which implies that process exit is imminent, we simply do nothing and let the deletion of the main heap at process exit take care of stray objects. Task-number: QTBUG-11218 Reviewed-by: Janne Koskinen --- src/corelib/io/qprocess_symbian.cpp | 47 ++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp index af657b2..003e781 100644 --- a/src/corelib/io/qprocess_symbian.cpp +++ b/src/corelib/io/qprocess_symbian.cpp @@ -375,10 +375,9 @@ QProcessActive::QProcessActive() // Nothing to do } -// Called from ProcessManagerThread +// Called from main thread QProcessActive::~QProcessActive() { - Cancel(); process = NULL; pproc = NULL; } @@ -482,10 +481,9 @@ QProcessManagerMediator::QProcessManagerMediator() // Nothing to do } -// Called from ProcessManagerThread +// Called from main thread QProcessManagerMediator::~QProcessManagerMediator() { - Cancel(); processManagerThread.Close(); currentCommand = ENoCommand; currentObserver = NULL; @@ -648,25 +646,36 @@ QProcessManager::QProcessManager() QProcessManager::~QProcessManager() { QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager()"); - // Cancel death listening for all child processes - if (mediator) { - QMap::Iterator it = children.begin(); - while (it != children.end()) { - // Remove all monitors - QProcessActive *active = it.value(); - mediator->remove(active); - - QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process"); - ++it; + + // Check if manager thread is still alive. If this destructor is ran as part of global + // static cleanup, manager thread will most likely be terminated by kernel at this point, + // so trying to delete QProcessActives and QProcessMediators will panic as they + // will still be active. They can also no longer be canceled as the thread is already gone. + // In case manager thread has already died, we simply do nothing and let the deletion of + // the main heap at process exit take care of stray objects. + + if (managerThread.Handle() && managerThread.ExitType() == EExitPending) { + // Cancel death listening for all child processes + if (mediator) { + QMap::Iterator it = children.begin(); + while (it != children.end()) { + // Remove all monitors + QProcessActive *active = it.value(); + mediator->remove(active); + + QPROCESS_DEBUG_PRINT("QProcessManager::~QProcessManager() removed listening for a process"); + ++it; + } + + // Terminate process manager thread. + mediator->terminate(); + delete mediator; } - // Terminate process manager thread. - mediator->terminate(); - delete mediator; + qDeleteAll(children.values()); + children.clear(); } - qDeleteAll(children.values()); - children.clear(); managerThread.Close(); managerMutex.Close(); } -- cgit v0.12 From 8f3489c8bfb18246480a489779c2d9b330474c5d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 16 Aug 2010 15:59:30 +0200 Subject: qdoc: Reorganized the QML elements table to be a dictionary... ...and a set of functional group pages. --- doc/src/declarative/elements.qdoc | 252 ++++++++++++--------- .../WebKit/qt/declarative/qdeclarativewebview.cpp | 1 + .../graphicsitems/qdeclarativeanimatedimage.cpp | 3 +- .../graphicsitems/qdeclarativeborderimage.cpp | 1 + .../graphicsitems/qdeclarativeevents.cpp | 4 + .../graphicsitems/qdeclarativeflickable.cpp | 2 + .../graphicsitems/qdeclarativeflipable.cpp | 2 + .../graphicsitems/qdeclarativefocuspanel.cpp | 2 + .../graphicsitems/qdeclarativefocusscope.cpp | 2 + .../graphicsitems/qdeclarativegridview.cpp | 2 + .../graphicsitems/qdeclarativeimage.cpp | 2 + src/declarative/graphicsitems/qdeclarativeitem.cpp | 7 + .../graphicsitems/qdeclarativelayoutitem.cpp | 1 + .../graphicsitems/qdeclarativelistview.cpp | 1 + .../graphicsitems/qdeclarativeloader.cpp | 1 + .../graphicsitems/qdeclarativemousearea.cpp | 1 + src/declarative/graphicsitems/qdeclarativepath.cpp | 7 + .../graphicsitems/qdeclarativepathview.cpp | 1 + .../graphicsitems/qdeclarativepositioners.cpp | 4 + .../graphicsitems/qdeclarativerectangle.cpp | 3 + .../graphicsitems/qdeclarativerepeater.cpp | 1 + src/declarative/graphicsitems/qdeclarativetext.cpp | 3 +- .../graphicsitems/qdeclarativetextedit.cpp | 1 + .../graphicsitems/qdeclarativetextinput.cpp | 4 + .../graphicsitems/qdeclarativevisualitemmodel.cpp | 2 + src/declarative/qml/qdeclarativecomponent.cpp | 1 + src/declarative/qml/qdeclarativeengine.cpp | 2 + src/declarative/qml/qdeclarativeworkerscript.cpp | 1 + src/declarative/util/qdeclarativeanimation.cpp | 13 ++ src/declarative/util/qdeclarativebehavior.cpp | 1 + src/declarative/util/qdeclarativebind.cpp | 1 + src/declarative/util/qdeclarativeconnections.cpp | 1 + src/declarative/util/qdeclarativefontloader.cpp | 1 + src/declarative/util/qdeclarativelistmodel.cpp | 4 +- src/declarative/util/qdeclarativepackage.cpp | 1 + .../util/qdeclarativepropertychanges.cpp | 1 + .../util/qdeclarativesmoothedanimation.cpp | 1 + .../util/qdeclarativespringanimation.cpp | 1 + src/declarative/util/qdeclarativestate.cpp | 1 + src/declarative/util/qdeclarativestategroup.cpp | 1 + .../util/qdeclarativestateoperations.cpp | 3 + src/declarative/util/qdeclarativesystempalette.cpp | 1 + src/declarative/util/qdeclarativetimer.cpp | 1 + src/declarative/util/qdeclarativetransition.cpp | 1 + src/declarative/util/qdeclarativexmllistmodel.cpp | 2 + .../qdeclarativefolderlistmodel.cpp | 1 + src/imports/gestures/qdeclarativegesturearea.cpp | 2 + src/imports/particles/qdeclarativeparticles.cpp | 4 + tools/qdoc3/ditaxmlgenerator.cpp | 10 + tools/qdoc3/htmlgenerator.cpp | 10 + tools/qdoc3/htmlgenerator.h | 1 + 51 files changed, 267 insertions(+), 110 deletions(-) diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index c008404..94abe10 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -26,113 +26,151 @@ ****************************************************************************/ /*! -\page qdeclarativeelements.html -\target elements -\title QML Elements - -The following table lists the QML elements provided by the \l {QtDeclarative}{Qt Declarative} module. - -\table -\header \o {2,1} \bold {Basic Visual Items} -\row \o \l {Item} \o Basic item element inherited by all visual items in QML -\row \o \l {Rectangle} \o Basic visual rectangle element -\row \o \l {Gradient} \o Defines a gradient between two or more colors -\row \o \l {GradientStop} \o Defines a color used in a \l {Gradient} -\row \o \l {Image} \o Allows the use of bitmaps to a scene -\row \o \l {BorderImage} (Item-specific) \o Defines an image as a border -\row \o \l {AnimatedImage} \o For playing animations stored as a series of frames -\row \o \l {Text} \o Allows the use of formatted text in a scene -\row \o \l {TextInput} \o Displays an editable line of text -\row \o \l {IntValidator} \o Validator for integer values -\row \o \l {DoubleValidator} \o Validator for non-integer values -\row \o \l {RegExpValidator} \o Validator for string regular expressions -\row \o \l {TextEdit} \o Displays multiple lines of editable formatted text - -\header \o {2,1} \bold {Basic Interaction Items} -\row \o \l {MouseArea} \o Handles mouse interactions -\row \o \l {FocusScope} \o For keyboard focus handling -\row \o \l {Flickable} \o Provides a surface that can be "flicked" -\row \o \l {Flipable} \o Provides a surface that produces flipping effects -\row \o \l {GestureArea} (experimental) \o Enables simple gesture handling - -\header \o {2,1} \bold {States} -\row \o \l {State} \o Defines sets of configurations of objects and properties -\row \o \l {PropertyChanges} \o Describes property changes within a state -\row \o \l {StateGroup} \o Contains a set of states and state transitions -\row \o \l {StateChangeScript} \o Allows script binding in a state -\row \o \l {ParentChange} (Item-specific) \o Re-parent an Item in a state change -\row \o \l {AnchorChanges} \o Change the anchors of an item in a state - -\header \o {2,1} \bold {Animation and Transitions} -\row \o \l {Behavior} \o Specifies a default animation for property changes -\row \o \l {SequentialAnimation} \o Runs animations sequentially -\row \o \l {ParallelAnimation} \o Runs animations in parallel -\row \o \l {PropertyAnimation} \o Animates property changes -\row \o \l {NumberAnimation} \o Animates properties of type qreal -\row \o \l {Vector3dAnimation} \o Animates properties of type QVector3d -\row \o \l {ColorAnimation} \o Animates color changes -\row \o \l {RotationAnimation} \o Animates rotations -\row \o \l {ParentAnimation} \o Animates parent changes -\row \o \l {AnchorAnimation} \o Animates anchor changes -\row \o \l {PauseAnimation} \o Pauses an animation -\row \o \l {SmoothedAnimation} \o Allows a property to smoothly track a value -\row \o \l {SpringAnimation} \o Allows a property to track a value in a spring-like motion -\row \o \l {PropertyAction} \o Sets immediate property changes during animation -\row \o \l {ScriptAction} \o Runs scripts during an animation -\row \o \l {Transition} \o Animates transitions during state changes - -\header \o {2,1} \bold {Working with Data} -\row \o \l {Binding} \o Binds any value to any property -\row \o \l {ListModel} \o Defines a list of data -\row \o \l {ListElement} \o Defines a data item in a \l {ListModel} -\row \o \l {VisualItemModel} \o Contains items that already defines its own visual delegate -\row \o \l {VisualDataModel} \o Encapsulates a model and a delegate -\row \o \l {Package} \o Collection that enables sharing of items within different views -\row \o \l {XmlListModel} \o Specifies a model using XPath expressions -\row \o \l {XmlRole} \o Specifies a role for an \l {XmlListModel} - -\header \o {2,1} \bold {Views} -\row \o \l {ListView} \o Provides a list visualization of a model -\row \o \l {GridView} \o Provides a grid visualization of a model -\row \o \l {PathView} \o Visualizes a model's contents along a path -\row \o \l {Path} \o Defines a path used by \l {PathView} -\row \o \l {PathLine} \o Defines a line in \l {Path} -\row \o \l {PathQuad} \o Defines a quadratic Bezier curve in a \l {Path} -\row \o \l {PathCubic} \o Defines a cubic Bezier curve in a \l {Path} -\row \o \l {PathAttribute} \o Allows the setting of attributes along a \l {Path} -\row \o \l {PathPercent} \o Modifies the item distribution along a \l {Path} -\row \o \l {WebView} \o Allows the addition of web content to a canvas - -\header \o {2,1} \bold {Positioners} -\row \o \l {Column} \o Arranges its children vertically -\row \o \l {Row} \o Arranges its children horizontally -\row \o \l {Grid} \o Positions its children in a grid -\row \o \l {Flow} \o Positions its children with wrapping support - -\header \o {2,1} \bold {Utility} -\row \o \l {Connections} \o Explicitly connects signals and signal handlers -\row \o \l {Component} \o Encapsulate QML items as a component -\row \o \l {Timer} \o Provides timed triggers -\row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property -\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt. -\row \o \l {WorkerScript} \o Enables the use of threads in QML -\row \o \l {Loader} \o Controls the loading of items or components -\row \o \l {Repeater} \o Uses a model to create multiples of components -\row \o \l {SystemPalette} \o Provides access to the Qt palettes -\row \o \l {FontLoader} \o Loads fonts by name or URL -\row \o \l {LayoutItem} \o Allows declarative UI elements inside Qt's Graphics View layouts - -\header \o {2,1} \bold {Transforms} -\row \o \l {Scale} \o Assigns item scaling behaviors -\row \o \l {Rotation} \o Assigns item rotation behaviors -\row \o \l {Translate} \o Assigns item translation behaviors - -\header \o {2,1} \bold {Effects} -\row \o \l {Particles} (experimental) \o Generates and animates particles -\row \o \l {ParticleMotionLinear} \o Adds linear motion behavior to \l {Particles} -\row \o \l {ParticleMotionGravity} \o Adds gravitational motion to \l {Particles} -\row \o \l {ParticleMotionWander} \o Adds varied motions to \l {Particles} -\endtable + \page qdeclarativeelements.html + \target elements + \title QML Elements + This is a dictionary of all the QML elements available in the \l + {QtDeclarative} {Qt Declarative} module. + + To see the QML elements listed by + functional area, \l{Groups Of Related QML Elements} {look here}. + + \generatelist qmlclasses + +*/ + + +/*! + \group qml-groups + \title Groups Of Related QML Elements + + \brief If you know what kind of QML element you want (Basic Visual, + Interaction, Animation, etc), look here. + + This is a list of functional groups of QML elements. + + \generatelist{related} + +*/ + +/*! + \group qml-basic-visual-elements + \title Basic QML Visual Elements + \ingroup qml-groups + + \brief Elements for constructing basic visual items. + + \generatelist{related} + +*/ + +/*! + \group qml-basic-interaction-elements + \title Basic QML Interaction Elements + \ingroup qml-groups + + \brief Elements for handling basic interactions. + + \generatelist{related} + +*/ + +/*! + \group qml-state-elements + \title QML State Elements + \ingroup qml-groups + + \brief Elements for handling state changes. + + \generatelist{related} + +*/ + +/*! + \group qml-event-elements + \title QML Event Elements + \ingroup qml-groups + + \brief Elements for handling events. + + \generatelist{related} + +*/ + +/*! + \group qml-animation-transition + \title QML Animation and Transition Elements + \ingroup qml-groups + + \brief Elements for handling animations and transitions. + + \generatelist{related} + +*/ + +/*! + \group qml-working-with-data + \title Working With Data in QML + \ingroup qml-groups + + \brief Elements for working with data. + + \generatelist{related} + +*/ + +/*! + \group qml-view-elements + \title QML View Elements + \ingroup qml-groups + + \brief Elements for handling views. + + \generatelist{related} + +*/ + +/*! + \group qml-positioning-elements + \title QML Positioning Elements + \ingroup qml-groups + + \brief Elements for positioning items. + + \generatelist{related} + +*/ + +/*! + \group qml-utility-elements + \title QML Utility Elements + \ingroup qml-groups + + \brief Elements for handling misc operations. + + \generatelist{related} + +*/ + +/*! + \group qml-transform-elements + \title QML Transform Elements + \ingroup qml-groups + + \brief Elements for handling transformations. + + \generatelist{related} + +*/ + +/*! + \group qml-particle-elements + \title QML Particle Elements + \ingroup qml-groups + + \brief Elements for handling particle effects. + + \generatelist{related} */ diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp index 9dcba60..c1ca23d 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp @@ -139,6 +139,7 @@ void GraphicsWebView::mouseMoveEvent(QGraphicsSceneMouseEvent* event) /*! \qmlclass WebView QDeclarativeWebView + \ingroup qml-view-elements \since 4.7 \brief The WebView item allows you to add web content to a canvas. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp index d8527d3..e0a2149 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp @@ -62,7 +62,8 @@ QT_BEGIN_NAMESPACE \qmlclass AnimatedImage QDeclarativeAnimatedImage \inherits Image \since 4.7 - + \ingroup basic-visual-elements + The AnimatedImage element provides for playing animations stored as images containing a series of frames, such as GIF files. diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 4881248..e0c7fc2 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE \brief The BorderImage element provides an image that can be used as a border. \inherits Item \since 4.7 + \ingroup qm-basic-visual-elements A BorderImage breaks an image into 9 sections, as shown below: diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp index 81ec6e1..0a35a3f 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents.cpp +++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp @@ -45,6 +45,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass KeyEvent QDeclarativeKeyEvent \since 4.7 + \ingroup qml-event-elements + \brief The KeyEvent object provides information about a key event. For example, the following changes the Item's state property when the Enter @@ -115,6 +117,8 @@ Item { /*! \qmlclass MouseEvent QDeclarativeMouseEvent \since 4.7 + \ingroup qml-event-elements + \brief The MouseEvent object provides information about a mouse event. The position of the mouse can be found via the x and y properties. diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 19cabdd..31f7707 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -345,6 +345,8 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd() /*! \qmlclass Flickable QDeclarativeFlickable \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The Flickable item provides a surface that can be "flicked". \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index b266273..6ce0fa6 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -70,6 +70,8 @@ public: /*! \qmlclass Flipable QDeclarativeFlipable \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The Flipable item provides a surface that can be flipped. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp index bd60e25..5c7959a 100644 --- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp +++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass FocusPanel QDeclarativeFocusPanel \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The FocusPanel item explicitly creates a focus panel. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp index e8e6fa2..4498275 100644 --- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp +++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass FocusScope QDeclarativeFocusScope \since 4.7 + \ingroup qml-basic-interaction-elements + \brief The FocusScope object explicitly creates a focus scope. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 68a4c64..d67e69a 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -1056,6 +1056,8 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m /*! \qmlclass GridView QDeclarativeGridView \since 4.7 + \ingroup qml-view-elements + \inherits Flickable \brief The GridView item provides a grid view of items provided by a model. diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 37736cc..47a410c 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Image QDeclarativeImage \since 4.7 + \ingroup qml-vasic-visual-elements + \brief The Image element allows you to add bitmaps to a scene. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index cc7c673..0f16a79 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -69,6 +69,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Transform QGraphicsTransform + \ingroup qml-transform-elements \since 4.7 \brief The Transform elements provide a way of building advanced transformations on Items. @@ -90,6 +91,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Translate QDeclarativeTranslate + \ingroup qml-transform-elements \since 4.7 \brief The Translate object provides a way to move an Item without changing its x or y properties. @@ -131,6 +133,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Scale QGraphicsScale + \ingroup qml-transform-elements \since 4.7 \brief The Scale element provides a way to scale an Item. @@ -172,6 +175,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Rotation QGraphicsRotation + \ingroup qml-transform-elements \since 4.7 \brief The Rotation object provides a way to rotate an Item. @@ -419,6 +423,7 @@ void QDeclarativeItemKeyFilter::componentComplete() /*! \qmlclass KeyNavigation QDeclarativeKeyNavigationAttached + \ingroup qml-basic-interaction-elements \since 4.7 \brief The KeyNavigation attached property supports key navigation by arrow keys. @@ -725,6 +730,7 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post) /*! \qmlclass Keys QDeclarativeKeysAttached + \ingroup qml-basic-interaction-elements \since 4.7 \brief The Keys attached property provides key handling to Items. @@ -1310,6 +1316,7 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec /*! \qmlclass Item QDeclarativeItem + \ingroup qml-basic-visual-elements \since 4.7 \brief The Item is the most basic of all visual items in QML. diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp index 38d5f59..8509473 100644 --- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass LayoutItem QDeclarativeLayoutItem + \ingroup qml-utility-elements \since 4.7 \brief The LayoutItem element allows declarative UI elements to be placed inside Qt's Graphics View layouts. diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index e1dd1c0..ec1b6cf 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -1357,6 +1357,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m /*! \qmlclass ListView QDeclarativeListView + \ingroup qml-view-elements \since 4.7 \inherits Flickable \brief The ListView item provides a list view of items provided by a model. diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index d28181e..4c6268f 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -108,6 +108,7 @@ void QDeclarativeLoaderPrivate::initResize() /*! \qmlclass Loader QDeclarativeLoader + \ingroup qml-utility-elements \since 4.7 \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index dcdb9f6..2823888 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -180,6 +180,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate() /*! \qmlclass MouseArea QDeclarativeMouseArea + \ingroup qml-basic-interaction-elements \since 4.7 \brief The MouseArea item enables simple mouse handling. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp index c48011d3..62e03e7 100644 --- a/src/declarative/graphicsitems/qdeclarativepath.cpp +++ b/src/declarative/graphicsitems/qdeclarativepath.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass PathElement QDeclarativePathElement + \ingroup qml-view-elements \since 4.7 \brief PathElement is the base path type. @@ -67,6 +68,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Path QDeclarativePath + \ingroup qml-view-elements \since 4.7 \brief A Path object defines a path for use by \l PathView. @@ -497,6 +499,7 @@ void QDeclarativeCurve::setY(qreal y) /*! \qmlclass PathAttribute QDeclarativePathAttribute + \ingroup qml-view-elements \since 4.7 \brief The PathAttribute allows setting an attribute at a given position in a Path. @@ -587,6 +590,7 @@ void QDeclarativePathAttribute::setValue(qreal value) /*! \qmlclass PathLine QDeclarativePathLine + \ingroup qml-view-elements \since 4.7 \brief The PathLine defines a straight line. @@ -627,6 +631,7 @@ void QDeclarativePathLine::addToPath(QPainterPath &path) /*! \qmlclass PathQuad QDeclarativePathQuad + \ingroup qml-view-elements \since 4.7 \brief The PathQuad defines a quadratic Bezier curve with a control point. @@ -713,6 +718,7 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path) /*! \qmlclass PathCubic QDeclarativePathCubic + \ingroup qml-view-elements \since 4.7 \brief The PathCubic defines a cubic Bezier curve with two control points. @@ -828,6 +834,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path) /*! \qmlclass PathPercent QDeclarativePathPercent + \ingroup qml-view-elements \since 4.7 \brief The PathPercent manipulates the way a path is interpreted. diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 380c6ad..535fb90 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -326,6 +326,7 @@ void QDeclarativePathViewPrivate::regenerate() /*! \qmlclass PathView QDeclarativePathView + \ingroup qml-view-elements \since 4.7 \brief The PathView element lays out model-provided items on a path. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 179f13d..5c21b03 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -310,6 +310,7 @@ static inline bool isInvisible(QDeclarativeItem *child) /*! \qmlclass Column QDeclarativeColumn + \ingroup qml-positioning-elements \since 4.7 \brief The Column item arranges its children vertically. \inherits Item @@ -475,6 +476,7 @@ void QDeclarativeColumn::reportConflictingAnchors() /*! \qmlclass Row QDeclarativeRow + \ingroup qml-positioning-elements \since 4.7 \brief The Row item arranges its children horizontally. \inherits Item @@ -613,6 +615,7 @@ void QDeclarativeRow::reportConflictingAnchors() /*! \qmlclass Grid QDeclarativeGrid + \ingroup qml-positioning-elements \since 4.7 \brief The Grid item positions its children in a grid. \inherits Item @@ -905,6 +908,7 @@ void QDeclarativeGrid::reportConflictingAnchors() /*! \qmlclass Flow QDeclarativeFlow + \ingroup qml-positioning-elements \since 4.7 \brief The Flow item arranges its children side by side, wrapping as necessary. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp index c49be46..5990c2d 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp +++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp @@ -84,6 +84,7 @@ void QDeclarativePen::setWidth(int w) /*! \qmlclass GradientStop QDeclarativeGradientStop + \ingroup qml-basic-visual-elements \since 4.7 \brief The GradientStop item defines the color at a position in a Gradient @@ -105,6 +106,7 @@ void QDeclarativeGradientStop::updateGradient() /*! \qmlclass Gradient QDeclarativeGradient + \ingroup qml-basic-visual-elements \since 4.7 \brief The Gradient item defines a gradient fill. @@ -152,6 +154,7 @@ void QDeclarativeGradient::doUpdate() /*! \qmlclass Rectangle QDeclarativeRectangle + \ingroup qml-basic-visual-elements \since 4.7 \brief The Rectangle item allows you to add rectangles to a scene. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 68e7e9a..8828d3e 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -62,6 +62,7 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() /*! \qmlclass Repeater QDeclarativeRepeater + \ingroup qml-utility-elements \since 4.7 \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index ab2be9c..fcd112e 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -162,7 +162,8 @@ QSet QTextDocumentWithImageResources::errors; /*! \qmlclass Text QDeclarativeText - \since 4.7 + \ingroup qml-basic-visual-elements + \since 4.7 \brief The Text item allows you to add formatted text to a scene. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 8117676..b8e8726 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextEdit QDeclarativeTextEdit + \ingroup qml-basic-visual-elements \since 4.7 \brief The TextEdit item displays multiple lines of editable formatted text. \inherits Item diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 90f5a70..bd8d404 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextInput QDeclarativeTextInput + \ingroup qml-basic-visual-elements \since 4.7 \brief The TextInput item displays an editable line of text. \inherits Item @@ -561,6 +562,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b) /*! \qmlclass IntValidator QIntValidator + \ingroup qml-basic-visual-elements This element provides a validator for integer values. */ @@ -579,6 +581,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b) /*! \qmlclass DoubleValidator QDoubleValidator + \ingroup qml-basic-visual-elements This element provides a validator for non-integer numbers. */ @@ -617,6 +620,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b) /*! \qmlclass RegExpValidator QRegExpValidator + \ingroup qml-basic-visual-elements This element provides a validator, which counts as valid any string which matches a specified regular expression. diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index a489b5a..764676a 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -128,6 +128,7 @@ public: /*! \qmlclass VisualItemModel QDeclarativeVisualItemModel + \ingroup qml-working-with-data \since 4.7 \brief The VisualItemModel allows items to be provided to a view. @@ -644,6 +645,7 @@ QDeclarativeVisualDataModelData *QDeclarativeVisualDataModelPrivate::data(QObjec /*! \qmlclass VisualDataModel QDeclarativeVisualDataModel + \ingroup qml-working-with-data \brief The VisualDataModel encapsulates a model and delegate A VisualDataModel encapsulates a model and the delegate that will diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 5f4a063..73689fc 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -104,6 +104,7 @@ class QByteArray; /*! \qmlclass Component QDeclarativeComponent + \ingroup qml-utility-elements \since 4.7 \brief The Component element encapsulates a QML component definition. diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index de79e4d..1061c03 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -114,6 +114,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass QtObject QObject + \ingroup qml-utility-elements \since 4.7 \brief The QtObject element is the most basic element in QML. @@ -185,6 +186,7 @@ void QDeclarativeEnginePrivate::defineModule() /*! \qmlclass QML:Qt QDeclarativeEnginePrivate + \ingroup qml-utility-elements \brief The QML global Qt object provides useful enums and functions from Qt. \keyword QmlGlobalQtObject diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index aec84a6..789116e 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -514,6 +514,7 @@ void QDeclarativeWorkerScriptEngine::run() /*! \qmlclass WorkerScript QDeclarativeWorkerScript + \ingroup qml-utility-elements \brief The WorkerScript element enables the use of threads in QML. Use WorkerScript to run operations in a new thread. diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 2fca09d..3b8cb37 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -74,6 +74,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Animation QDeclarativeAbstractAnimation + \ingroup qml-animation-transition \since 4.7 \brief The Animation element is the base of all QML animations. @@ -554,6 +555,7 @@ void QDeclarativeAbstractAnimation::timelineComplete() /*! \qmlclass PauseAnimation QDeclarativePauseAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PauseAnimation element provides a pause for an animation. @@ -630,6 +632,7 @@ QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation() /*! \qmlclass ColorAnimation QDeclarativeColorAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The ColorAnimation element animates changes in color values. @@ -730,6 +733,7 @@ void QDeclarativeColorAnimation::setTo(const QColor &t) /*! \qmlclass ScriptAction QDeclarativeScriptAction + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The ScriptAction element allows scripts to be run during an animation. @@ -878,6 +882,7 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation() /*! \qmlclass PropertyAction QDeclarativePropertyAction + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PropertyAction element allows immediate property changes during animation. @@ -1129,6 +1134,7 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions, /*! \qmlclass NumberAnimation QDeclarativeNumberAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The NumberAnimation element animates changes in qreal-type values. @@ -1238,6 +1244,7 @@ void QDeclarativeNumberAnimation::setTo(qreal t) /*! \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The Vector3dAnimation element animates changes in QVector3d values. @@ -1311,6 +1318,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t) /*! \qmlclass RotationAnimation QDeclarativeRotationAnimation + \ingroup qml-animation-transition \since 4.7 \inherits PropertyAnimation \brief The RotationAnimation element animates changes in rotation values. @@ -1540,6 +1548,7 @@ QDeclarativeListProperty QDeclarativeAnimationGro /*! \qmlclass SequentialAnimation QDeclarativeSequentialAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The SequentialAnimation element allows animations to be run sequentially. @@ -1613,6 +1622,7 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio /*! \qmlclass ParallelAnimation QDeclarativeParallelAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The ParallelAnimation element allows animations to be run in parallel. @@ -1731,6 +1741,7 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int /*! \qmlclass PropertyAnimation QDeclarativePropertyAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The PropertyAnimation element animates changes in property values. @@ -2400,6 +2411,7 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions /*! \qmlclass ParentAnimation QDeclarativeParentAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The ParentAnimation element animates changes in parent values. @@ -2759,6 +2771,7 @@ QAbstractAnimation *QDeclarativeParentAnimation::qtAnimation() /*! \qmlclass AnchorAnimation QDeclarativeAnchorAnimation + \ingroup qml-animation-transition \since 4.7 \inherits Animation \brief The AnchorAnimation element animates changes in anchor values. diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 1e7f81a..f1b6f9a 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -72,6 +72,7 @@ public: /*! \qmlclass Behavior QDeclarativeBehavior + \ingroup qml-animation-transition \since 4.7 \brief The Behavior element allows you to specify a default animation for a property change. diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index 5fab631..86d08f5 100644 --- a/src/declarative/util/qdeclarativebind.cpp +++ b/src/declarative/util/qdeclarativebind.cpp @@ -72,6 +72,7 @@ public: /*! \qmlclass Binding QDeclarativeBind + \ingroup qml-working-with-data \since 4.7 \brief The Binding element allows arbitrary property bindings to be created. diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index b364821..293928e 100644 --- a/src/declarative/util/qdeclarativeconnections.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -71,6 +71,7 @@ public: /*! \qmlclass Connections QDeclarativeConnections + \ingroup qml-utility-elements \since 4.7 \brief A Connections element describes generalized connections to signals. diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index 83bdb17..291583c 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -78,6 +78,7 @@ public: /*! \qmlclass FontLoader QDeclarativeFontLoader + \ingroup qml-utility-elements \since 4.7 \brief The FontLoader element allows fonts to be loaded by name or URL. diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 20fe3a9..1f66f0f 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -68,6 +68,7 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM /*! \qmlclass ListModel QDeclarativeListModel + \ingroup qml-working-with-data \since 4.7 \brief The ListModel element defines a free-form list data source. @@ -129,7 +130,7 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM \snippet examples/declarative/threading/threadedlistmodel/dataloader.js 0 - The application's \tt Timer object periodically sends a message to the +working-with-data worker script by calling \l WorkerScript::sendMessage(). When this message is received, \l {WorkerScript::onMessage}{WorkerScript.onMessage()} is invoked in \tt dataloader.js, which appends the current time to the list model. @@ -769,6 +770,7 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s) /*! \qmlclass ListElement + \ingroup qml-working-with-data \since 4.7 \brief The ListElement element defines a data item in a ListModel. diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index 1a4f2a7..a5ec9b3 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Package QDeclarativePackage + \ingroup qml-working-with-data \brief Package provides a collection of named items. The Package class is used in conjunction with diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 12c6353..25edd35 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass PropertyChanges QDeclarativePropertyChanges + \ingroup qml-state-elements \since 4.7 \brief The PropertyChanges element describes new property bindings or values for a state. diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index 30e1491..b2f02e6 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -249,6 +249,7 @@ void QSmoothedAnimation::init() /*! \qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation + \ingroup qml-animation-transition \since 4.7 \inherits NumberAnimation \brief The SmoothedAnimation element allows a property to smoothly track a value. diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index 6f4ac51..fce4097 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -228,6 +228,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode() /*! \qmlclass SpringAnimation QDeclarativeSpringAnimation + \ingroup qml-animation-transition \inherits Animation \since 4.7 diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 028bacb..6e17cf2 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -133,6 +133,7 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje /*! \qmlclass State QDeclarativeState + \ingroup qml-state-elements \since 4.7 \brief The State element defines configurations of objects and properties. diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 1c1e964..fc90baa 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -88,6 +88,7 @@ public: /*! \qmlclass StateGroup QDeclarativeStateGroup + \ingroup qml-state-elements \since 4.7 \brief The StateGroup element provides state support for non-Item elements. diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 2291c16..6e6f0cb 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -161,6 +161,7 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q /*! \preliminary \qmlclass ParentChange QDeclarativeParentChange + \ingroup qml-state-elements \brief The ParentChange element allows you to reparent an Item in a state change. ParentChange reparents an item while preserving its visual appearance (position, size, @@ -589,6 +590,7 @@ public: /*! \qmlclass StateChangeScript QDeclarativeStateChangeScript + \ingroup qml-state-elements \brief The StateChangeScript element allows you to run a script in a state. A StateChangeScript is run upon entering a state. You can optionally use @@ -693,6 +695,7 @@ QString QDeclarativeStateChangeScript::typeName() const /*! \qmlclass AnchorChanges QDeclarativeAnchorChanges + \ingroup qml-state-elements \brief The AnchorChanges element allows you to change the anchors of an item in a state. The AnchorChanges element is used to modify the anchors of an item in a \l State. diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index c334859..7b80736 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -58,6 +58,7 @@ public: /*! \qmlclass SystemPalette QDeclarativeSystemPalette + \ingroup qml-utility-elements \since 4.7 \brief The SystemPalette element provides access to the Qt palettes. diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index 838a8f3..56320e6 100644 --- a/src/declarative/util/qdeclarativetimer.cpp +++ b/src/declarative/util/qdeclarativetimer.cpp @@ -70,6 +70,7 @@ public: /*! \qmlclass Timer QDeclarativeTimer + \ingroup qml-utility-elements \since 4.7 \brief The Timer item triggers a handler at a specified interval. diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index aa1426c..21d7ded 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass Transition QDeclarativeTransition + \ingroup qml-animation-transition \since 4.7 \brief The Transition element defines animated transitions that occur on state changes. diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 8bd829e..7b3d4a8 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -72,6 +72,7 @@ typedef QPair QDeclarativeXmlListRange; /*! \qmlclass XmlRole QDeclarativeXmlListModelRole + \ingroup qml-working-with-data \since 4.7 \brief The XmlRole element allows you to specify a role for an XmlListModel. @@ -505,6 +506,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListPropertyroot()); findAllFunctions(tree->root()); findAllLegaleseTexts(tree->root()); @@ -751,6 +752,9 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, else if (atom->string() == "classes") { generateCompactList(relative, marker, nonCompatClasses, true); } + else if (atom->string() == "qmlclasses") { + generateCompactList(relative, marker, qmlClasses, true); + } else if (atom->string().contains("classesbymodule")) { QString arg = atom->string().trimmed(); QString moduleName = atom->string().mid(atom->string().indexOf( @@ -3675,6 +3679,12 @@ void DitaXmlGenerator::findAllClasses(const InnerNode *node) if (!serviceName.isEmpty()) serviceClasses.insert(serviceName, *c); } + else if ((*c)->type() == Node::Fake && + (*c)->subType() == Node::QmlClass && + !(*c)->doc().isEmpty()) { + QString qmlClassName = (*c)->name(); + qmlClasses.insert(qmlClassName,*c); + } else if ((*c)->isInnerNode()) { findAllClasses(static_cast(*c)); } diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 4603a40..50f8b56 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -376,6 +376,7 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker) funcIndex.clear(); legaleseTexts.clear(); serviceClasses.clear(); + qmlClasses.clear(); findAllClasses(tree->root()); findAllFunctions(tree->root()); findAllLegaleseTexts(tree->root()); @@ -611,6 +612,9 @@ int HtmlGenerator::generateAtom(const Atom *atom, else if (atom->string() == "classes") { generateCompactList(relative, marker, nonCompatClasses, true); } + else if (atom->string() == "qmlclasses") { + generateCompactList(relative, marker, qmlClasses, true); + } else if (atom->string().contains("classesbymodule")) { QString arg = atom->string().trimmed(); QString moduleName = atom->string().mid(atom->string().indexOf( @@ -3707,6 +3711,12 @@ void HtmlGenerator::findAllClasses(const InnerNode *node) if (!serviceName.isEmpty()) serviceClasses.insert(serviceName, *c); } + else if ((*c)->type() == Node::Fake && + (*c)->subType() == Node::QmlClass && + !(*c)->doc().isEmpty()) { + QString qmlClassName = (*c)->name(); + qmlClasses.insert(qmlClassName,*c); + } else if ((*c)->isInnerNode()) { findAllClasses(static_cast(*c)); } diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index eab10c6..d885ada 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -330,6 +330,7 @@ class HtmlGenerator : public PageGenerator NodeMap obsoleteClasses; NodeMap namespaceIndex; NodeMap serviceClasses; + NodeMap qmlClasses; QMap funcIndex; QMap legaleseTexts; NewSinceMaps newSinceMaps; -- cgit v0.12 From 0fb9e0fff4097bf0b84ff217526b0a9c33b69414 Mon Sep 17 00:00:00 2001 From: Benjamin Poulain Date: Fri, 13 Aug 2010 20:57:07 +0200 Subject: Implement the general blending of ARGB32_pm with SSSE3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SSSE3 provides two tools to improve the blending speed over SSE2: -palignr -byte permutation The alignement is enforced on src and dst with palignr to always make aligned access. The extraction of the alpha mask is done with a byte permutation in order to save two instructions per cycle. On Atom, this patch gives between 0% (aligned src) to 10% of improvement (unaligned 4 and 12 bytes). On Core 2, this patch gives consistently 8% to 10% of improvement for every miss-alignment. Reviewed-by: Samuel Rødal --- src/gui/painting/painting.pri | 1 + src/gui/painting/qdrawhelper.cpp | 11 ++ src/gui/painting/qdrawhelper_ssse3.cpp | 263 +++++++++++++++++++++++++ tests/benchmarks/gui/image/blendbench/main.cpp | 43 ++++ 4 files changed, 318 insertions(+) create mode 100644 src/gui/painting/qdrawhelper_ssse3.cpp diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index dfa4a48..793d380 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -212,6 +212,7 @@ if(mmx|3dnow|sse|sse2|iwmmxt) { SSE3DNOW_SOURCES += painting/qdrawhelper_sse3dnow.cpp SSE_SOURCES += painting/qdrawhelper_sse.cpp SSE2_SOURCES += painting/qdrawhelper_sse2.cpp + SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp } diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 1ff3d7b..276da93 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -7840,6 +7840,17 @@ void qInitDrawhelperAsm() qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_RGB32] = qt_blend_rgb32_on_rgb32_sse2; qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2; qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_sse2; + +#if defined(QT_HAVE_SSSE3) + if (features & SSSE3) { + extern void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha); + qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3; + qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3; + } +#endif // QT_HAVE_SSSE3 } else #endif { diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp new file mode 100644 index 0000000..bc4a7eb8 --- /dev/null +++ b/src/gui/painting/qdrawhelper_ssse3.cpp @@ -0,0 +1,263 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#ifdef QT_HAVE_SSSE3 + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +inline static void blend_pixel(quint32 &dst, const quint32 src) +{ + if (src >= 0xff000000) + dst = src; + else if (src != 0) + dst = src + BYTE_MUL(dst, qAlpha(~src)); +} + + +/* The instruction palignr uses direct arguments, so we have to generate the code fo the different + shift (4, 8, 12). Checking the alignment inside the loop is unfortunatelly way too slow. + */ +#define BLENDING_LOOP(palignrOffset, length)\ + for (; x < length-3; x += 4) { \ + const __m128i srcVectorLastLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes + 4]);\ + const __m128i srcVector = _mm_alignr_epi8(srcVectorLastLoaded, srcVectorPrevLoaded, palignrOffset); \ + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ + _mm_store_si128((__m128i *)&dst[x], srcVector); \ + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ + alphaChannel = _mm_sub_epi16(one, alphaChannel); \ + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ + __m128i destMultipliedByOneMinusAlpha; \ + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ + _mm_store_si128((__m128i *)&dst[x], result); \ + } \ + srcVectorPrevLoaded = srcVectorLastLoaded;\ + } + + +#define BLEND_SOURCE_OVER_ARGB32_FIRST_ROW_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \ + int x = 0; \ +\ + /* First, get dst aligned. */ \ + const int offsetToAlignOn16Bytes = (4 - ((reinterpret_cast(dst) >> 2) & 0x3)) & 0x3;\ + const int prologLength = qMin(length, offsetToAlignOn16Bytes);\ +\ + for (; x < prologLength; ++x) {\ + blend_pixel(dst[x], src[x]); \ + } \ +\ + const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast(&(src[x])) >> 2) & 0x3;\ +\ + if (!minusOffsetToAlignSrcOn16Bytes) {\ + /* src is aligned, usual algorithm but with aligned operations.\ + See the SSE2 version for more documentation on the algorithm itself. */\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + for (; x < length-3; x += 4) { \ + const __m128i srcVector = _mm_load_si128((__m128i *)&src[x]); \ + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ + _mm_store_si128((__m128i *)&dst[x], srcVector); \ + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ + alphaChannel = _mm_sub_epi16(one, alphaChannel); \ + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ + __m128i destMultipliedByOneMinusAlpha; \ + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ + _mm_store_si128((__m128i *)&dst[x], result); \ + } \ + } /* end for() */\ + } else if ((length - x) >= 8) {\ + /* We are at the first line, so "x - minusOffsetToAlignSrcOn16Bytes" could go before src, and\ + generate an invalid access. */\ +\ + /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\ + __m128i srcVectorPrevLoaded;\ + if (minusOffsetToAlignSrcOn16Bytes <= prologLength) {\ + srcVectorPrevLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\ + } else {\ + quint32 temp[4] Q_DECL_ALIGN(16);\ + switch (prologLength) {\ + case 3:\ + temp[1] = src[x - 3];\ + case 2:\ + temp[2] = src[x - 2];\ + case 1:\ + temp[3] = src[x - 1];\ + default:\ + break;\ + }\ + srcVectorPrevLoaded = _mm_load_si128((__m128i *)temp);\ + }\ + const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\ +\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + switch (palignrOffset) {\ + case 4:\ + BLENDING_LOOP(4, length)\ + break;\ + case 8:\ + BLENDING_LOOP(8, length)\ + break;\ + case 12:\ + BLENDING_LOOP(12, length)\ + break;\ + }\ + }\ + for (; x < length; ++x) \ + blend_pixel(dst[x], src[x]); \ +} + +// Basically blend src over dst with the const alpha defined as constAlphaVector. +// nullVector, half, one, colorMask are constant accross the whole image/texture, and should be defined as: +//const __m128i nullVector = _mm_set1_epi32(0); +//const __m128i half = _mm_set1_epi16(0x80); +//const __m128i one = _mm_set1_epi16(0xff); +//const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); +//const __m128i alphaMask = _mm_set1_epi32(0xff000000); +// +// The computation being done is: +// result = s + d * (1-alpha) +// with shortcuts if fully opaque or fully transparent. +#define BLEND_SOURCE_OVER_ARGB32_MAIN_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \ + int x = 0; \ +\ + /* First, get dst aligned. */ \ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ + blend_pixel(dst[x], src[x]); \ + } \ +\ + const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast(&(src[x])) >> 2) & 0x3;\ +\ + if (!minusOffsetToAlignSrcOn16Bytes) {\ + /* src is aligned, usual algorithm but with aligned operations.\ + See the SSE2 version for more documentation on the algorithm itself. */\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + for (; x < length-3; x += 4) { \ + const __m128i srcVector = _mm_load_si128((__m128i *)&src[x]); \ + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ + _mm_store_si128((__m128i *)&dst[x], srcVector); \ + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ + alphaChannel = _mm_sub_epi16(one, alphaChannel); \ + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ + __m128i destMultipliedByOneMinusAlpha; \ + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ + _mm_store_si128((__m128i *)&dst[x], result); \ + } \ + } /* end for() */\ + } else if ((length - x) >= 8) {\ + /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\ + __m128i srcVectorPrevLoaded = _mm_load_si128((__m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\ + const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\ +\ + const __m128i alphaShuffleMask = _mm_set_epi8(0xff,15,0xff,15,0xff,11,0xff,11,0xff,7,0xff,7,0xff,3,0xff,3);\ + switch (palignrOffset) {\ + case 4:\ + BLENDING_LOOP(4, length)\ + break;\ + case 8:\ + BLENDING_LOOP(8, length)\ + break;\ + case 12:\ + BLENDING_LOOP(12, length)\ + break;\ + }\ + }\ + for (; x < length; ++x) \ + blend_pixel(dst[x], src[x]); \ +} + +void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl, + const uchar *srcPixels, int sbpl, + int w, int h, + int const_alpha) +{ + const quint32 *src = (const quint32 *) srcPixels; + quint32 *dst = (quint32 *) destPixels; + if (const_alpha == 256) { + const __m128i alphaMask = _mm_set1_epi32(0xff000000); + const __m128i nullVector = _mm_setzero_si128(); + const __m128i half = _mm_set1_epi16(0x80); + const __m128i one = _mm_set1_epi16(0xff); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + + // We have to unrol the first row in order to deal with the load on unaligned data + // prior to the src pointer. + BLEND_SOURCE_OVER_ARGB32_FIRST_ROW_SSSE3(dst, src, w, nullVector, half, one, colorMask, alphaMask); + dst = (quint32 *)(((uchar *) dst) + dbpl); + src = (const quint32 *)(((const uchar *) src) + sbpl); + + for (int y = 1; y < h; ++y) { + BLEND_SOURCE_OVER_ARGB32_MAIN_SSSE3(dst, src, w, nullVector, half, one, colorMask, alphaMask); + dst = (quint32 *)(((uchar *) dst) + dbpl); + src = (const quint32 *)(((const uchar *) src) + sbpl); + } + } else if (const_alpha != 0) { + // dest = (s + d * sia) * ca + d * cia + // = s * ca + d * (sia * ca + cia) + // = s * ca + d * (1 - sa*ca) + const_alpha = (const_alpha * 255) >> 8; + const __m128i nullVector = _mm_setzero_si128(); + const __m128i half = _mm_set1_epi16(0x80); + const __m128i one = _mm_set1_epi16(0xff); + const __m128i colorMask = _mm_set1_epi32(0x00ff00ff); + const __m128i constAlphaVector = _mm_set1_epi16(const_alpha); + for (int y = 0; y < h; ++y) { + BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2(dst, src, w, nullVector, half, one, colorMask, constAlphaVector) + dst = (quint32 *)(((uchar *) dst) + dbpl); + src = (const quint32 *)(((const uchar *) src) + sbpl); + } + } +} + +QT_END_NAMESPACE + +#endif // QT_HAVE_SSSE3 diff --git a/tests/benchmarks/gui/image/blendbench/main.cpp b/tests/benchmarks/gui/image/blendbench/main.cpp index f53654b..d420d6c 100644 --- a/tests/benchmarks/gui/image/blendbench/main.cpp +++ b/tests/benchmarks/gui/image/blendbench/main.cpp @@ -106,6 +106,9 @@ private slots: void blendBenchAlpha_data(); void blendBenchAlpha(); + + void unalignedBlendArgb32_data(); + void unalignedBlendArgb32(); }; void BlendBench::blendBench_data() @@ -179,6 +182,46 @@ void BlendBench::blendBenchAlpha() } } +void BlendBench::unalignedBlendArgb32_data() +{ + // The performance of blending can depend of the alignment of the data + // on 16 bytes. Some SIMD instruction set have significantly better + // memory access when the memory is aligned on 16 bytes boundary. + + // offset in 32 bits words + QTest::addColumn("offset"); + QTest::newRow("aligned on 16 bytes") << 0; + QTest::newRow("unaligned by 4 bytes") << 1; + QTest::newRow("unaligned by 8 bytes") << 2; + QTest::newRow("unaligned by 12 bytes") << 3; +} + +void BlendBench::unalignedBlendArgb32() +{ + const int dimension = 1024; + + // We use dst aligned by design. We don't want to test all the combination of alignemnt for src and dst. + // Moreover, it make sense for us to align dst in the implementation because it is accessed more often. + uchar *dstMemory = static_cast(qMallocAligned((dimension * dimension * sizeof(quint32)), 16)); + QImage destination(dstMemory, dimension, dimension, QImage::Format_ARGB32_Premultiplied); + destination.fill(0x12345678); // avoid special cases of alpha + + uchar *srcMemory = static_cast(qMallocAligned((dimension * dimension * sizeof(quint32)) + 16, 16)); + QFETCH(int, offset); + srcMemory += (offset * sizeof(quint32)); + + QImage src(srcMemory, dimension, dimension, QImage::Format_ARGB32_Premultiplied); + src.fill(0x87654321); + + QPainter painter(&destination); + QBENCHMARK { + painter.drawImage(QPoint(), src); + } + + qFreeAligned(srcMemory); + qFreeAligned(dstMemory); +} + QTEST_MAIN(BlendBench) #include "main.moc" -- cgit v0.12 From 34eb6cb58629c58b819d4c82b582106513da03bd Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 16 Aug 2010 17:35:17 +0200 Subject: diagramscene example: fix leak and crashes. In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753 Merge-request: 775 Reviewed-by: Liang Qi --- doc/src/examples/diagramscene.qdoc | 3 ++- examples/graphicsview/diagramscene/mainwindow.cpp | 29 ++++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc index f4d6b0d..7c643c2 100644 --- a/doc/src/examples/diagramscene.qdoc +++ b/doc/src/examples/diagramscene.qdoc @@ -265,7 +265,8 @@ \snippet examples/graphicsview/diagramscene/mainwindow.cpp 3 - This slot deletes the selected item, if any, from the scene. If + This slot deletes the selected item, if any, from the scene. It + deletes the arrows first in order to avoid to delete them twice. If the item to be deleted is a \c DiagramItem, we also need to delete arrows connected to it; we don't want arrows in the scene that aren't connected to items in both ends. diff --git a/examples/graphicsview/diagramscene/mainwindow.cpp b/examples/graphicsview/diagramscene/mainwindow.cpp index f09c552..7d82df0 100644 --- a/examples/graphicsview/diagramscene/mainwindow.cpp +++ b/examples/graphicsview/diagramscene/mainwindow.cpp @@ -45,6 +45,7 @@ #include "diagramitem.h" #include "diagramscene.h" #include "diagramtextitem.h" +#include "arrow.h" const int InsertTextButton = 10; @@ -55,7 +56,7 @@ MainWindow::MainWindow() createToolBox(); createMenus(); - scene = new DiagramScene(itemMenu); + scene = new DiagramScene(itemMenu, this); scene->setSceneRect(QRectF(0, 0, 5000, 5000)); connect(scene, SIGNAL(itemInserted(DiagramItem*)), this, SLOT(itemInserted(DiagramItem*))); @@ -123,11 +124,22 @@ void MainWindow::buttonGroupClicked(int id) void MainWindow::deleteItem() { foreach (QGraphicsItem *item, scene->selectedItems()) { - if (item->type() == DiagramItem::Type) { - qgraphicsitem_cast(item)->removeArrows(); + if (item->type() == Arrow::Type) { + scene->removeItem(item); + Arrow *arrow = qgraphicsitem_cast(item); + arrow->startItem()->removeArrow(arrow); + arrow->endItem()->removeArrow(arrow); + delete item; } - scene->removeItem(item); } + + foreach (QGraphicsItem *item, scene->selectedItems()) { + if (item->type() == DiagramItem::Type) { + qgraphicsitem_cast(item)->removeArrows(); + } + scene->removeItem(item); + delete item; + } } //! [3] @@ -313,7 +325,7 @@ void MainWindow::about() //! [21] void MainWindow::createToolBox() { - buttonGroup = new QButtonGroup; + buttonGroup = new QButtonGroup(this); buttonGroup->setExclusive(false); connect(buttonGroup, SIGNAL(buttonClicked(int)), this, SLOT(buttonGroupClicked(int))); @@ -345,7 +357,7 @@ void MainWindow::createToolBox() QWidget *itemWidget = new QWidget; itemWidget->setLayout(layout); - backgroundButtonGroup = new QButtonGroup; + backgroundButtonGroup = new QButtonGroup(this); connect(backgroundButtonGroup, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(backgroundButtonGroupClicked(QAbstractButton*))); @@ -460,7 +472,6 @@ void MainWindow::createToolbars() editToolBar->addAction(sendBackAction); fontCombo = new QFontComboBox(); - fontSizeCombo = new QComboBox(); connect(fontCombo, SIGNAL(currentFontChanged(QFont)), this, SLOT(currentFontChanged(QFont))); @@ -526,7 +537,7 @@ void MainWindow::createToolbars() linePointerButton->setCheckable(true); linePointerButton->setIcon(QIcon(":/images/linepointer.png")); - pointerTypeGroup = new QButtonGroup; + pointerTypeGroup = new QButtonGroup(this); pointerTypeGroup->addButton(pointerButton, int(DiagramScene::MoveItem)); pointerTypeGroup->addButton(linePointerButton, int(DiagramScene::InsertLine)); @@ -605,7 +616,7 @@ QMenu *MainWindow::createColorMenu(const char *slot, QColor defaultColor) names << tr("black") << tr("white") << tr("red") << tr("blue") << tr("yellow"); - QMenu *colorMenu = new QMenu; + QMenu *colorMenu = new QMenu(this); for (int i = 0; i < colors.count(); ++i) { QAction *action = new QAction(names.at(i), this); action->setData(colors.at(i)); -- cgit v0.12 From 5b47a913473802d377ec303b425eb1ad0496f843 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 16 Aug 2010 17:35:19 +0200 Subject: Translate bughowto.qdoc into zh_CN. Merge-request: 775 Reviewed-by: Liang Qi --- doc/src/zh_CN/bughowto.qdoc | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 doc/src/zh_CN/bughowto.qdoc diff --git a/doc/src/zh_CN/bughowto.qdoc b/doc/src/zh_CN/bughowto.qdoc new file mode 100644 index 0000000..05c8403 --- /dev/null +++ b/doc/src/zh_CN/bughowto.qdoc @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in a +** written agreement between you and Nokia. +** +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page bughowto.html + \title 如何报告 Bug + \brief 关于报告 Qt 中 bug 方法的信息。 + + 如果您认为您已经发现了 Qt 的一个 bug，我们非常高兴听到这个消息，因为在此之后我们可以修复它。 + + 在报告 bug 之前，请检查 Qt 网站中的 \l{FAQs}{FAQ}、\l{Platform Notes}{平台备注}和 \l{Qt Bug Tracker}{Qt Bug 跟踪器}确认这个问题是否已知。 + + 如果您还没有 \l{Qt Bug Tracker}{Qt Bug 跟踪器}的帐号，您要做的第一件事情就是注册一个。一旦您完成了这一步，您就可以提交并且跟踪您的 bug 报告，而且在您提交之后，公众就可以看到它们。 + + 请在您的 bug 报告中包含以下信息： + + \list 1 + \o 您的编译器的名称和版本号 + \o 您的操作系统的名称和版本号 + \o 您所使用的 Qt 的版本号，以及它在被编译的时候所使用的配置选项 + \o 关于如何重复这个问题的可靠并且清晰的描述 + \endlist + + 如果可能，请提供一个使用 QtTest 模块编写的测试程序，因为这样做可以加快我们重现您的这个问题的进程，并且可以让开发人员更有效率的确认这个问题。 + + 另外，如果您的问题只是在运行时可见，请尽量创建一个可以运行并且显示这个问题的小测试程序。通常，您可以在众多 Qt 实例中选择一个进行少量修改就可以实现这一目的。 + + 如果您已经实现了一个 bug 修复并且希望直接贡献这个修复，那么您需要通过\l{Public Qt Repository}{公共 Qt 代码仓库}来实现。 +*/ -- cgit v0.12 From 3e07671a2b043703bc51c2672f16c45ed0c31c42 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 13 Aug 2010 18:12:30 +0200 Subject: Keyboard navigation regression in QTreeView Ammends commit 8da7252de0badb818302763cbe62c38ad699f1f3 Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-11466 --- src/gui/itemviews/qabstractitemview.cpp | 8 +- tests/auto/qtreeview/tst_qtreeview.cpp | 125 ++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 3 deletions(-) diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 97499f3..4ffd284 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -2270,9 +2270,11 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) } else { d->selectionModel->setCurrentIndex(newCurrent, command); d->pressedPosition = visualRect(newCurrent).center() + d->offset(); - // We copy the same behaviour as for mousePressEvent(). - QRect rect(d->pressedPosition - d->offset(), QSize(1, 1)); - setSelection(rect, command); + if (newCurrent.isValid()) { + // We copy the same behaviour as for mousePressEvent(). + QRect rect(d->pressedPosition - d->offset(), QSize(1, 1)); + setSelection(rect, command); + } } event->accept(); return; diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index 75a4c62..7e2e800 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -239,6 +239,7 @@ private slots: void doubleClickedWithSpans(); void taskQTBUG_6450_selectAllWith1stColumnHidden(); void taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint(); + void taskQTBUG_11466_keyboardNavigationRegression(); }; class QtTestModel: public QAbstractItemModel @@ -3785,5 +3786,129 @@ void tst_QTreeView::keyboardNavigationWithDisabled() QCOMPARE(view.currentIndex(), model.index(6, 0)); } +class Model_11466 : public QAbstractItemModel +{ + Q_OBJECT +public: + Model_11466(QObject *parent) : + m_block(false) + { + // set up the model to have two top level items and a few others + m_selectionModel = new QItemSelectionModel(this, this); // owned by this + + connect(m_selectionModel, SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)), + this, SLOT(slotCurrentChanged(const QModelIndex &,const QModelIndex &))); + }; + + int rowCount(const QModelIndex &parent) const + { + if (parent.isValid()) + return (parent.internalId() == 0) ? 4 : 0; + return 2; // two top level items + } + + int columnCount(const QModelIndex &parent) const + { + return 2; + } + + QVariant data(const QModelIndex &index, int role) const + { + if (role == Qt::DisplayRole && index.isValid()) { + qint64 parentRowPlusOne = index.internalId(); + QString str; + QTextStream stream(&str); + if (parentRowPlusOne > 0) + stream << parentRowPlusOne << " -> " << index.row() << " : " << index.column(); + else + stream << index.row() << " : " << index.column(); + return QVariant(str); + } + return QVariant(); + } + + QModelIndex parent(const QModelIndex &index) const + { + if (index.isValid()) { + qint64 parentRowPlusOne = index.internalId(); + if (parentRowPlusOne > 0) { + int row = static_cast(parentRowPlusOne - 1); + return createIndex(row, 0, (quint32)0); + } + } + return QModelIndex(); + } + + void bindView(QTreeView *view) + { + // sets the view to this model with a shared selection model + QItemSelectionModel *oldModel = view->selectionModel(); + if (oldModel != m_selectionModel) + delete oldModel; + view->setModel(this); // this creates a new selection model for the view, but we dont want it either ... + oldModel = view->selectionModel(); + view->setSelectionModel(m_selectionModel); + delete oldModel; + } + + QModelIndex index(int row, int column, const QModelIndex &parent) const + { + return createIndex(row, column, parent.isValid() ? (quint32)(parent.row() + 1) : (quint32)0); + } + +public slots: + void slotCurrentChanged(const QModelIndex ¤t,const QModelIndex &) + { + if (m_block) + return; + + if (current.isValid()) { + int selectedRow = current.row(); + quint32 parentRowPlusOne = static_cast(current.internalId()); + + for (int i = 0; i < 2; ++i) { + // announce the removal of all non top level items + beginRemoveRows(createIndex(i, 0, 0), 0, 3); + // nothing to actually do for the removal + endRemoveRows(); + + // put them back in again + beginInsertRows(createIndex(i, 0, 0), 0, 3); + // nothing to actually do for the insertion + endInsertRows(); + } + // reselect the current item ... + QModelIndex selectedIndex = createIndex(selectedRow, 0, parentRowPlusOne); + + m_block = true; // recursion block + m_selectionModel->select(selectedIndex, QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Current|QItemSelectionModel::Rows); + m_selectionModel->setCurrentIndex(selectedIndex, QItemSelectionModel::NoUpdate); + m_block = false; + } else { + m_selectionModel->clear(); + } + } + +private: + bool m_block; + QItemSelectionModel *m_selectionModel; +}; + +void tst_QTreeView::taskQTBUG_11466_keyboardNavigationRegression() +{ + QTreeView treeView; + treeView.setSelectionBehavior(QAbstractItemView::SelectRows); + treeView.setSelectionMode(QAbstractItemView::SingleSelection); + Model_11466 model(&treeView); + model.bindView(&treeView); + treeView.expandAll(); + treeView.show(); + QTest::qWaitForWindowShown(&treeView); + + QTest::keyPress(treeView.viewport(), Qt::Key_Down); + QTest::qWait(10); + QTRY_COMPARE(treeView.currentIndex(), treeView.selectionModel()->selection().indexes().first()); +} + QTEST_MAIN(tst_QTreeView) #include "tst_qtreeview.moc" -- cgit v0.12 From 69e8769e2a3f44700c24437dc851ea817c16318f Mon Sep 17 00:00:00 2001 From: Nicolai de Haan Brogger Date: Mon, 16 Aug 2010 21:55:42 +0000 Subject: Take advantage of a new EGL extension when posting 16 bit surfaces. Replaces the existing NVIDIA EGL extension "EGL_NV_post_convert_replication" with another newer extension named "EGL_NV_post_convert_roundinng". The newer extension produces similar result when posting 16 bit surfaces to 24/32 bit as the old and performs faster. Motivated by qtbug-9444. Merge-request: 742 Reviewed-by: Donald Carr --- src/gui/egl/qegl_x11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp index fea6e8d..15cc109 100644 --- a/src/gui/egl/qegl_x11.cpp +++ b/src/gui/egl/qegl_x11.cpp @@ -165,7 +165,7 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config) if (chosenVisualInfo) { // Skip size checks if implementation supports non-matching visual // and config (http://bugreports.qt.nokia.com/browse/QTBUG-9444). - if (QEgl::hasExtension("EGL_NV_post_convert_replication")) + if (QEgl::hasExtension("EGL_NV_post_convert_rounding")) return visualId; int visualRedSize = countBits(chosenVisualInfo->red_mask); -- cgit v0.12 From c6867a620259ee6c82a038995f424bef63d45aea Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 17 Aug 2010 09:12:58 +1000 Subject: Add missing auto test files. --- .../data/flickableqgraphicswidget.qml | 7 +++++++ .../data/verticalqgraphicswidget.qml | 24 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml diff --git a/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml new file mode 100644 index 0000000..8e95a94 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml @@ -0,0 +1,7 @@ +import Qt 4.7 + +Flickable { + width: 100; height: 100 + + QGraphicsWidget { objectName: "widget1"; width: 200; height: 300 } +} diff --git a/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml b/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml new file mode 100644 index 0000000..c9c8607 --- /dev/null +++ b/tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml @@ -0,0 +1,24 @@ +import Qt 4.7 + +Item { + width: 640 + height: 480 + Column { + objectName: "column" + QGraphicsWidget { + objectName: "one" + width: 50 + height: 50 + } + QGraphicsWidget { + objectName: "two" + width: 20 + height: 10 + } + QGraphicsWidget { + objectName: "three" + width: 40 + height: 20 + } + } +} -- cgit v0.12 From 875d5e374dce3dd7d7cce87b55e277e8e9497044 Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Tue, 17 Aug 2010 13:29:08 +1000 Subject: Update QtGui def files Task-number: Reviewed-by: Martin Jones --- src/s60installs/bwins/QtGuiu.def | 4 +++- src/s60installs/eabi/QtGuiu.def | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 90c0878..21a2122 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -4148,7 +4148,7 @@ EXPORTS ?ensureSceneTransformRecursive@QGraphicsItemPrivate@@QAEXPAPAVQGraphicsItem@@@Z @ 4147 NONAME ; void QGraphicsItemPrivate::ensureSceneTransformRecursive(class QGraphicsItem * *) ?ensureSequentialSiblingIndex@QGraphicsItemPrivate@@QAEXXZ @ 4148 NONAME ; void QGraphicsItemPrivate::ensureSequentialSiblingIndex(void) ?ensureSortedChildren@QGraphicsItemPrivate@@QAEXXZ @ 4149 NONAME ; void QGraphicsItemPrivate::ensureSortedChildren(void) - ?ensureSpace@QTextEngine@@QBEXH@Z @ 4150 NONAME ; void QTextEngine::ensureSpace(int) const + ?ensureSpace@QTextEngine@@QBEXH@Z @ 4150 NONAME ABSENT ; void QTextEngine::ensureSpace(int) const ?ensureVisible@QGraphicsItem@@QAEXABVQRectF@@HH@Z @ 4151 NONAME ; void QGraphicsItem::ensureVisible(class QRectF const &, int, int) ?ensureVisible@QGraphicsItem@@QAEXMMMMHH@Z @ 4152 NONAME ; void QGraphicsItem::ensureVisible(float, float, float, float, int, int) ?ensureVisible@QGraphicsView@@QAEXABVQRectF@@HH@Z @ 4153 NONAME ; void QGraphicsView::ensureVisible(class QRectF const &, int, int) @@ -12886,4 +12886,6 @@ EXPORTS ?zScaleChanged@QGraphicsScale@@IAEXXZ @ 12885 NONAME ; void QGraphicsScale::zScaleChanged(void) ?xScaleChanged@QGraphicsScale@@IAEXXZ @ 12886 NONAME ; void QGraphicsScale::xScaleChanged(void) ?yScaleChanged@QGraphicsScale@@IAEXXZ @ 12887 NONAME ; void QGraphicsScale::yScaleChanged(void) + ?_q_aboutToQuit@QApplicationPrivate@@QAEXXZ @ 12888 NONAME ; void QApplicationPrivate::_q_aboutToQuit(void) + ?ensureSpace@QTextEngine@@QBE_NH@Z @ 12889 NONAME ; bool QTextEngine::ensureSpace(int) const diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index d8e86bf..c4ad848 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12091,4 +12091,5 @@ EXPORTS _ZN14QGraphicsScale13xScaleChangedEv @ 12090 NONAME _ZN14QGraphicsScale13yScaleChangedEv @ 12091 NONAME _ZN14QGraphicsScale13zScaleChangedEv @ 12092 NONAME + _ZN19QApplicationPrivate14_q_aboutToQuitEv @ 12093 NONAME -- cgit v0.12 From cf0f53ecefd6914d533ffea057748480e3e5bd33 Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Tue, 17 Aug 2010 13:29:08 +1000 Subject: Update QtDeclarative def files Task-number: Reviewed-by: Martin Jones --- src/s60installs/bwins/QtDeclarativeu.def | 1 + src/s60installs/eabi/QtDeclarativeu.def | 1 + 2 files changed, 2 insertions(+) diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index 480d9ff..bc6d0aa 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -1684,4 +1684,5 @@ EXPORTS ?rootContext@QDeclarativeView@@QBEPAVQDeclarativeContext@@XZ @ 1683 NONAME ; class QDeclarativeContext * QDeclarativeView::rootContext(void) const ?rootContext@QDeclarativeEngine@@QBEPAVQDeclarativeContext@@XZ @ 1684 NONAME ; class QDeclarativeContext * QDeclarativeEngine::rootContext(void) const ?qmlregister@QDeclarativePrivate@@YAHW4RegistrationType@1@PAX@Z @ 1685 NONAME ; int QDeclarativePrivate::qmlregister(enum QDeclarativePrivate::RegistrationType, void *) + ?hasValue@QDeclarativeOpenMetaObject@@QBE_NH@Z @ 1686 NONAME ; bool QDeclarativeOpenMetaObject::hasValue(int) const diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index 9a3cefa..723f2ae 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -1714,4 +1714,5 @@ EXPORTS _ZNK16QDeclarativeView6engineEv @ 1713 NONAME _ZNK18QDeclarativeEngine11rootContextEv @ 1714 NONAME _ZN19QDeclarativePrivate11qmlregisterENS_16RegistrationTypeEPv @ 1715 NONAME + _ZNK26QDeclarativeOpenMetaObject8hasValueEi @ 1716 NONAME -- cgit v0.12 From 056574f7d6c331ec7d972b298585e1a3a6c975ac Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Tue, 17 Aug 2010 14:05:53 +1000 Subject: Docs - clarify use of PropertyChanges for immediate property changes in a State (e.g. for setting a transformOrigin for a RotationAnimation). Also improve some other animation docs in general. --- doc/src/declarative/animation.qdoc | 19 ++- doc/src/snippets/declarative/propertychanges.qml | 92 +++++++++++ doc/src/snippets/declarative/rotationanimation.qml | 3 +- src/declarative/util/qdeclarativeanimation.cpp | 169 +++++++++++++++------ .../util/qdeclarativepropertychanges.cpp | 119 ++++++--------- 5 files changed, 273 insertions(+), 129 deletions(-) create mode 100644 doc/src/snippets/declarative/propertychanges.qml diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index 7416341..53a0c55 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -156,11 +156,13 @@ The \l {PropertyAnimation::}{to} property is also required to specify the new \section2 Standalone Animations Animations can also be created as ordinary QML objects that are not bound to -any particular objects and properties. An example: +any particular objects and properties. Here is an example, using a +PropertyAnimation object. The animation is explicitly started when the +\l Rectangle is clicked: \snippet doc/src/snippets/declarative/animation-standalone.qml 0 -A standalone animation is not running by default and must be started explicitly +A standalone animation object is not running by default and must be started explicitly using the \l {Animation::}{running} property or \l {Animation::}{start()} and \l {Animation::}{stop()} methods. Since the animation is not bound to a particular object or property, it must define the \l @@ -183,10 +185,13 @@ object and add it to an item's \l {Item::}{transitions} property. An example: \snippet doc/src/snippets/declarative/animation-transitions.qml 0 -When the \l Rectangle changes to the \e moved state, its \c x and \c y property -values are changed by the PropertyChanges object, and the PropertyAnimation -defined within the \l Transition is triggered on these properties. The -animation will not be applied at any time other than during the state change. +The PropertyChanges object in the \e moved state defines that when the +\l Rectangle is in this state, its position should be changed +to (50, 50). When the \l Rectangle changes to the \e moved state, the +\l Transition will be triggered, and the transition's \l PropertyAnimation will +animate the changes in the \c x and \c y properties to their new values. +The animation will not be applied at any time other than during the state +change. Notice the example does not set any \l {PropertyAnimation::}{from} and \l {PropertyAnimation::}{to} values for the PropertyAnimation. As a convenience, @@ -234,7 +239,7 @@ and rotation changes. A ColorAnimation allows color values for the \l {ColorAnimation::}{from} and \l {ColorAnimation::}{to} properties. The -following animates the rectangle's \l {Rectangle::color} property: +following animates the rectangle's \l {Rectangle::}{color} property: \snippet doc/src/snippets/declarative/animation-elements.qml color diff --git a/doc/src/snippets/declarative/propertychanges.qml b/doc/src/snippets/declarative/propertychanges.qml new file mode 100644 index 0000000..9f119bf --- /dev/null +++ b/doc/src/snippets/declarative/propertychanges.qml @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +//![import] +import Qt 4.7 +//![import] + +Column { + +//![0] +Item { + id: container + width: 300; height: 300 + + Rectangle { + id: rect + width: 100; height: 100 + color: "red" + + MouseArea { + id: mouseArea + anchors.fill: parent + } + + states: State { + name: "resized"; when: mouseArea.pressed + PropertyChanges { target: rect; color: "blue"; height: container.height } + } + } +} +//![0] + +//![reset] +Rectangle { + width: 300; height: 200 + + Text { + id: myText + width: 50 + wrapMode: Text.WordWrap + text: "a text string that is longer than 50 pixels" + + states: State { + name: "widerText" + PropertyChanges { target: myText; width: undefined } + } + } + + MouseArea { + anchors.fill: parent + onClicked: myText.state = "widerText" + } +} +//![reset] +} diff --git a/doc/src/snippets/declarative/rotationanimation.qml b/doc/src/snippets/declarative/rotationanimation.qml index c81395a..b56cb3f 100644 --- a/doc/src/snippets/declarative/rotationanimation.qml +++ b/doc/src/snippets/declarative/rotationanimation.qml @@ -52,7 +52,8 @@ Item { smooth: true states: State { - name: "rotated"; PropertyChanges { target: rect; rotation: 180 } + name: "rotated" + PropertyChanges { target: rect; rotation: 180 } } transitions: Transition { diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 3b8cb37..4e9e8d5 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -694,9 +694,12 @@ QDeclarativeColorAnimation::~QDeclarativeColorAnimation() } \endqml - If this value is not set and the ColorAnimation is defined within - a \l Transition, it defaults to the value defined in the starting - state of the \l Transition. + If the ColorAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ QColor QDeclarativeColorAnimation::from() const { @@ -714,9 +717,12 @@ void QDeclarativeColorAnimation::setFrom(const QColor &f) This property holds the color value at which the animation should end. - If this value is not set and the ColorAnimation is defined within - a \l Transition or \l Behavior, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + If the ColorAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ QColor QDeclarativeColorAnimation::to() const { @@ -887,29 +893,45 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation() \inherits Animation \brief The PropertyAction element allows immediate property changes during animation. - PropertyAction is used to specify an immediate property change - during an animation. The property change is not animated. + PropertyAction is used to specify an immediate property change during an + animation. The property change is not animated. - For example, to explicitly set \c {theImage.smooth = true} during a \l Transition: - \code - transitions: Transition { - ... - PropertyAction { target: theImage; property: "smooth"; value: true } - ... - } - \endcode + It is useful for setting non-animated property values during an animation. - Or, to set \c theWebView.url to the value set for the destination state: - \code + For example, here is a SequentialAnimation that sets the image's + \l {Image::}{smooth} property to \c true, animates the width of the image, + then sets \l {Image::}{smooth} back to \c false: + + \snippet doc/src/snippets/declarative/propertyaction.qml standalone + + PropertyAction is also useful for setting the exact point at which a property + change should occur during a \l Transition. For example, if PropertyChanges + was used in a \l State to rotate an item around a particular + \l {Item::}{transformOrigin}, it might be implemented like this: + + \snippet doc/src/snippets/declarative/propertyaction.qml transition + + However, with this code, the \c transformOrigin is not set until \e after + the animation, as a \l State is taken to define the values at the \e end of + a transition. The animation would rotate at the default \c transformOrigin, + then jump to \c Item.BottomRight. To fix this, insert a PropertyChanges + before the RotationAnimation begins: + + \qml transitions: Transition { - ... - PropertyAction { target: theWebView; property: "url" } - ... + SequentialAnimation { + PropertyAction { target: rect; property: "transformOrigin" } + RotationAnimation { ... } + } } - \endcode - + \endqml + + This immediately sets the \c transformOrigin property to the value defined + in the end state of the \l Transition (i.e. the value defined in the + PropertyChanges object) so that the rotation animation begins with the + correct transform origin. - \sa QtDeclarative + \sa {QML Animation}, QtDeclarative */ /*! \internal @@ -1014,7 +1036,11 @@ QDeclarativeListProperty QDeclarativePropertyAction::exclude() /*! \qmlproperty any PropertyAction::value This property holds the value to be set on the property. - If not set, then the value defined for the end state of the transition. + + If the PropertyAction is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. */ QVariant QDeclarativePropertyAction::value() const { @@ -1190,7 +1216,7 @@ void QDeclarativeNumberAnimation::init() /*! \qmlproperty real NumberAnimation::from - This property holds the starting number value. + This property holds the starting value for the animation. For example, the following animation is not applied until the \c x value has reached 100: @@ -1205,9 +1231,12 @@ void QDeclarativeNumberAnimation::init() } \endqml - If this value is not set and the NumberAnimation is defined within - a \l Transition, it defaults to the value defined in the start - state of the \l Transition. + If the NumberAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ qreal QDeclarativeNumberAnimation::from() const @@ -1223,11 +1252,14 @@ void QDeclarativeNumberAnimation::setFrom(qreal f) /*! \qmlproperty real NumberAnimation::to - This property holds the ending number value. + This property holds the end value for the animation. - If this value is not set and the NumberAnimation is defined within - a \l Transition or \l Behavior, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + If the NumberAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ qreal QDeclarativeNumberAnimation::to() const { @@ -1280,10 +1312,14 @@ QDeclarativeVector3dAnimation::~QDeclarativeVector3dAnimation() /*! \qmlproperty real Vector3dAnimation::from - This property holds the starting value. + This property holds the starting value for the animation. + + If the Vector3dAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. - If this value is not set, it defaults to the value defined in the start - state of the \l Transition. + \sa {QML Animation} */ QVector3D QDeclarativeVector3dAnimation::from() const { @@ -1298,10 +1334,14 @@ void QDeclarativeVector3dAnimation::setFrom(QVector3D f) /*! \qmlproperty real Vector3dAnimation::to - This property holds the ending value. + This property holds the end value for the animation. - If this value is not set, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + If the Vector3dAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ QVector3D QDeclarativeVector3dAnimation::to() const { @@ -1343,6 +1383,12 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t) your own properties via \l {PropertyAnimation::properties}{properties} or \l {PropertyAnimation::property}{property}. + Also, note the \l Rectangle will be rotated around its default + \l {Item::}{transformOrigin} (which is \c Item.Center). To use a different + transform origin, set the origin in the PropertyChanges object and apply + the change at the start of the animation using PropertyAction. See the + PropertyAction documentation for more details. + Like any other animation element, a RotationAnimation can be applied in a number of ways, including transitions, behaviors and property value sources. The \l {QML Animation} documentation shows a variety of methods @@ -1408,7 +1454,7 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation() /*! \qmlproperty real RotationAnimation::from - This property holds the starting number value. + This property holds the starting value for the animation. For example, the following animation is not applied until the \c angle value has reached 100: @@ -1423,8 +1469,12 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation() } \endqml - If this value is not set, it defaults to the value defined in the start - state of the \l Transition. + If the RotationAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ qreal QDeclarativeRotationAnimation::from() const { @@ -1439,10 +1489,14 @@ void QDeclarativeRotationAnimation::setFrom(qreal f) /*! \qmlproperty real RotationAnimation::to - This property holds the ending value. + This property holds the end value for the animation.. + + If the RotationAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. - If this value is not set, it defaults to the value defined in the end - state of the \l Transition or \l Behavior. + \sa {QML Animation} */ qreal QDeclarativeRotationAnimation::to() const { @@ -1854,8 +1908,14 @@ void QDeclarativePropertyAnimation::setDuration(int duration) /*! \qmlproperty real PropertyAnimation::from - This property holds the starting value. - If not set, then the value defined in the start state of the transition. + This property holds the starting value for the animation. + + If the PropertyAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the starting state of the + \l Transition, or the current value of the property at the moment the + \l Behavior is triggered. + + \sa {QML Animation} */ QVariant QDeclarativePropertyAnimation::from() const { @@ -1875,8 +1935,14 @@ void QDeclarativePropertyAnimation::setFrom(const QVariant &f) /*! \qmlproperty real PropertyAnimation::to - This property holds the ending value. - If not set, then the value defined in the end state of the transition or \l Behavior. + This property holds the end value for the animation. + + If the PropertyAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. + + \sa {QML Animation} */ QVariant QDeclarativePropertyAnimation::to() const { @@ -2502,7 +2568,10 @@ void QDeclarativeParentAnimation::setTarget(QDeclarativeItem *target) \qmlproperty Item ParentAnimation::newParent The new parent to animate to. - If not set, then the parent defined in the end state of the transition. + If the ParentAnimation is defined within a \l Transition or \l Behavior, + this value defaults to the value defined in the end state of the + \l Transition, or the value of the property change that triggered the + \l Behavior. */ QDeclarativeItem *QDeclarativeParentAnimation::newParent() const { diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 25edd35..c28ada3 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -65,48 +65,30 @@ QT_BEGIN_NAMESPACE \since 4.7 \brief The PropertyChanges element describes new property bindings or values for a state. - PropertyChanges provides a state change that modifies the properties of an item. + PropertyChanges is used to define the property values or bindings in a + \l State. This enables an item's property values to be changed when it + \l {QML States}{changes between states}. - Here is a property change that modifies the text and color of a \l Text element - when it is clicked: + To create a PropertyChanges object, specify the \l target item whose + properties are to be modified, and define the new property values or + bindings. For example: - \qml - Text { - id: myText - width: 100; height: 100 - text: "Hello" - color: "blue" - - states: State { - name: "myState" - - PropertyChanges { - target: myText - text: "Goodbye" - color: "red" - } - } - - MouseArea { anchors.fill: parent; onClicked: myText.state = 'myState' } - } - \endqml - - By default, PropertyChanges will establish new bindings where appropriate. - For example, the following creates a new binding for myItem's \c height property. - - \qml - PropertyChanges { - target: myItem - height: parent.height - } - \endqml - - If you don't want a binding to be established (and instead just want to assign - the value of the binding at the time the state is entered), - you should set the PropertyChange's \l{PropertyChanges::explicit}{explicit} + \snippet doc/src/snippets/declarative/propertychanges.qml import + \codeline + \snippet doc/src/snippets/declarative/propertychanges.qml 0 + + When the mouse is pressed, the \l Rectangle changes to the \e resized + state. In this state, the PropertyChanges object sets the rectangle's + color to blue and the \c height value to that of \c container.height. + + Note this automatically binds \c rect.height to \c container.height + in the \e resized state. If a property binding should not be + established, and the height should just be set to the value of + \c container.height at the time of the state change, set the \l explicit property to \c true. - - State-specific script for signal handlers can also be specified: + + A PropertyChanges object can also override the default signal handler + for an object to implement a signal handler specific to the new state: \qml PropertyChanges { @@ -115,36 +97,31 @@ QT_BEGIN_NAMESPACE } \endqml - You can reset a property in a state change by assigning \c undefined. In the following - example we reset \c theText's width when we enter state1. This will give the text its - natural width (which is the whole string on one line). + \note PropertyChanges can be used to change anchor margins, but not other anchor + values; use AnchorChanges for this instead. Similarly, to change an \l Item's + \l {Item::}{parent} value, use ParentChanges instead. - \qml - import Qt 4.7 - - Rectangle { - width: 640 - height: 480 - Text { - id: theText - width: 50 - wrapMode: Text.WordWrap - text: "a text string that is longer than 50 pixels" - } - states: State { - name: "state1" - PropertyChanges { - target: theText - width: undefined - } - } - } - \endqml + \section2 Resetting property values - Anchor margins should be changed with PropertyChanges, but other anchor changes or changes to - an Item's parent should be done using the associated change elements - (ParentChange and AnchorChanges, respectively). + The \c undefined value can be used to reset the property value for a state. + In the following example, when \c theText changes to the \e widerText + state, its \c width property is reset, giving the text its natural width + and displaying the whole string on a single line. + + \snippet doc/src/snippets/declarative/propertychanges.qml reset + + + \section2 Immediate property changes in transitions + + When \l Transitions are used to animate state changes, they animate + properties from their values in the current state to those defined in the + new state (as defined by PropertyChanges objects). However, + it is sometimes desirable to set a property value \e immediately during a + \l Transition, without animation; in these cases, the PropertyAction + element can be used to force an immediate property change. + + See the PropertyAction documentation for more details. \sa {declarative/animation/states}{states example}, {qmlstate}{States}, QtDeclarative */ @@ -397,12 +374,12 @@ void QDeclarativePropertyChanges::setObject(QObject *o) /*! \qmlproperty bool PropertyChanges::restoreEntryValues - - Whether or not the previous values should be restored when - leaving the state. By default, restoreEntryValues is true. - By setting restoreEntryValues to false, you can create a temporary state - that has permanent effects on property values. + This property holds whether the previous values should be restored when + leaving the state. + + The default value is \c true. Setting this value to \c false creates a + temporary state that has permanent effects on property values. */ bool QDeclarativePropertyChanges::restoreEntryValues() const { -- cgit v0.12 From 59d2b0a0a1c836d3371c18a2a857d88c2d28621f Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Tue, 17 Aug 2010 14:09:07 +1000 Subject: Add missing file --- doc/src/snippets/declarative/propertyaction.qml | 86 +++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 doc/src/snippets/declarative/propertyaction.qml diff --git a/doc/src/snippets/declarative/propertyaction.qml b/doc/src/snippets/declarative/propertyaction.qml new file mode 100644 index 0000000..1a15469 --- /dev/null +++ b/doc/src/snippets/declarative/propertyaction.qml @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import Qt 4.7 + +Row { + +//![transition] +Item { + width: 400; height: 400 + + Rectangle { + id: rect + width: 200; height: 100 + color: "red" + + states: State { + name: "rotated" + PropertyChanges { target: rect; rotation: 180; transformOrigin: Item.BottomRight } + } + + transitions: Transition { + RotationAnimation { duration: 1000; direction: RotationAnimation.Counterclockwise } + } + + MouseArea { + anchors.fill: parent + onClicked: rect.state = "rotated" + } + } +} +//![transition] + +Item { + width: 300; height: 300 + + Image { id: img; source: "pics/qt.png" } + +//![standalone] +SequentialAnimation { + PropertyAction { target: img; property: "smooth"; value: "true" } + NumberAnimation { target: img; property: "width"; to: 300; duration: 1000 } + PropertyAction { target: img; property: "smooth"; value: "false" } +} +//![standalone] +} + +} + -- cgit v0.12 From d7213ecceabf79de561cd276429372e09464e62c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 17 Aug 2010 11:11:15 +0200 Subject: tst_QDataStream::stream_QPixmap: actualy test QPixmap. Because of a type, QIcon was tested twicen and QPixmap was not tested --- tests/auto/qdatastream/tst_qdatastream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index 31e12fe..c03bc71 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -1820,7 +1820,7 @@ void tst_QDataStream::stream_QPixmap() #ifdef Q_OS_WINCE QSKIP("Test depends on more memory than available on Qt/CE", SkipAll); #endif - STREAM_IMPL(QIcon); + STREAM_IMPL(QPixmap); } void tst_QDataStream::stream_QIcon_data() -- cgit v0.12