forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/2.3'
Conflicts: share/qtcreator/dumper/bridge.py src/plugins/debugger/gdb/gdbengine.cpp src/plugins/remotelinux/remotelinuxapplicationrunner.cpp Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
This commit is contained in:
Oswald Buddenhagen
3
.gitignore
vendored
3
.gitignore
vendored
@@ -69,6 +69,7 @@ lib/*
|
||||
lib64/*
|
||||
release
|
||||
doc/html/*
|
||||
doc/html-dev/*
|
||||
doc/api/html/*
|
||||
doc/pluginhowto/html/*
|
||||
.rcc
|
||||
@@ -86,7 +87,7 @@ bin/qml2puppet
|
||||
bin/qml2puppet.exe
|
||||
bin/qtpromaker
|
||||
bin/qtpromaker.exe
|
||||
share/doc/qtcreator/qtcreator.qch
|
||||
share/doc/qtcreator/*.qch
|
||||
src/tools/gen-cpp-ast/generate-ast
|
||||
src/tools/mkvisitor/cplusplus0
|
||||
src/tools/qml/qmldump/qmldump
|
||||
|
||||
81
dist/changes-2.3.0
vendored
Normal file
81
dist/changes-2.3.0
vendored
Normal file
@@ -0,0 +1,81 @@
|
||||
Qt Creator version 2.3 contains bug fixes and new features.
|
||||
|
||||
The most important changes are listed in this document. For a complete
|
||||
list of changes, see the Git log for the Qt Creator sources that
|
||||
you can check out from the public Git repository. For example:
|
||||
|
||||
git clone git://gitorious.org/qt-creator/qt-creator.git
|
||||
git log --cherry-pick --pretty=oneline v2.2.1...origin/2.3
|
||||
|
||||
General
|
||||
* Welcome page redesign allows searching through examples with descriptions
|
||||
* Restore previous size when unmaximizing output panes
|
||||
* Added support for building with the Clang compiler
|
||||
|
||||
Editing
|
||||
* Fixed lock up when regular expression search matched empty line
|
||||
* Completions are now computed in a separate thread (non-blocking editor)
|
||||
|
||||
Managing Projects
|
||||
|
||||
Debugging
|
||||
* Color memory display highlighting the variables in stack layout
|
||||
* Correct source location for breakpoints in CDB using code model
|
||||
(QTCREATORBUG-2317)
|
||||
|
||||
Debugging QML/JS
|
||||
|
||||
C++ Support
|
||||
* Made C++ coding style configurable (QTCREATORBUG-2670, QTCREATORBUG-4310,
|
||||
QTCREATORBUG-2763, QTCREATORBUG-3623, QTCREATORBUG-567)
|
||||
* Various indentation fixes (QTCREATORBUG-4993)
|
||||
|
||||
QML/JS Support
|
||||
* Updated QML type descriptions for the current state of Qt 5
|
||||
* Made tab settings configurable separately and per-project
|
||||
* Added 'Find usages' functionality for QML types
|
||||
* Added type resolution for alias properties (QTCREATORBUG-2306)
|
||||
* Added tooltips to imports
|
||||
* Added documentation on using QML modules with plugins
|
||||
* Added support for properties and methods with a revision, allowing
|
||||
the QtQuick 1.0 and 1.1 imports to behave as intended
|
||||
* Added 'Reset code model' action to the Tools->QML/JS menu (QTCREATORBUG-4813)
|
||||
* Use qmlplugindump from Qt 4.8 or newer instead of building own qmldump
|
||||
* Improved error message for missing prototypes (QTCREATORBUG-4952)
|
||||
* Fixed completion of slots (QTCREATORBUG-3614, QTCREATORBUG-3459)
|
||||
* Fixed completion inside grouped property bindings (QTCREATORBUG-3541)
|
||||
* Fixed scanning and indentation of regular expression literals (QTCREATORBUG-4566)
|
||||
* Fixed indentation of object literals
|
||||
|
||||
Help
|
||||
|
||||
Platform Specific
|
||||
|
||||
Mac
|
||||
* "Open Terminal Here" opens Terminal.app instead of xterm
|
||||
|
||||
Linux (GNOME and KDE)
|
||||
|
||||
Windows
|
||||
|
||||
Symbian Target
|
||||
|
||||
Remote Linux Support
|
||||
* Created new plugin "RemoteLinux" comprising support for Maemo/MeeGo and
|
||||
generic remote Linux hosts
|
||||
* Generic remote Linux support entails:
|
||||
* The ability to create a deploy configuration and associated steps the
|
||||
same way as for Maemo
|
||||
* A device configuration wizard for a "Generic Linux" device type
|
||||
* The possibility to add device types and associated wizards and actions
|
||||
for the device configuration dialog via third-party plugins
|
||||
|
||||
Qt Designer
|
||||
|
||||
Version control plugins
|
||||
* Git: Manage remote repositories
|
||||
* Git: Improved branch dialog
|
||||
* Bazaar: lots of small improvements
|
||||
|
||||
Additional credits go to:
|
||||
Hugues Delorme for his work on the Bazaar plugin as well as version control base.
|
||||
@@ -4,8 +4,6 @@
|
||||
**
|
||||
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
**
|
||||
** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
|
||||
**
|
||||
** Contact: Nokia Corporation (info@qt.nokia.com)
|
||||
**
|
||||
**
|
||||
@@ -32,15 +30,3 @@
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef VALGRINDTOOLBASE_GLOBAL_H
|
||||
#define VALGRINDTOOLBASE_GLOBAL_H
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#if defined(VALGRINDTOOLBASE_LIBRARY)
|
||||
# define VALGRINDTOOLBASE_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
# define VALGRINDTOOLBASE_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
|
||||
#endif // VALGRINDTOOLBASE_GLOBAL_H
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
@@ -154,10 +154,6 @@
|
||||
|
||||
\section1 UI Text Capitalization
|
||||
|
||||
The capitalization of the Qt Creator UI text follows the
|
||||
\l{http://developer.kde.org/documentation/standards/kde/style/basics/labels.html#items}
|
||||
{KDE Style Guide}.
|
||||
|
||||
Two styles are used, book title and sentence style:
|
||||
|
||||
\list
|
||||
@@ -168,6 +164,11 @@
|
||||
|
||||
\endlist
|
||||
|
||||
When using book style capitalization, capitalize all words, except
|
||||
prepositions that are shorter than five letters (for example, 'with' but
|
||||
'Without'), conjunctions (for example, and, or, but), and articles (a, an,
|
||||
the).
|
||||
|
||||
Use book style capitalization for:
|
||||
|
||||
\list
|
||||
@@ -182,6 +183,9 @@
|
||||
|
||||
\endlist
|
||||
|
||||
When using sentence style capitalization, capitalize only the first letter,
|
||||
except proper names.
|
||||
|
||||
Use sentence style capitalization for:
|
||||
|
||||
\list
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 32 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 145 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 181 KiB After Width: | Height: | Size: 107 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 68 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 66 KiB |
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
@@ -613,9 +613,9 @@
|
||||
|
||||
\list
|
||||
|
||||
\o Open tutorials and example projects
|
||||
\o Read news from the Qt labs
|
||||
|
||||
\o View tips and hints on using Qt Creator
|
||||
\o Open tutorials and example projects
|
||||
|
||||
\o Create and open projects
|
||||
|
||||
@@ -623,10 +623,6 @@
|
||||
|
||||
\o Open recent sessions and projects
|
||||
|
||||
\o Read news from the Qt labs
|
||||
|
||||
\o Ask for support
|
||||
|
||||
\endlist
|
||||
|
||||
You can use the mode selector to change to another Qt Creator mode.
|
||||
@@ -3066,7 +3062,7 @@
|
||||
without delimiter characters and the initial character of each element is
|
||||
capitalized. For example, rewrites \c an_example_symbol
|
||||
as \c anExampleSymbol and \c AN_EXAMPLE_SYMBOL as \c AnExampleSymbol
|
||||
\i Indentifier
|
||||
\i Identifier
|
||||
\row
|
||||
\i Complete Switch Statement
|
||||
\i Adds all possible cases to a switch statement of the type \c enum
|
||||
@@ -3178,14 +3174,14 @@
|
||||
|
||||
To develop applications for Symbian devices, you use
|
||||
qmake and the local Symbian compiler (on Windows) or qmake and a compilation
|
||||
service at Forum Nokia (on Linux and Mac OS) to build the applications for
|
||||
service at Nokia Developer (on Linux and Mac OS) to build the applications for
|
||||
the Symbian devices target. The interface to the compilation service, Remote
|
||||
Compiler, is installed as a part of the \QSDK. For more information, see
|
||||
\l{Building with Remote Compiler}.
|
||||
|
||||
When you install the \QSDK, the build and run settings for the Maemo, MeeGo
|
||||
Harmattan, and
|
||||
Symbian targets are set up automatically. However, you need to install and
|
||||
You can install Maemo, MeeGo Harmattan, and Symbian targets as parts of
|
||||
the \QSDK. The build and run settings for the selected targets are set up
|
||||
automatically. However, you need to install and
|
||||
configure some additional software on the devices to be able to connect to
|
||||
them from the development PC.
|
||||
|
||||
@@ -3232,8 +3228,10 @@
|
||||
|
||||
\o Qt Quick Project
|
||||
|
||||
Use QML to define the user interface and,
|
||||
optionally, C++ or JavaScript to define the application logic
|
||||
Use QML elements or Qt Quick Components to define the user interface and,
|
||||
optionally, C++ or JavaScript to define the application logic.
|
||||
|
||||
|
||||
|
||||
\o Qt Widget Project
|
||||
|
||||
@@ -4037,31 +4035,37 @@
|
||||
|
||||
\list
|
||||
|
||||
\o GNU Compiler Collection (GCC) is a cross compiler for Linux and
|
||||
\o GNU Compiler Collection (GCC) is a compiler for Linux and
|
||||
Mac OS X.
|
||||
|
||||
\o MinGW (Minimalist GNU for Windows) is a native software port of GCC
|
||||
and GNU Binutils for use in the development of native Microsoft
|
||||
Windows applications on Windows or as cross compiler. MinGW is
|
||||
Windows applications on Windows. MinGW is
|
||||
distributed together with Qt Creator and Qt SDK for Windows.
|
||||
|
||||
\o GCCE (GNU Compiler Collection for Embedded) is an ARM-based
|
||||
compiler used in Symbian OS 9 and distributed together with the
|
||||
Symbian OS 9 SDKs.
|
||||
\o Linux ICC (Intel C++ Compiler) is a group of C and C++ compilers
|
||||
for Linux.
|
||||
|
||||
\o RVCT is an ARM-bases compiler for building applications for Symbian
|
||||
\o Clang is a C, C++, Objective C, and Objective C++ front-end for the
|
||||
LLVM compiler for Windows, Linux, Mac OS X, and Symbian.
|
||||
|
||||
\o GCCE (GNU Compiler Collection for Embedded) is an ARM-based
|
||||
compiler used in Symbian OS 9 and distributed together with \QSDK.
|
||||
|
||||
\o RVCT is an ARM-based compiler for building applications for Symbian
|
||||
devices (requires a license).
|
||||
|
||||
\o WINSCW is a compiler for building applications that can be run or
|
||||
debugged on the Symbian Emulator. It is distributed together with
|
||||
Symbian SDKs.
|
||||
Symbian SDKs (but not with the \QSDK).
|
||||
|
||||
\endlist
|
||||
|
||||
To build an application using MinGW or GCCE, specify the paths to the
|
||||
To build an application using GCC, MinGW, GCCE, or Clang, specify the paths
|
||||
to the
|
||||
directories where the compiler and debugger are located and select the
|
||||
application binary interface (ABI) version from the list of available
|
||||
versions.
|
||||
versions. You can also create a custom ABI definition.
|
||||
|
||||
Qt Creator allows you to select a tool chain that matches the Qt version
|
||||
in the \gui Projects mode \gui {Build Settins}.
|
||||
@@ -4073,6 +4077,8 @@
|
||||
\o Select \gui {Tools > Options... Tool Chains > Add} and select a
|
||||
compiler in the list.
|
||||
|
||||
\image qtcreator-toolchains.png
|
||||
|
||||
To clone the selected tool chain, select \gui {Clone}.
|
||||
|
||||
\o In the \gui Name column, double-click the name to change it.
|
||||
@@ -4081,8 +4087,6 @@
|
||||
where the compiler is located. For WINSCW, enter the path to the
|
||||
Carbide C++ installation directory here.
|
||||
|
||||
\image qtcreator-toolchains.png
|
||||
|
||||
The other settings to specify depend on the tool chain.
|
||||
|
||||
\o For RVCT, select the ARM version to use in the \gui {ARM version}
|
||||
@@ -4373,7 +4377,7 @@
|
||||
The tool chain for building applications locally on the development PC for
|
||||
the \gui {Symbian Device} target is only supported on Windows.
|
||||
If you develop on Linux or Mac OS, you must use the Remote Compiler
|
||||
interface to a compilation service at Forum Nokia. For more information,
|
||||
interface to a compilation service at Nokia Developer. For more information,
|
||||
see \l{Building with Remote Compiler}.
|
||||
|
||||
\section2 Troubleshooting Build Issues
|
||||
@@ -4516,7 +4520,7 @@
|
||||
The tool tip of the target selector shows more details about the actual
|
||||
device that will be used when you run your application.
|
||||
|
||||
\o Start the debugging agent (CODA or App TRK) application on your device.
|
||||
\o Start the CODA debugging agent on the device.
|
||||
|
||||
\note If you use CODA over an USB connection, it starts up
|
||||
automatically when you connect the device to the development PC.
|
||||
@@ -4539,7 +4543,7 @@
|
||||
\o The Nokia USB drivers that come with \e{PC Suite} or \e{Ovi Suite}
|
||||
have been installed on the development PC.
|
||||
\o The device is connected through USB cable in \e{PC Suite} mode.
|
||||
\o The debugging agent (App TRK or CODA) is running on the device with
|
||||
\o The CODA debugging agent is running on the device with
|
||||
the status \e connected.
|
||||
|
||||
\note If you use the CODA debugging agent over WLAN, you must enter
|
||||
@@ -4587,15 +4591,15 @@
|
||||
\title Building with Remote Compiler
|
||||
|
||||
The \gui {Remote Compiler} target is an interface to a compilation service at
|
||||
Forum Nokia. It provides a simple, standardized environment for building Qt
|
||||
Nokia Developer. It provides a simple, standardized environment for building Qt
|
||||
applications and creating installation packages for Symbian, Maemo, and
|
||||
MeeGo Harmattan devices
|
||||
when you do not have the necessary tool chains and SDKs installed or they are
|
||||
not supported on the development PC. You can choose from a set of supported
|
||||
devices, such as S60 3rd Edition or S60 5th Edition devices.
|
||||
|
||||
You need a Forum Nokia user account to use the Remote Compiler. You can
|
||||
create an account for free at \l{http://www.forum.nokia.com/}{Forum Nokia}.
|
||||
You need a Nokia Developer user account to use the Remote Compiler. You can
|
||||
create an account for free at \l{http://www.developer.nokia.com/}{Nokia Developer}.
|
||||
|
||||
\note Remote Compiler is an experimental component that is installed as
|
||||
part of \QSDK.
|
||||
@@ -4609,7 +4613,7 @@
|
||||
Remote Compiler} to install Remote Compiler.
|
||||
|
||||
\o In Qt Creator, choose \gui {Tools > Options > Projects > Remote Compiler}
|
||||
to log on to Forum Nokia.
|
||||
to log on to Nokia Developer.
|
||||
|
||||
\image remotecompiler-fn-logon.png "Remote Compiler options"
|
||||
|
||||
@@ -5194,7 +5198,7 @@
|
||||
(Express Signing). Participants can submit an unsigned SIS file to Ovi
|
||||
Publishing for signing. For more information about how
|
||||
to participate, see
|
||||
\l {http://wiki.forum.nokia.com/index.php/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}{Guide to Publishing Qt Applications to the Ovi Store}.
|
||||
\l {http://www.developer.nokia.com/Community/Wiki/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}{Guide to Publishing Qt Applications to the Ovi Store}.
|
||||
|
||||
There are also options that do not require you to get a Publisher ID. For
|
||||
more detail about how the Symbian Signed process works, see
|
||||
@@ -5285,7 +5289,7 @@
|
||||
|
||||
You can either install the Nokia Smart Installer for Symbian as part of
|
||||
the \QSDK, or download and install it from the
|
||||
\l{http://wiki.forum.nokia.com/index.php/Nokia_Smart_Installer_for_Symbian}{Nokia Smart Installer for Symbian}
|
||||
\l{http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}{Nokia Smart Installer for Symbian}
|
||||
wiki.
|
||||
|
||||
To package Nokia Smart Installer with the application, select the \gui {Create Smart Installer
|
||||
@@ -5311,7 +5315,7 @@
|
||||
|
||||
\list 1
|
||||
|
||||
\o Make sure that the source directory is clean. For example, if you use git,
|
||||
\o Make sure that the source directory is clean. For example, if you use Git,
|
||||
enter the following command:
|
||||
|
||||
\c {git clean -dfx}
|
||||
@@ -5367,7 +5371,7 @@
|
||||
|
||||
\list 1
|
||||
|
||||
\o Make sure that the source directory is clean. For example, if you use git,
|
||||
\o Make sure that the source directory is clean. For example, if you use Git,
|
||||
enter the following command:
|
||||
|
||||
\c {git clean -dfx}
|
||||
@@ -5499,7 +5503,7 @@
|
||||
|
||||
The process and requirements to publish Qt applications to Ovi Store are
|
||||
described in the
|
||||
\l {http://wiki.forum.nokia.com/index.php/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}{Guide to Publishing Qt Applications to the Ovi Store} wiki.
|
||||
\l {http://www.developer.nokia.com/Community/Wiki/Guide_to_Publishing_Qt_Applications_to_the_Ovi_Store}{Guide to Publishing Qt Applications to the Ovi Store} wiki.
|
||||
|
||||
This section describes how to
|
||||
generate installation packages that
|
||||
@@ -5565,7 +5569,7 @@
|
||||
device if you use UIDs from the trusted range (0x2xxxxxxx) in a self-signed
|
||||
application: \gui {Unable to install a trusted application from a trusted
|
||||
supplier.} For more
|
||||
information, see \l{http://wiki.forum.nokia.com/index.php/UID}{UID}.
|
||||
information, see \l{http://www.developer.nokia.com/Community/Wiki/UID}{UID}.
|
||||
|
||||
If you try to use more capabilites than the certificate permits, the
|
||||
following error message is displayed on the device: \gui {Requested
|
||||
@@ -5642,7 +5646,7 @@
|
||||
|
||||
The applications that you publish on Ovi Store, must meet the testing criteria
|
||||
listed in
|
||||
\l{http://www.forum.nokia.com/info/sw.nokia.com/id/9cd1eb18-821b-4228-a0a3-36b049c5d608/Maemo_5_Application_OVI_Store_Entry_Requirements.pdf.html}
|
||||
\l{http://www.developer.nokia.com/info/sw.nokia.com/id/9cd1eb18-821b-4228-a0a3-36b049c5d608/Maemo_5_Application_OVI_Store_Entry_Requirements.pdf.html}
|
||||
{Maemo 5 Applications: Ovi Store Entry Requirements}.
|
||||
|
||||
Make sure that your application passes the following most commonly
|
||||
@@ -6074,7 +6078,7 @@
|
||||
debugging agent on the device. For more information,
|
||||
see \l{Connecting Symbian Devices}.
|
||||
|
||||
\o Start the debugging agent, App TRK or CODA, on the device.
|
||||
\o Start the CODA debugging agent on the device.
|
||||
|
||||
\o Click the \gui {Target Selector} and select \gui {Symbian Device}.
|
||||
|
||||
@@ -9365,6 +9369,20 @@
|
||||
|
||||
\o Click \gui{Next}.
|
||||
|
||||
The \gui {Application Type} dialog opens.
|
||||
|
||||
\image qmldesigner-new-project-qml-sources.png "Application Type dialog"
|
||||
|
||||
\o Select the Qt Quick Component Set to use in your application. The
|
||||
built-in elements allow you to write cross-platform applications with
|
||||
custom look and feel. The components for Symbian and MeeGo Harmattan
|
||||
allow you to create applications with a native look and feel for the
|
||||
selected mobile platform.
|
||||
|
||||
You can also import an existing QML file in this dialog.
|
||||
|
||||
\o Click \gui{Next}.
|
||||
|
||||
The \gui {Target Setup} dialog opens.
|
||||
|
||||
\image qmldesigner-new-project-qt-versions.png "Target Setup dialog"
|
||||
@@ -9412,13 +9430,6 @@
|
||||
\o In the \gui {Application icon} field, select the application
|
||||
icon to use on Maemo or Harmattan targets, or use the default icon.
|
||||
|
||||
The \gui {QML Sources} dialog opens.
|
||||
|
||||
\image qmldesigner-new-project-qml-sources.png "QML Sources" dialog
|
||||
|
||||
\o In the \gui {QML Main File} group, select \gui {Generate a .qml file},
|
||||
and then click \gui{Next}.
|
||||
|
||||
The \gui {Project Management} dialog opens.
|
||||
|
||||
\image qmldesigner-new-project-summary.png "Project Management" dialog
|
||||
@@ -9452,19 +9463,20 @@
|
||||
|
||||
\o Name the project and set its path, and then click \gui Next.
|
||||
|
||||
\o In the \gui {Application Type} dialog, select the \gui {Use an
|
||||
existing .qml file}
|
||||
option and specify the main .qml file of the project you want to import.
|
||||
|
||||
\image qmldesigner-import-project.png "Application Type dialog"
|
||||
|
||||
\o Click \gui Next.
|
||||
|
||||
\o Select the Qt versions to use as build targets for your project, and click
|
||||
\gui{Next}.
|
||||
|
||||
\o Specify options for deploying the application to mobile device targets, and
|
||||
click \gui{Next}.
|
||||
|
||||
\o In the \gui {QML Sources} dialog, select the \gui {Import an existing .qml file}
|
||||
option and specify the main .qml file of the project you want to import.
|
||||
|
||||
\image qmldesigner-import-project.png "QML Sources" dialog
|
||||
|
||||
\o Click \gui Next.
|
||||
|
||||
\o Review the project settings, and click \gui{Finish} to create the project.
|
||||
|
||||
\endlist
|
||||
@@ -9515,10 +9527,17 @@
|
||||
|
||||
\endlist
|
||||
|
||||
You can experiment with a set of Qt Quick components that are designed to
|
||||
appear native to the Symbian devices target platform. For more information,
|
||||
see
|
||||
\l{http://labs.qt.nokia.com/2011/04/08/qt-quick-components-for-symbian-technology-preview/}{Qt Quick components for Symbian Technology Preview}.
|
||||
QML elements allow you to write cross-platform applications with custom look
|
||||
and feel. You can also use ready-made Qt Quick Components for Symbian and
|
||||
MeeGo Harmattan that allow you to create applications with a native look and
|
||||
feel for the selected mobile platform. You can install the components as
|
||||
part of \QSDK.
|
||||
|
||||
When you use the Qt Creator project wizard to create Qt Quick applications,
|
||||
you can select which component set to use in your application.
|
||||
|
||||
Even if you use the Qt Quick Components, you can still write cross-platform
|
||||
applications, by using different sets of QML files for each platform.
|
||||
|
||||
You can dowload a set of commonly used UI-components for generic use in
|
||||
Qt Quick projects from
|
||||
@@ -9798,8 +9817,13 @@
|
||||
The QML files in the project folder are displayed in \gui {QML Components} in the
|
||||
\gui Library pane.
|
||||
|
||||
You can also use ready-made Qt Quick Components for Symbian and
|
||||
MeeGo Harmattan that allow you to create screens with a native look and
|
||||
feel for the selected mobile platform. You can install the components as
|
||||
part of \QSDK.
|
||||
|
||||
You can dowload QML templates that specify different types of screens from
|
||||
\l{https://projects.forum.nokia.com/QMLTemplates}{QML Templates} for use in
|
||||
\l{https://projects.developer.nokia.com/QMLTemplates}{QML Templates} for use in
|
||||
your Qt Quick projects. You can open and edit the templates in \QD.
|
||||
|
||||
\section1 Adding Components to Screens
|
||||
@@ -10649,8 +10673,7 @@
|
||||
\endlist
|
||||
|
||||
For more information about user experience techniques for mobile devices, see the
|
||||
\l{http://library.forum.nokia.com/topic/Design_and_User_Experience_Library/GUID-A8DF3EB8-E97C-4DA0-95F6-F464ECC995BC_cover.html}{Design and User Experience Library}
|
||||
on Forum Nokia.
|
||||
\l{http://www.developer.nokia.com/Resources/Library/Design_and_UX} on Nokia Developer.
|
||||
|
||||
*/
|
||||
|
||||
@@ -12289,7 +12312,7 @@
|
||||
|
||||
\row
|
||||
\o Develop Qt applications for Nokia mobile devices
|
||||
\o \l{http://www.forum.nokia.com/Develop/Qt/}{Forum Nokia - Qt}
|
||||
\o \l{http://www.developer.nokia.com/Develop/Qt/}{Nokia Developer - Qt}
|
||||
|
||||
\row
|
||||
\o Participate in Qt development
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
** file.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
@@ -51,8 +51,8 @@
|
||||
the standard methods for installing applications.
|
||||
|
||||
To debug applications on Symbian devices by using the Qt Creator \gui Debug
|
||||
mode, you must install an on-device debugging agent on the device. You have
|
||||
a choice between App TRK and CODA debugging agents. For more information,
|
||||
mode, you must install the CODA on-device debugging agent on the device.
|
||||
For more information,
|
||||
see
|
||||
\if defined(qcmanual)
|
||||
\l{Using On-device Debugging Agents}.
|
||||
@@ -65,7 +65,7 @@
|
||||
The tool chain for building applications locally on the development PC for
|
||||
the \gui {Symbian Device} target is only supported on Windows.
|
||||
If you develop on Linux or Mac OS, you must use the Remote Compiler
|
||||
interface to a compilation service at Forum Nokia.
|
||||
interface to a compilation service at Nokia Developer.
|
||||
|
||||
For more information about developing applications for the Symbian
|
||||
platform, select \gui {Help > Index} and look for \gui {Platform Notes},
|
||||
@@ -78,10 +78,10 @@
|
||||
following:
|
||||
\list
|
||||
\o The Nokia USB drivers that come with \e{PC Suite} or \e{Ovi Suite}
|
||||
\o An on-device debugging agent, \e {App TRK} or \e CODA, installed on
|
||||
\o The \e CODA on-device debugging agent installed on
|
||||
the device
|
||||
\o \e Qt installed on the device
|
||||
\o \e {Qt Mobility APIs} installed on the device, if you use them in
|
||||
\o \e {Qt libraries} installed on the device
|
||||
\o \e {Qt Mobility libraries} installed on the device, if you use them in
|
||||
applications
|
||||
\o \e {QtWebKit} installed on the device, if you use web functionality
|
||||
in applications
|
||||
@@ -104,7 +104,8 @@
|
||||
|
||||
Separate installation packages are provided for Symbian^3 and Symbian^1
|
||||
devices. To check the Symbian platform version of your device, see
|
||||
\l{http://www.forum.nokia.com/devices}{Device Details}.
|
||||
\l{http://www.developer.nokia.com/Devices/Device_specifications/}
|
||||
{Device Specifications}.
|
||||
|
||||
\note You can also copy the .sis files from
|
||||
\c {<QtSDK_install_path>\Symbian\sis} to the device using USB storage
|
||||
@@ -126,11 +127,6 @@
|
||||
and follow the instructions on the screen to install Qt
|
||||
mobility libraries to the device.
|
||||
|
||||
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.3 > Install TRK
|
||||
(Debug Agent) for Symbian^3 on Device} and follow the
|
||||
instructions on the screen to install
|
||||
the App TRK debugging agent to the device.
|
||||
|
||||
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.3 > Install QtWebKit
|
||||
for for Qt 4.7.3 on Symbian^3 Device} and follow the
|
||||
instructions on the screen to install QtWebKit to the device.
|
||||
@@ -155,11 +151,6 @@
|
||||
for Symbian^1 on Device} and follow the instructions on the screen to install Qt
|
||||
mobility libraries to the device.
|
||||
|
||||
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.3 > Install TRK
|
||||
(Debug Agent)} for the type of the connected device and follow the
|
||||
instructions on the screen to install
|
||||
the App TRK debugging agent to the device.
|
||||
|
||||
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.3 > Install QtWebKit
|
||||
for for Qt 4.7.3 on Symbian^1 Device} and follow the
|
||||
instructions on the screen to install QtWebKit to the device.
|
||||
@@ -173,43 +164,26 @@
|
||||
\if defined(qcmanual)
|
||||
\section1 Using On-device Debugging Agents
|
||||
|
||||
CODA is a new on-device debugging agent that will eventually replace App TRK.
|
||||
You can choose which debugging agent to use in the \gui {Run Settings} for
|
||||
the project.
|
||||
|
||||
CODA offers the following benefits:
|
||||
Support for the App TRK on-device debugging agent has been removed from
|
||||
Qt Creator 2.3. Only CODA is supported. It offers the following benefits:
|
||||
|
||||
\list
|
||||
|
||||
\o Extended error information
|
||||
\o Extensive error information
|
||||
|
||||
\o Debugging over WLAN
|
||||
|
||||
\o Extended information about the device
|
||||
\o Extensive information about the device
|
||||
|
||||
\endlist
|
||||
|
||||
CODA differs from App TRK in the following ways:
|
||||
|
||||
\list
|
||||
|
||||
\o CODA does not support debugging over a Bluetooth connection.
|
||||
|
||||
\o CODA supports only Symbian^1 and Symbian^3 devices. It does not
|
||||
support S60 3rd Edition devices.
|
||||
|
||||
\endlist
|
||||
\note CODA does not support debugging over a Bluetooth connection.
|
||||
|
||||
\section2 Installing Debugging Agents
|
||||
|
||||
You can download CODA from the
|
||||
\l{http://tools.ext.nokia.com/coda/}{CODA download server}.
|
||||
|
||||
The \QSDK installation program creates a shortcut for installing
|
||||
App TRK on Symbian devices, but you can also download and install it
|
||||
separately from the
|
||||
\l{http://tools.ext.nokia.com/trk/}{App TRK download server}.
|
||||
|
||||
\section1 Adding Symbian Platform SDKs
|
||||
|
||||
\QSDK contains all the tools you need for developing Qt applications for
|
||||
@@ -258,9 +232,7 @@
|
||||
The tool tip of the target selector shows more details about the actual
|
||||
device that will be used when you run your application.
|
||||
|
||||
\o Start the debugging application, App TRK or CODA, on the device and
|
||||
deny the
|
||||
Bluetooth connection.
|
||||
\o Start the CODA debugging agent on the device.
|
||||
|
||||
\o Select \gui Options to select USB as connection type.
|
||||
|
||||
|
||||
@@ -11,3 +11,16 @@ TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
|
||||
SUBDIRS = src share
|
||||
|
||||
OTHER_FILES += dist/copyright_template.txt \
|
||||
dist/changes-1.1.0 \
|
||||
dist/changes-1.1.1 \
|
||||
dist/changes-1.2.0 \
|
||||
dist/changes-1.2.1 \
|
||||
dist/changes-1.3.0 \
|
||||
dist/changes-1.3.1 \
|
||||
dist/changes-2.0.0 \
|
||||
dist/changes-2.0.1 \
|
||||
dist/changes-2.1.0 \
|
||||
dist/changes-2.2.0 \
|
||||
dist/changes-2.3.0
|
||||
|
||||
@@ -11,20 +11,56 @@ if True:
|
||||
import gdb
|
||||
|
||||
def registerCommand(name, func):
|
||||
warn("REGISTER %s" % name)
|
||||
|
||||
class Command(gdb.Command):
|
||||
def __init__(self):
|
||||
super(Command, self).__init__(name, gdb.COMMAND_OBSCURE)
|
||||
warn("INIT %s" % name)
|
||||
|
||||
def invoke(self, args, from_tty):
|
||||
print func(args)
|
||||
warn("INVOKE %s" % name)
|
||||
output = func(args)
|
||||
try:
|
||||
print(output)
|
||||
except:
|
||||
out = ""
|
||||
for c in output:
|
||||
cc = ord(c)
|
||||
if cc > 127:
|
||||
out += "\\\\%d" % cc
|
||||
elif cc < 0:
|
||||
out += "\\\\%d" % (cc + 256)
|
||||
else:
|
||||
out += c
|
||||
print(out)
|
||||
|
||||
|
||||
|
||||
Command()
|
||||
|
||||
|
||||
def isGoodGdb():
|
||||
#return gdb.VERSION.startswith("6.8.50.2009") \
|
||||
# and gdb.VERSION != "6.8.50.20090630-cvs"
|
||||
return 'parse_and_eval' in __builtin__.dir(gdb)
|
||||
|
||||
|
||||
def parseAndEvaluate(exp):
|
||||
if isGoodGdb():
|
||||
return gdb.parse_and_eval(exp)
|
||||
# Work around non-existing gdb.parse_and_eval as in released 7.0
|
||||
gdb.execute("set logging redirect on")
|
||||
gdb.execute("set logging on")
|
||||
try:
|
||||
gdb.execute("print %s" % exp)
|
||||
except:
|
||||
gdb.execute("set logging off")
|
||||
gdb.execute("set logging redirect off")
|
||||
return None
|
||||
gdb.execute("set logging off")
|
||||
gdb.execute("set logging redirect off")
|
||||
return gdb.history(0)
|
||||
|
||||
|
||||
def listOfLocals(varList):
|
||||
frame = gdb.selected_frame()
|
||||
try:
|
||||
frame = gdb.selected_frame()
|
||||
#warn("FRAME %s: " % frame)
|
||||
@@ -40,7 +76,7 @@ if True:
|
||||
|
||||
items = []
|
||||
#warn("HAS BLOCK: %s" % hasBlock)
|
||||
if hasBlock:
|
||||
if hasBlock and isGoodGdb():
|
||||
#warn("IS GOOD: %s " % varList)
|
||||
try:
|
||||
block = frame.block()
|
||||
@@ -160,6 +196,43 @@ if True:
|
||||
items.append(item)
|
||||
|
||||
return items
|
||||
|
||||
|
||||
def catchCliOutput(command):
|
||||
try:
|
||||
return gdb.execute(command, to_string=True).split("\n")
|
||||
except:
|
||||
pass
|
||||
filename, file = createTempFile()
|
||||
gdb.execute("set logging off")
|
||||
gdb.execute("set logging redirect off")
|
||||
gdb.execute("set logging file %s" % filename)
|
||||
gdb.execute("set logging redirect on")
|
||||
gdb.execute("set logging on")
|
||||
msg = ""
|
||||
try:
|
||||
gdb.execute(command)
|
||||
except RuntimeError, error:
|
||||
# For the first phase of core file loading this yield
|
||||
# "No symbol table is loaded. Use the \"file\" command."
|
||||
msg = str(error)
|
||||
except:
|
||||
msg = "Unknown error"
|
||||
gdb.execute("set logging off")
|
||||
gdb.execute("set logging redirect off")
|
||||
if len(msg):
|
||||
# Having that might confuse result handlers in the gdbengine.
|
||||
#warn("CLI ERROR: %s " % msg)
|
||||
return "CLI ERROR: %s " % msg
|
||||
temp = open(filename, "r")
|
||||
lines = []
|
||||
for line in temp:
|
||||
lines.append(line)
|
||||
temp.close()
|
||||
removeTempFile(filename, file)
|
||||
return lines
|
||||
|
||||
|
||||
|
||||
|
||||
#except:
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<categories name="Qt Examples and Demos">
|
||||
<category dirname="declarative/toys" name="Toys">
|
||||
<example filename="dynamicscene" name="Dynamic Scene" executable="false" qml="true" />
|
||||
<example filename="tic-tac-toe" name="Tic Tac Toe" executable="false" qml="true" />
|
||||
<example filename="clocks" name="Clocks" executable="false" qml="true" />
|
||||
<example filename="corkboards" name="Corkboards" executable="false" qml="true" />
|
||||
<example filename="tvtennis" name="TV Tennis" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/ui-components" name="QML UI Components">
|
||||
<example filename="dialcontrol" name="Dial" executable="false" qml="true" />
|
||||
<example filename="flipable" name="Flipable" executable="false" qml="true" />
|
||||
<example filename="progressbar" name="Progress Bar" executable="false" qml="true" />
|
||||
<example filename="scrollbar" name="Scroll Bar" executable="false" qml="true" />
|
||||
<example filename="searchbox" name="Search Box" executable="false" qml="true" />
|
||||
<example filename="slideswitch" name="Slide Switch" executable="false" qml="true" />
|
||||
<example filename="spinner" name="Spinner" executable="false" qml="true" />
|
||||
<example filename="tabwidget" name="Tab Widget" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/text" name="Text">
|
||||
<example filename="fonts" name="Fonts" executable="false" qml="true" />
|
||||
<example filename="fonts/banner" name="Available Fonts" executable="false" qml="true" />
|
||||
<example filename="fonts/availableFonts" name="Available Fonts" executable="false" qml="true" />
|
||||
<example filename="fonts/hello" name="Hello" executable="false" qml="true" />
|
||||
<example filename="fonts/fonts" name="Fonts" executable="false" qml="true" />
|
||||
<example filename="textselection" name="Text selection" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/modelviews/webview" name="WebView">
|
||||
<example filename="googlemaps" name="Google Maps" executable="false" qml="true" />
|
||||
<example filename="autosize" name="Autosize" executable="false" qml="true" />
|
||||
<example filename="inlinehtml" name="Inline HTML" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/modelviews" name="Models and Views">
|
||||
<example filename="package" name="Package" executable="false" qml="true" />
|
||||
<example filename="gridview" name="GridView" executable="false" qml="true" />
|
||||
<example filename="visualitemmodel" name="VisualItemModel" executable="false" qml="true" />
|
||||
<example filename="webview" name="WebView" executable="false" qml="true" />
|
||||
<example filename="pathview" name="PathView" executable="false" qml="true" />
|
||||
<example filename="webview-examples" name="WebView" executable="false" qml="true" />
|
||||
<example filename="pathview-example" name="PathView" executable="false" qml="true" />
|
||||
<example filename="parallax" name="Parallax Sliding" executable="false" qml="true" />
|
||||
<example filename="listview" name="ListView" executable="false" qml="true" />
|
||||
<example filename="listview/sections" name="Sections in ListView" executable="false" qml="true" />
|
||||
<example filename="listview/expandingdelegates" name="Expanding delegates in ListView" executable="false" qml="true" />
|
||||
<example filename="listview/highlight" name="Highlight in ListView" executable="false" qml="true" />
|
||||
<example filename="listview/highlightranges" name="Highlight ranges in ListView" executable="false" qml="true" />
|
||||
<example filename="listview/dynamiclist" name="Dynamic list with ListView" executable="false" qml="true" />
|
||||
<example filename="objectlistmodel" name="Object List Model" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/threading" name="Threading">
|
||||
<example filename="threadedlistmodel" name="Threaded ListModel" executable="false" qml="true" />
|
||||
<example filename="workerscript" name="WorkerScript" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/animation" name="Animation">
|
||||
<example filename="basics/color-animation" name="Color animation" executable="false" qml="true" />
|
||||
<example filename="basics/propery-animation" name="Property animation" executable="false" qml="true" />
|
||||
<example filename="basics" name="Basics" executable="false" qml="true" />
|
||||
<example filename="behaviors" name="Behaviors" executable="false" qml="true" />
|
||||
<example filename="easing" name="Easing Curves" executable="false" qml="true" />
|
||||
<example filename="states" name="States" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/imageelements" name="Image elements">
|
||||
<example filename="image" name="Image" executable="false" qml="true" />
|
||||
<example filename="borderimage" name="Border Image" executable="false" qml="true" />
|
||||
<example filename="shadows" name="Shadows" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/touchinteraction" name="Touch interaction">
|
||||
<example filename="gestures" name="Gestures" executable="false" qml="true" />
|
||||
<example filename="mousearea" name="MouseArea" executable="false" qml="true" />
|
||||
<example filename="gestures/experimental-gestures" name="Gestures" executable="false" qml="true" />
|
||||
<example filename="mousearea/mousearea-example" name="MouseArea" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative/demos" name="Demos">
|
||||
<example filename="calculator" name="Calculator" executable="false" qml="true" />
|
||||
<example filename="flickr" name="Flickr" executable="false" qml="true" />
|
||||
<example filename="photoviewer" name="Photo viewer" executable="false" qml="true" />
|
||||
<example filename="rssnews" name="RSS news" executable="false" qml="true" />
|
||||
<example filename="samegame" name="Same Game" executable="false" qml="true" />
|
||||
<example filename="twitter" name="Twitter" executable="false" qml="true" />
|
||||
<example filename="webbrowser" name="Web browser" executable="false" qml="true" />
|
||||
</category>
|
||||
<category dirname="declarative" name="Miscellaneous">
|
||||
<example filename="positioners" name="Positioners" executable="false" qml="true" />
|
||||
<example filename="screenorientation" name="Screen Orientation" executable="false" qml="true" />
|
||||
<example filename="xml/xmlhttprequest" name="XmlHttpRequest" executable="false" qml="true" />
|
||||
<example filename="sqllocalstorage" name="SQL Local Storage" executable="false" qml="true" />
|
||||
<example filename="keyinteraction/focus" name="Focus" executable="false" qml="true" />
|
||||
</category>
|
||||
</categories>
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
As baseline, d85391173658dc6dcbf1acc5edbe331b1296f572 (Mon Jun 20 17:53:28)
|
||||
should be used.
|
||||
|
||||
For Mac:
|
||||
|
||||
+ gdb-increased-dcache-line-size.patch
|
||||
|
||||
For Linux:
|
||||
|
||||
+ gdb-increased-dcache-line-size.patch
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ Alternatively, this file may be used in accordance with the terms and
|
||||
conditions contained in a signed written agreement between you and Nokia.
|
||||
|
||||
If you have questions regarding the use of this file, please contact
|
||||
Nokia at qt-info@nokia.com.</string>
|
||||
Nokia at info@qt.nokia.com.</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>@ICON@</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at qt-info@nokia.com.
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user