Skip to content

GitLab

Commit f46a87a6 authored by con's avatar con
Browse files

Merge remote branch 'origin/2.1' 

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
parents a444cdc7 9a7e4865
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 31 deletions
doc/qtcreator.qdoc
View file @ f46a87a6
......@@ -67,7 +67,7 @@
\list
\o \l{Building and Running an Example Application}
\o \l{Creating a Qt C++ Application}
\o \l{Creating a Mobile Application with Nokia Qt SDK}
\o \l{Creating a Mobile Application with Qt SDK}
\o \l{Creating a Qt Quick Application}
\endlist
\o \l{Managing Projects}
......@@ -106,6 +106,7 @@
\o \l {Creating Screens}
\o \l {Animating Screens}
\o \l {Adding User Interaction Methods}
\o \l {Exporting Designs from Graphics Software}
\o \l {Implementing Application Logic}
\endlist
\o \l{Developing Widget Based Applications}
......@@ -355,8 +356,7 @@
\section2 Debuggers
Qt Creator does not include a debugger. It provides a debugger plugin that acts
as an interface between the Qt Creator core and external native debuggers:
Qt Creator is integrated to several external native debuggers:
\list
......@@ -2950,7 +2950,7 @@
\section3 Troubleshooting MinGW Compilation Errors
If error messages displayed in the \gui {Compile Output} pane contain
paths where slashes are missing (for example, C:NokiaQtSDK),
paths where slashes are missing (for example, C:QtSDK),
check your PATH variable. At the command line, enter the following commands:
\code
......@@ -4161,7 +4161,7 @@
\note The instructions below assume that you have installed \QSDK.
\o To package Nokia Smart Installer for Symbian with the application, choose
\gui {Start > Nokia Qt SDK > Symbian > Qt for Symbian Command Prompt}
\gui {Start > Qt SDK > Symbian > Qt for Symbian Command Prompt}
to open the Qt command line environment.
\o Change to the project directory. For example:
......@@ -4433,7 +4433,7 @@
\list
\o \l{Building and Running an Example Application}
\o \l{Creating a Qt C++ Application}
\o \l{Creating a Mobile Application with Nokia Qt SDK}
\o \l{Creating a Mobile Application with Qt SDK}
\o \l{Creating a Qt Quick Application}
\endlist
......@@ -4446,7 +4446,7 @@
\page creator-mobile-example.html
\nextpage creator-qml-application.html
\title Creating a Mobile Application with Nokia Qt SDK
\title Creating a Mobile Application with Qt SDK
\note To complete this tutorial, you must install \QSDK.
The installation program installs and configures the necessary tool chains
......@@ -4781,7 +4781,7 @@
To use the states.png image in your application, you must copy it to the project
directory from the examples directory in the
Qt installation directory. For example:
\c {C:\NokiaQtSDK\Examples\4.7\declarative\animation\states}. The image appears
\c {C:\QtSDK\Examples\4.7\declarative\animation\states}. The image appears
in the \gui Resources pane. You can also use any other image or a QML element, instead.
\list 1
......@@ -5953,7 +5953,7 @@
\title Debugging
Qt Creator does not include a debugger. It provides a debugger plugin that acts
Qt Creator provides a debugger plugin that acts
as an interface between the Qt Creator core and external native debuggers
such as the GNU Symbolic Debugger (gdb), the Microsoft Console Debugger (CDB),
and a QML/JavaScript debugger.
......@@ -7397,6 +7397,7 @@
\o \l {Creating Screens}
\o \l {Animating Screens}
\o \l {Adding User Interaction Methods}
\o \l {Exporting Designs from Graphics Software}
\o \l {Implementing Application Logic}
\endlist
......@@ -8063,7 +8064,7 @@
\contentspage index.html
\previouspage quick-animations.html
\page quick-user-interaction.html
\nextpage quick-application-logic.html
\nextpage quick-export-to-qml.html
\title Adding User Interaction Methods
......@@ -8090,6 +8091,146 @@
\contentspage index.html
\previouspage quick-user-interaction.html
\page quick-export-to-qml.html
\nextpage quick-application-logic.html
\title Exporting Designs from Graphics Software
You can export designs from graphics software, such as Adobe Photoshop and GIMP,
to QML files. Each scene is converted into a single QML file with an Image or a
Text element for each layer and saved on the development PC. Top-level layer
groups are converted into merged QML Image elements.
Note: GIMP does not support grouping, and therefore, each layer is exported as
an item in GIMP.
The following rules apply to the conversions:
\list
\o Layer names are used as element names. Spaces and hash marks (#) are
replaced with underscore characters to create valid ids for the elements.
\o Layer styles, such as drop shadows, are converted to images.
\o Offset, size, ordering and opacity are preserved.
\o Text layers are converted to Text elements, unless you specify that they
be converted to Image elements.
\o Hidden layers can be exported, and their visibility is set to hidden.
\o PNG images are copied to the images subirectory.
\endlist
You can open the QML file in Qt Creator for editing. If you edit the file in Adobe
Photoshop and export it to the same directory again, any changes you made in Qt
Creator are overwritten. However, you can re-export graphical assets without
recreating the QML code.
If you create vector graphics with other tools that have an Adobe Photoshop export
option,such as Adobe Illustrator, you can export them first to Photoshop and then
to QML.
\section1 Exporting from Adobe Photoshop to QML
\image qml-export-photoshop.png
The script has been tested to work on Adobe Photoshop CS 4 and 5, but it might also
work on other versions.
\list 1
\o Download the export script, \e{Export QML.jx}, from
\l{http://qt.gitorious.org/qt-labs/photoshop-qmlexporter/trees/master}{Gitorious}.
\note Read the README.txt file in the repository for latest information about
the script.
\o Double-click the export script to add the export command to the \gui Scripts
menu. You can also copy the script file to the Adobe Photoshop scripts directory
(typically, \c{\Presets\Scripts} in the Photoshop installation directory).
\o In Adobe Photoshop, choose \gui {File > Scripts > Export to QML} to export the
scene to a QML file.
\o In the \gui {Export Document to QML} dialog, enter a name and location for the
QML file.
\o Select the \gui {Rasterize text} check box to export text layers as images,
not as Text elements.
\o Select the \gui {Group layers} check box to export each top-level group as a
merged QML Image element.
\o Select the \gui {Export hidden} check box to export hidden layers and to set
their visibility property to hidden.
\o Deselect the \gui {Export QML} check box if you have modified the QML document
in Qt Creator, but still want to re-export graphical assets.
\o Click \gui Export.
\endlist
The QML file is saved to the location that you specified.
In Qt Creator, choose \gui {File > Open File or Project} to open the QML file.
\note Existing files are replaced without warning.
\section1 Exporting from GIMP to QML
\image qml-export-gimp.png
The script has been tested to work on GIMP 2. You can download GIMP 2 from
\l{http://www.gimp.org/downloads/}{GIMP Downloads}.
To use the export script on Microsoft Windows, you also need to install the
GIMP Python extension (Python, PyCairo, PyGobject, PyGTK). However, GIMP is
not officially supported on Windows, so we cannot guarantee that this will
work.
\list 1
\o On Microsoft Windows, you must first add Python support to your GIMP
installation, as instructed in
\l {http://www.gimpusers.com/tutorials/install-python-for-gimp-2-6-windows}{Tutorial: Installing Python for GIMP 2.6 (Windows)}.
\o Download the export script, \e qmlexporter.py, from
\l{http://qt.gitorious.org/qt-labs/gimp-qmlexporter/trees/master}{Gitorious}.
\note Read the INSTALL.txt in the repository for latest information about the
script.
\o Copy the export script to the plug-ins directory in the GIMP installation
directory.
\o Check the properties of the file to make sure that it is executable.
On Linux, run the following command: \c {chmod u+rx}
\o Restart GIMP to have the export command added to the \gui File menu.
\o Choose \gui {File > Export to QML} to export the design to a QML file.
\o In the \gui {Export Layers to a QML Document} dialog, enter a name and
location for the QML file, and click \gui Export.
\endlist
The QML file is saved to the location that you specified.
In Qt Creator, choose \gui {File > Open File or Project} to open the QML file.
\note Existing files are replaced without warning.
*/
/*!
\contentspage index.html
\previouspage quick-export-to-qml.html
\page quick-application-logic.html
\nextpage creator-using-qt-designer.html
......@@ -9358,7 +9499,7 @@
you installed \QSDK, Qt Creator, and MADDE.
\o If error messages displayed in the \gui {Compile Output} pane contain
paths where slashes are missing (for example, C:NokiaQtSDK),
paths where slashes are missing (for example, C:QtSDK),
check your PATH variable. For more information, see
\l{Troubleshooting MinGW Compilation Errors}.
......
doc/qtcreator.qdocconf
View file @ f46a87a6
......@@ -89,7 +89,7 @@ macro.QL = "\\e{Qt Linguist}"
macro.QC = "\\e{Qt Creator}"
macro.QMLD = "\\e{Qt Quick Designer}"
macro.QQV = "\\e{Qt QML Viewer}"
macro.QSDK = "\\e{Nokia Qt SDK}"
macro.QSDK = "\\e{Qt SDK}"
macro.param = "\\e"
macro.raisedaster.HTML = "<sup>*</sup>"
macro.reg.HTML = "<sup>&reg;</sup>"
......
doc/symbiandev.qdoc
View file @ f46a87a6
......@@ -62,12 +62,16 @@
\e {App TRK}
\endif
application for your device
\o The \e{qt_installer.sis} package installed on the device, that is
delivered with the \QSDK
\o \e Qt installed on the device
\o \e {Qt Mobility APIs} installed on the device, if you use them in
applications
\o \QQV to run Qt Quick applications on Symbian^3 devices.
\endlist
In addition, you can install example applications, demos, and utility
applications, such as Nokia Energy Profiler and Nokia Performance Manager,
on devices.
\if defined(qcmanual)
To run your applications in the Symbian emulator, you also need
to install Carbide.c++ v2.0.0 or higher.
......@@ -77,36 +81,73 @@
The \QSDK installation program creates shortcuts for installing
the required applications on Symbian devices (you can also use any of
the standard methods for installing applications on devices):
the standard methods for installing applications on devices).
Connect the device to the development PC with an USB cable in
PC Suite Mode. If you have not previously used the device with Ovi Suite
or PC Suite, all the necessary drivers are installed automatically.
This takes approximately one minute.
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}.
\note You can also copy the .sis files from
\c {<QtSDK_install_path>\Symbian\sis} to the device using USB storage
mode and install them from the file manager on the device.
\section2 Developing for Symbian^3
\list 1
\o Connect the device to the development PC with an USB cable in
PC Suite Mode. If you have not previously used the device with Ovi Suite
or PC Suite, all the necessary drivers are installed automatically.
This takes approximately one minute.
\o Choose \gui {Start > Qt SDK > Symbian^3 > Install Qt 4.7.1 to
Symbian^3 Device}. Follow the instructions on the screen to install Qt
libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian > Install Qt to Symbian
\o Choose \gui {Start > Qt SDK > Symbian^3 > Install QtMobility 1.1.0 to
Symbian^3 Device}
and follow the instructions on the screen to install Qt
mobility libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian^3 > Install TRK (Debug Agent)
to Symbian^3 Device} and follow the instructions on the screen to install
the TRK
debugging application to the device.
\o Choose \gui {Start > Qt SDK > Symbian^3 > Install QML Viewer
to Symbian^3 Device} and follow the instructions on the screen to
install \QQV to the device.
\endlist
\section2 Developing for Symbian^1
Symbian^1 incorporates Symbian OS and S60 5th Edition (S60 5.0), which is
built on Symbian OS v9.4.
\list 1
\o Choose \gui {Start > Qt SDK > Symbian^1 > Install Qt 4.7.1 to Symbian^1
Device}. Follow the instructions on the screen to install Qt
libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian > Install QtMobility to
Symbian Device}
and follow the instructions on the screen to install Qt
\o Choose \gui {Start > Qt SDK > Symbian^1 > Install QtMobility 1.1.0 to
Symbian^1 Device} and follow the instructions on the screen to install Qt
mobility libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian > Install TRK (Debug Agent)
to Symbian Device} and follow the instructions on the screen to install the TRK
\o Choose \gui {Start > Qt SDK > Symbian^1 > Install TRK (Debug Agent)
to Symbian^1 Device} and follow the instructions on the screen to install
the TRK
debugging application to the device.
\note To check the Symbian platform version of your device, see
\l{http://www.forum.nokia.com/devices}{Device Details}.
\o Choose \gui {Start > Qt SDK > Symbian^1 > Install QML Viewer
to Symbian^3 Device} and follow the instructions on the screen to
install \QQV to the device.
\endlist
\note If errors occur during the installation, copy the .sis files from
\c {<NokiaQtSDK_install_path>\Symbian\sis} to the device using USB storage
mode. Then install them from the file manager on the device.
In addition, you can install an example application and demos to Symbian^1
devices.
\if defined(qcmanual)
\section1 Adding Symbian Platform SDKs
......
share/qtcreator/gdbmacros/dumper.py
View file @ f46a87a6
......@@ -94,6 +94,7 @@ def isGoodGdb():
return 'parse_and_eval' in __builtin__.dir(gdb)
def hasInferiorThreadList():
return False
try:
a= gdb.inferiors()[0].threads()
return True
......
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
View file @ f46a87a6
......@@ -250,7 +250,8 @@ bool MaemoTemplatesManager::adaptRulesFile(const Project *project)
}
QByteArray rulesContents = rulesFile.readAll();
rulesContents.replace("DESTDIR", "INSTALL_ROOT");
rulesContents.replace("dh_shlibdeps", "# dh_shlibdeps");
rulesContents.replace("dh_shlibdeps",
"# dh_shlibdeps # Uncomment this line for publishing!");
// rulesContents.replace("$(MAKE) clean", "# $(MAKE) clean");
// const Qt4Project * const qt4Project
// = static_cast<const Qt4Project *>(project);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment