summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dist/changes-4.8.010
-rw-r--r--doc/src/getting-started/installation.qdoc58
-rw-r--r--doc/src/platforms/platform-notes.qdoc71
-rw-r--r--examples/activeqt/activeqt.pro3
-rw-r--r--examples/dialogs/extension/finddialog.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/environmentalreverb.cpp4
-rw-r--r--src/3rdparty/phonon/phonon/volumeslider.cpp6
-rw-r--r--src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp2
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp2
-rw-r--r--src/gui/widgets/qdialogbuttonbox.cpp1
-rw-r--r--src/xmlpatterns/parser/qquerytransformparser.cpp2
-rw-r--r--src/xmlpatterns/schema/qxsdschemaresolver.cpp2
-rw-r--r--src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp2
13 files changed, 119 insertions, 46 deletions
diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index 5dd1d8a669..d7eb05982f 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -82,6 +82,7 @@ that the changes lead to a leaner API and the change applies to all platforms.
- QProcessEnvironment: major optimizations, especially on Unix
- Add branch prediction macros Q_LIKELY and Q_UNLIKELY
- QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
+ - QDateTime: Fix generation of ISO8601 strings to include proper timezone information [QTBUG-18290]
QtGui
-----
@@ -184,6 +185,11 @@ QtDBus
- QDBusConnection: Add methods disconnectFromPeer and connectToPeer
- Make the DBus timeout configurable in QDBusAbstractInterface.
+QtTest
+------
+ - Added -random and -seed options to tests, making the test cases within
+ a test execute in arbitrary order.
+
****************************************************************************
* Database Drivers *
****************************************************************************
@@ -368,6 +374,10 @@ Qt for Windows CE
- syncqt
* Fix to allow $QTDIR to contain any valid pathname characters.
+- qdoc3
+ * Add support for documenting QML using module identifiers.
+ * Change the format of qdocconf files.
+
****************************************************************************
* Plugins *
****************************************************************************
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 36d63f5832..2936d60db7 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -510,7 +510,10 @@ in the \l{Qt for the Symbian platform Requirements} document.
\section1 Step 1: Install Qt
- Run \c{qt-symbian-opensource-%VERSION%.exe} and follow the instructions.
+ Download the \c {Qt libraries 4.x for Windows} package (for \c minGW or \c {VS 2008})
+ from the \l {http://qt.nokia.com/downloads#qt-lib}{downloads} page.
+
+ Run the downloaded package and follow the instructions.
\note Qt must be installed on the same drive as the Symbian SDK you are
using, and the install path must not contain any spaces.
@@ -652,23 +655,39 @@ Binary Package} document.
Congratulations, Qt is now ready to use.
\section1 Step 7: Installing Qt Libraries on the Device
+
+ To run a Qt application on a device, it must have Qt libraries installed.
+
+ Symbian devices have a pre-installed Qt as follows:
+ \list
+ \o Symbian Anna devices have the pre-installed Qt, Qt Mobility, and Qt Webkit.
+ \o Symbian Belle and later devices have the pre-installed Qt on the device firmware.
+ \endlist
+
+ \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}
+ {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60
+ and Symbian devices if the libraries are not pre-installed.
+
+ Nokia Developer site's \l {http://www.developer.nokia.com/Devices/Device_specifications/?filter1=qt}
+ {Device specifications} provide information on which devices have a
+ pre-installed Qt and the used Qt version.
+
+ To create your own Qt installation package, do as follows:
+
+ \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
+
+ The Qt libraries are built with "All -Tcb" capability, so they can support
+ all types of applications. If you don't have a suitable certificate, you can
+ patch the binaries in either of the following ways:
+
+ \list
+ \o If you have no certificate, build a self-signed Qt:
+ \snippet doc/src/snippets/code/doc_src_installation.qdoc 34
- To run the demo on a real device, you first have to install
- the Qt libraries on the device:
-
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 29
-
- The Qt libraries are built with "All -Tcb" capability, so that
- they can support all types of application.
- If you don't have a suitable certificate, it is possible to patch
- the binaries as follows:
-
- If you have no certificate, build a self signed Qt:
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 34
-
- If you have a symbian-signed developer certificate, specify the
+ \o If you have a symbian-signed developer certificate, specify the
capabilities you can sign for, for example:
-\snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+ \snippet doc/src/snippets/code/doc_src_installation.qdoc 35
+ \endlist
\section1 Running Qt demos
@@ -1315,7 +1334,12 @@ We hope you will enjoy using Qt.
\brief Setting up the Symbian platform environment for Qt.
\previouspage General Qt Requirements
- Qt for the Symbian platform requires the following software installed on your development PC:
+ \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools
+ and libraries for developing Qt applications. However, if you want to build
+ Qt itself for Symbian, follow the instructions below.
+
+ Qt for the Symbian platform requires the following software installed on
+ your development PC:
\list
\o \l{http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/}{Carbide.c++ v2.3.0 or higher recommended}.
\list
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 477f125077..e1e8c44cd8 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -685,9 +685,7 @@
\ingroup platform-specific
\brief Information about the state of support for the Symbian platform.
- As with any port, the maturity for Qt for Symbian has not yet reached the
- same level as other established Qt ports. This page documents the current
- notes for the Symbian port.
+ This page documents the current notes for the Symbian port.
\section1 Source Compatibility
@@ -698,18 +696,39 @@
\section1 Binary Compatibility
- As with every supported platform, we will strive to maintain
- application behavior and binary compatibility throughout the lifetime of
- the Qt 4.x series. However, due to the fact that Symbian support is newly
- added in 4.6.0, there is a slight possibility that minor corrections to the
- application binary interface (ABI) might be required in 4.6.1, in order to
- ensure compatibility going forward. Any such change will be clearly
- documented in the release notes for 4.6.1.
+ As with every supported platform, Qt strives to maintain application
+ behavior and binary compatibility throughout the lifetime of the Qt 4.x
+ major version and on the Symbian devices that support Qt. Symbian support in
+ Qt SDK and Ovi Store were introduced with Qt 4.6. Each Qt release contains
+ bug fixes that might change the API behavior and thereby affect application
+ compatibility.
+
+ In addition, Symbian devices have different input methods, such as different
+ keyboard styles or touch input, screen sizes, memory, and CPU and GPU
+ capabilities. Therefore, you must test applications on specific target
+ devices to ensure compatibility. In order to build applications that are
+ supported also on earlier devices, select the target in Qt SDK carefully.
+ Generally, an earlier target (such as S60 5th Edition) is supported on a
+ larger number of devices than a later target (such as Symbian Belle).
\section1 Supported Devices
- See the list of supported devices at
- http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian#Supported_Devices
+ \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian#Supported_Devices}{Nokia Smart Installer for Symbian}
+ documentation lists supported devices.
+
+ Qt versions are supported by Symbian devices as follows:
+ \list
+ \o Qt 4.6 is supported by S60 3rd Edition feature pack 1 and newer devices
+ through \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}{Smart Installer}.
+ \o Qt 4.7.3 is supported by S60 5th Edition and newer devices.
+ \endlist
+
+ Symbian devices have a pre-installed Qt support as follows:
+ \list
+ \o Symbian Anna: Qt 4.7.3 in C: drive.
+ \o Symbian Belle: Qt 4.7.4 in device firmware (ROM).
+ \endlist
+
\section1 Supported Functionality
@@ -729,17 +748,30 @@
\endtable
The following technologies have limited support:
+
\table
\header \o Technology
\o Note
\row \o QtSql
- \o The only driver supported is SQLite.
+ \o The supported drivers are SQLite and QSYMSQL.
\row \o QtMultimedia
- \o Although the module itself is supported, no backend for Symbian
- is currently available. However, there is a backend available
- for Phonon.
+ \o For support details see \l {Multimedia and Phonon Support} section.
\endtable
+
+ It is not recommended to use the following Qt widgets:
+ \list
+ \o QFileDialog with the \c DontUseNativeDialog option
+ \o QColorDialog with the \c DontUseNativeDialog option
+ \o QFontDialog
+ \o QWizard
+ \o QCalendarWidget
+ \o QDateTimeEdit
+ \o QMdiArea
+ \o QMdiSubWindow
+ \o QDockWidget
+ \o QPrintPreviewWidget
+ \endlist
\section1 Compiler Notes
@@ -796,6 +828,7 @@
For more information see the documentation of the individual Qt classes. If
a class does not mention Symbian capabilities, it requires none.
+ \target Multimedia and Phonon Support
\section1 Multimedia and Phonon Support
Qt provides a high-level API for multimedia functionality with
@@ -808,7 +841,7 @@
In this release the support is experimental. Video playback may show
artifacts when the video is moved or resized (for instance during
- orientation flips). This problem is present on Symbian^1 and earlier
+ orientation flips). This problem is present on S60 5th Edition and earlier
versions, and on Symbian^3 systems.
The audio and video formats that Phonon supports depends on what support
@@ -822,7 +855,7 @@
\section1 Hardware Accelerated Rendering
- The default graphics system on Symbian^3 is OpenVG, which uses OpenVG
+ The default graphics system on Symbian Anna is OpenVG, which uses OpenVG
hardware to accelerate \l QPainter functions. There are a few exceptions,
where Qt will use software rendering fallback.
@@ -839,7 +872,7 @@
\section1 QtOpenGL Support in Symbian
- Qt 4.7 introduces the \l {QtOpenGL} module to Symbian^3. QtOpenGL is
+ Qt 4.7 introduces the \l {QtOpenGL} module. QtOpenGL is
supported on devices which support OpenGL ES 2.0. Symbian platforms prior
to Symbian^3 are not supported.
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 79d257a7bd..ad41a477ff 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -12,6 +12,9 @@ contains(QT_CONFIG, opengl):SUBDIRS += opengl
# For now only the contain examples with mingw, for the others you need
# an IDL compiler
win32-g++*|wince*:SUBDIRS = webbrowser
+# Due to build problems, active qt was disabled from mingw build,
+# so we have to remove the only one left
+win32-g++*:SUBDIRS =
# install
target.path = $$[QT_INSTALL_EXAMPLES]/activeqt
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp
index 2ce0391d3c..2457a5b97c 100644
--- a/examples/dialogs/extension/finddialog.cpp
+++ b/examples/dialogs/extension/finddialog.cpp
@@ -104,9 +104,11 @@ FindDialog::FindDialog(QWidget *parent)
connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit()));
addAction(backSoftKeyAction);
#else
+//! [6]
buttonBox = new QDialogButtonBox(Qt::Vertical);
buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
+//! [6]
connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
#endif
diff --git a/src/3rdparty/phonon/mmf/environmentalreverb.cpp b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
index d4f522314f..cdce6eb2a4 100644
--- a/src/3rdparty/phonon/mmf/environmentalreverb.cpp
+++ b/src/3rdparty/phonon/mmf/environmentalreverb.cpp
@@ -164,7 +164,7 @@ bool EnvironmentalReverb::getParameters(CMdaAudioOutputStream *stream,
parameters.append(createParameter(
Diffusion, tr("Diffusion (%)"), effect->Diffusion(), 0, 100));
- //: ReflectionsDelay: Amount of delay between the arrival the direct
+ //: ReflectionsDelay: Amount of delay between the arrival of the direct
//: path from the source and the arrival of the first reflection.
parameters.append(createParameter(
ReflectionsDelay, tr("Reflections delay (ms)"),
@@ -185,7 +185,7 @@ bool EnvironmentalReverb::getParameters(CMdaAudioOutputStream *stream,
0, effect->ReverbDelayMax()));
effect->ReverbLevelRange(min, max);
- //: ReverbLevel Amplitude of reverberations. This value is
+ //: ReverbLevel: Amplitude of reverberations. This value is
//: corrected by the RoomLevel to give the final reverberation
//: amplitude.
parameters.append(createParameter(
diff --git a/src/3rdparty/phonon/phonon/volumeslider.cpp b/src/3rdparty/phonon/phonon/volumeslider.cpp
index 00970c1bf5..5b38bae96d 100644
--- a/src/3rdparty/phonon/phonon/volumeslider.cpp
+++ b/src/3rdparty/phonon/phonon/volumeslider.cpp
@@ -42,7 +42,7 @@ VolumeSlider::VolumeSlider(QWidget *parent)
setToolTip(tr("Volume: %1%").arg(100));
#endif
#ifndef QT_NO_WHATSTHIS
- setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%").arg(100));
+ setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1%").arg(100));
#endif
connect(&d->slider, SIGNAL(valueChanged(int)), SLOT(_k_sliderChanged(int)));
@@ -60,7 +60,7 @@ VolumeSlider::VolumeSlider(AudioOutput *output, QWidget *parent)
setToolTip(tr("Volume: %1%").arg(100));
#endif
#ifndef QT_NO_WHATSTHIS
- setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%").arg(100));
+ setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1%").arg(100));
#endif
connect(&d->slider, SIGNAL(valueChanged(int)), SLOT(_k_sliderChanged(int)));
@@ -114,7 +114,7 @@ void VolumeSlider::setMaximumVolume(qreal volume)
int max = static_cast<int>(volume * 100);
k_ptr->slider.setMaximum(max);
#ifndef QT_NO_WHATSTHIS
- setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%")
+ setWhatsThis(tr("Use this slider to adjust the volume. The leftmost position is 0%. The rightmost is %1%")
.arg(max));
#endif
}
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 5e0a2e6343..fc9bd044d2 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -918,7 +918,7 @@ void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c
WebCore::ResourceError FrameLoaderClientQt::cancelledError(const WebCore::ResourceRequest& request)
{
ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().prettyURL(),
- QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Request canceled", 0, QCoreApplication::UnicodeUTF8));
error.setIsCancellation(true);
return error;
}
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 9caa37e955..cd3450e4be 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -61,7 +61,7 @@ QString QSoftKeyManager::standardSoftKeyText(StandardSoftKey standardKey)
QString softKeyText;
switch (standardKey) {
case OkSoftKey:
- softKeyText = QSoftKeyManager::tr("Ok");
+ softKeyText = QSoftKeyManager::tr("OK");
break;
case SelectSoftKey:
softKeyText = QSoftKeyManager::tr("Select");
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index 6c29141d66..e6842b3e40 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -94,6 +94,7 @@ QT_BEGIN_NAMESPACE
specifying their role.
\snippet examples/dialogs/extension/finddialog.cpp 1
+ \snippet examples/dialogs/extension/finddialog.cpp 6
Alternatively, QDialogButtonBox provides several standard buttons (e.g. OK, Cancel, Save)
that you can use. They exist as flags so you can OR them together in the constructor.
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index c9801c8c06..25287462ba 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -4561,7 +4561,7 @@ yyreduce:
{
parseInfo->staticContext->error(QtXmlPatterns::tr("The namespace for a user defined function "
"cannot be empty (try the predefined "
- "prefix %1 which exists for cases "
+ "prefix %1, which exists for cases "
"like this)")
.arg(formatKeyword("local")),
ReportContext::XQST0060, fromYYLTYPE((yyloc), parseInfo));
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
index 29c9f5aa98..2549f5f059 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
@@ -854,7 +854,7 @@ void XsdSchemaResolver::resolveComplexContentComplexTypes(const XsdComplexType::
group->setCompositor(XsdModelGroup::SequenceCompositor);
if (effectiveContent && effectiveContent->term()->isModelGroup() && XsdModelGroup::Ptr(effectiveContent->term())->compositor() == XsdModelGroup::AllCompositor) {
- m_context->error(QtXmlPatterns::tr("Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.")
+ m_context->error(QtXmlPatterns::tr("Content model of complex type %1 contains %2 element, so it cannot be derived by extension from a non-empty type.")
.arg(formatType(m_namePool, complexType)).arg(formatKeyword("all")), XsdSchemaContext::XSDError, sourceLocation(complexType));
return;
}
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
index 80c95c1545..22d5d22540 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp
@@ -699,7 +699,7 @@ bool XsdValidatingInstanceReader::validateElementComplexType(const XsdElement::P
if (complexType->contentType()->variety() == XsdComplexType::ContentType::Mixed) {
if (declaration->valueConstraint() && declaration->valueConstraint()->variety() == XsdElement::ValueConstraint::Fixed) {
if (hasChildElement()) {
- error(QtXmlPatterns::tr("Element %1 cannot contain other elements, as it has a fixed content.").arg(formatKeyword(declaration->displayName(m_namePool))));
+ error(QtXmlPatterns::tr("Element %1 cannot contain other elements, as it has fixed content.").arg(formatKeyword(declaration->displayName(m_namePool))));
return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 18:37:58 +0000