Commit 35bb6159 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/2.1'

Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
parents 3b2614c6 49bb8522
......@@ -86,6 +86,7 @@ Platform Specific
Mac
Linux (GNOME and KDE)
* Respect http_proxy variable if set
Windows
......
......@@ -89,13 +89,6 @@
\endlist
The Qt Creator/MADDE integration is supported on the following platforms:
\list
\o Linux (32 bit and 64 bit)
\o Windows (32 bit and 64 bit)
\omit \o Mac OS 10.5 Leopard, or higher \endomit
\endlist
\note The only supported build system for Maemo in Qt
Creator is qmake.
......
This diff is collapsed.
......@@ -994,28 +994,23 @@
editor. Then select the \gui {Design} mode to edit the file in the
visual editor.
To enable or disable the \QMLD visual editor, select
\gui {Help > About Plugins... > Qt Quick > QmlDesigner}. You must restart Qt Creator
to enable or disable the visual editor.
\image qmldesigner-visual-editor.png "Visual editor"
Use the visual editor panes to manage your project:
\list
\o \gui {Navigator} pane displays the items in the editor. You can
show and hide items to focus on specific parts of the application.
\o \gui {Navigator} pane displays the QML elements in the current QML file.
You can show and hide items to focus on specific parts of the application.
To view lists of files or projects, instead, select \gui {File System},
\gui {Open Documents}, or \gui Projects in the menu.
\o \gui {Library} pane displays lists of predefined \gui {Items} and
imported \gui {Resources} that you can use to design applications. The
images and other files that you copy to the project folder appear in the
\gui {Resources} pane.
\o \gui {Library} pane displays the building blocks that you can use to design
applications: predefined QML elements, your own QML components, and other
resources.
\o \gui {Properties} pane displays the properties of the selected component.
You can also change the properties in the code editor.
\o \gui {Properties} pane organizes the properties of the selected QML element
or QML component. You can also change the properties in the code editor.
\o \gui {State} pane displays the different states of the component. To add
states, click the empty slot. Then modify the new state in the editor.
......@@ -1024,6 +1019,59 @@
\endlist
\section1 Element Library
The \gui {Library} pane contains two tabs: \gui {Items} and \gui {Resources}.
The \gui Items pane displays the QML elements grouped by type: your own QML
components, basic elements, interaction elements, views, and widgets.
\image qmldesigner-qml-components.png "QML Components pane"
The \gui {Resources} pane displays the images and other files that you copy to
the project folder.
\section1 Specifying Element Properties
The \gui Properties pane displays all the properties of the selected QML element.
The properties are grouped by type. The top part of the pane displays properties
that are common to all elements, such as element type, position, size,
and visibility.
The bottom part of the pane displays properties that are specific to each element
type. For example, the following image displays the properties you can set for
\gui Rectangle and \gui Text elements.
\image qmldesigner-element-properties.png
For more information on the properties available for an element, press \key {F1}.
\section2 Setting Expressions
You can set Java Script expressions as values of some properties. Click the circle
icon next to a property to open a context menu, and select \gui {Set Expression}.
\image qmldesigner-set-expression.png "Element properties context menu"
For more information on the Java Script environment provided by QML, see
\l{http://doc.qt.nokia.com/4.7-snapshot/qdeclarativejavascript.html}{Integrating JavaScript}.
\section2 Setting Anchors and Margins
The \gui Layout pane allows you to set anchors and margins for elements. To set
the anchors of an item, click the anchor buttons. You can combine the top/bottom
and left/right anchors to anchor objects in the corners of the parent element.
\inlineimage qmldesigner-anchor-buttons.png "Anchor buttons"
\section2 Building Transformations on Items
The \gui Advanced pane allows you configure advanced transformations, such as
rotation, scale, and translation. You can assign any number of transformations
to an item. Each transformation is applied in order, one at a time.
For more information on Transform elements, see
\l {http://doc.qt.nokia.com/4.7/qml-transform.html}{QML Transform Element}.
*/
......@@ -6170,14 +6218,6 @@
\endlist
\note The \QMLD visual editor is provided as an experimental plugin that you must
enable to be able to edit QML files in the \gui Design mode. Enabling the
visual editor can negatively affect the overall stability of Qt Creator.
To enable or disable the \QMLD visual editor, select
\gui {Help > About Plugins... > Qt Quick > QmlDesigner}. You must restart Qt Creator
to enable or disable the visual editor.
*/
......@@ -6266,6 +6306,9 @@
\o Select \gui {File > New File or Project > Files and Classes > QML
> Choose...} to create a new .qml file.
\note Components are listed in the \gui {QML Components} section of the
\gui Library pane only if the filename begins with a capital letter.
\o Click \gui Design to open the .qml file in \QMLD.
\o Drag and drop an item from the \gui Library pane to the editor.
......@@ -6316,8 +6359,8 @@
\list a
\o In the \gui Size field, set the width (\gui W) of the button to 60
and the height of the button (\gui H) to 20.
\o In the \gui Size field, set the width (\gui W) and height (\gui H)
of the button.
\o In the \gui Color field, select the button color.
......@@ -6434,8 +6477,6 @@
\o Drag and drop a \gui MouseArea to the screen.
\o Click \gui Design to return to the visual editor.
\o In the \gui Navigator pane, select \gui border_image1 to specify
settings for it in the \gui Properties pane:
......@@ -6537,17 +6578,15 @@
Typically, the main qml file in a Qt Quick project specifies the main window of an
application.
The QML files in the project folder are displayed in \gui {QML Components} in the
\gui Library pane.
\section1 Adding Components to Screens
\list 1
\o Select \gui {File > New File or Project > Qt Quick Project > Qt Quick UI}
or \gui {Qt Quick Application} to create a Qt Quick project.
\o Drag and drop components from the \gui Library pane to the editor.
The QML files in the project folder are displayed in \gui {QML Elements}.
\o Select components in the \gui Navigator pane to edit their properties
in the \gui Properties pane.
......
examplebrowser @ bf3bd5f8
Subproject commit bf3bd5f8e6a5a311b922069f508f96d846c0b742
<?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="textselection" name="Text selection" 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="parallax" name="Parallax Sliding" executable="false" qml="true" />
<example filename="listview" name="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" 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" />
</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" />
</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>
......@@ -1561,14 +1561,18 @@ class Dumper:
## Generic pointer type with format None
#warn("GENERIC AUTODEREF POINTER: %s" % value.address)
innerType = realtype.target()
self.putType(innerType)
savedCurrentChildType = self.currentChildType
self.currentChildType = stripClassTag(str(innerType))
self.putItemHelper(
Item(item.value.dereference(), item.iname, None, None))
self.currentChildType = savedCurrentChildType
self.putPointerValue(value.address)
return
innerTypeName = str(innerType.unqualified())
# Never dereference char types.
if innerTypeName != "char" and innerTypeName != "signed char" \
and innerTypeName != "unsigned char" and innerTypeName != "wchar_t":
self.putType(innerType)
savedCurrentChildType = self.currentChildType
self.currentChildType = stripClassTag(str(innerType))
self.putItemHelper(
Item(item.value.dereference(), item.iname, None, None))
self.currentChildType = savedCurrentChildType
self.putPointerValue(value.address)
return
# Fall back to plain pointer printing.
#warn("GENERIC PLAIN POINTER: %s" % value.type)
......@@ -1660,7 +1664,13 @@ class Dumper:
#warn("FIELD NAME: %s" % field.name)
#warn("FIELD TYPE: %s" % field.type)
if field.is_base_class:
# The 'field.is_base_class' attribute exists in gdb 7.0.X and later only.
# Symbian gdb is 6.8 as of 20.10.2010. TODO: Remove once Symbian gdb is up to date.
if hasattr(field, 'is_base_class'):
isBaseClass = field.is_base_class
else:
isBaseClass = field.name == stripClassTag(str(field.type))
if isBaseClass:
# Field is base type. We cannot use field.name as part
# of the iname as it might contain spaces and other
# strange characters.
......@@ -1739,15 +1749,18 @@ class ThreadNamesCommand(gdb.Command):
if e == None or e.name() == None:
break
if e.name() == ns + "QThreadPrivate::start":
thrptr = e.read_var("thr").dereference()
obtype = lookupType(ns + "QObjectPrivate").pointer()
d_ptr = thrptr["d_ptr"]["d"].cast(obtype).dereference()
objectName = d_ptr["objectName"]
out += '{valueencoded="';
out += str(Hex4EncodedLittleEndianWithoutQuotes)+'",id="'
out += str(thread.num) + '",value="'
out += encodeString(objectName)
out += '"},'
try:
thrptr = e.read_var("thr").dereference()
obtype = lookupType(ns + "QObjectPrivate").pointer()
d_ptr = thrptr["d_ptr"]["d"].cast(obtype).dereference()
objectName = d_ptr["objectName"]
out += '{valueencoded="';
out += str(Hex4EncodedLittleEndianWithoutQuotes)+'",id="'
out += str(thread.num) + '",value="'
out += encodeString(objectName)
out += '"},'
except:
pass
print out[:-1] + ']'
ThreadNamesCommand()
......
......@@ -24,6 +24,7 @@ isEmpty(vcproj) {
}
DATA_DIRS = \
examplebrowser \
snippets \
templates \
designer \
......
......@@ -22,6 +22,12 @@ symbian:TARGET.UID3 = 0xE1111234
# and 0x2002CCCF value if protected UID is given to the application
#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
# If your application uses the Qt Mobility libraries, uncomment
# the following lines and add the respective components to the
# MOBILITY variable.
# CONFIG += mobility
# MOBILITY +=
SOURCES += main.cpp mainwindow.cpp
HEADERS += mainwindow.h
FORMS += mainwindow.ui
......
......@@ -31,6 +31,12 @@ symbian:TARGET.UID3 = 0xE1111234
# (This might significantly increase build time)
# DEFINES += QMLJSDEBUGGER
# If your application uses the Qt Mobility libraries, uncomment
# the following lines and add the respective components to the
# MOBILITY variable.
# CONFIG += mobility
# MOBILITY +=
# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp
......
......@@ -2025,7 +2025,7 @@ Sollen sie überschrieben werden?</translation>
</message>
<message>
<source>Configure...</source>
<translation>Einstellungen...</translation>
<translation type="obsolete">Einstellungen...</translation>
</message>
</context>
<context>
......@@ -3528,7 +3528,7 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</message>
<message>
<source>Open Memory Editor at 0x%1</source>
<translation>Speicher-Editor bei %1 öffnen</translation>
<translation>Speicher-Editor bei 0x%1 öffnen</translation>
</message>
<message>
<source>Open Disassembler at 0x%1</source>
......@@ -4091,7 +4091,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
</message>
<message>
<source>Configure...</source>
<translation>Einstellungen...</translation>
<translation type="obsolete">Einstellungen...</translation>
</message>
<message>
<source>Choose a Class Name</source>
......@@ -5640,6 +5640,10 @@ on slow machines. In this case, the value should be increased.</source>
<source>Diff Project &quot;%1&quot;</source>
<translation>Diff für Projekt &quot;%1&quot;</translation>
</message>
<message>
<source>Undo Uncommited Changes...</source>
<translation>Ausstehende Änderungen rückgängig machen...</translation>
</message>
<message>
<source>Stashes...</source>
<translation>Stashes...</translation>
......@@ -5674,11 +5678,11 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<source>Undo Uncommitted Changes</source>
<translation>Nicht eingetragene Änderungen rückgängig machen</translation>
<translation>Ausstehende Änderungen rückgängig machen</translation>
</message>
<message>
<source>Undo Uncommitted Changes for &quot;%1&quot;</source>
<translation>Nicht eingetragene Änderungen in &quot;%1&quot; rückgängig machen</translation>
<translation>Ausstehende Änderungen in &quot;%1&quot; rückgängig machen</translation>
</message>
<message>
<source>Clean Project...</source>
......@@ -5748,6 +5752,17 @@ on slow machines. In this case, the value should be increased.</source>
<source>Log</source>
<translation>Log</translation>
</message>
<message>
<source>Undo all pending changes to the repository
%1?</source>
<translation>Möchten Sie alle ausstehenden Änderungen des Repositories
%1
rückgängig machen?</translation>
</message>
<message>
<source>Undo Changes</source>
<translation>Änderungen rückgängig machen</translation>
</message>
<message>
<source>Closing Git Editor</source>
<translation>Git-Editor schließen</translation>
......@@ -5782,7 +5797,7 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<source>Reset...</source>
<translation>Repository Zurücksetzen...</translation>
<translation type="obsolete">Repository Zurücksetzen...</translation>
</message>
<message>
<source>Clean...</source>
......@@ -5823,11 +5838,11 @@ on slow machines. In this case, the value should be increased.</source>
<message>
<source>Revert all pending changes to the repository
%1?</source>
<translation>Möchten Sie alle ausstehenden Änderungen des Repositories %1 rückgängig machen?</translation>
<translation type="obsolete">Möchten Sie alle ausstehenden Änderungen des Repositories %1 rückgängig machen?</translation>
</message>
<message>
<source>Revert</source>
<translation>Rückgängig machen</translation>
<translation type="obsolete">Rückgängig machen</translation>
</message>
<message>
<source>Another submit is currently being executed.</source>
......@@ -5955,7 +5970,7 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<source>Omit date from annotation output</source>
<translation>Datum in Annotation weglassen</translation>
<translation type="obsolete">Datum in Annotation weglassen</translation>
</message>
<message>
<source>Miscellaneous</source>
......@@ -6003,7 +6018,15 @@ on slow machines. In this case, the value should be increased.</source>
</message>
<message>
<source>Ignore whitespace changes in annotation and diff</source>
<translation>Änderungen der Leerzeichen bei Annotation und Diff weglassen</translation>
<translation type="obsolete">Änderungen der Leerzeichen bei Annotation und Diff weglassen</translation>
</message>
<message>
<source>Omit date from blame output</source>
<translation>Datum bei Blame-Ausgabe weglassen</translation>
</message>
<message>
<source>Ignore whitespace changes in blame and diff</source>
<translation>Änderungen der Leerzeichen bei Blame- und Diff-Ausgabe weglassen</translation>
</message>
</context>
<context>
......@@ -7980,12 +8003,12 @@ Fehler: %2</translation>
</message>
<message>
<source>No Executable specified.</source>
<translation>Es wurde keine ausführbaren Datei angegeben.
<translation type="obsolete">Es wurde keine ausführbaren Datei angegeben.
</translation>
</message>
<message>
<source>Running executable: &lt;b&gt;%1&lt;/b&gt; %2</source>
<translation>Führe aus: &lt;b&gt;%1&lt;/b&gt; %2</translation>
<translation type="obsolete">Führe aus: &lt;b&gt;%1&lt;/b&gt; %2</translation>
</message>
</context>
<context>
......@@ -8595,7 +8618,7 @@ konnte dem Projekt &apos;%2&apos; nicht hinzugefügt werden.</translation>
</message>
<message>
<source>F5</source>
<translation>F5</translation>
<translation type="obsolete">F5</translation>
</message>
<message>
<source>Add New...</source>
......@@ -13105,6 +13128,14 @@ p, li { white-space: pre-wrap; }
<source>Invalid regular expression flag &apos;%0&apos;</source>
<translation>Ungültiger Modifikator für regulären Ausdruck &apos;%0&apos;</translation>
</message>
<message>
<source>Unterminated regular expression backslash sequence</source>
<translation>Der reguläre Ausdruck endet mit einer nicht abgeschlossenen Backslash-Sequenz</translation>
</message>
<message>
<source>Unterminated regular expression class</source>
<translation>Nicht abgeschlossene Zeichenklassenangabe innerhalb des regulären Ausdrucks</translation>
</message>
<message>
<source>Syntax error</source>
<translation>Syntaxfehler</translation>
......@@ -17888,6 +17919,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
<source>Could not move package files from %1 to %2.</source>
<translation>Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
</message>
<message>
<source>Packaging failed: Foreign debian directory detected.</source>
<translation>Fehlschlag bei Paketerstellung: Es wurde ein fremder Debian-Ordner festgestellt.</translation>
</message>
<message>
<source>You are not using a shadow build and there is a debian directory in your project root (&apos;%1&apos;). Qt Creator will not overwrite that directory. Please remove it or use the shadow build feature.</source>
<translation>Sie verwenden keinen Shadow-Build und es befindet sich ein Debian-Ordner im Hauptordner Ihres Projektes (&apos;%1&apos;). Qt Creator wird diesen Ordner nicht überschreiben. Bitte entfernen Sie den Ordner oder verwenden Sie einen Shadow-Build.</translation>
</message>
<message>
<source>Could not remove directory &apos;%1&apos;.</source>
<translation>Der Ordner %1 konnte nicht entfernt werden.</translation>
......@@ -17900,6 +17939,10 @@ should a repository require SSH-authentication (see documentation on SSH and the
<source>Could not copy file &apos;%1&apos; to &apos;%2&apos;</source>
<translation>Die Datei &apos;%1&apos; konnte nicht nach &apos;%2&apos; kopiert werden</translation>
</message>
<message>
<source>Error: Could not create create file &apos;%1&apos;.</source>
<translation>Fehler: Die Datei &apos;%1&apos; konnte nicht erstellt werden.</translation>
</message>
<message>
<source>Packaging error: Could not start command &apos;%1&apos;. Reason: %2</source>
<translation>Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; konnte nicht ausgeführt werden: %2</translation>
......@@ -18255,7 +18298,7 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
</message>
<message>
<source>Warning: Cannot build qmldump; Qt version must be 4.7.1 or higher.</source>
<translation>Warnung: Der QML-Beobachter kann nicht erstellt werden, da er Qt-Version 4.7.1 oder höher erfordert.</translation>
<translation>Warnung: Das Werkzeug qmldump kann nicht erstellt werden, da es Qt-Version 4.7.1 oder höher erfordert.</translation>
</message>
</context>
<context>
......@@ -20838,6 +20881,10 @@ Fehlerausgabe: %1</translation>
</context>
<context>
<name>Qt4ProjectManager::Internal::MaemoTemplatesManager</name>
<message>
<source>Error creating Maemo packaging directory &apos;%1&apos;.</source>
<translation>Fehler beim Anlegen des Maemo-Paket-Ordners &apos;%1&apos;</translation>
</message>
<message>
<source>Unable to create Debian templates: dh_make failed (%1)</source>
<translation>Es konnten keine Debian-Vorlagedateien erstellt werden: dh_make schlug fehl (%1)</translation>
......@@ -20846,6 +20893,10 @@ Fehlerausgabe: %1</translation>
<source>Unable to create debian templates: dh_make failed (%1)</source>
<translation>Es konnten keine Debian-Vorlagedateien erstellt werden: dh_make schlug fehl (%1)</translation>
</message>
<message>
<source>Unable to move new debian directory to &apos;%1&apos;.</source>
<translation>Der Debian-Ordner konnte nicht zu %1 verschoben werden.</translation>
</message>
<message>
<source>Packaging Error: Cannot open file &apos;%1&apos;.</source>
<translation>Fehler bei Paketerstellung: Die Datei &apos;%1&apos; kann nicht geöffnet werden.</translation>
......
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