diff --git a/dist/changes-2.0.1 b/dist/changes-2.0.1
index ba610a70a1171fb4faff3e2c2bbf96dd26d6b95f..d3363619179500be41fa9ad4b749d8b3a7a72644 100644
--- a/dist/changes-2.0.1
+++ b/dist/changes-2.0.1
@@ -5,24 +5,67 @@ within the logs of Qt Creator's sources. Simply check it out from the public git
repository e.g.,
git clone git://gitorious.org/qt-creator/qt-creator.git
-git log --cherry-pick --pretty=oneline v2.0.0...v2.0.1
+git log --cherry-pick --pretty=oneline origin/2.0.0...origin/2.0.1
-General
+General:
* Fix the suggested path in the new dialog in case of sub projects
* Search dialog now opens the completion box for the search term on cursor down
- * Fix Mercurial plugin (QTCREATORBUG-1503)
+ * The .bin postfix was removed from the qtcreator executable
-Editing
+Editing:
+ * Fixed disabled "Open with" context menu in project tree
+ * CodePaster: Do not show popup about modified files on Windows
* FakeVim: Fix issues with non-letter keys on non-US keyboards
* FakeVim: Fix performance of find/replace
- * Fixed disabled "Open with" context menu in project tree.
+ * Fakevim: Fix mark interpretion for d'a etc
+ * Fakevim: clear opcount and mvcount on escape
+ * Fakevim: fix Delete key in command mode
+ * Fakevim: fix backspace in the presence of physical tabs
+ * Fakevim: fix insert of Tabs and up/down movement in the presence of real tabs
+ * Fakevim: fix mark positions after <Delete>
+ * Fakevim: make Ctrl-V <Tab> and Ctrl-V <Return> work in Insert and Ex mode
+ * BinEditor: Add "jump to address" functionality
+ * BinEditor: Add a bit of value interpretation
+ * BinEditor: Fix cursor position label
+ * BinEditor: Fix file name not being displayed
+ * BinEditor: Implement "Jump to start/end of file" for lazy data
+ * QmlDesigner: Fix crash when typing keywords as Ids
+ * QmlDesigner: Fix import handling in rewriter
+ * QmlDesigner: Prevent freezing while doing drag&drop on some Windows systems
+ * QML snippet: property has a name and a value, not two names
+ * QmlJS: Avoid infinite recursion when encountering property loops
+ * QmlJS: Make variables in imported JS documents show up in completion
+ * QmlJS: Remove spurious spaces from default import path in qmlproject
+ * Qt Designer integration: Fix Help button in stylesheet editor
+ * QuickDesigner: Make metainfo system robust for different version numbers
+ * QuickDesigner: Reduce numbers of redraws / state switching in States Editor
-C++ Support
+C++ Support:
+ * Added C-style comment folding
+ * Fix crash while renaming symbol when a symbol is being renamed
-Project support
+VCS Support:
+ * Diff editors: Set readonly attributes correctly
+ * Mercurial: Working directory not set for asynchronous commands
+ * Subversion: Remove LANG=C setting
+ * git: Adapt to 1.7.0, handling of renamed files. Reviewed-by: con
+
+Project support:
* Fix auto-scrolling in application and compile output
+ * Cmake: Don't delete run configurations on switching buildconfigurations
+ * Ask to save all editors before running qmake
+ * Allow the user to set the version number used for the build deb package
+ * Don't crash if the session node is the current node in context menu
+ * Fix DESTDIR=. case
+ * Don't reset build directory for clone cmake buildconfigurations
+ * Don't show the full file name in the reload prompt by default
+ * Fix crash for newly added project nodes
+ * Improve task parsing
+ * Fixes: New Project action didn't respect the default project location
-Debugging
+Debugging:
+ * Fix 2.0 regression: QObject property display
+ * Speed up cdb debugging helper initialization
* Fix display of certain structures within containers
* Fix display of typedefs of typedefs of simple types such as qulonglong
* Fix behaviour of 'step' and 'next' when a lower frame was selected
@@ -30,17 +73,70 @@ Debugging
* Improve gdb version string parsing
* Fix that the newest version of compiled debugging helper was not used
if there was an older version still was around in a different search path
+ * Windows[gdb]: Fix Attach to running (gui) process
+ * Fix 2.0 regression: allow assignment to structure members
+ * Always switch to frame 0 before trying to leave frame
+ * Cache results of gdb.lookup_type to increase performance
+ * Finish "Launching" bar even if we don't hit a "^running"
+ * Fix 2.0 regression: 'jump to line' and 'run to line' with older versions of gdb
+ * Fix decoding of %04x encoded 16 bit big endian data
+ * Fix 2.0 regression: display of typedefs-of-typedefs, such as qulonglong
+ * Fix 2.0 regression: list of members in case gdb reports '_class_ SomeClass'
+ * Handle gdb 7.1.50's thread-group-started 'pid' field
+ * Fix python dumper for std::vector<bool>
+ * Improve robustness in the presence of outdated debug information
+ * Make ctrl-click to navigate between input and output pane (much) faster
+ * Switch off reverse debugging tool button if not useful
+ * Fix reporting of loaded libraries on Symbian devices
+ * Fix late crash when closing Creator while building debugging helper (QTCREATORBUG-1576)
+
+QML/JS Support:
+ * New QmlDesigner
+ * Allows visual manipulation of .qml files
+ * Supports changing top-level states
+ * Integrates tighly with text editor, e.g. shared history, navigation facilities ..
+
+Documentation:
+ * Add description of the Use debug versions of Frameworks option
+ * Add descriptions for new Maemo packaging options
+ * Add info about layouts to the example
+ * Add information about unlocking views in Debug mode
+ * Add qtquick to defines to display Qt Quick information
+ * Add tips and tricks
+ * Edit the introduction
-Platform Specific
+Translations:
+ * Update Japanese translation
+ * Update Russian translation
+ * Update Slovenian translation
+ * Update German translation
+ * Add Simplified Chinese translation
+ * Add French translation, done by the developpez.com team
-Mac
+Mac specific:
+ * Save maemo device configuration on MacOS
-Linux (GNOME and KDE)
+Linux specific:
-Windows
+Windows specific:
* Fixed that some menu items got disabled during keyboard navigation
+ * Fix wildcard expansion, etc. under windows
* Detect Microsoft Visual Studio 2010
* Fixed handling of usernames with Cyrillic characters (QTCREATORBUG-1643)
-Additional credits go to:
+Maemo specific:
+ * Fix Qemu start on Mac
+ * Fix building projects if MADDE is on a different drive then the project
+ * Fix access rights for remote .ssh directory
+ * Fix end-of-process detection
+ * Fix incorrect assumption about build directory
+ * Make device configuration id type consistent
+ * Make packaging step optional
+Symbian specific:
+ * Symbian support is no longer experimental
+ * Symbian/trk: Don't try to dereference references
+ * Symbian/trk: Fix handling of partial frames
+ * Small improvements to the abld parser
+ * Use outputparsers when creating S60 packages
+ * Improve detection of simulator Qts
diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
index 41d204e81d8a87f0f34f69d88cfec971ab55eb71..dc29b74f4b1b0f0ec6cd68a8c063cfe273d0f7ba 100644
--- a/dist/changes-2.1.0
+++ b/dist/changes-2.1.0
@@ -5,11 +5,10 @@ within the logs of Qt Creator sources. Simply check it 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.0.0...v2.0.1
+git log --cherry-pick --pretty=oneline v2.1.0...v2.0.1
General
- *
- *
+ * Made search result panel searchable
Editing
@@ -17,21 +16,67 @@ C++ Support
* Added semantic highlighting of types, virtual methods, locals, statics and
member variables (only enabled when running against Qt 4.7.1 and up, for
performance reasons)
+ * Add new indenter along with a new option to control alignment indents
* Add new %FILENAME%, %CLASS% placeholders to license template
+ * Added searching for symbols that match a pattern to advanced find
+ * Made 'Follow symbol' for classes skip forward declarations
Project Support
- * Add option for adding subprojects to projects in the New wizard
- * Add context-menu command for removing subprojects in the Edit mode,
+ * Added option for adding subprojects to projects in the New wizard
+ * Added context-menu command for removing subprojects in the Edit mode,
Projects view
- * Add a wizard for adding other than Qt libraries to project files
+ * Added a wizard for adding other than Qt libraries to project files
Debugging
- * Fix console debugging with MinGW/gdb
- * Symbian: Add basic thread support, improve logging
+ * Fixed splitter inconsistency of debugger tool bar
+ * Fixed console debugging with MinGW/gdb
+ * Symbian: Added basic thread support, improve logging
+ * New dumpers for QDate, QTime, QHostAddress, QRegion, boost::optional,
+ QSharedData and QSharedDataPointer
+ * Improved/fixed dumpers for QObject (include user defined properties), QList,
+ C-style arrays, QSize, QSizeF, QImage/QPixmap, std::vector<bool>,
+ QVariant(QString), qulonglong, std::size_t, std::ptrdiff_t,
+ QScopedPointer, QStandardItem
+ * Performance improvements due to use of dwarf index data to reduce gdb
+ startup time, use of new gdb.read_memory for QByteArray and QString display
+ * Debugger framework handles multiple debugging sessions in parallel
+ * Allow per item and/or type selection of display method in Locals&Watchers
+ * Implement data watchpoints
+ * Implement a debugger engine to debug Python scripts
+ * Direct remote debugging using -debug binary@host:port[@arch] on the command line
+ * Make alphabetic sorting of struct members optional
+ * New Add/Edit breakpoint dialog
+ * Show QThread object names in threads view
+ * Support for per-thread breakpoints
+ * Show dynamic type of objects for gdb versions newer than Aug 31, 2010
+ * [etc]
Help
QML/JS Support
+ * Added 'Find usages' action that works on ids, properties, functions and
+ variables
+ * Improved 'Follow symbol' to also work on file imports and JS functions
+ * Completion: Sort completion items by relevance
+ * Completion: Automatically complete trailing : or .
+ * Added new indenter
+ * Added code folding for multiline comments
+ * Improved performance of the code model significantly
+ * Added Qt Quick ToolBar
+
+FakeVim:
+ * Fix indentation of first line after >iB and >ib, undo after cjaaa<Esc>, ~ etc
+ * Implement :mak, :nohlsearch, :only, :reg[isters], Ctrl-J, Ctrl-N, Ctrl-P,
+ * Implement [(, ]), [{, ]}, some of the :bn/bp commands
+ * Implement {}/[]/<>-block text objects
+ * Make :q after :sp more vim-ish, make <C-.> etc work in mappings
+ * Make Searching a 'sub-sub-mode' to allow d/
+ * Make recognition of ex command names similar to vi's
+ * Move "status line" to the main statusbar
+ * Refactor searching for less random jumps and more speed
+ * Rework line ranges and support for marks
+ * Use basetext cursor handling and indentation support for better integration
+ * [etc]
Platform Specific
@@ -44,27 +89,35 @@ Windows
Symbian Target
Maemo Target
+ * Improved support for Debian packaging:
+ - Automatic creation of Debian files in project directory
+ - Debian files adaptable by users
+ * Deployment information is taken from .pro file's INSTALLS variable
+ * Support for "subdirs" and library project types
+ * Projects created by mobile wizards are now usable for Maemo development
+ * Automatic creation and deployment of Desktop files for application projects
+ * Fremantle: Support for exporting host directories to the device (also employed for zero-copy deployment)
Designer
- * Add switching between code and forms using Shift-F4
- * Various improvements to mode switching
+ * Added switching between code and forms using Shift-F4
+ * Made various improvements to mode switching
Version control plugins
* Support git version 1.7.x
- * Add support for git --amend
- * Make it possible to run gitk from Qt Creator
- * Improve commit window, show number of files to be committed, add context
+ * Added support for git --amend
+ * Made it possible to run gitk from Qt Creator
+ * Improved commit window, show number of files to be committed, add context
menu for quickly checking and unchecking all files
- * Add branch selector to the git checkout wizard
- * Add support for the CVS 'edit' functionality, make Qt Creator prompt to
+ * Added branch selector to the git checkout wizard
+ * Added support for the CVS 'edit' functionality, make Qt Creator prompt to
request a read-only file using 'cvs edit' (cvsnt only).
- * Perforce: Add setting to automatically open read-only files
+ * Perforce: Added setting to automatically open read-only files
Wizards
- * Custom wizard: Enhance template processing of wizards to be able to include
+ * Custom wizard: Enhanced template processing of wizards to be able to include
sections of files conditionally, extend functionality of combo control
to be able to handle user-displayable strings and keywords
- * Custom wizard: Add ability to have files generated by scripts
+ * Custom wizard: Added ability to have files generated by scripts
Additional credits go to:
diff --git a/doc/examples/batteryindicator/BatteryIndicator.desktop b/doc/examples/batteryindicator/BatteryIndicator.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..84e6ad1429f856a7d719b7c3f68a83f39f33c1b1
--- /dev/null
+++ b/doc/examples/batteryindicator/BatteryIndicator.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=BatteryIndicator
+Exec=/opt/usr/bin/BatteryIndicator
+Icon=BatteryIndicator
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/doc/examples/batteryindicator/BatteryIndicator.png b/doc/examples/batteryindicator/BatteryIndicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..707d5c4e85d82959740b243a8a36d5071c277299
Binary files /dev/null and b/doc/examples/batteryindicator/BatteryIndicator.png differ
diff --git a/doc/examples/batteryindicator/BatteryIndicator.pro b/doc/examples/batteryindicator/BatteryIndicator.pro
index da30a71a4b610c7bd23c699f837b8e80aac244b8..dd26e70344f729d88f2faf072de1915711306ee2 100644
--- a/doc/examples/batteryindicator/BatteryIndicator.pro
+++ b/doc/examples/batteryindicator/BatteryIndicator.pro
@@ -1,28 +1,32 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2010-05-26T16:46:58
-#
-#-------------------------------------------------
+# Add files and directories to ship with the application
+# by adapting the examples below.
+# file1.source = myfile
+# dir1.source = mydir
+DEPLOYMENTFOLDERS = # file1 dir1
-QT += core gui
+# Avoid auto screen rotation
+#DEFINES += ORIENTATIONLOCK
-TARGET = BatteryIndicator
-TEMPLATE = app
+# Needs to be defined for Symbian
+#DEFINES += NETWORKACCESS
-
-SOURCES += main.cpp\
- batteryindicator.cpp
-
-HEADERS += batteryindicator.h
-
-FORMS += batteryindicator.ui
+symbian:TARGET.UID3 = 0xE5123A52
CONFIG += mobility
MOBILITY = systeminfo
-symbian {
- TARGET.UID3 = 0xecbd72d7
- # TARGET.CAPABILITY +=
- TARGET.EPOCSTACKSIZE = 0x14000
- TARGET.EPOCHEAPSIZE = 0x020000 0x800000
-}
+SOURCES += main.cpp mainwindow.cpp
+HEADERS += mainwindow.h
+FORMS += mainwindow.ui
+
+# Please do not modify the following two lines. Required for deployment.
+include(deployment.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+ debian/changelog \
+ debian/compat \
+ debian/control \
+ debian/copyright \
+ debian/README \
+ debian/rules
diff --git a/doc/examples/batteryindicator/BatteryIndicator.svg b/doc/examples/batteryindicator/BatteryIndicator.svg
new file mode 100644
index 0000000000000000000000000000000000000000..566acfada01cfe8ab7550dc4187ff76fe34d86ae
--- /dev/null
+++ b/doc/examples/batteryindicator/BatteryIndicator.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="44px"
+ version="1.1"
+ viewBox="0 0 44 44"
+ width="44px"
+ x="0px"
+ y="0px"
+ id="svg2"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="qt.svg">
+ <metadata
+ id="metadata18">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs16">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 22 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="44 : 22 : 1"
+ inkscape:persp3d-origin="22 : 14.666667 : 1"
+ id="perspective2836" />
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1020"
+ id="namedview14"
+ showgrid="false"
+ inkscape:zoom="21.454545"
+ inkscape:cx="49.412871"
+ inkscape:cy="21.894358"
+ inkscape:window-x="-4"
+ inkscape:window-y="-4"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g3" />
+ <g
+ transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
+ id="g3">
+ <path
+ d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
+ style="fill:#006225"
+ id="path5"
+ sodipodi:nodetypes="cccccccc" />
+ <path
+ d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
+ style="fill:#80c342"
+ id="path7" />
+ <path
+ d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
+ style="fill:#006225"
+ id="path11" />
+ <path
+ d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
+ style="fill:#006225"
+ id="path13" />
+ <path
+ id="path17"
+ style="fill:#ffffff"
+ d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
+ <path
+ d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
+ style="fill:#006225"
+ id="path19" />
+ <path
+ id="path21"
+ style="fill:#006225"
+ d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
+ </g>
+</svg>
diff --git a/doc/examples/batteryindicator/batteryindicator.cpp b/doc/examples/batteryindicator/batteryindicator.cpp
deleted file mode 100644
index 8ddb69590a6f95503abceaf9e7e9276b958ed96b..0000000000000000000000000000000000000000
--- a/doc/examples/batteryindicator/batteryindicator.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "batteryindicator.h"
-#include "ui_batteryindicator.h"
-
-//! [2]
-BatteryIndicator::BatteryIndicator(QWidget *parent) :
- QDialog(parent),
- ui(new Ui::BatteryIndicator),
- deviceInfo(NULL)
-{
- ui->setupUi(this);
- setupGeneral();
-}
-//! [2]
-
-BatteryIndicator::~BatteryIndicator()
-{
- delete ui;
-}
-
-//! [1]
-void BatteryIndicator::setupGeneral()
-{
- deviceInfo = new QSystemDeviceInfo(this);
-
- ui->batteryLevelBar->setValue(deviceInfo->batteryLevel());
-
- connect(deviceInfo, SIGNAL(batteryLevelChanged(int)),
- ui->batteryLevelBar, SLOT(setValue(int)));
-}
-//! [1]
diff --git a/doc/examples/batteryindicator/batteryindicator.h b/doc/examples/batteryindicator/batteryindicator.h
deleted file mode 100644
index 50a1b93bd6280e6c1d6c76fd1281eb371396a92e..0000000000000000000000000000000000000000
--- a/doc/examples/batteryindicator/batteryindicator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef BATTERYINDICATOR_H
-#define BATTERYINDICATOR_H
-
-#include <QDialog>
-
-//! [1]
-#include <QSystemInfo>
-//! [1]
-
-//! [2]
-QTM_USE_NAMESPACE
-//! [2]
-
-namespace Ui {
- class BatteryIndicator;
-}
-
-class BatteryIndicator : public QDialog
-{
- Q_OBJECT
-
-public:
- explicit BatteryIndicator(QWidget *parent = 0);
- ~BatteryIndicator();
-
-//! [3]
-private:
- Ui::BatteryIndicator *ui;
- void setupGeneral();
-
- QSystemDeviceInfo *deviceInfo;
-//! [3]
-};
-
-#endif // BATTERYINDICATOR_H
diff --git a/doc/examples/batteryindicator/batteryindicator.ui b/doc/examples/batteryindicator/batteryindicator.ui
deleted file mode 100644
index 3e62af26ae11dab3b13d742a09ff81b3c56b1f6a..0000000000000000000000000000000000000000
--- a/doc/examples/batteryindicator/batteryindicator.ui
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>BatteryIndicator</class>
- <widget class="QDialog" name="BatteryIndicator">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>800</width>
- <height>480</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>BatteryIndicator</string>
- </property>
- <widget class="QProgressBar" name="batteryLevelBar">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>118</width>
- <height>23</height>
- </rect>
- </property>
- <property name="value">
- <number>24</number>
- </property>
- </widget>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
diff --git a/doc/examples/batteryindicator/debian/README b/doc/examples/batteryindicator/debian/README
new file mode 100644
index 0000000000000000000000000000000000000000..69fa63a59c537a281d3a5b4314ee54be089f94ac
--- /dev/null
+++ b/doc/examples/batteryindicator/debian/README
@@ -0,0 +1,6 @@
+The Debian Package batteryindicator
+----------------------------
+
+Comments regarding the Package
+
+ -- unknown <> Tue, 05 Oct 2010 12:01:24 +0200
diff --git a/doc/examples/batteryindicator/debian/changelog b/doc/examples/batteryindicator/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..ff9ebf3ec708bb9b14590eed3b1d3e0222c79d7c
--- /dev/null
+++ b/doc/examples/batteryindicator/debian/changelog
@@ -0,0 +1,5 @@
+batteryindicator (0.0.1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- unknown <> Tue, 05 Oct 2010 12:01:24 +0200
diff --git a/doc/examples/batteryindicator/debian/compat b/doc/examples/batteryindicator/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..7f8f011eb73d6043d2e6db9d2c101195ae2801f2
--- /dev/null
+++ b/doc/examples/batteryindicator/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/doc/examples/batteryindicator/debian/control b/doc/examples/batteryindicator/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..a414f056825c4166a9340ec146f5cce45c3ebb5a
--- /dev/null
+++ b/doc/examples/batteryindicator/debian/control
@@ -0,0 +1,13 @@
+Source: batteryindicator
+Section: user/hidden
+Priority: optional
+Maintainer: unknown <>
+Build-Depends: debhelper (>= 5), libqt4-dev
+Standards-Version: 3.7.3
+Homepage: <insert the upstream URL, if relevant>
+
+Package: batteryindicator
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
diff --git a/doc/examples/batteryindicator/debian/copyright b/doc/examples/batteryindicator/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..3656176d071cb1affe36be350b3b12d80dd93942
--- /dev/null
+++ b/doc/examples/batteryindicator/debian/copyright
@@ -0,0 +1,40 @@
+This package was debianized by unknown <> on
+Tue, 05 Oct 2010 12:01:24 +0200.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+ <put author's name and email here>
+ <likewise for another author>
+
+Copyright:
+
+ <Copyright (C) YYYY Name OfAuthor>
+ <likewise for another author>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2010, unknown <> and
+is licensed under the GPL, see above.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/doc/examples/batteryindicator/debian/rules b/doc/examples/batteryindicator/debian/rules
new file mode 100644
index 0000000000000000000000000000000000000000..69d5d226dd5ee54304cd19558b8f24b03c0dde36
--- /dev/null
+++ b/doc/examples/batteryindicator/debian/rules
@@ -0,0 +1,91 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ #docbook-to-man debian/batteryindicator.sgml > batteryindicator.1
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ $(MAKE) clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/batteryindicator.
+ $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/batteryindicator install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+# dh_install
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ # dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_makeshlibs
+ dh_installdeb
+ # dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/doc/examples/batteryindicator/deployment.pri b/doc/examples/batteryindicator/deployment.pri
new file mode 100644
index 0000000000000000000000000000000000000000..7b7f7280fad3cc3a620d0d708132cd3eb9bbbb8b
--- /dev/null
+++ b/doc/examples/batteryindicator/deployment.pri
@@ -0,0 +1,93 @@
+# checksum 0x2bb3 version 0x10001
+# This file should not be edited.
+# Future versions of Qt Creator might offer updated versions of this file.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+ item = item$${deploymentfolder}
+ itemsources = $${item}.sources
+ $$itemsources = $$eval($${deploymentfolder}.source)
+ itempath = $${item}.path
+ $$itempath= $$eval($${deploymentfolder}.target)
+ export($$itemsources)
+ export($$itempath)
+ DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+ ICON = $${TARGET}.svg
+ TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+ contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -leiksrv -lcone
+ contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
+} else:win32 {
+ !isEqual(PWD,$$OUT_PWD) {
+ copyCommand = @echo Copying application data...
+ for(deploymentfolder, DEPLOYMENTFOLDERS) {
+ source = $$eval($${deploymentfolder}.source)
+ pathSegments = $$split(source, /)
+ sourceAndTarget = $$MAINPROFILEPWD/$$source $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(pathSegments)
+ copyCommand += && $(COPY_DIR) $$replace(sourceAndTarget, /, \\)
+ }
+ copydeploymentfolders.commands = $$copyCommand
+ first.depends = $(first) copydeploymentfolders
+ export(first.depends)
+ export(copydeploymentfolders.commands)
+ QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+ }
+} else:unix {
+ maemo5 {
+ installPrefix = /opt/usr
+ desktopfile.path = /usr/share/applications/hildon
+ } else {
+ installPrefix = /usr/local
+ desktopfile.path = /usr/share/applications
+ !isEqual(PWD,$$OUT_PWD) {
+ copyCommand = @echo Copying application data...
+ for(deploymentfolder, DEPLOYMENTFOLDERS) {
+ macx {
+ target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+ } else {
+ target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+ }
+ copyCommand += && $(MKDIR) $$target
+ copyCommand += && $(COPY_DIR) $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) $$target
+ }
+ copydeploymentfolders.commands = $$copyCommand
+ first.depends = $(first) copydeploymentfolders
+ export(first.depends)
+ export(copydeploymentfolders.commands)
+ QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+ }
+ }
+ for(deploymentfolder, DEPLOYMENTFOLDERS) {
+ item = item$${deploymentfolder}
+ itemfiles = $${item}.files
+ $$itemfiles = $$eval($${deploymentfolder}.source)
+ itempath = $${item}.path
+ $$itempath = $${installPrefix}/share/$${TARGET}/$$eval($${deploymentfolder}.target)
+ export($$itemfiles)
+ export($$itempath)
+ INSTALLS += $$item
+ }
+ icon.files = $${TARGET}.png
+ icon.path = /usr/share/icons/hicolor/64x64/apps
+ desktopfile.files = $${TARGET}.desktop
+ target.path = $${installPrefix}/bin
+ export(icon.files)
+ export(icon.path)
+ export(desktopfile.files)
+ export(desktopfile.path)
+ export(target.path)
+ INSTALLS += desktopfile icon target
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
diff --git a/doc/examples/batteryindicator/main.cpp b/doc/examples/batteryindicator/main.cpp
index 4d85d5cdc760eed2dc4eb07282ea6e3ee6ac4823..4476d2fdc91eedc8be9f43355e97a21ff994a407 100644
--- a/doc/examples/batteryindicator/main.cpp
+++ b/doc/examples/batteryindicator/main.cpp
@@ -1,18 +1,23 @@
+#include "mainwindow.h"
+
#include <QtGui/QApplication>
-#include "batteryindicator.h"
int main(int argc, char *argv[])
{
- QApplication a(argc, argv);
- BatteryIndicator w;
+ QApplication app(argc, argv);
+
+ MainWindow mainWindow;
+ mainWindow.setOrientation(MainWindow::Auto);
//! [0]
-#if defined(Q_WS_S60)
- w.showMaximized();
+#ifdef Q_OS_SYMBIAN
+ mainWindow.showFullScreen();
+#elif defined(Q_WS_MAEMO_5)
+ mainWindow.showMaximized();
#else
- w.show();
+ mainWindow.show();
#endif
//! [0]
- return a.exec();
+ return app.exec();
}
diff --git a/doc/examples/batteryindicator/mainwindow.cpp b/doc/examples/batteryindicator/mainwindow.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..82263cf9be239966f3146391d0974d3fb2e4512d
--- /dev/null
+++ b/doc/examples/batteryindicator/mainwindow.cpp
@@ -0,0 +1,77 @@
+// checksum 0xd429 version 0x10001
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include <QtCore/QCoreApplication>
+
+#if defined(Q_OS_SYMBIAN) && defined(ORIENTATIONLOCK)
+#include <eikenv.h>
+#include <eikappui.h>
+#include <aknenv.h>
+#include <aknappui.h>
+#endif // Q_OS_SYMBIAN && ORIENTATIONLOCK
+
+//! [2]
+MainWindow::MainWindow(QWidget *parent):
+ QMainWindow(parent),
+ ui(new Ui::MainWindow),
+ deviceInfo(NULL)
+{
+ ui->setupUi(this);
+ setupGeneral();
+}
+//! [2]
+
+MainWindow::~MainWindow()
+{
+ delete ui;
+}
+
+//! [1]
+void MainWindow::setupGeneral()
+{
+ deviceInfo = new QSystemDeviceInfo(this);
+
+ ui->batteryLevelBar->setValue(deviceInfo->batteryLevel());
+
+ connect(deviceInfo, SIGNAL(batteryLevelChanged(int)),
+ ui->batteryLevelBar, SLOT(setValue(int)));
+}
+//! [1]
+
+void MainWindow::setOrientation(Orientation orientation)
+{
+#ifdef Q_OS_SYMBIAN
+ if (orientation != Auto) {
+#if defined(ORIENTATIONLOCK)
+ const CAknAppUiBase::TAppUiOrientation uiOrientation =
+ (orientation == LockPortrait) ? CAknAppUi::EAppUiOrientationPortrait
+ : CAknAppUi::EAppUiOrientationLandscape;
+ CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi());
+ TRAPD(error,
+ if (appUi)
+ appUi->SetOrientationL(uiOrientation);
+ );
+#else // ORIENTATIONLOCK
+ qWarning("'ORIENTATIONLOCK' needs to be defined on Symbian when locking the orientation.");
+#endif // ORIENTATIONLOCK
+ }
+#elif defined(Q_WS_MAEMO_5)
+ Qt::WidgetAttribute attribute;
+ switch (orientation) {
+ case LockPortrait:
+ attribute = Qt::WA_Maemo5PortraitOrientation;
+ break;
+ case LockLandscape:
+ attribute = Qt::WA_Maemo5LandscapeOrientation;
+ break;
+ case Auto:
+ default:
+ attribute = Qt::WA_Maemo5AutoOrientation;
+ break;
+ }
+ setAttribute(attribute, true);
+#else // Q_OS_SYMBIAN
+ Q_UNUSED(orientation);
+#endif // Q_OS_SYMBIAN
+}
diff --git a/doc/examples/batteryindicator/mainwindow.h b/doc/examples/batteryindicator/mainwindow.h
new file mode 100644
index 0000000000000000000000000000000000000000..fe219713c2f1bea4138d96a1e133cabfff825103
--- /dev/null
+++ b/doc/examples/batteryindicator/mainwindow.h
@@ -0,0 +1,42 @@
+// checksum 0xa940 version 0x10001
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+
+//! [1]
+#include <QSystemInfo>
+//! [1]
+
+//! [2]
+QTM_USE_NAMESPACE
+//! [2]
+
+namespace Ui {
+ class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+public:
+ enum Orientation {
+ LockPortrait,
+ LockLandscape,
+ Auto
+ };
+
+ MainWindow(QWidget *parent = 0);
+ ~MainWindow();
+
+ void setOrientation(Orientation orientation);
+
+//! [3]
+private:
+ Ui::MainWindow *ui;
+ void setupGeneral();
+
+ QSystemDeviceInfo *deviceInfo;
+//! [3]
+};
+
+#endif // MAINWINDOW_H
diff --git a/doc/examples/batteryindicator/mainwindow.ui b/doc/examples/batteryindicator/mainwindow.ui
new file mode 100644
index 0000000000000000000000000000000000000000..5b9ccdbf099abc456191132fe133d6e4fdf61815
--- /dev/null
+++ b/doc/examples/batteryindicator/mainwindow.ui
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>200</width>
+ <height>320</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>MainWindow</string>
+ </property>
+ <widget class="QWidget" name="centralWidget">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QProgressBar" name="batteryLevelBar">
+ <property name="value">
+ <number>24</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QMenuBar" name="menuBar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>200</width>
+ <height>21</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QToolBar" name="mainToolBar">
+ <attribute name="toolBarArea">
+ <enum>TopToolBarArea</enum>
+ </attribute>
+ <attribute name="toolBarBreak">
+ <bool>false</bool>
+ </attribute>
+ </widget>
+ <widget class="QStatusBar" name="statusBar"/>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/doc/images/completion/element.png b/doc/images/completion/element.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b7b6a9ed868a482930d4064eb99abfaec56a07e
Binary files /dev/null and b/doc/images/completion/element.png differ
diff --git a/doc/images/completion/qmlsnippet.png b/doc/images/completion/qmlsnippet.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1cb870fbac8822bf7439edd4635146bee0ce34
Binary files /dev/null and b/doc/images/completion/qmlsnippet.png differ
diff --git a/doc/images/completion/snippet.png b/doc/images/completion/snippet.png
new file mode 100644
index 0000000000000000000000000000000000000000..929ac6b9229fa59c585af15b90ece33908c189b1
Binary files /dev/null and b/doc/images/completion/snippet.png differ
diff --git a/doc/images/qmldesigner-helloworld-edited.png b/doc/images/qmldesigner-helloworld-edited.png
index 1af779dbb0beffd8b97ff8b517501e86ffb8c8e4..177efac186604a8d058da5478187148f1e06e938 100644
Binary files a/doc/images/qmldesigner-helloworld-edited.png and b/doc/images/qmldesigner-helloworld-edited.png differ
diff --git a/doc/images/qmldesigner-helloworld.png b/doc/images/qmldesigner-helloworld.png
index 7cd4a607ac764b74d6ebd11ccd804453693a9ba6..db8f23aaa4ee453a6f68ae8ba3afdd3f4972d8d7 100644
Binary files a/doc/images/qmldesigner-helloworld.png and b/doc/images/qmldesigner-helloworld.png differ
diff --git a/doc/images/qmldesigner-import-project.png b/doc/images/qmldesigner-import-project.png
new file mode 100644
index 0000000000000000000000000000000000000000..54163e67220b2f7484f8e6c877c46ebfca3d62e8
Binary files /dev/null and b/doc/images/qmldesigner-import-project.png differ
diff --git a/doc/images/qmldesigner-new-project-contents.png b/doc/images/qmldesigner-new-project-contents.png
index d2bd3cc6f1c5f8d49da23c0fb9b7aa85a8814bc4..c52cdd6b486d06cf1bd9cdd5879181ea9ef2f203 100644
Binary files a/doc/images/qmldesigner-new-project-contents.png and b/doc/images/qmldesigner-new-project-contents.png differ
diff --git a/doc/images/qmldesigner-new-project-location.png b/doc/images/qmldesigner-new-project-location.png
index 9ebf56d5afc8d5a680eb7ee7cfe72ae59f3c91cb..f4214b54134e41b6d7dee0c6d97ea6a2681df287 100644
Binary files a/doc/images/qmldesigner-new-project-location.png and b/doc/images/qmldesigner-new-project-location.png differ
diff --git a/doc/images/qmldesigner-new-project-qml-sources.png b/doc/images/qmldesigner-new-project-qml-sources.png
new file mode 100644
index 0000000000000000000000000000000000000000..86064f203b388573334efff98970c0fa331f9747
Binary files /dev/null and b/doc/images/qmldesigner-new-project-qml-sources.png differ
diff --git a/doc/images/qmldesigner-new-project-qt-versions.png b/doc/images/qmldesigner-new-project-qt-versions.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b12dd6911d4910c84fbeb18030ddc1ef71f235b
Binary files /dev/null and b/doc/images/qmldesigner-new-project-qt-versions.png differ
diff --git a/doc/images/qmldesigner-new-project-summary.png b/doc/images/qmldesigner-new-project-summary.png
index 958ce937fcbff2e06b7b8b2b67b50980e5d365f8..2cfe09dd168010ac45a685199570ebc1761016b2 100644
Binary files a/doc/images/qmldesigner-new-project-summary.png and b/doc/images/qmldesigner-new-project-summary.png differ
diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png
index f74bd4310ccb5fb56e1341b3cd3b6f2ff092ec36..9acad09c20b8b21c645f0424b692ce41c4c971fb 100644
Binary files a/doc/images/qmldesigner-new-project.png and b/doc/images/qmldesigner-new-project.png differ
diff --git a/doc/images/qmldesigner-new-ui-project-summary.png b/doc/images/qmldesigner-new-ui-project-summary.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee3e556f5d3e95e8c19dddd78eed7f6e25f78fb
Binary files /dev/null and b/doc/images/qmldesigner-new-ui-project-summary.png differ
diff --git a/doc/images/qtcreator-add-resource-wizard.png b/doc/images/qtcreator-add-resource-wizard.png
index 5109123f16e15b50f1dac39127dcf5d0d3353376..db76501c0b9d95825846b64c3529c0ff7b5ce7e5 100644
Binary files a/doc/images/qtcreator-add-resource-wizard.png and b/doc/images/qtcreator-add-resource-wizard.png differ
diff --git a/doc/images/qtcreator-add-resource-wizard3.png b/doc/images/qtcreator-add-resource-wizard3.png
index 8f4208b708cb9cbda7fafd929e5caa5e54e4a793..ffad73d367a89863df7bbc994e789148ccb0a290 100644
Binary files a/doc/images/qtcreator-add-resource-wizard3.png and b/doc/images/qtcreator-add-resource-wizard3.png differ
diff --git a/doc/images/qtcreator-batteryindicator-screenshot.png b/doc/images/qtcreator-batteryindicator-screenshot.png
index 8447e2be7dbce0563d46b0ee647de07479191041..d312bd9b8eebbe1e3296271085031eeeac4ae486 100644
Binary files a/doc/images/qtcreator-batteryindicator-screenshot.png and b/doc/images/qtcreator-batteryindicator-screenshot.png differ
diff --git a/doc/images/qtcreator-intro-and-location.png b/doc/images/qtcreator-intro-and-location.png
index 014bba770834359af81abd25d8c358d605f2a6c7..346e855c7447125b9ee1ccc0dbe9f8dc0b8f6389 100644
Binary files a/doc/images/qtcreator-intro-and-location.png and b/doc/images/qtcreator-intro-and-location.png differ
diff --git a/doc/images/qtcreator-mobile-intro-and-location.png b/doc/images/qtcreator-mobile-intro-and-location.png
index 5ca057b2e1c9def98e2b638f799d834e009077e2..dc78f7b887060f6cc7f31ea5cd9f5dec02782529 100644
Binary files a/doc/images/qtcreator-mobile-intro-and-location.png and b/doc/images/qtcreator-mobile-intro-and-location.png differ
diff --git a/doc/images/qtcreator-mobile-project-app-options.png b/doc/images/qtcreator-mobile-project-app-options.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b48732648dd2ab26a3857508425250a72194fa5
Binary files /dev/null and b/doc/images/qtcreator-mobile-project-app-options.png differ
diff --git a/doc/images/qtcreator-mobile-project-contents.png b/doc/images/qtcreator-mobile-project-contents.png
index a41ef63dc3710370ee17f70cbdb70d6760bd6ce6..da21d4b927f822244623053be58a6ea126052151 100644
Binary files a/doc/images/qtcreator-mobile-project-contents.png and b/doc/images/qtcreator-mobile-project-contents.png differ
diff --git a/doc/images/qtcreator-mobile-project-qt-versions.png b/doc/images/qtcreator-mobile-project-qt-versions.png
index d7593b2f2a992291aa20411b49a438506743363c..5e8e23a5b69133d76fe423abe4ec1ea8b6d3237c 100644
Binary files a/doc/images/qtcreator-mobile-project-qt-versions.png and b/doc/images/qtcreator-mobile-project-qt-versions.png differ
diff --git a/doc/images/qtcreator-mobile-project-summary.png b/doc/images/qtcreator-mobile-project-summary.png
index c1f2a1b5a89a75548f1a2594afb92272eb37ff3d..744f35c47b99254bb715a3c9d98adf3e54084c27 100644
Binary files a/doc/images/qtcreator-mobile-project-summary.png and b/doc/images/qtcreator-mobile-project-summary.png differ
diff --git a/doc/images/qtcreator-mobile-project-widgets.png b/doc/images/qtcreator-mobile-project-widgets.png
index cdd61eb0f04bf64d7a5a6edeb5da522b7b9a8a2a..ee6f3791dc46fb80ad4bd62431f6e560326d61dc 100644
Binary files a/doc/images/qtcreator-mobile-project-widgets.png and b/doc/images/qtcreator-mobile-project-widgets.png differ
diff --git a/doc/images/qtcreator-mobile-simulated.png b/doc/images/qtcreator-mobile-simulated.png
index a498fdc937557cbafdad3449b665f447324dface..3769f24ba0031ca422562dec076a38c0fd715406 100644
Binary files a/doc/images/qtcreator-mobile-simulated.png and b/doc/images/qtcreator-mobile-simulated.png differ
diff --git a/doc/images/qtcreator-new-mobile-project.png b/doc/images/qtcreator-new-mobile-project.png
index b47951da16252abe6d43dede9d18b3c13ba64d68..fc9408c1657ddf8b1f8d895b3051e1f6dde407cc 100644
Binary files a/doc/images/qtcreator-new-mobile-project.png and b/doc/images/qtcreator-new-mobile-project.png differ
diff --git a/doc/images/qtcreator-new-project-qt-versions.png b/doc/images/qtcreator-new-project-qt-versions.png
index 48ef70b91d2733e64023ed8790b70fc94744272a..16a2fb8033fa2f77a47f0c045cfada276d503a1c 100644
Binary files a/doc/images/qtcreator-new-project-qt-versions.png and b/doc/images/qtcreator-new-project-qt-versions.png differ
diff --git a/doc/images/qtcreator-new-project-summary.png b/doc/images/qtcreator-new-project-summary.png
index 2b99727ebb88093ed39de57b7739b60999b77672..94b8c151c6788ffe14811a7644e58d8b9ecf32b8 100644
Binary files a/doc/images/qtcreator-new-project-summary.png and b/doc/images/qtcreator-new-project-summary.png differ
diff --git a/doc/images/qtcreator-new-project.png b/doc/images/qtcreator-new-project.png
index fed25bfdbd0f1be80123b9d25a40cf94b1dad8f0..f6996fa9754ddd785f64129839e9761dc60e07c1 100644
Binary files a/doc/images/qtcreator-new-project.png and b/doc/images/qtcreator-new-project.png differ
diff --git a/doc/images/qtcreator-search-allprojects.png b/doc/images/qtcreator-search-allprojects.png
index 84693d1151da9e958e338c934a408c9428f2dd65..f34b2f2c4a378415bddf9f996c33981a045f995a 100644
Binary files a/doc/images/qtcreator-search-allprojects.png and b/doc/images/qtcreator-search-allprojects.png differ
diff --git a/doc/images/qtcreator-search-cpp-symbols.png b/doc/images/qtcreator-search-cpp-symbols.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9cdbef66141dc440864661656b62556e4e90dd1
Binary files /dev/null and b/doc/images/qtcreator-search-cpp-symbols.png differ
diff --git a/share/qtcreator/examplebrowser b/share/qtcreator/examplebrowser
new file mode 160000
index 0000000000000000000000000000000000000000..bf3bd5f8e6a5a311b922069f508f96d846c0b742
--- /dev/null
+++ b/share/qtcreator/examplebrowser
@@ -0,0 +1 @@
+Subproject commit bf3bd5f8e6a5a311b922069f508f96d846c0b742
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index b60b5df341b143bbaa422987fa715b7648f98735..a52da81d20db93c8d547da82ccc46f9169086177 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -1700,7 +1700,7 @@ class Dumper:
iname = "%s.%s" % (item.iname, name)
child = Item(item.value, iname, None, name)
with SubItem(self):
- self.put('name="%s",', name)
+ self.put('name="%s",' % name)
self.putValue(" ")
if str(field.type).endswith("<anonymous union>"):
self.putType("<anonymous union>")
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 0250be1741cc15a66ee8ff604028eb3a2fad1fd2..d1bf4126336a7305761707429e8bfbe9cd73ef88 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -1299,6 +1299,7 @@ static void qDumpQDateTime(QDumper &d)
d.putItem("value", "(null)");
d.putItem("type", NS"QDateTime");
d.putItem("numchild", "0");
+ d.disarm();
return;
}
d.putItem("value", date.toString());
@@ -3037,7 +3038,7 @@ static void qDumpQVector(QDumper &d)
if (const void *p = addOffset(v, i * innersize + typeddatasize))
qCheckPointer(deref(p));
- d.putItemCount("value", n);
+ d.putItemCount("value", nn);
d.putItem("valueeditable", "false");
d.putItem("numchild", nn);
if (d.dumpChildren) {
@@ -3457,7 +3458,11 @@ static void qDumpStdVector(QDumper &d)
#ifdef Q_CC_MSVC
// Pointers are at end of the structure
const char * vcp = static_cast<const char *>(d.data);
+# if _MSC_VER >= 1600 // VS2010 onwards: Beginning of structure + base class containing pointer
+ const VectorImpl *v = reinterpret_cast<const VectorImpl *>(vcp + sizeof(void*));
+# else // pre VS2010: End of structure
const VectorImpl *v = reinterpret_cast<const VectorImpl *>(vcp + sizeof(std::vector<int>) - sizeof(VectorImpl));
+# endif // _MSC_VER
#else
const VectorImpl *v = static_cast<const VectorImpl *>(d.data);
#endif
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 0a0bcec04dc94b283389e6c0f6b50306d387585f..63b7c17c1426e3ccc05ad9712ec301d5f6b2cc18 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -321,6 +321,12 @@ def qdump__QFileInfo(d, item):
d.putCallItem("lastRead", item, "lastRead()")
+def qdump__QFixed(d, item):
+ v = int(item.value["val"])
+ d.putValue("%s/64 = %s" % (v, v/64.0))
+ d.putNumChild(0)
+
+
def qdump__QFlags(d, item):
#warn("QFLAGS: %s" % item.value)
i = item.value["i"]
@@ -2048,6 +2054,11 @@ def qdump__std__set(d, item):
node = node["_M_left"]
+def qdump__std__stack(d, item):
+ data = item.value["c"]
+ qdump__std__deque(d, Item(data, item.iname))
+
+
def qdump__std__string(d, item):
data = item.value["_M_dataplus"]["_M_p"]
baseType = item.value.type.unqualified().strip_typedefs()
diff --git a/share/qtcreator/qml/qmldump/qmldump.pro b/share/qtcreator/qml/qmldump/qmldump.pro
index 1b86e6a2ebfe88e85fa1074527b5dc2886f3f735..ea1fb42c0fef522d8590e9e3623eff7e427d6135 100644
--- a/share/qtcreator/qml/qmldump/qmldump.pro
+++ b/share/qtcreator/qml/qmldump/qmldump.pro
@@ -8,10 +8,6 @@ TARGET = qmldump
QT += declarative
CONFIG += console
-### FIXME: only debug plugins are now supported.
-CONFIG -= release
-CONFIG += debug
-
TEMPLATE = app
SOURCES += main.cpp
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
index 6aba5be42625342030bf21c71fe94ccfb853d45f..2ba7d0892b9c14cc56c2ad1fadc79fdddab9ce13 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
@@ -34,10 +34,13 @@
# if defined(BUILD_QMLJSDEBUGGER_LIB)
# define QMLJSDEBUGGER_EXPORT Q_DECL_EXPORT
+# define QMLJSDEBUGGER_EXTERN Q_DECL_IMPORT
# elif defined(BUILD_QMLJSDEBUGGER_STATIC_LIB)
# define QMLJSDEBUGGER_EXPORT
+# define QMLJSDEBUGGER_EXTERN Q_DECL_IMPORT
# else
# define QMLJSDEBUGGER_EXPORT Q_DECL_IMPORT
+# define QMLJSDEBUGGER_EXTERN Q_DECL_IMPORT
#endif
#endif // QMLJSDEBUGGER_GLOBAL_H
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
index c9cb8391212b3386afc92d86381f330953477f2b..d676ebce4d1e04f6b4335d21b1c42ebd0db1fbd9 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
@@ -42,6 +42,7 @@
#ifndef QDECLARATIVEDEBUGHELPER_P_H
#define QDECLARATIVEDEBUGHELPER_P_H
+#include "../qmljsdebugger_global.h"
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
@@ -53,7 +54,7 @@ class QDeclarativeEngine;
// Helper methods to access private API through a stable interface
// This is used in the qmljsdebugger library of QtCreator.
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
+class QMLJSDEBUGGER_EXTERN QDeclarativeDebugHelper
{
public:
static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine);
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
index 0cadbe5b585cac516616432bb46b40a28576e0c3..e6e7ffe739170085cdd41fc0c6895a013430f2c2 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
@@ -42,6 +42,7 @@
#ifndef QDECLARATIVEDEBUGSERVICE_H
#define QDECLARATIVEDEBUGSERVICE_H
+#include "../qmljsdebugger_global.h"
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
@@ -51,7 +52,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
class QDeclarativeDebugServicePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
+class QMLJSDEBUGGER_EXTERN QDeclarativeDebugService : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativeDebugService)
diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
index ec99cd06cc5a131cf866142f72a399a320e6312b..6abc94f3aca72ce361b5e12e90dbb5d475fee895 100644
--- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
@@ -11,9 +11,7 @@ contains(CONFIG, dll) {
## Input
HEADERS += \
include/jsdebuggeragent.h \
- include/qmljsdebugger_global.h \
- include/qt_private/qdeclarativedebughelper_p.h \
- include/qt_private/qdeclarativedebugservice_p.h
+ include/qmljsdebugger_global.h
SOURCES += \
jsdebuggeragent.cpp
diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro
index 5f3eb509580b0479012ce266276d5c487ccd6524..1fc040262e9759f973c3eec70caed0f41c91cea8 100644
--- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro
+++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro
@@ -6,5 +6,5 @@ DEFINES += QMLOBSERVER
unix:QMAKE_CXXFLAGS_DEBUG += -O3
-include(../../../src/qtcreatorlibrary.pri)
+include(../../../../src/qtcreatorlibrary.pri)
include(qmljsdebugger-lib.pri)
diff --git a/share/qtcreator/qml/qmlobserver/crumblepath.cpp b/share/qtcreator/qml/qmlobserver/crumblepath.cpp
index f773d37bb47d9919ff8634e2a576f9ac009a24e9..47f471f3c11523d6aef8ce160242fd4cac1d5608 100644
--- a/share/qtcreator/qml/qmlobserver/crumblepath.cpp
+++ b/share/qtcreator/qml/qmlobserver/crumblepath.cpp
@@ -150,12 +150,12 @@ CrumblePathButton::CrumblePathButton(const QString &title, QWidget *parent)
m_textPos.setY(height());
m_baseColor = QColor(0x666666);
- m_segment = QImage(":/utils/images/crumblepath-segment.png");
- m_segmentSelected = QImage(":/utils/images/crumblepath-segment-selected.png");
- m_segmentHover = QImage(":/utils/images/crumblepath-segment-hover.png");
- m_segmentEnd = QImage(":/utils/images/crumblepath-segment-end.png");
- m_segmentSelectedEnd = QImage(":/utils/images/crumblepath-segment-selected-end.png");
- m_segmentHoverEnd = QImage(":/utils/images/crumblepath-segment-hover-end.png");
+ m_segment = QImage(":/crumblepath/images/crumblepath-segment.png");
+ m_segmentSelected = QImage(":/crumblepath/images/crumblepath-segment-selected.png");
+ m_segmentHover = QImage(":/crumblepath/images/crumblepath-segment-hover.png");
+ m_segmentEnd = QImage(":/crumblepath/images/crumblepath-segment-end.png");
+ m_segmentSelectedEnd = QImage(":/crumblepath/images/crumblepath-segment-selected-end.png");
+ m_segmentHoverEnd = QImage(":/crumblepath/images/crumblepath-segment-hover-end.png");
tintImages();
}
diff --git a/share/qtcreator/qml/qmlobserver/crumblepath.qrc b/share/qtcreator/qml/qmlobserver/crumblepath.qrc
new file mode 100644
index 0000000000000000000000000000000000000000..1c0897973c1a16012f44f814f28405154d7c4018
--- /dev/null
+++ b/share/qtcreator/qml/qmlobserver/crumblepath.qrc
@@ -0,0 +1,10 @@
+<RCC>
+ <qresource prefix="/crumblepath">
+ <file>images/crumblepath-segment-end.png</file>
+ <file>images/crumblepath-segment-hover-end.png</file>
+ <file>images/crumblepath-segment-hover.png</file>
+ <file>images/crumblepath-segment-selected-end.png</file>
+ <file>images/crumblepath-segment-selected.png</file>
+ <file>images/crumblepath-segment.png</file>
+ </qresource>
+</RCC>
diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-end.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fc371cfec1a632e8ae5a20a19f5412f7c74cb09
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-end.png differ
diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover-end.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..5663d29ee67512937d555536f2dbfe4006ba1652
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover-end.png differ
diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..741f0575dd7467301e491839628317a648a8b64a
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-hover.png differ
diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected-end.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ef4e05b45f29c3db82c14b01a8fcb82612b0f93
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected-end.png differ
diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c674099b5a18ef978baf32c7e6b9614affb433f6
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment-selected.png differ
diff --git a/share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad6e7165f6c1025fbbfe918fd104821b430c7634
Binary files /dev/null and b/share/qtcreator/qml/qmlobserver/images/crumblepath-segment.png differ
diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp
index f04640d970eb8b53f22833aa88f793be17e442bc..6733265b2fe98c9f4bf73401b8e4904d590b403d 100644
--- a/share/qtcreator/qml/qmlobserver/main.cpp
+++ b/share/qtcreator/qml/qmlobserver/main.cpp
@@ -113,7 +113,7 @@ void myMessageOutput(QtMsgType type, const char *msg)
void usage()
{
- qWarning("Usage: qmlviewer [options] <filename>");
+ qWarning("Usage: qmlobserver [options] <filename>");
qWarning(" ");
qWarning(" options:");
qWarning(" -v, -version ............................. display version");
@@ -125,6 +125,7 @@ void usage()
qWarning(" -sizerootobjecttoview .................... the content resizes to the changes in the view (default)");
qWarning(" -qmlbrowser .............................. use a QML-based file browser");
qWarning(" -warnings [show|hide]..................... show warnings in a separate log window");
+#ifndef NO_PRIVATE_HEADERS
qWarning(" -recordfile <output> ..................... set video recording file");
qWarning(" - ImageMagick 'convert' for GIF)");
qWarning(" - png file for raw frames");
@@ -133,6 +134,7 @@ void usage()
qWarning(" -recordrate <fps> ........................ set recording frame rate");
qWarning(" -record arg .............................. add a recording process argument");
qWarning(" -autorecord [from-]<tomilliseconds> ...... set recording to start and stop");
+#endif
qWarning(" -devicekeys .............................. use numeric keys (see F1)");
qWarning(" -dragthreshold <size> .................... set mouse drag threshold size");
qWarning(" -netcache <size> ......................... set disk cache to size bytes");
@@ -141,8 +143,10 @@ void usage()
qWarning(" display path if <directory> is empty");
qWarning(" -P <directory> ........................... prepend to the plugin search path");
qWarning(" -opengl .................................. use a QGLWidget for the viewport");
+#ifndef NO_PRIVATE_HEADERS
qWarning(" -script <path> ........................... set the script to use");
qWarning(" -scriptopts <options>|help ............... set the script options to use");
+#endif
qWarning(" ");
qWarning(" Press F1 for interactive help");
@@ -151,7 +155,7 @@ void usage()
void scriptOptsUsage()
{
- qWarning("Usage: qmlviewer -scriptopts <option>[,<option>...] ...");
+ qWarning("Usage: qmlobserver -scriptopts <option>[,<option>...] ...");
qWarning(" options:");
qWarning(" record ................................... record a new script");
qWarning(" play ..................................... playback an existing script");
diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
index 14918b238096cb651ccd2ae39eced80d33e8a2c9..83e8c06018e14e68aea4b578a32516cccc1bf245 100644
--- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
+++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
@@ -47,8 +47,12 @@
#include <QDeclarativeComponent>
#include <QDir>
#include <QCryptographicHash>
+#include <QGraphicsObject>
+
+#ifndef NO_PRIVATE_HEADERS
#include <private/qabstractanimation_p.h>
#include <private/qdeclarativeitem_p.h>
+#endif
QT_BEGIN_NAMESPACE
@@ -60,7 +64,9 @@ QDeclarativeTester::QDeclarativeTester(const QString &script, QDeclarativeViewer
{
parent->viewport()->installEventFilter(this);
parent->installEventFilter(this);
+#ifndef NO_PRIVATE_HEADERS
QUnifiedTimer::instance()->setConsistentTiming(true);
+#endif
if (options & QDeclarativeViewer::Play)
this->run();
start();
@@ -239,7 +245,9 @@ void QDeclarativeTester::save()
void QDeclarativeTester::updateCurrentTime(int msec)
{
+#ifndef NO_PRIVATE_HEADERS
QDeclarativeItemPrivate::setConsistentTime(msec);
+#endif
if (!testscript && msec > 16 && options & QDeclarativeViewer::Snapshot)
return;
diff --git a/share/qtcreator/qml/qmlobserver/qml.pri b/share/qtcreator/qml/qmlobserver/qml.pri
index 2016513f4e49fac7fa2e1a281175fb716b334b31..08da6e4cfe9985c76268c43a0bc1d724a1caecb6 100644
--- a/share/qtcreator/qml/qmlobserver/qml.pri
+++ b/share/qtcreator/qml/qmlobserver/qml.pri
@@ -5,6 +5,10 @@ contains(QT_CONFIG, opengl) {
DEFINES += GL_SUPPORTED
}
+!exists($$[QT_INSTALL_HEADERS]/QtCore/private/qabstractanimation_p.h) {
+ DEFINES += NO_PRIVATE_HEADERS
+}
+
INCLUDEPATH += $$PWD
HEADERS += $$PWD/qmlruntime.h \
@@ -21,7 +25,8 @@ SOURCES += $$PWD/qmlruntime.cpp \
$$PWD/loggerwidget.cpp \
$$PWD/crumblepath.cpp
-RESOURCES += $$PWD/qmlruntime.qrc
+RESOURCES += $$PWD/qmlruntime.qrc \
+ crumblepath.qrc
OTHER_FILES += toolbarstyle.css
diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
index 140aee7084c75e69c91f1c3f0ff07f1ebceca3c9..d15814c71781a6690c8679dc4be5f77be6768dbe 100644
--- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
+++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp
@@ -64,7 +64,9 @@
#include <qdeclarativenetworkaccessmanagerfactory.h>
#include "qdeclarative.h"
#include <QAbstractAnimation>
+#ifndef NO_PRIVATE_HEADERS
#include <private/qabstractanimation_p.h>
+#endif
#include <QSettings>
#include <QXmlStreamReader>
@@ -104,6 +106,8 @@
#include <QGLWidget>
#endif
+#include <qt_private/qdeclarativedebughelper_p.h>
+
#include <qdeclarativetester.h>
#include "jsdebuggeragent.h"
@@ -737,6 +741,9 @@ void QDeclarativeViewer::createMenu()
recordAction = new QAction(tr("Start Recording &Video"), this);
recordAction->setShortcut(QKeySequence("F9"));
connect(recordAction, SIGNAL(triggered()), this, SLOT(toggleRecordingWithSelection()));
+#ifdef NO_PRIVATE_HEADERS
+ recordAction->setEnabled(false);
+#endif
QAction *recordOptions = new QAction(tr("Video &Options..."), this);
connect(recordOptions, SIGNAL(triggered()), this, SLOT(chooseRecordingOptions()));
@@ -1001,6 +1008,7 @@ void QDeclarativeViewer::toggleRecordingWithSelection()
void QDeclarativeViewer::toggleRecording()
{
+#ifndef NO_PRIVATE_HEADERS
if (record_file.isEmpty()) {
toggleRecordingWithSelection();
return;
@@ -1008,6 +1016,7 @@ void QDeclarativeViewer::toggleRecording()
bool recording = !recordTimer.isActive();
recordAction->setText(recording ? tr("&Stop Recording Video\tF9") : tr("&Start Recording Video\tF9"));
setRecording(recording);
+#endif
}
void QDeclarativeViewer::setAnimationsPaused(bool enable)
@@ -1147,8 +1156,10 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
url = QUrl(file_or_url);
setWindowTitle(tr("%1 - Qt QML Viewer").arg(file_or_url));
+#ifndef NO_PRIVATE_HEADERS
if (!m_script.isEmpty())
tester = new QDeclarativeTester(m_script, m_scriptOptions, canvas);
+#endif
delete canvas->rootObject();
canvas->engine()->clearComponentCache();
@@ -1295,8 +1306,10 @@ void QDeclarativeViewer::setRecording(bool on)
return;
int period = int(1000/record_rate+0.5);
+#ifndef NO_PRIVATE_HEADERS
QUnifiedTimer::instance()->setTimingInterval(on ? period:16);
QUnifiedTimer::instance()->setConsistentTiming(on);
+#endif
if (on) {
canvas->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
recordTimer.setInterval(period);
@@ -1527,8 +1540,7 @@ void QDeclarativeViewer::setSizeToView(bool sizeToView)
void QDeclarativeViewer::setAnimationSpeed(float f)
{
- QUnifiedTimer::instance()->setSlowdownFactor(f);
- QUnifiedTimer::instance()->setSlowModeEnabled(f != 1.0);
+ QDeclarativeDebugHelper::setAnimationSlowDownFactor(f);
}
void QDeclarativeViewer::updateSizeHints(bool initial)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentHorizontalButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentVerticalButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/CheckBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorLabel.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorLabel.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorScheme.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorScheme.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorTypeButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorTypeButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColumnSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColumnSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ComboBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBoxAlternate.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBoxAlternate.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExpressionEditor.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Extended.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Extended.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedFunctionButton.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedSwitches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedSwitches.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlagedButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlagedButton.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlickableSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlipableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlipableSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontComboBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontStyleButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontStyleButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Geometry.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Geometry.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBoxOption.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBoxOption.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalLayout.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalWhiteLine.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalWhiteLine.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/IntEditor.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ItemPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Label.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Label.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Layout.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/LayoutPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/LayoutPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/LineEdit.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/LineEdit.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ListViewSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Modifiers.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/PlaceHolder.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/PlaceHolder.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/PropertyFrame.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/PropertyFrame.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleColorGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ScrollArea.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ScrollArea.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/SliderWidget.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/SpinBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextColorGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Switches.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextEditSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Transformation.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Transformation.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Type.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Type.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/VerticalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/VerticalLayout.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Visibility.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Visibility.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbottom.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbottom.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbox.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbox.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorfill.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorfill.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorhorizontal.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorhorizontal.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorleft.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorleft.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorright.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorright.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorspacer.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorspacer.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchortop.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchortop.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorvertical.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorvertical.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/applybutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/applybutton.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/aspectlock.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/aspectlock.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/cancelbutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/cancelbutton.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/emptyPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/emptyPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/apply.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/apply.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/behaivour.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/behaivour.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/blended-image-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/blended-image-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/button.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/button.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/button.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/button.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/cancel.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/cancel.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/default-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/default-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/downArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/downArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/expression.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/expression.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/extended.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/extended.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/grid-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/grid-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_gradient.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_gradient.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_none.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_none.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_solid.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_solid.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/image-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/image-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/item-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/item-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/layout.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/layout.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/leftArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/leftArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/list-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/list-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/mouse-area-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/mouse-area-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/placeholder.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/placeholder.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rect-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rect-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/reset-button.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/reset-button.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rightArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rightArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/standard.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/standard.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/submenu.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/submenu.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-edit-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-edit-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/upArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/upArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/layoutWidget.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/layoutWidget.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/propertyEditor.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/specialCheckBox.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/specialCheckBox.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonleft.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonleft.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonmiddle.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonmiddle.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonright.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonright.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/switch.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/switch.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/typeLabel.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/typeLabel.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/WebViewSpecifics.qml
deleted file mode 100644
index 7db0da1738793760f9322fb9c7b8d95563931c0a..0000000000000000000000000000000000000000
--- a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/WebViewSpecifics.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-import Qt 4.7
-import Bauhaus 1.0
-
-QWidget {
- layout: QVBoxLayout {
- topMargin: 0
- bottomMargin: 0
- leftMargin: 0
- rightMargin: 0
- spacing: 0
- GroupBox {
-
-
- GroupBox {
- maximumHeight: 200;
-
- finished: finishedNotify;
- caption: qsTr("WebView")
- id: webViewSpecifics;
-
- layout: VerticalLayout {
- QWidget {
- layout: HorizontalLayout {
- leftMargin: 0;
- rightMargin: 0;
- Label {
- text: "Url"
- }
- LineEdit {
- backendValue: backendValues.url
- baseStateFlag: isBaseState;
- }
- }
- }
-
- IntEditor {
- id: preferredWidth;
- backendValue: backendValues.preferredWidth;
- caption: qsTr("Preferred Width")
- baseStateFlag: isBaseState;
- step: 1;
- minimumValue: 0;
- maximumValue: 2000;
- }
-
- IntEditor {
- id: webPageWidth;
- backendValue: backendValues.preferredHeight;
- caption: qsTr("Page Height")
- baseStateFlag: isBaseState;
- step: 1;
- minimumValue: 0;
- maximumValue: 2000;
- }
-
- QWidget {
- layout: HorizontalLayout {
-
- Label {
- minimumHeight: 20;
- text: "Zoom Factor"
- }
- DoubleSpinBox {
- id: zoomSpinBox;
- minimumWidth: 60;
- text: ""
- backendValue: backendValues.zoomFactor;
- minimum: 0.01
- maximum: 10
- singleStep: 0.1
- baseStateFlag: isBaseState;
- onBackendValueChanged: {
- zoomSlider.value = backendValue.value * 10;
- }
- }
- QSlider {
- id: zoomSlider;
- orientation: "Qt::Horizontal";
- minimum: 1;
- maximum: 100;
- singleStep: 1;
- onValueChanged: {
- backendValues.zoomFactor.value = value / 10;
- }
- }
- }
- }
- }
- }
-
- }
- }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
new file mode 100644
index 0000000000000000000000000000000000000000..2be51f77b059eb42e057d12c409d701a2aafd941
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
@@ -0,0 +1,106 @@
+import Qt 4.7
+import Bauhaus 1.0
+import "../Qt/"
+
+QWidget {
+ layout: QVBoxLayout {
+ topMargin: 0
+ bottomMargin: 0
+ leftMargin: 0
+ rightMargin: 0
+ spacing: 0
+
+ GroupBox {
+ maximumHeight: 200;
+
+ finished: finishedNotify;
+ caption: qsTr("WebView")
+ id: webViewSpecifics;
+
+ layout: VerticalLayout {
+ QWidget {
+ layout: HorizontalLayout {
+ leftMargin: 0;
+ rightMargin: 0;
+ Label {
+ text: qsTr("Url")
+ }
+ LineEdit {
+ backendValue: backendValues.url
+ baseStateFlag: isBaseState;
+ }
+ }
+ }
+
+ QWidget {
+ layout: HorizontalLayout {
+ leftMargin: 0;
+ rightMargin: 0;
+ Label {
+ text: qsTr("Title")
+ }
+ LineEdit {
+ backendValue: backendValues.title
+ baseStateFlag: isBaseState;
+ }
+ }
+ }
+
+ IntEditor {
+ id: preferredWidth;
+ backendValue: backendValues.preferredWidth;
+ caption: qsTr("Pref Width")
+ toolTip: qsTr("Preferred Width")
+ baseStateFlag: isBaseState;
+ step: 1;
+ minimumValue: 0;
+ maximumValue: 2000;
+ }
+
+ IntEditor {
+ id: webPageWidth;
+ backendValue: backendValues.preferredHeight;
+ caption: qsTr("Pref Height")
+ toolTip: qsTr("Preferred Height")
+ baseStateFlag: isBaseState;
+ step: 1;
+ minimumValue: 0;
+ maximumValue: 2000;
+ }
+
+ QWidget {
+ layout: HorizontalLayout {
+
+ Label {
+ text: qsTr("Scale")
+ toolTip: qsTr("Contents Scale")
+ }
+ DoubleSpinBox {
+ id: zoomSpinBox;
+ minimumWidth: 60;
+ text: ""
+ backendValue: backendValues.contentsScale;
+ minimum: 0.01
+ maximum: 10
+ singleStep: 0.1
+ baseStateFlag: isBaseState;
+ onBackendValueChanged: {
+ zoomSlider.value = backendValue.value * 10;
+ }
+ }
+ QSlider {
+ id: zoomSlider;
+ orientation: "Qt::Horizontal";
+ minimum: 1;
+ maximum: 100;
+ singleStep: 1;
+ onValueChanged: {
+ backendValues.contentsScale.value = value / 10;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/share/qtcreator/templates/wizards/qml-extension/project.pro b/share/qtcreator/templates/wizards/qml-extension/project.pro
index d4f5293be80b80aa410ba17ee8aef42147e0c5d2..8a5a9c44e9edbd7a76bf4477d2ecc90c216018fd 100644
--- a/share/qtcreator/templates/wizards/qml-extension/project.pro
+++ b/share/qtcreator/templates/wizards/qml-extension/project.pro
@@ -18,6 +18,6 @@ OTHER_FILES = qmldir
copy_qmldir.target = $$OUT_PWD/qmldir
copy_qmldir.depends = $$PWD/qmldir
-copy_qmldir.commands = $(COPY_FILE) $$copy_qmldir.depends $$copy_qmldir.target
+copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
QMAKE_EXTRA_TARGETS += copy_qmldir
PRE_TARGETDEPS += $$copy_qmldir.target
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
index 1ccad3bd6098a1e951243c4f7d9ee203c57cbb02..37df03ca121958987e7ff820b1aab186649cfff9 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
@@ -47,7 +47,7 @@ bool %PluginName%Impl::initialize(const QStringList &arguments, QString *errorSt
Core::ActionManager *am = Core::ICore::instance()->actionManager();
QAction *action = new QAction(tr("%PluginName% action"), this);
- Core::Command *cmd = am->registerAction(action, QLatin1String(ACTION_ID),
+ Core::Command *cmd = am->registerAction(action, ACTION_ID,
Core::Context(Core::Constants::C_GLOBAL));
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+Meta+A")));
connect(action, SIGNAL(triggered()), this, SLOT(triggerAction()));
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index bb83e6febf51f8432728632686c9ab4e7c6da9dc..ca158c496a38689f1cffb01e283965f7130f1974 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -4,22 +4,18 @@
<context>
<name>Application</name>
<message>
- <location filename="../../../src/app/main.cpp" line="+137"/>
<source>Failed to load core: %1</source>
<translation>Das Core-Plugin konnte nicht geladen werden: %1</translation>
</message>
<message>
- <location line="+5"/>
<source>Unable to send command line arguments to the already running instance. It appears to be not responding.</source>
<translation>Die Kommandozeilen-Argumente konnten nicht an die laufende Instanz übermittelt werden. Sie antwortet nicht.</translation>
</message>
<message>
- <location line="+125"/>
<source>Could not find 'Core.pluginspec' in %1</source>
<translation>Die Datei 'Core.pluginspec' konnte im Verzeichnis %1 nicht gefunden werden</translation>
</message>
<message>
- <location line="+42"/>
<source>Qt Creator - Plugin loader messages</source>
<translation>Qt Creator - Meldungen der Plugin-Verwaltung</translation>
</message>
@@ -27,17 +23,14 @@
<context>
<name>AttachCoreDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/attachcoredialog.ui"/>
<source>Start Debugger</source>
<translation>Debugger starten</translation>
</message>
<message>
- <location/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
<message>
- <location/>
<source>Core file:</source>
<translation>Core-Datei:</translation>
</message>
@@ -45,12 +38,10 @@
<context>
<name>AttachExternalDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/attachexternaldialog.ui"/>
<source>Start Debugger</source>
<translation>Debugger starten</translation>
</message>
<message>
- <location/>
<source>Attach to process ID:</source>
<translation>Prozess-Id:</translation>
</message>
@@ -58,12 +49,10 @@
<context>
<name>BINEditor::Internal::BinEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+479"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+3"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
@@ -71,46 +60,34 @@
<context>
<name>BookmarkDialog</name>
<message>
- <location filename="../../../src/shared/help/bookmarkdialog.ui"/>
<source>Add Bookmark</source>
<translation>Lesezeichen hinzufügen</translation>
</message>
<message>
- <location/>
<source>Bookmark:</source>
<translation>Lesezeichen:</translation>
</message>
<message>
- <location/>
<source>+</source>
<translation>+</translation>
</message>
<message>
- <location/>
<source>New Folder</source>
<translation>Neuer Ordner</translation>
</message>
<message>
- <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+179"/>
- <location line="+18"/>
- <location line="+39"/>
- <location line="+18"/>
- <location line="+30"/>
<source>Bookmarks</source>
<translation>Lesezeichen</translation>
</message>
<message>
- <location line="-61"/>
<source>Delete Folder</source>
<translation>Ordner löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Rename Folder</source>
<translation>Ordner umbenennen</translation>
</message>
<message>
- <location filename="../../../src/shared/help/bookmarkdialog.ui"/>
<source>Add in folder:</source>
<translation>Im Ordner:</translation>
</message>
@@ -118,23 +95,18 @@
<context>
<name>BookmarkManager</name>
<message>
- <location filename="../../../src/shared/help/bookmarkmanager.cpp" line="+432"/>
<source>Bookmarks</source>
<translation>Lesezeichen</translation>
</message>
<message>
- <location line="+38"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location line="+1"/>
<source>Deleting a folder also removes its content.<br>Do you want to continue?</source>
<translation>Beim Löschen eines Ordners wird auch dessen Inhalt gelöscht.<br>Möchten Sie trotzdem fortsetzen?</translation>
</message>
<message>
- <location line="+111"/>
- <location line="+8"/>
<source>New Folder</source>
<translation>Neuer Ordner</translation>
</message>
@@ -142,42 +114,34 @@
<context>
<name>BookmarkWidget</name>
<message>
- <location line="-428"/>
<source>Delete Folder</source>
<translation>Ordner löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Rename Folder</source>
<translation>Ordner umbenennen</translation>
</message>
<message>
- <location line="+2"/>
<source>Show Bookmark</source>
<translation>Lesezeichen anzeigen</translation>
</message>
<message>
- <location line="+1"/>
<source>Show Bookmark in New Tab</source>
<translation>Lesezeichen in neuem Reiter anzeigen</translation>
</message>
<message>
- <location line="+3"/>
<source>Delete Bookmark</source>
<translation>Lesezeichen löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Rename Bookmark</source>
<translation>Lesezeichen umbenennen</translation>
</message>
<message>
- <location line="+72"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+9"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
@@ -185,28 +149,22 @@
<context>
<name>Bookmarks::Internal::BookmarkView</name>
<message>
- <location filename="../../../src/plugins/bookmarks/bookmarkmanager.cpp" line="+209"/>
- <location line="+569"/>
<source>Bookmarks</source>
<translation>Lesezeichen</translation>
</message>
<message>
- <location line="-548"/>
<source>Move Up</source>
<translation>Nach oben</translation>
</message>
<message>
- <location line="+1"/>
<source>Move Down</source>
<translation>Nach unten</translation>
</message>
<message>
- <location line="+1"/>
<source>&Remove</source>
<translation>&Entfernen</translation>
</message>
<message>
- <location line="+1"/>
<source>Remove All</source>
<translation>&Alle entfernen</translation>
</message>
@@ -214,63 +172,50 @@
<context>
<name>Bookmarks::Internal::BookmarksPlugin</name>
<message>
- <location filename="../../../src/plugins/bookmarks/bookmarksplugin.cpp" line="+76"/>
<source>&Bookmarks</source>
<translation>&Lesezeichen</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+62"/>
<source>Toggle Bookmark</source>
<translation>Lesezeichen umschalten</translation>
</message>
<message>
- <location line="-58"/>
<source>Ctrl+M</source>
<translation>Ctrl+M</translation>
</message>
<message>
- <location line="+2"/>
<source>Meta+M</source>
<translation>Meta+M</translation>
</message>
<message>
- <location line="+10"/>
<source>Previous Bookmark</source>
<translation>Vorhergehendes Lesezeichen</translation>
</message>
<message>
- <location line="+3"/>
<source>Ctrl+,</source>
<translation>Ctrl+,</translation>
</message>
<message>
- <location line="+2"/>
<source>Meta+,</source>
<translation>Meta+,</translation>
</message>
<message>
- <location line="+5"/>
<source>Next Bookmark</source>
<translation>Nächstes Lesezeichen</translation>
</message>
<message>
- <location line="+3"/>
<source>Ctrl+.</source>
<translation>Ctrl+.</translation>
</message>
<message>
- <location line="+2"/>
<source>Meta+.</source>
<translation>Meta+.</translation>
</message>
<message>
- <location line="+10"/>
<source>Previous Bookmark in Document</source>
<translation>Vorhergehendes Lesezeichen im Dokument</translation>
</message>
<message>
- <location line="+5"/>
<source>Next Bookmark in Document</source>
<translation>Nächstes Lesezeichen im Dokument</translation>
</message>
@@ -278,45 +223,37 @@
<context>
<name>BreakByFunctionDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/breakbyfunction.ui"/>
<source>Set Breakpoint at Function</source>
- <translation>Haltepunkt bei Funktion setzen</translation>
+ <translation type="obsolete">Haltepunkt bei Funktion setzen</translation>
</message>
<message>
- <location/>
<source>Function to break on:</source>
- <translation>Funktion:</translation>
+ <translation type="obsolete">Funktion:</translation>
</message>
</context>
<context>
<name>BreakCondition</name>
<message>
- <location filename="../../../src/plugins/debugger/breakcondition.ui"/>
<source>Condition:</source>
<translation>Bedingung:</translation>
</message>
<message>
- <location/>
<source>Ignore count:</source>
<translation>Anhalten erst nach:</translation>
</message>
<message>
- <location/>
<source>File name:</source>
- <translation>Dateiname:</translation>
+ <translation type="obsolete">Dateiname:</translation>
</message>
<message>
- <location/>
<source>Line number:</source>
- <translation>Zeilennummer:</translation>
+ <translation type="obsolete">Zeilennummer:</translation>
</message>
<message>
- <location/>
<source>Function:</source>
- <translation>Funktion:</translation>
+ <translation type="obsolete">Funktion:</translation>
</message>
<message>
- <location/>
<source>Thread specification:</source>
<translation>Thread:</translation>
</message>
@@ -324,17 +261,14 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp" line="+195"/>
<source>Build</source>
<translation>Erstellen</translation>
</message>
<message>
- <location line="+24"/>
<source>New Configuration</source>
<translation>Neue Konfiguration</translation>
</message>
<message>
- <location line="+1"/>
<source>New configuration name:</source>
<translation>Name der neuen Konfiguration:</translation>
</message>
@@ -342,12 +276,10 @@
<context>
<name>CMakeProjectManager::Internal::CMakeBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeproject.cpp" line="+630"/>
<source>Reconfigure project:</source>
<translation>Projekt neu konfigurieren:</translation>
</message>
<message>
- <location line="+9"/>
<source>&Change</source>
<translation>&Ändern</translation>
</message>
@@ -355,7 +287,6 @@
<context>
<name>CMakeProjectManager::Internal::CMakeOpenProjectWizard</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+136"/>
<source>CMake Wizard</source>
<translation>CMake-Assistent</translation>
</message>
@@ -363,52 +294,42 @@
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+332"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
- <location line="+6"/>
<source>Select Working Directory</source>
<translation>Wählen Sie das Arbeitsverzeichnis aus</translation>
</message>
<message>
- <location line="+3"/>
<source>Reset to default</source>
<translation>Zurücksetzen</translation>
</message>
<message>
- <location line="+7"/>
<source>Working directory:</source>
<translation>Arbeitsverzeichnis:</translation>
</message>
<message>
- <location line="+7"/>
<source>Debugger:</source>
<translation>Debugger:</translation>
</message>
<message>
- <location line="+23"/>
<source>Run Environment</source>
<translation>Ausführungsumgebung</translation>
</message>
<message>
- <location line="+10"/>
<source>Base environment for this runconfiguration:</source>
<translation>Basisumgebung für diese Ausführungskonfiguration</translation>
</message>
<message>
- <location line="+4"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+1"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
@@ -416,83 +337,66 @@
<context>
<name>CMakeProjectManager::Internal::CMakeRunPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+159"/>
<source> The path %1 is not a executable.</source>
<translation> %1 ist keine ausführbare Datei.</translation>
</message>
<message>
- <location line="+19"/>
- <location line="+17"/>
<source>Run CMake</source>
<translation>CMake ausführen</translation>
</message>
<message>
- <location line="-9"/>
<source>Arguments</source>
<translation>Argumente</translation>
</message>
<message>
- <location line="-34"/>
<source>Please specify the path to the CMake executable. No CMake executable was found in the path.</source>
<translation>Bitte geben Sie den Pfad zu der ausführbaren Datei von cmake an. Sie konnte nicht im Pfad gefunden werden.</translation>
</message>
<message>
- <location line="+5"/>
<source> The CMake executable (%1) does not exist.</source>
<translation> Die ausführbaren Datei von cmake (%1) existiert nicht.</translation>
</message>
<message>
- <location line="+4"/>
<source> The path %1 is not a valid CMake.</source>
<translation> Der Pfad %1 ist keine gültige CMake-Installation.</translation>
</message>
<message>
- <location line="+45"/>
<source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used toolchain here and rerun CMake. Or simply finish the wizard directly.</source>
<translation>Das Verzeichnis %1 enthält bereits eine hinreichend aktuelle cbp-Datei. Sie können spezielle Argumente angeben oder die Toolchain ändern und cmake noch einmal ausführen. Oder beenden Sie den Wizard an dieser Stelle</translation>
</message>
<message>
- <location line="+5"/>
<source>The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running CMake. Some projects require command line arguments to the initial CMake call.</source>
<translation>Das Verzeichnis %1 enthält keine cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erzeugen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich.</translation>
</message>
<message>
- <location line="+4"/>
<source>The directory %1 contains an outdated .cbp file. Qt Creator needs to update this file by running CMake. If you want to add additional command line arguments, add them below. Note that CMake remembers command line arguments from the previous runs.</source>
<translation>Das Verzeichnis %1 enthält eine veraltete cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erneuern. Zusätzliche Kommandozeilenargumente können unten angegeben werden. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
</message>
<message>
- <location line="+6"/>
<source>The directory %1 specified in a build-configuration, does not contain a cbp file. Qt Creator needs to recreate this file, by running CMake. Some projects require command line arguments to the initial CMake call. Note that CMake remembers command line arguments from the previous runs.</source>
<translation>Das Verzeichnis %1, was in einer Build-Konfiguration angegeben wurde, enthält keine cbp-Datei. Qt Creator muss die Datei durch einen cmake-Aufruf erzeugen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich. Beachten Sie, dass cmake die Argumente vorangegangener Aufrufe speichert.</translation>
</message>
<message>
- <location line="+8"/>
<source>Qt Creator needs to run CMake in the new build directory. Some projects require command line arguments to the initial CMake call.</source>
<translation> Qt Creator muss cmake im Build-Verzeichnis aufrufen. Für einige Projekte sind dazu Kommandozeilenargumente erforderlich.</translation>
</message>
<message>
- <location line="+4"/>
<source>Refreshing cbp file in %1.</source>
<translation>Die cpb-Datei im Ordner %1 wird neu erzeugt.</translation>
</message>
<message>
- <location line="+29"/>
<source>NMake Generator</source>
<translation>NMake-Generator</translation>
</message>
<message>
- <location line="+3"/>
<source>NMake Generator (%1)</source>
<translation>NMake-Generator (%1)</translation>
</message>
<message>
- <location line="+8"/>
<source>MinGW Generator</source>
<translation>MinGW-Generator</translation>
</message>
<message>
- <location line="+60"/>
<source>No valid CMake executable specified.</source>
<translation>Es wurde keine ausführbare cmake-Datei angegeben.</translation>
</message>
@@ -500,12 +404,10 @@
<context>
<name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp" line="+259"/>
<source>CMake</source>
<translation>CMake</translation>
</message>
<message>
- <location line="+25"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
@@ -513,12 +415,10 @@
<context>
<name>CMakeProjectManager::Internal::InSourceBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="-242"/>
<source>Qt Creator has detected an <b>in-source-build in %1</b> which prevents shadow builds. Qt Creator will not allow you to change the build directory. If you want a shadow build, clean your source directory and re-open the project.</source>
<translation>Es wurde ein <b>Build im Quellverzeichnis %1</b> festgestellt, der Shadow-Builds verhindert. Das Build-Verzeichnis kann nicht in Qt Creator geändert werden. Wenn Sie einen Shadow-Build wünschen, bereinigen Sie bitte das Quellverzeichnis und öffnen Sie das Projekt noch einmal.</translation>
</message>
<message>
- <location line="+5"/>
<source>Build Location</source>
<translation>Build-Ordner</translation>
</message>
@@ -526,28 +426,23 @@
<context>
<name>CMakeProjectManager::Internal::MakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+216"/>
<source>Additional arguments:</source>
<translation>Zusätzliche Argumente:</translation>
</message>
<message>
- <location line="+6"/>
<source>Targets:</source>
<translation>Ziele:</translation>
</message>
<message>
- <location line="+31"/>
<source>Make</source>
<comment>CMakeProjectManager::MakeStepConfigWidget display name.</comment>
<translation>Make</translation>
</message>
<message>
- <location line="+45"/>
<source><b>Make:</b> %1 %2</source>
<translation><b>Make-Kommando:</b> %1 %2</translation>
</message>
<message>
- <location line="+2"/>
<source><b>Unknown Toolchain</b></source>
<translation><b>Unbekannte Toolchain</b></translation>
</message>
@@ -555,22 +450,18 @@
<context>
<name>CMakeProjectManager::Internal::ShadowBuildPage</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp" line="+13"/>
<source>Please enter the directory in which you want to build your project. </source>
<translation>Bitte geben Sie das Verzeichnis ein, in dem das Projekt erstellt werden soll.</translation>
</message>
<message>
- <location line="+2"/>
<source>Please enter the directory in which you want to build your project. Qt Creator recommends to not use the source directory for building. This ensures that the source directory remains clean and enables multiple builds with different settings.</source>
<translation>Bitte geben Sie das Verzeichnis ein, in dem das Projekt erstellt werden soll. Es wird empfohlen, nicht das Quellverzeichnis zum Erstellen zu verwenden. Das ermöglicht es, verschiedene Builds mit verschiedenen Einstellungen zu erstellen.</translation>
</message>
<message>
- <location line="+9"/>
<source>Build directory:</source>
<translation>Build-Verzeichnis:</translation>
</message>
<message>
- <location line="+1"/>
<source>Build Location</source>
<translation>Build-Pfad</translation>
</message>
@@ -578,12 +469,10 @@
<context>
<name>CPlusPlus::OverviewModel</name>
<message>
- <location filename="../../../src/libs/cplusplus/OverviewModel.cpp" line="+143"/>
<source><Select Symbol></source>
<translation><Symbol auswählen></translation>
</message>
<message>
- <location line="+2"/>
<source><No Symbols></source>
<translation><keine Symbole></translation>
</message>
@@ -591,318 +480,254 @@
<context>
<name>CVS::Internal::CVSPlugin</name>
<message>
- <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="+82"/>
<source>Parsing of the log output failed</source>
<translation>Die Log-Ausgabe konnte nicht ausgewertet werden</translation>
</message>
<message>
- <location line="+193"/>
<source>&CVS</source>
<translation>&CVS</translation>
</message>
<message>
- <location line="+37"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+0"/>
<source>Add "%1"</source>
<translation>"%1" hinzufügen</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+C,Alt+A</source>
<translation>Alt+C,Alt+A</translation>
</message>
<message>
- <location line="+54"/>
<source>Diff Project</source>
<translation>Diff für Projekt</translation>
</message>
<message>
- <location line="-87"/>
<source>Diff Current File</source>
<translation>Diff für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Diff "%1"</source>
<translation>Diff für "%1"</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+C,Alt+D</source>
<translation>Alt+C,Alt+D</translation>
</message>
<message>
- <location line="+146"/>
<source>Commit All Files</source>
<translation>Alle Dateien abgeben</translation>
</message>
<message>
- <location line="-112"/>
<source>Commit Current File</source>
<translation>Datei abgeben</translation>
</message>
<message>
- <location line="+0"/>
<source>Commit "%1"</source>
<translation>"%1" abgeben</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+C,Alt+C</source>
<translation>Alt+C,Alt+C</translation>
</message>
<message>
- <location line="-33"/>
<source>Filelog Current File</source>
<translation>Filelog für Datei</translation>
</message>
<message>
- <location line="-216"/>
<source>Cannot find repository for '%1'</source>
<translation>Das Repository der Datei '%1' konnte nicht gefunden werden</translation>
</message>
<message>
- <location line="+216"/>
<source>Filelog "%1"</source>
<translation>Filelog für "%1"</translation>
</message>
<message>
- <location line="+9"/>
<source>Annotate Current File</source>
<translation>Annotation für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Annotate "%1"</source>
<translation>Annotation für "%1"</translation>
</message>
<message>
- <location line="+29"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Delete "%1"...</source>
<translation>Lösche "%1"...</translation>
</message>
<message>
- <location line="+8"/>
<source>Revert...</source>
<translation>Rückgängig machen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Revert "%1"...</source>
<translation>Änderungen in "%1" rückgängig machen...</translation>
</message>
<message>
- <location line="+10"/>
<source>Edit</source>
<translation>Anfordern</translation>
</message>
<message>
- <location line="+0"/>
<source>Edit "%1"</source>
<translation>"%1" anfordern</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+567"/>
<source>Unedit</source>
<translation>Anforderung zurücknehmen</translation>
</message>
<message>
- <location line="-567"/>
<source>Unedit "%1"</source>
<translation>Anforderung der Datei '%1" zurücknehmen</translation>
</message>
<message>
- <location line="+7"/>
<source>Unedit Repository</source>
<translation>Anforderung im gesamten Repository zurücknehmen</translation>
</message>
<message>
- <location line="+8"/>
<source>Diff Project "%1"</source>
<translation>Diff für Projekt "%1"</translation>
</message>
<message>
- <location line="+8"/>
<source>Project Status</source>
<translation>Status des Projekts</translation>
</message>
<message>
- <location line="+0"/>
<source>Status of Project "%1"</source>
<translation>Status des Projekts "%1"</translation>
</message>
<message>
- <location line="+8"/>
<source>Log Project</source>
<translation>Log für Projekt</translation>
</message>
<message>
- <location line="+0"/>
<source>Log Project "%1"</source>
<translation>Log für Projekt "%1"</translation>
</message>
<message>
- <location line="+7"/>
<source>Update Project</source>
<translation>Projekt auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+0"/>
<source>Update Project "%1"</source>
<translation>Projekt "%1"auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+7"/>
<source>Commit Project</source>
<translation>Projekt abgeben</translation>
</message>
<message>
- <location line="+0"/>
<source>Commit Project "%1"</source>
<translation>Projekt "%1" abgeben</translation>
</message>
<message>
- <location line="+9"/>
<source>Diff Repository</source>
<translation>Diff des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Repository Status</source>
<translation>Status des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Repository Log</source>
<translation>Log des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Update Repository</source>
<translation>Repository auf den aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+13"/>
<source>Revert Repository...</source>
<translation>Änderungen im gesamten Repository rückgängig machen...</translation>
</message>
<message>
- <location line="+10"/>
<source>Commit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location line="+5"/>
<source>Diff Selected Files</source>
<translation>Diff für Auswahl</translation>
</message>
<message>
- <location line="+3"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+3"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+26"/>
<source>Closing CVS Editor</source>
<translation>CVS-Editor schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you want to commit the change?</source>
<translation>Möchten Sie die Dateien abgeben?</translation>
</message>
<message>
- <location line="+1"/>
<source>The commit message check failed. Do you want to commit the change?</source>
<translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie die Dateien trotzdem abgeben?</translation>
</message>
<message>
- <location line="+64"/>
<source>The files do not differ.</source>
<translation>Die Dateien unterscheiden sich nicht.</translation>
</message>
<message>
- <location line="+78"/>
<source>Revert repository</source>
<translation>Alle Änderungen rückgängig machen</translation>
</message>
<message>
- <location line="+1"/>
<source>Would you like to revert all changes to the repository?</source>
<translation>Möchten Sie alle ausstehenden Änderungen des Repositories rückgängig machen?</translation>
</message>
<message>
- <location line="+10"/>
<source>Revert failed: %1</source>
<translation>Fehler beim Rücksetzen der Änderungen: %1</translation>
</message>
<message>
- <location line="+24"/>
<source>The file has been changed. Do you want to revert it?</source>
<translation>Die Datei wurde geändert. Möchten Sie die Änderungen rückgängig machen?</translation>
</message>
<message>
- <location line="+52"/>
<source>Another commit is currently being executed.</source>
<translation>Es läuft bereits ein Abgabevorgang.</translation>
</message>
<message>
- <location line="+24"/>
<source>There are no modified files.</source>
<translation>Es gibt keine geänderten Dateien.</translation>
</message>
<message>
- <location line="+9"/>
<source>Cannot create temporary file: %1</source>
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="+169"/>
<source>Would you like to discard your changes to the repository '%1'?</source>
<translation>Möchten Sie alle ausstehenden Änderungen des Repositories %1 rückgängig machen?</translation>
</message>
<message>
- <location line="+1"/>
<source>Would you like to discard your changes to the file '%1'?</source>
<translation>Möchten Sie alle ausstehenden Änderungen in der Datei '%1' rückgängig machen?</translation>
</message>
<message>
- <location line="+69"/>
<source>Project status</source>
<translation>Status des Projekts</translation>
</message>
<message>
- <location line="+21"/>
<source>Repository status</source>
<translation>Status des Repositories</translation>
</message>
<message>
- <location line="+44"/>
<source>The initial revision %1 cannot be described.</source>
<translation>Die erste Version (%1) kann nicht weiter beschrieben werden.</translation>
</message>
<message>
- <location line="+37"/>
<source>Could not find commits of id '%1' on %2.</source>
<translation>Es konnten keine Abgaben des Datums %2 mit der Id '%1' gefunden werden.</translation>
</message>
<message>
- <location line="+98"/>
<source>No cvs executable specified!</source>
<translation>Es wurde keine ausführbare Datei angegeben!
</translation>
@@ -911,17 +736,14 @@
<context>
<name>CVS::Internal::CVSSubmitEditor</name>
<message>
- <location filename="../../../src/plugins/cvs/cvssubmiteditor.cpp" line="+41"/>
<source>Added</source>
<translation>Hinzugefügt</translation>
</message>
<message>
- <location line="+1"/>
<source>Removed</source>
<translation>Gelöscht</translation>
</message>
<message>
- <location line="+1"/>
<source>Modified</source>
<translation>Geändert</translation>
</message>
@@ -929,12 +751,10 @@
<context>
<name>CVS::Internal::CheckoutWizard</name>
<message>
- <location filename="../../../src/plugins/cvs/checkoutwizard.cpp" line="+56"/>
<source>Checks out a CVS repository and tries to load the contained project.</source>
<translation>Erstellt einen Checkout eines CVS-Repositories und versucht, das darin enthaltene Projekt zu laden.</translation>
</message>
<message>
- <location line="+5"/>
<source>CVS Checkout</source>
<translation>Projekt aus CVS-Repository</translation>
</message>
@@ -942,17 +762,14 @@
<context>
<name>CVS::Internal::CheckoutWizardPage</name>
<message>
- <location filename="../../../src/plugins/cvs/checkoutwizardpage.cpp" line="+38"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
<message>
- <location line="+1"/>
<source>Specify repository and path.</source>
<translation>Geben Sie Repository und Pfad an.</translation>
</message>
<message>
- <location line="+1"/>
<source>Repository:</source>
<translation>Repository:</translation>
</message>
@@ -960,57 +777,46 @@
<context>
<name>CVS::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/cvs/settingspage.cpp" line="+98"/>
<source>CVS</source>
<translation>CVS</translation>
</message>
<message>
- <location filename="../../../src/plugins/cvs/settingspage.ui"/>
<source>Configuration</source>
<translation>Konfiguration</translation>
</message>
<message>
- <location/>
<source>Miscellaneous</source>
<translation>Sonstige Einstellungen</translation>
</message>
<message>
- <location/>
<source>Prompt on submit</source>
<translation>Abgabe bestätigen</translation>
</message>
<message>
- <location/>
<source>Describe all files matching commit id</source>
<translation>Alle zur Commit-Id gehörenden Dateien beschreiben:</translation>
</message>
<message>
- <location/>
<source>Timeout:</source>
<translation>Zeitlimit:</translation>
</message>
<message>
- <location/>
<source>s</source>
<translation>s</translation>
</message>
<message>
- <location/>
<source>CVS command:</source>
<translation>CVS-Kommando:</translation>
</message>
<message>
- <location/>
<source>CVS root:</source>
<translation>CVS-Quelle (CVSROOT):</translation>
</message>
<message>
- <location/>
<source>Diff options:</source>
<translation>Optionen für Diff:</translation>
</message>
<message>
- <location/>
<source>When checked, all files touched by a commit will be displayed when clicking on a revision number in the annotation view (retrieved via commit ID). Otherwise, only the respective file will be displayed.</source>
<translation>Wenn die Option aktiviert ist, werden beim Klick auf die Revisionsnummer in der Annotationsansicht alle Dateien angezeigt, die zu einer Abgabe gehören (mittels Commit-Id bestimmt). Ansonsten wird nur die betreffende Datei angezeigt.</translation>
</message>
@@ -1018,7 +824,6 @@
<context>
<name>CVS::Internal::SettingsPageWidget</name>
<message>
- <location filename="../../../src/plugins/cvs/settingspage.cpp" line="-47"/>
<source>CVS Command</source>
<translation>CVS-Kommando</translation>
</message>
@@ -1026,66 +831,58 @@
<context>
<name>CdbOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdboptionspagewidget.ui"/>
<source>These options take effect at the next start of Qt Creator.</source>
<translation>Die Einstellungen werden beim nächsten Start von Qt Creator wirksam.</translation>
</message>
<message>
- <location/>
<source>Debugger Paths</source>
<translation>Debugger-Pfade</translation>
</message>
<message>
- <location/>
<source>Symbol paths:</source>
<translation>Symbolpfade:</translation>
</message>
<message>
- <location/>
<source>Source paths:</source>
<translation>Quelltext-Pfade:</translation>
</message>
<message>
- <location/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location/>
<source>CDB</source>
<extracomment>Placeholder</extracomment>
<translation>CDB</translation>
</message>
<message>
- <location/>
<source>Other Options</source>
<translation>Weitere Optionen</translation>
</message>
<message>
- <location/>
<source>Verbose symbol loading</source>
<translation>Ausführliche Meldungen beim Laden der Symbole</translation>
</message>
<message>
- <location/>
<source>Fast loading of debugging helpers</source>
<translation>Schnelles Laden der Ausgabe-Hilfsbibliothek</translation>
</message>
+ <message>
+ <source>Break on exception</source>
+ <translation>Bei Ausnahme anhalten</translation>
+ </message>
</context>
<context>
<name>CdbStackFrameContext</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbstackframecontext.cpp" line="+139"/>
<source><Unknown Type></source>
<translation><Unbekannter Typ></translation>
</message>
<message>
- <location line="+13"/>
<source><Unknown Value></source>
<translation><Unbekannter Wert></translation>
</message>
<message>
- <location line="+217"/>
<source><Unknown></source>
<translation><Unbekannt></translation>
</message>
@@ -1093,17 +890,14 @@
<context>
<name>ChangeSelectionDialog</name>
<message>
- <location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
<source>Select</source>
<translation>Auswählen</translation>
</message>
<message>
- <location/>
<source>Change:</source>
<translation>Änderung:</translation>
</message>
<message>
- <location/>
<source>Repository location:</source>
<translation>Repository:</translation>
</message>
@@ -1111,17 +905,14 @@
<context>
<name>CodePaster::CodePasterProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/codepasterprotocol.cpp" line="+81"/>
<source>No Server defined in the CodePaster preferences.</source>
<translation>Es wurde kein Server in den CodePaster-Einstellungen angegeben.</translation>
</message>
<message>
- <location line="+2"/>
<source>No Server defined in the CodePaster options.</source>
<translation>Es wurde kein Server in den CodePaster-Einstellungen angegeben.</translation>
</message>
<message>
- <location line="+103"/>
<source>No such paste</source>
<translation>Angeforderter Ausschnitt existiert nicht</translation>
</message>
@@ -1129,17 +920,14 @@
<context>
<name>CodePaster::CodePasterSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpaster/codepastersettings.cpp" line="+67"/>
<source>CodePaster</source>
<translation>CodePaster</translation>
</message>
<message>
- <location line="+27"/>
<source>Server:</source>
<translation>Server:</translation>
</message>
<message>
- <location line="+4"/>
<source>Note: Specify the host name for the CodePaster service without any protocol prepended (e.g. codepaster.mycompany.com).</source>
<translation>Hinweis: Geben Sie den Namen des Servers für den CodePaster-Service ohne Protokollpräfix ein (zum Beispiel codepaster.mycompany.com).</translation>
</message>
@@ -1147,37 +935,30 @@
<context>
<name>CodePaster::CodepasterPlugin</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterplugin.cpp" line="+118"/>
<source>&Code Pasting</source>
<translation>&Code Pasting</translation>
</message>
<message>
- <location line="+5"/>
<source>Paste Snippet...</source>
<translation>Ausschnitt einfügen...</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+C,Alt+P</source>
<translation>Alt+C,Alt+P</translation>
</message>
<message>
- <location line="+4"/>
<source>Paste Clipboard...</source>
<translation>Zwischenablage einfügen...</translation>
</message>
<message>
- <location line="+5"/>
<source>Fetch Snippet...</source>
<translation>Ausschnitt holen...</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+C,Alt+F</source>
<translation>Alt+C,Alt+F</translation>
</message>
<message>
- <location line="+169"/>
<source>Empty snippet received for "%1".</source>
<translation>Leeren Text für "%1" erhalten.</translation>
</message>
@@ -1185,27 +966,22 @@
<context>
<name>CodePaster::PasteSelectDialog</name>
<message>
- <location filename="../../../src/plugins/cpaster/pasteselect.ui"/>
<source>Paste:</source>
<translation>Ausschnitt:</translation>
</message>
<message>
- <location/>
<source>Protocol:</source>
<translation>Protokoll:</translation>
</message>
<message>
- <location filename="../../../src/plugins/cpaster/pasteselectdialog.cpp" line="+54"/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
<message>
- <location line="+68"/>
<source>Waiting for items</source>
<translation>Warte auf Daten</translation>
</message>
<message>
- <location line="+13"/>
<source>This protocol does not support listing</source>
<translation>Dieses Protokoll stellt keine Liste zur Verfügung</translation>
</message>
@@ -1213,27 +989,22 @@
<context>
<name>CodePaster::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpaster/settingspage.ui"/>
<source>Username:</source>
<translation>Nutzername:</translation>
</message>
<message>
- <location filename="../../../src/plugins/cpaster/settingspage.cpp" line="+94"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../../../src/plugins/cpaster/settingspage.ui"/>
<source>Default protocol:</source>
<translation>Vorgabeprotokoll:</translation>
</message>
<message>
- <location/>
<source>Display Output pane after sending a post</source>
<translation>Ausgabepanel nach Senden anzeigen</translation>
</message>
<message>
- <location/>
<source>Copy-paste URL to clipboard</source>
<translation>Kopiere den URL in die Zwischenablage</translation>
</message>
@@ -1241,47 +1012,38 @@
<context>
<name>CommonOptionsPage</name>
<message>
- <location filename="../../../src/plugins/debugger/commonoptionspage.ui"/>
<source>Checking this will populate the source file view automatically but might slow down debugger startup considerably.</source>
<translation>Die Quelldatei-Ansicht wird automatisch aktualisiert, was den Start des Debuggers beträchtlich verlangsamen kann.</translation>
</message>
<message>
- <location/>
<source>Populate source file view automatically</source>
<translation>Quelldatei-Ansicht automatisch aktualisieren</translation>
</message>
<message>
- <location/>
<source>Maximal stack depth:</source>
<translation>Maximale Stack-Tiefe</translation>
</message>
<message>
- <location/>
<source><unlimited></source>
<translation><unbegrenzt></translation>
</message>
<message>
- <location/>
<source>Use alternating row colors in debug views</source>
<translation>Alternierende Farben für Debug-Ansichten benutzen</translation>
</message>
<message>
- <location/>
<source>Use tooltips in main editor while debugging</source>
<translation>Tooltips beim Debuggen benutzen</translation>
</message>
<message>
- <location/>
<source>Register Qt Creator for debugging crashed applications.</source>
<translation>Qt Creator als Debugger für abgestürzte Anwendungen registrieren.</translation>
</message>
<message>
- <location/>
<source>GUI Behavior</source>
<translation>Verhalten</translation>
</message>
<message>
- <location/>
<source>Use Qt Creator for post-mortem debugging</source>
<translation>Qt Creator als Post-Mortem-Debugger verwenden</translation>
</message>
@@ -1289,72 +1051,58 @@
<context>
<name>CompletionSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpptools/completionsettingspage.ui"/>
<source>Automatically insert (, ) and ; when appropriate.</source>
<translation>(, ), ; automatisch einfügen</translation>
</message>
<message>
- <location/>
<source>Insert the common prefix of available completion items.</source>
<translation>Gemeinsamen Präfix der passenden Ergänzungsvorschläge einfügen.</translation>
</message>
<message>
- <location/>
<source>Autocomplete common &prefix</source>
<translation>Gemeinsamen &Präfix ergänzen</translation>
</message>
<message>
- <location/>
<source>&Automatically insert brackets</source>
<translation>&Klammern automatisch einfügen</translation>
</message>
<message>
- <location/>
<source>Behavior</source>
<translation>Verhalten</translation>
</message>
<message>
- <location/>
<source>&Case-sensitivity:</source>
<translation>&Groß/Kleinschreibung:</translation>
</message>
<message>
- <location/>
<source>Full</source>
<translation>Vollständig</translation>
</message>
<message>
- <location/>
<source>None</source>
<translation>Keine</translation>
</message>
<message>
- <location/>
<source>Insert &space after function name</source>
<translation>Leerzeichen nach &Funktionsname einfügen</translation>
</message>
<message>
- <location/>
<source>First Letter</source>
<translation>Erster Buchstabe</translation>
</message>
<message>
- <location/>
<source>Activate completion:</source>
<translation>Code-Vervollständigung aktivieren:</translation>
</message>
<message>
- <location/>
<source>Manually</source>
<translation>Manuell</translation>
</message>
<message>
- <location/>
<source>When Triggered</source>
<translation>Auf Anforderung</translation>
</message>
<message>
- <location/>
<source>Always</source>
<translation>Immer</translation>
</message>
@@ -1362,12 +1110,10 @@
<context>
<name>ContentWindow</name>
<message>
- <location filename="../../../src/shared/help/contentwindow.cpp" line="+143"/>
<source>Open Link</source>
<translation>Adresse öffnen</translation>
</message>
<message>
- <location line="+1"/>
<source>Open Link as New Page</source>
<translation>Adresse in neuem Reiter öffnen</translation>
</message>
@@ -1375,63 +1121,48 @@
<context>
<name>Core::BaseFileWizard</name>
<message>
- <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+530"/>
- <location line="+29"/>
- <location line="+9"/>
- <location line="+15"/>
<source>File Generation Failure</source>
<translation>Fehler bei Dateierzeugung</translation>
</message>
<message>
- <location line="-32"/>
- <location line="+147"/>
<source>Existing files</source>
<translation>Bereits existierende Dateien</translation>
</message>
<message>
- <location line="-534"/>
<source>Unable to create the directory %1.</source>
<translation>Das Verzeichnis %1 kann nicht erstellt werden.</translation>
</message>
<message>
- <location line="+12"/>
<source>Unable to open %1 for writing: %2</source>
<translation>Die Datei %1 kann nicht zum Schreiben geöffnet werden: %2</translation>
</message>
<message>
- <location line="+4"/>
<source>Error while writing to %1: %2</source>
<translation>Fehler beim Schreiben in %1: %2</translation>
</message>
<message>
- <location line="+451"/>
<source>Failed to open an editor for '%1'.</source>
<translation>Es konnte kein Editor für die Datei '%1' geöffnet werden.</translation>
</message>
<message>
- <location line="+17"/>
<source> [read only]</source>
<translation> [schreibgeschützt]</translation>
</message>
<message>
- <location line="+1"/>
<source> [directory]</source>
<translation> [Verzeichnis]</translation>
</message>
<message>
- <location line="+1"/>
<source> [symbolic link]</source>
<translation> [symbolischer Link]</translation>
</message>
<message>
- <location line="+40"/>
<source>The project directory %1 contains files which cannot be overwritten:
%2.</source>
<translation>Das Projektverzeichnis %1 enthält Dateien, die nicht überschrieben werden können:
%2.</translation>
</message>
<message>
- <location line="+4"/>
<source>The following files already exist in the directory %1:
%2.
Would you like to overwrite them?</source>
@@ -1443,286 +1174,222 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::EditorManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editormanager.cpp" line="+226"/>
- <location line="+1596"/>
<source>Revert to Saved</source>
<translation>Wiederherstellen</translation>
</message>
<message>
- <location line="-1593"/>
- <location line="+92"/>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+330"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location line="-91"/>
<source>Close All</source>
<translation>Alle schließen</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+1381"/>
<source>Close Others</source>
<translation>Andere schließen</translation>
</message>
<message>
- <location line="-1376"/>
<source>Open in External Editor</source>
<translation>Öffne in externem Editor</translation>
</message>
<message>
- <location line="+46"/>
<source>Revert File to Saved</source>
<translation>Gespeicherten Stand wiederherstellen</translation>
</message>
<message>
- <location line="+38"/>
<source>Ctrl+F4</source>
<translation>Ctrl+F4</translation>
</message>
<message>
- <location line="-10"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location line="+17"/>
<source>Ctrl+Shift+W</source>
<translation>Ctrl+Shift+W</translation>
</message>
<message>
- <location line="+13"/>
<source>Alt+Tab</source>
<translation>Alt+Tab</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Tab</source>
<translation>Ctrl+Tab</translation>
</message>
<message>
- <location line="+8"/>
<source>Alt+Shift+Tab</source>
<translation>Alt+Shift+Tab</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+Tab</source>
<translation>Ctrl+Shift+Tab</translation>
</message>
<message>
- <location line="+8"/>
<source>Ctrl+Alt+Left</source>
<translation>Ctrl+Alt+Left</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+Left</source>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="+8"/>
<source>Ctrl+Alt+Right</source>
<translation>Ctrl+Alt+Right</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+Right</source>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="+6"/>
<source>Meta+E</source>
<translation>Meta+E</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location line="+3"/>
<source>Split</source>
<translation>Teilen</translation>
</message>
<message>
- <location line="+6"/>
<source>Split Side by Side</source>
<translation>Nebeneinander teilen</translation>
</message>
<message>
- <location line="+6"/>
<source>Remove Current Split</source>
<translation>Teilung aufheben</translation>
</message>
<message>
- <location line="+6"/>
<source>Remove All Splits</source>
<translation>Alle Teilungen aufheben</translation>
</message>
<message>
- <location line="+1203"/>
<source>Save %1 &As...</source>
<translation>Speichere '%1' &unter...</translation>
</message>
<message>
- <location line="-1188"/>
<source>&Advanced</source>
<translation>&Weitere</translation>
</message>
<message>
- <location line="+18"/>
<source>Alt+V,Alt+I</source>
<translation>Alt+V,Alt+I</translation>
</message>
<message>
- <location line="+794"/>
- <location line="+31"/>
<source>Opening File</source>
<translation>Datei Öffnen</translation>
</message>
<message>
- <location line="-31"/>
<source>Cannot open file %1!</source>
<translation>Die Datei '%1' kann nicht geöffnet werden!</translation>
</message>
<message>
- <location line="+199"/>
<source>File is Read Only</source>
<translation>Die Datei ist schreibgeschützt</translation>
</message>
<message>
- <location line="+6"/>
<source>Open with VCS (%1)</source>
<translation>Öffnen mittels Versionskontrollsystem (%1)</translation>
</message>
<message>
- <location line="+6"/>
<source>Save as ...</source>
<translation>Speichern als...</translation>
</message>
<message>
- <location line="+29"/>
- <location line="+8"/>
<source>Failed!</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="-8"/>
<source>Could not open the file for editing with SCC.</source>
<translation>Die Datei konnte nicht mit Hilfe der Versionsverwaltung schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Could not set permissions to writable.</source>
<translation>Die Datei konnte nicht schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+108"/>
<source><b>Warning:</b> You are changing a read-only file.</source>
<translation><b>Hinweis:</b> Sie sind im Begriff, eine schreibgeschützte Datei zu ändern.</translation>
</message>
<message>
- <location line="-149"/>
- <location line="+150"/>
<source>Make writable</source>
<translation>Schreibbar machen</translation>
</message>
<message>
- <location line="-1353"/>
<source>Next Open Document in History</source>
<translation>Nächstes geöffnetes Dokument im Verlauf</translation>
</message>
<message>
- <location line="+1"/>
<source>Previous Open Document in History</source>
<translation>Vorhergehendes geöffnetes Dokument im Verlauf</translation>
</message>
<message>
- <location line="+1"/>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="-233"/>
<source>Go Back</source>
<translation>Vorheriges</translation>
</message>
<message>
- <location line="+1"/>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+1"/>
<source>Go Forward</source>
<translation>Nächstes</translation>
</message>
<message>
- <location line="+150"/>
<source>%1,2</source>
<translation>%1,2</translation>
</message>
<message>
- <location line="+6"/>
<source>%1,3</source>
<translation>%1,3</translation>
</message>
<message>
- <location line="+6"/>
<source>%1,0</source>
<translation>%1,0</translation>
</message>
<message>
- <location line="+6"/>
<source>%1,1</source>
<translation>%1,1</translation>
</message>
<message>
- <location line="+4"/>
<source>Go to Next Split</source>
<translation>Gehe zu nächsten Teilung</translation>
</message>
<message>
- <location line="+2"/>
<source>%1,o</source>
<translation>%1,o</translation>
</message>
<message>
- <location line="+1019"/>
<source>The file <i>%1</i> is read only.</source>
<translation>Die Datei <i>%1</i> ist schreibgeschützt.</translation>
</message>
<message>
- <location line="+177"/>
<source>&Save %1</source>
<translation>&Speichere %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Revert %1 to Saved</source>
<translation>Stelle %1 wieder her</translation>
</message>
<message>
- <location line="+3"/>
<source>Close %1</source>
<translation>Schließe %1</translation>
</message>
<message>
- <location line="+3"/>
<source>Close All Except %1</source>
<translation>Alle außer %1 schließen</translation>
</message>
<message>
- <location line="+211"/>
<source>You will lose your current changes if you proceed reverting %1.</source>
<translation>Bei der Wiederherstellung von %1 gehen Ihre derzeitigen Änderungen verloren.</translation>
</message>
<message>
- <location line="+2"/>
<source>Proceed</source>
<translation>Weiter</translation>
</message>
<message>
- <location line="+1"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location line="+43"/>
<source><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%f</td><td>file name</td></tr><tr><td>%l</td><td>current line number</td></tr><tr><td>%c</td><td>current column number</td></tr><tr><td>%x</td><td>editor's x position on screen</td></tr><tr><td>%y</td><td>editor's y position on screen</td></tr><tr><td>%w</td><td>editor's width in pixels</td></tr><tr><td>%h</td><td>editor's height in pixels</td></tr><tr><td>%W</td><td>editor's width in characters</td></tr><tr><td>%H</td><td>editor's height in characters</td></tr><tr><td>%%</td><td>%</td></tr></table></source>
<translation><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expandiert zu</th></tr><tr><td>%f</td><td>file name</td></tr><tr><td>%l</td><td>Zeilennummer</td></tr><tr><td>%c</td><td>Spaltennummer</td></tr><tr><td>%x</td><td>X-Koordinate der Position des Editors</td></tr><tr><td>%y</td><td>Y-Koordinate der Position des Editors</td></tr><tr><td>%w</td><td>Breite des Editors (Pixel)</td></tr><tr><td>%h</td><td>Höhe des Editors (Pixel)</td></tr><tr><td>%W</td><td>Breite des Editors (Zeichen)</td></tr><tr><td>%H</td><td>Höhe des Editors (Zeichen)</td></tr><tr><td>%%</td><td>%</td></tr></table></translation>
</message>
@@ -1730,32 +1397,26 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::FileManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+590"/>
<source>Cannot save file</source>
<translation>Die Datei kann nicht gespeichert werden</translation>
</message>
<message>
- <location line="+1"/>
<source>Cannot save changes to '%1'. Do you want to continue and lose your changes?</source>
<translation>Die Datei '%1' kann nicht gespeichert werden. Wollen Sie trotzdem fortsetzen und Ihre Änderungen aufgeben?</translation>
</message>
<message>
- <location line="+135"/>
<source>Overwrite?</source>
<translation>Ãœberschreiben?</translation>
</message>
<message>
- <location line="+1"/>
<source>An item named '%1' already exists at this location. Do you want to overwrite it?</source>
<translation>Es existiert bereits eine Datei des Namens '%1' an dieser Stelle. Wollen Sie sie überschreiben?</translation>
</message>
<message>
- <location line="+49"/>
<source>Save File As</source>
<translation>Datei speichern</translation>
</message>
<message>
- <location line="+26"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
@@ -1763,7 +1424,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::EditMode</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editmode.cpp" line="+95"/>
<source>Edit</source>
<translation>Editieren</translation>
</message>
@@ -1771,72 +1431,58 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::EditorSplitter</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editorsplitter.cpp" line="+73"/>
<source>Split Left/Right</source>
<translation>Links/rechts teilen</translation>
</message>
<message>
- <location line="+7"/>
<source>Split Top/Bottom</source>
<translation>Oben/unten teilen</translation>
</message>
<message>
- <location line="+7"/>
<source>Unsplit</source>
<translation>Teilung aufheben</translation>
</message>
<message>
- <location line="+11"/>
<source>Default Splitter Layout</source>
<translation>Vorgabe wiederherstellen</translation>
</message>
<message>
- <location line="+3"/>
<source>Save Current as Default</source>
<translation>Gegenwärtige Anordnung als Vorgabe speichern</translation>
</message>
<message>
- <location line="+7"/>
<source>Restore Default Layout</source>
<translation>Vorgabe wiederherstellen</translation>
</message>
<message>
- <location line="+11"/>
<source>Previous Document</source>
<translation>Voriges Dokument</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+Left</source>
<translation>Alt+Left</translation>
</message>
<message>
- <location line="+5"/>
<source>Next Document</source>
<translation>Nächstes Dokument</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+Right</source>
<translation>Alt+Right</translation>
</message>
<message>
- <location line="+6"/>
<source>Previous Group</source>
<translation>Vorige Gruppe</translation>
</message>
<message>
- <location line="+6"/>
<source>Next Group</source>
<translation>Nächste Gruppe</translation>
</message>
<message>
- <location line="+6"/>
<source>Move Document to Previous Group</source>
<translation>Dokument in vorige Gruppe verschieben</translation>
</message>
<message>
- <location line="+6"/>
<source>Move Document to Next Group</source>
<translation>Dokument in nächste Gruppe verschieben</translation>
</message>
@@ -1844,12 +1490,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::EditorView</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/editorview.cpp" line="+114"/>
<source>Placeholder</source>
<translation>Platzhalter</translation>
</message>
<message>
- <location line="+6"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -1857,102 +1501,82 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::GeneralSettings</name>
<message>
- <location filename="../../../src/plugins/coreplugin/generalsettings.cpp" line="+68"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location line="+30"/>
<source><System Language></source>
<translation><Sprache des Betriebssystems></translation>
</message>
<message>
- <location line="+216"/>
<source>Restart required</source>
<translation>Neustart erforderlich</translation>
</message>
<message>
- <location line="+1"/>
<source>The language change will take effect after a restart of Qt Creator.</source>
<translation>Die Änderung der Sprache wird nach einem Neustart von Qt Creator wirksam.</translation>
</message>
<message>
- <location line="-40"/>
<source>Variables</source>
<translation>Variablen</translation>
</message>
<message>
- <location filename="../../../src/plugins/coreplugin/generalsettings.ui"/>
<source>Reset to default</source>
<translation>Zurücksetzen</translation>
</message>
<message>
- <location/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location/>
<source>Terminal:</source>
<translation>Terminal:</translation>
</message>
<message>
- <location/>
<source>External editor:</source>
<translation>Externer Editor:</translation>
</message>
<message>
- <location/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location/>
<source>When files are externally modified:</source>
<translation>Wenn externe Änderungen an Dateien festgestellt werden:</translation>
</message>
<message>
- <location/>
<source>External file browser:</source>
<translation>Externer Datei-Browser:</translation>
</message>
<message>
- <location/>
<source>User Interface</source>
<translation>Benutzeroberfläche</translation>
</message>
<message>
- <location/>
<source>Color:</source>
<translation>Farbe:</translation>
</message>
<message>
- <location/>
<source>Language:</source>
<translation>Sprache:</translation>
</message>
<message>
- <location/>
<source>System</source>
<translation>System</translation>
</message>
<message>
- <location/>
<source>Default file encoding: </source>
<translation>Vorgabe-Encoding:</translation>
</message>
<message>
- <location/>
<source>Always Ask</source>
<translation>Stets fragen</translation>
</message>
<message>
- <location/>
<source>Reload All Unchanged Editors</source>
<translation>Alle Dateien in ungeänderten Editoren neu laden</translation>
</message>
<message>
- <location/>
<source>Ignore Modifications</source>
<translation>Änderungen ignorieren</translation>
</message>
@@ -1960,188 +1584,147 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::MainWindow</name>
<message>
- <location filename="../../../src/plugins/coreplugin/mainwindow.cpp" line="+164"/>
<source>Qt Creator</source>
<translation>Qt Creator</translation>
</message>
<message>
- <location line="+290"/>
<source>&File</source>
<translation>&Datei</translation>
</message>
<message>
- <location line="+14"/>
<source>&Edit</source>
<translation>&Bearbeiten</translation>
</message>
<message>
- <location line="+11"/>
<source>&Tools</source>
<translation>E&xtras</translation>
</message>
<message>
- <location line="+5"/>
<source>&Window</source>
<translation>&Fenster</translation>
</message>
<message>
- <location line="+11"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <location line="+66"/>
<source>&New File or Project...</source>
<translation>&Neu...</translation>
</message>
<message>
- <location line="+8"/>
<source>&Open File or Project...</source>
<translation>Datei oder Projekt &öffnen...</translation>
</message>
<message>
- <location line="+7"/>
<source>Open File &With...</source>
<translation>&Öffne Datei mit...</translation>
</message>
<message>
- <location line="+8"/>
<source>Recent &Files</source>
<translation>Zu&letzt bearbeitete Dateien</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+4"/>
<source>&Save</source>
<translation>&Speichern</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+6"/>
<source>Save &As...</source>
<translation>Speichern &unter...</translation>
</message>
<message>
- <location line="-3"/>
- <location line="+10"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location line="-3"/>
<source>Save A&ll</source>
<translation>&Alles speichern</translation>
</message>
<message>
- <location line="+10"/>
<source>&Print...</source>
<translation>&Drucken...</translation>
</message>
<message>
- <location line="+7"/>
<source>E&xit</source>
<translation>B&eenden</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+4"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+4"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+6"/>
<source>Cu&t</source>
<translation>&Ausschneiden</translation>
</message>
<message>
- <location line="+8"/>
<source>&Copy</source>
<translation>&Kopieren</translation>
</message>
<message>
- <location line="+8"/>
<source>&Paste</source>
<translation>&Einfügen</translation>
</message>
<message>
- <location line="+8"/>
<source>&Select All</source>
<translation>Alles Aus&wählen</translation>
</message>
<message>
- <location line="+8"/>
<source>&Go To Line...</source>
<translation>&Gehe zu Zeile...</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location line="+5"/>
<source>&Options...</source>
<translation>&Einstellungen...</translation>
</message>
<message>
- <location line="+11"/>
<source>Minimize</source>
<translation>Minimieren</translation>
</message>
<message>
- <location line="+7"/>
<source>Zoom</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location line="+12"/>
<source>Show Sidebar</source>
<translation>Seitenleiste anzeigen</translation>
</message>
<message>
- <location line="+16"/>
<source>Full Screen</source>
<translation>Vollbild</translation>
</message>
<message>
- <location line="+11"/>
<source>&Views</source>
<translation>&Ansichten</translation>
</message>
<message>
- <location line="+5"/>
<source>About &Qt Creator</source>
<translation>Ãœber &Qt Creator</translation>
</message>
<message>
- <location line="+2"/>
<source>About &Qt Creator...</source>
<translation>Ãœber &Qt Creator...</translation>
</message>
<message>
- <location line="+11"/>
<source>About &Plugins...</source>
<translation>Plugins...</translation>
</message>
<message>
- <location line="+25"/>
<source>New</source>
<comment>Title of dialog</comment>
<translation>Neu</translation>
</message>
<message>
- <location line="+562"/>
<source>Settings...</source>
<translation>Einstellungen...</translation>
</message>
@@ -2149,7 +1732,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::MessageOutputWindow</name>
<message>
- <location filename="../../../src/plugins/coreplugin/messageoutputwindow.cpp" line="+76"/>
<source>General Messages</source>
<translation>Allgemeine Ausgaben</translation>
</message>
@@ -2157,12 +1739,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::NavigationSubWidget</name>
<message>
- <location filename="../../../src/plugins/coreplugin/navigationsubwidget.cpp" line="+86"/>
<source>Split</source>
<translation>Teilen</translation>
</message>
<message>
- <location line="+3"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -2170,27 +1750,22 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::NewDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/newdialog.ui"/>
<source>New Project</source>
<translation>Neues Projekt</translation>
</message>
<message>
- <location/>
<source>Choose a template:</source>
<translation>Vorlage:</translation>
</message>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/newdialog.cpp" line="+161"/>
<source>&Choose...</source>
<translation>&Auswählen...</translation>
</message>
<message>
- <location line="+45"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+3"/>
<source>Files and Classes</source>
<translation>Dateien und Klassen</translation>
</message>
@@ -2198,33 +1773,26 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::OpenEditorsWidget</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/openeditorsview.cpp" line="+100"/>
- <location line="+147"/>
<source>Open Documents</source>
<translation>Offene Dokumente</translation>
</message>
<message>
- <location line="-39"/>
<source>Close %1</source>
<translation>Schließe %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Close Editor</source>
<translation>Editor schließen</translation>
</message>
<message>
- <location line="+2"/>
<source>Close All Except %1</source>
<translation>Alle außer %1 schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Close Other Editors</source>
<translation>Andere Editoren schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Close All Editors</source>
<translation>Alle Editoren schließen</translation>
</message>
@@ -2232,8 +1800,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::OpenEditorsWindow</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/openeditorswindow.cpp" line="+212"/>
- <location line="+27"/>
<source>*</source>
<translation>*</translation>
</message>
@@ -2241,7 +1807,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::OpenWithDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.cpp" line="+43"/>
<source>Open file '%1' with:</source>
<translation>Öffne '%1; mit:</translation>
</message>
@@ -2249,38 +1814,30 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::OutputPaneManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/outputpanemanager.cpp" line="+117"/>
<source>Output</source>
<translation>Ausgaben</translation>
</message>
<message>
- <location line="+4"/>
<source>Clear</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="+5"/>
<source>Next Item</source>
<translation>Nächster Eintrag</translation>
</message>
<message>
- <location line="+5"/>
<source>Previous Item</source>
<translation>Vorangehender Eintrag</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+193"/>
<source>Maximize Output Pane</source>
<translation>Ausgabepanel maximiert darstellen</translation>
</message>
<message>
- <location line="-131"/>
<source>Output &Panes</source>
<translation>Ausgabe&panele</translation>
</message>
<message>
- <location line="+130"/>
<source>Minimize Output Pane</source>
<translation>Ausgabepanel minimiert darstellen</translation>
</message>
@@ -2288,38 +1845,31 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::PluginDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/plugindialog.cpp" line="+57"/>
<source>Details</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location line="+1"/>
<source>Error Details</source>
<translatorcomment>Fehlermeldungen zu %1</translatorcomment>
<translation>Fehlermeldungen</translation>
</message>
<message>
- <location line="+1"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location line="+6"/>
<source>Restart required.</source>
<translation>Neustart erforderlich.</translation>
</message>
<message>
- <location line="+16"/>
<source>Installed Plugins</source>
<translation>Installierte Plugins</translation>
</message>
<message>
- <location line="+52"/>
<source>Plugin Details of %1</source>
<translation>Beschreibung zu %1</translation>
</message>
<message>
- <location line="+20"/>
<source>Plugin Errors of %1</source>
<translation>Fehler in %1</translation>
</message>
@@ -2327,7 +1877,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::ProgressView</name>
<message>
- <location filename="../../../src/plugins/coreplugin/progressmanager/progressview.cpp" line="+48"/>
<source>Processes</source>
<translation>Prozesse</translation>
</message>
@@ -2335,22 +1884,18 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::SaveItemsDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.cpp" line="+53"/>
<source>Do not Save</source>
<translation>Nicht speichern</translation>
</message>
<message>
- <location line="+44"/>
<source>Save All</source>
<translation>Alle speichern</translation>
</message>
<message>
- <location line="+3"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
- <location line="+3"/>
<source>Save Selected</source>
<translation>Auswahl speichern</translation>
</message>
@@ -2358,12 +1903,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::SettingsDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/settingsdialog.cpp" line="+275"/>
<source>Preferences</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location line="+2"/>
<source>Options</source>
<translation>Einstellungen</translation>
</message>
@@ -2371,38 +1914,30 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::ShortcutSettings</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/shortcutsettings.cpp" line="+77"/>
<source>Keyboard</source>
<translation>Tastatur</translation>
</message>
<message>
- <location line="+24"/>
<source>Keyboard Shortcuts</source>
<translation>Tastenkürzel</translation>
</message>
<message>
- <location line="+1"/>
<source>Key sequence:</source>
<translation>Tastenfolge:</translation>
</message>
<message>
- <location line="+1"/>
<source>Shortcut</source>
<translation>Tastenkürzel</translation>
</message>
<message>
- <location line="+113"/>
<source>Import Keyboard Mapping Scheme</source>
<translation>Tastaturschema importieren</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+49"/>
<source>Keyboard Mapping Scheme (*.kms)</source>
<translation>Tastaturschema-Datei (*.kms)</translation>
</message>
<message>
- <location line="-2"/>
<source>Export Keyboard Mapping Scheme</source>
<translation>Tastaturschema exportieren</translation>
</message>
@@ -2410,14 +1945,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::SideBarWidget</name>
<message>
- <location filename="../../../src/plugins/coreplugin/sidebarwidget.cpp" line="+75"/>
- <location line="+1"/>
<source>Split</source>
<translation>Teilen</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+1"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -2425,23 +1956,19 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::Internal::VersionDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/versiondialog.cpp" line="+58"/>
<source>About Qt Creator</source>
<translation>Ãœber Qt Creator</translation>
</message>
<message>
- <location line="+9"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<message>
- <location line="+6"/>
<source>From revision %1<br/></source>
<extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment>
<translation>Revision %1<br/></translation>
</message>
<message>
- <location line="+3"/>
<source><h3>Qt Creator %1 %8</h3>Based on Qt %2 (%3 bit)<br/><br/>Built on %4 at %5<br /><br/>%9<br/>Copyright 2008-%6 %7. All rights reserved.<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/></source>
<translation><h3>Qt Creator %1 %8</h3>Basierend auf Qt %2 (%3 bit)<br/><br/>Erstellt am %4 um %5<br /><br/>%9<br/>Copyright 2008-%6 %7. Alle Rechte vorbehalten.<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<br/></translation>
</message>
@@ -2449,7 +1976,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::ModeManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/modemanager.cpp" line="+194"/>
<source>Switch to <b>%1</b> mode</source>
<translation>Gehe zu Mode <b>'%1'</b></translation>
</message>
@@ -2457,14 +1983,12 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::ScriptManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
<source>Exception at line %1: %2
%3</source>
<translation>Ausnahme in Zeile%1: %2
%3</translation>
</message>
<message>
- <location line="+67"/>
<source>Unknown error</source>
<translation>Unbekannter Fehler</translation>
</message>
@@ -2472,7 +1996,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Core::StandardFileWizard</name>
<message>
- <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+53"/>
<source>New %1</source>
<translatorcomment>TODO: Grammatical case problem</translatorcomment>
<translation>Neue %1</translation>
@@ -2481,22 +2004,18 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CPPEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditor.cpp" line="+477"/>
<source>Sort Alphabetically</source>
<translation>Alphabetisch sortieren</translation>
</message>
<message>
- <location line="+198"/>
<source>This change cannot be undone.</source>
<translation>Diese Änderung kann nicht rückgängig gemacht werden.</translation>
</message>
<message>
- <location line="+1"/>
<source>Yes, I know what I am doing.</source>
<translation>Ja, Ich bin mir dessen bewusst.</translation>
</message>
<message>
- <location line="+1081"/>
<source>Unused variable</source>
<translation>Unbenutzte Variable</translation>
</message>
@@ -2504,17 +2023,14 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::ClassNamePage</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppclasswizard.cpp" line="+63"/>
<source>Enter Class Name</source>
<translation>Name der Klasse</translation>
</message>
<message>
- <location line="+1"/>
<source>The header and source file names will be derived from the class name</source>
<translation>Die Dateinamen werden aus dem Klassennamen generiert</translation>
</message>
<message>
- <location line="+27"/>
<source>Configure...</source>
<translation>Einstellungen...</translation>
</message>
@@ -2522,7 +2038,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CppClassWizard</name>
<message>
- <location line="+115"/>
<source>Error while generating file contents.</source>
<translation>Fehler beim Generieren der Dateien.</translation>
</message>
@@ -2530,12 +2045,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CppClassWizardDialog</name>
<message>
- <location line="-65"/>
<source>C++ Class Wizard</source>
<translation>Neue C++ Klasse</translation>
</message>
<message>
- <location line="+2"/>
<source>Details</source>
<translation>Details</translation>
</message>
@@ -2543,72 +2056,58 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppEditor::Internal::CppPlugin</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppplugin.cpp" line="+235"/>
<source>C++ Header File</source>
<translation>C++ Header-Datei</translation>
</message>
<message>
- <location line="-10"/>
<source>Creates a C++ header and a source file for a new class that you can add to a C++ project.</source>
<translation>Erstellt C++-Header- und Quelldateien für eine neue Klasse eines C++-Projekts.</translation>
</message>
<message>
- <location line="+4"/>
<source>Creates a C++ source file that you can add to a C++ project.</source>
<translation>Erstellt eine C++-Quelldatei für ein C++-Projekt.</translation>
</message>
<message>
- <location line="+1"/>
<source>C++ Source File</source>
<translation>C++-Quelldatei</translation>
</message>
<message>
- <location line="+4"/>
<source>Creates a C++ header file that you can add to a C++ project.</source>
<translation>Erstellt eine C++-Header-Datei für ein C++-Projekt.</translation>
</message>
<message>
- <location line="+13"/>
<source>Follow Symbol Under Cursor</source>
<translation>Symbol unter Einfügemarke verfolgen</translation>
</message>
<message>
- <location line="+9"/>
<source>Switch Between Method Declaration/Definition</source>
<translation>Wechsel zwischen Deklaration und Definition der Methode.</translation>
</message>
<message>
- <location line="+32"/>
<source>Rename Symbol Under Cursor</source>
<translation>Symbol unter Einfügemarke umbenennen</translation>
</message>
<message>
- <location line="-16"/>
<source>Open Type Hierarchy</source>
<translation>Klassenhierarchie öffnen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+T</source>
<translation>Ctrl+Shift+T</translation>
</message>
<message>
- <location line="+26"/>
<source>Update Code Model</source>
<translation>Code-Modell aktualisieren</translation>
</message>
<message>
- <location line="-78"/>
<source>C++ Class</source>
<translation>C++-Klasse</translation>
</message>
<message>
- <location line="+43"/>
<source>Find Usages</source>
<translation>Verwendung suchen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+U</source>
<translation>Ctrl+Shift+U</translation>
</message>
@@ -2616,22 +2115,18 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppFileSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
<source>Header suffix:</source>
<translation>Endung für Header-Dateien:</translation>
</message>
<message>
- <location/>
<source>Source suffix:</source>
<translation>Endung für Quelldateien:</translation>
</message>
<message>
- <location/>
<source>Lower case file names</source>
<translation>Kleinbuchstaben für Dateinamen verwenden</translation>
</message>
<message>
- <location/>
<source>License template:</source>
<translation>Lizenz-Vorlage:</translation>
</message>
@@ -2639,7 +2134,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppPreprocessor</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+545"/>
<source>%1: No such file or directory</source>
<translation>%1: Es existiert keine Datei oder kein Verzeichnis dieses Namens</translation>
</message>
@@ -2647,12 +2141,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+55"/>
<source>File Naming</source>
<translation>Namenskonventionen für Dateien</translation>
</message>
<message>
- <location line="+2"/>
<source>C++</source>
<translation>C++</translation>
</message>
@@ -2660,7 +2152,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CompletionSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpptools/completionsettingspage.cpp" line="+59"/>
<source>Completion</source>
<translation>Ergänzung</translation>
</message>
@@ -2668,7 +2159,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppClassesFilter</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppclassesfilter.h" line="+46"/>
<source>Classes</source>
<translation>Klassen</translation>
</message>
@@ -2676,7 +2166,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppCurrentDocumentFilter</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcurrentdocumentfilter.h" line="+53"/>
<source>Methods in Current Document</source>
<translation>Methoden im aktuellen Dokument</translation>
</message>
@@ -2684,7 +2173,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppFileSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfilesettingspage.cpp" line="+57"/>
<source>/**************************************************************************
** Qt Creator license header template
** Special keywords: %USER% %DATE% %YEAR%
@@ -2701,22 +2189,18 @@ Sollen sie überschrieben werden?</translation>
</translation>
</message>
<message>
- <location line="+173"/>
<source>Edit...</source>
<translation>Ändern...</translation>
</message>
<message>
- <location line="+63"/>
<source>Choose Location for New License Template File</source>
<translation>Dateiname für eine neue Lizenzvorlage</translation>
</message>
<message>
- <location line="+5"/>
<source>Template write error</source>
<translation>Fehler beim Ausschreiben der Vorlage</translation>
</message>
<message>
- <location line="+1"/>
<source>Cannot write to %1: %2</source>
<translation>Die Datei %1 kann nicht geschrieben werden: %2</translation>
</message>
@@ -2724,8 +2208,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppFindReferences</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfindreferences.cpp" line="+268"/>
- <location line="+166"/>
<source>Searching</source>
<translation>Suche</translation>
</message>
@@ -2733,7 +2215,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppFunctionsFilter</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppfunctionsfilter.h" line="+46"/>
<source>Methods</source>
<translation>Methoden</translation>
</message>
@@ -2741,12 +2222,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppModelManager</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+332"/>
<source>Scanning</source>
<translation>Suche</translation>
</message>
<message>
- <location line="+41"/>
<source>Parsing</source>
<translation>Parse</translation>
</message>
@@ -2754,7 +2233,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppLocatorFilter</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+48"/>
<source>Classes and Methods</source>
<translation>Klassen und Methoden</translation>
</message>
@@ -2762,12 +2240,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::CppToolsPlugin</name>
<message>
- <location filename="../../../src/plugins/cpptools/cpptoolsplugin.cpp" line="+127"/>
<source>&C++</source>
<translation>&C++</translation>
</message>
<message>
- <location line="+7"/>
<source>Switch Header/Source</source>
<translation>Zwischen Header- und Quelldatei wechseln</translation>
</message>
@@ -2775,7 +2251,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>CppTools::Internal::FunctionArgumentWidget</name>
<message>
- <location filename="../../../src/plugins/cpptools/cppcodecompletion.cpp" line="+416"/>
<source>%1 of %2</source>
<translation>%1 von %2</translation>
</message>
@@ -2783,17 +2258,14 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerconstants.h" line="+59"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location line="+3"/>
<source>Debugger</source>
<translation>Debugger</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchutils.cpp" line="+732"/>
<source><Encoding error></source>
<translation><Encoding-Fehler></translation>
</message>
@@ -2801,12 +2273,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>QtDumperHelper</name>
<message>
- <location line="+101"/>
<source>Found an outdated version of the debugging helper library (%1); version %2 is required.</source>
<translation>Es wurde eine veraltete Version (%1) der Ausgabe-Hilfsbibliothek gefunden. Version %2 ist erforderlich.</translation>
</message>
<message numerus="yes">
- <location line="+39"/>
<source>%n known types, Qt version: %1, Qt namespace: %2 Dumper version: %3</source>
<translation>
<numerusform>Ein unterstützter Datentyp, Qt-Version: %1, Namensraum: %2, Version: %3</numerusform>
@@ -2814,7 +2284,6 @@ Sollen sie überschrieben werden?</translation>
</translation>
</message>
<message>
- <location line="-1"/>
<source><none></source>
<translation><kein></translation>
</message>
@@ -2822,12 +2291,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::AddressDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+716"/>
<source>Select Start Address</source>
<translation>Startadresse</translation>
</message>
<message>
- <location line="+3"/>
<source>Enter an address: </source>
<translation>Adresse:</translation>
</message>
@@ -2835,12 +2302,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::AttachCoreDialog</name>
<message>
- <location line="-544"/>
<source>Select Executable</source>
<translation>Ausführbare Datei auswählen</translation>
</message>
<message>
- <location line="+3"/>
<source>Select Core File</source>
<translation>Core-Datei auswählen</translation>
</message>
@@ -2848,22 +2313,18 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::AttachExternalDialog</name>
<message>
- <location line="-86"/>
<source>Process ID</source>
<translation>Prozess-Id</translation>
</message>
<message>
- <location line="+1"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+1"/>
<source>State</source>
<translation>Status</translation>
</message>
<message>
- <location line="+241"/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
@@ -2871,163 +2332,130 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::BreakHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/breakpoint.cpp" line="+250"/>
<source>Marker File:</source>
<translation>Marker-Datei:</translation>
</message>
<message>
- <location line="+2"/>
<source>Marker Line:</source>
<translation>Marker-Zeile:</translation>
</message>
<message>
- <location line="+2"/>
<source>Breakpoint Number:</source>
<translation>Nummer des Haltepunkts:</translation>
</message>
<message>
- <location line="+27"/>
<source>Breakpoint Address:</source>
<translation>Adresse des Haltepunkts:</translation>
</message>
<message>
- <location line="-16"/>
<source>Property</source>
<translation>Eigenschaft</translation>
</message>
<message>
- <location line="-9"/>
<source>Breakpoint Type:</source>
<translation>Typ des Haltepunkts</translation>
</message>
<message>
- <location line="+2"/>
<source>Breakpoint</source>
<translation>Breakpoint</translation>
</message>
<message>
- <location line="+1"/>
<source>Watchpoint</source>
<translation>Watchpoint</translation>
</message>
<message>
- <location line="+1"/>
<source>Unknown breakpoint type</source>
<translation>Unbekannter Typ</translation>
</message>
<message>
- <location line="+2"/>
<source>State:</source>
<translation>Status:</translation>
</message>
<message>
- <location line="+4"/>
<source>Requested</source>
<translation>Angefordert</translation>
</message>
<message>
- <location line="+1"/>
<source>Obtained</source>
<translation>Erhalten</translation>
</message>
<message>
- <location line="+1"/>
<source>Internal Number:</source>
<translation>Interne Nummer:</translation>
</message>
<message>
- <location line="+2"/>
<source>File Name:</source>
<translation>Dateiname:</translation>
</message>
<message>
- <location line="+2"/>
<source>Function Name:</source>
<translation>Funktionsname:</translation>
</message>
<message>
- <location line="+2"/>
<source>Line Number:</source>
<translation>Zeilennummer:</translation>
</message>
<message>
- <location line="+13"/>
<source>Corrected Line Number:</source>
<translation>Korrigierte Zeilennummer:</translation>
</message>
<message>
- <location line="+8"/>
<source>Condition:</source>
<translation>Bedingung:</translation>
</message>
<message>
- <location line="+2"/>
<source>Ignore Count:</source>
<translation>Anhalten erst nach:</translation>
</message>
<message>
- <location line="+7"/>
<source>Thread Specification:</source>
<translation>Thread:</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+253"/>
<source>Number</source>
<translation>Zahl</translation>
</message>
<message>
- <location line="+0"/>
<source>Function</source>
<translation>Funktion</translation>
</message>
<message>
- <location line="+0"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Line</source>
<translation>Zeile</translation>
</message>
<message>
- <location line="+1"/>
<source>Condition</source>
<translation>Bedingung</translation>
</message>
<message>
- <location line="+0"/>
<source>Ignore</source>
<translation>Anhalten nach</translation>
</message>
<message>
- <location line="+0"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location line="+0"/>
<source>Threads</source>
<translation>Threads:</translation>
</message>
<message>
- <location line="+103"/>
<source>Breakpoint will only be hit if this condition is met.</source>
<translation>Der Haltepunkt wird nur ausgelöst, wenn die Bedingung erfüllt ist.</translation>
</message>
<message>
- <location line="+10"/>
<source>Breakpoint will only be hit after being ignored so many times.</source>
<translation>Der Haltepunkt wird ausgelöst, nachdem er vorher so viele Male übersprungen wurde.</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+2"/>
<source>(all)</source>
<translation>(alle)</translation>
</message>
<message>
- <location line="+3"/>
<source>Breakpoint will only be hit in the specified thread(s).</source>
<translation>Der Haltepunkt wird nur im angegebenen Thread ausgelöst.</translation>
</message>
@@ -3035,165 +2463,141 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::BreakWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="+133"/>
<source>Breakpoints</source>
<translation>Haltepunkte</translation>
</message>
<message>
- <location line="+112"/>
<source>Edit Breakpoint...</source>
<translation>Haltepunkts bearbeiten...</translation>
</message>
<message>
- <location line="+5"/>
<source>Associate Breakpoint With All Threads</source>
<translation>Haltepunkt für alle Threads setzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Associate Breakpoint With Thread %1</source>
<translation>Haltepunkt für Thread %1 setzen</translation>
</message>
<message>
- <location line="+26"/>
<source>Use Short Path</source>
- <translation>Kurzen Pfad verwenden</translation>
+ <translation type="obsolete">Kurzen Pfad verwenden</translation>
</message>
<message>
- <location line="+0"/>
<source>Use Full Path</source>
- <translation>Vollständigen Pfad verwenden</translation>
+ <translation type="obsolete">Vollständigen Pfad verwenden</translation>
</message>
<message>
- <location line="+5"/>
<source>Set Breakpoint...</source>
- <translation>Haltepunkt setzen...</translation>
+ <translation type="obsolete">Haltepunkt setzen...</translation>
</message>
<message>
- <location line="-75"/>
<source>Delete Breakpoint</source>
<translation>Haltepunkt löschen</translation>
</message>
<message>
- <location line="+3"/>
<source>Delete All Breakpoints</source>
<translation>Alle Haltepunkte löschen</translation>
</message>
<message>
- <location line="+15"/>
<source>Delete Breakpoints of "%1"</source>
<translation>Haltepunkte in Datei "%1" löschen</translation>
</message>
<message>
- <location line="+6"/>
<source>Delete Breakpoints of File</source>
<translation>Haltepunkte in Datei löschen</translation>
</message>
<message>
- <location line="+5"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+3"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
- <location line="+17"/>
<source>Synchronize Breakpoints</source>
<translation>Haltepunkte synchronisieren</translation>
</message>
<message>
- <location line="+11"/>
<source>Disable Selected Breakpoints</source>
<translation>Ausgewählte Haltepunkte deaktivieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Enable Selected Breakpoints</source>
<translation>Ausgewählte Haltepunkte aktivieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Disable Breakpoint</source>
<translation>Haltepunkt deaktivieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Enable Breakpoint</source>
<translation>Haltepunkt aktivieren</translation>
</message>
<message>
- <location line="+17"/>
+ <source>Add Breakpoint...</source>
+ <translation>Haltepunkt setzen...</translation>
+ </message>
+ <message>
<source>Set Breakpoint at "throw"</source>
<translation>Haltepunkt bei "throw" setzen</translation>
</message>
<message>
- <location line="+2"/>
<source>Set Breakpoint at "catch"</source>
<translation>Haltepunkt bei "catch" setzen</translation>
</message>
<message>
- <location line="+139"/>
+ <source>Edit Breakpoint Properties</source>
+ <translation>Haltepunkts bearbeiten</translation>
+ </message>
+ <message>
<source>Conditions on Breakpoint %1</source>
- <translation>Bedingungen des Haltepunkts %1</translation>
+ <translation type="obsolete">Bedingungen des Haltepunkts %1</translation>
</message>
</context>
<context>
<name>Debugger::Internal::CdbDumperHelper</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbdumperhelper.cpp" line="+166"/>
<source>injection</source>
<translation>Injektion</translation>
</message>
<message>
- <location line="+1"/>
<source>debugger call</source>
<translation>Debugger-Aufruf</translation>
</message>
<message>
- <location line="+5"/>
<source>Loading the custom dumper library '%1' (%2) ...</source>
<translation>Ausgabe-Hilfsbibliothek '%1' wird geladen (%2)...</translation>
</message>
<message>
- <location line="+7"/>
<source>Loading of the custom dumper library '%1' (%2) failed: %3</source>
<translation>Das Laden der Ausgabe-Hilfsbibliothek '%1' (%2) schlug fehl: %3</translation>
</message>
<message>
- <location line="+7"/>
<source>Loaded the custom dumper library '%1' (%2).</source>
<translation>Die Ausgabe-Hilfsbibliothek '%1' (%2) wurde geladen.</translation>
</message>
<message>
- <location line="+62"/>
<source>Stopped / Custom dumper library initialized.</source>
<translation>Angehalten / Ausgabe-Hilfsbibliothek initialisiert.</translation>
</message>
<message>
- <location line="+78"/>
<source>Disabling dumpers due to debuggee crash...</source>
<translation>Ausgabe-Hilfsbibliothek deaktiviert wegen Absturz der zu debuggenden Anwendung...</translation>
</message>
<message>
- <location line="-44"/>
<source>The debuggee does not appear to be Qt application.</source>
<translation>Die zu debuggende Anwendung scheint nicht Qt zu benutzen.</translation>
</message>
<message>
- <location line="+10"/>
<source>Initializing dumpers...</source>
<translation>Ausgabe-Hilfsbibliothek initialisieren...</translation>
</message>
<message>
- <location line="-39"/>
<source>The custom dumper library could not be initialized: %1</source>
<translation>Die Ausgabe-Hilfsbibliothek konnte nicht initialisiert werden: %1</translation>
</message>
<message>
- <location line="+410"/>
<source>Querying dumpers for '%1'/'%2' (%3)</source>
<translation>Abfrage der Ausgabe-Hilfsbibliothek für '%1'/'%2' (%3)</translation>
</message>
@@ -3201,40 +2605,33 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::CdbOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
<source><html><body><p>Specify the path to the <a href="%1">Debugging Tools for Windows</a> (%2) here.</p><p><b>Note:</b> Restarting Qt Creator is required for these settings to take effect.</p></p></body></html></source>
<extracomment>Label text for path configuration. %2 is "x-bit version".</extracomment>
<translation><html><body><p>Geben Sie den Pfad zu den <a href="%1">Debugging Tools for Windows</a> (%2) an.</p><p><b>Hinweis:</b> Änderungen werden erst beim nächsten Start von Qt Creator wirksam.</p></p></body></html></translation>
</message>
<message>
- <location line="+5"/>
<source>64-bit version</source>
<translation>64-bit-Version</translation>
</message>
<message>
- <location line="+1"/>
<source>32-bit version</source>
<translation>32-bit-Version</translation>
</message>
<message>
- <location line="+12"/>
<source>Autodetect</source>
<translation>Suchen</translation>
</message>
<message>
- <location line="+36"/>
<source>"Debugging Tools for Windows" could not be found.</source>
<translation>Die "Debugging Tools for Windows" konnten nicht gefunden werden.</translation>
</message>
<message>
- <location line="+1"/>
<source>Checked:
%1</source>
<translation>Abgesuchte Verzeichnisse:
%1</translation>
</message>
<message>
- <location line="+1"/>
<source>Autodetection</source>
<translation>Suche</translation>
</message>
@@ -3242,12 +2639,10 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::CdbSymbolPathListEditor</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="+112"/>
<source>Symbol Server...</source>
<translation>Symbol-Server...</translation>
</message>
<message>
- <location line="+1"/>
<source>Adds the Microsoft symbol server providing symbols for operating system libraries.Requires specifying a local cache directory.</source>
<translation>Fügt den von Microsoft betriebenen Symbol-Server hinzu, der die Symbole für die Bibliotheken des Betriebssystems bereitstellt. Erfordert die Angabe eines lokalen Cache-Verzeichnisses.</translation>
</message>
@@ -3255,7 +2650,6 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::DebugMode</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+482"/>
<source>Debug</source>
<translation>Debuggen</translation>
</message>
@@ -3263,228 +2657,191 @@ Sollen sie überschrieben werden?</translation>
<context>
<name>Debugger::Internal::DebuggerSettings</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggeractions.cpp" line="+220"/>
<source>Verbose Log</source>
<translation>Ausführliches Logging</translation>
</message>
<message>
- <location line="+11"/>
<source>This switches the debugger to instruction-wise operation mode. In this mode, stepping operates on single instructions and the source location view also shows the disassembled instructions.</source>
<translation>Weist den Debugger an, auf Anweisungsebene zu arbeiten. In diesem Modus arbeitet die Einzelschritt-Funktion auf Maschinenanweisungen und die Quelltextanzeige zeigt die disassemblierten Anweisungen an.</translation>
</message>
<message>
- <location line="-48"/>
<source>Debugger Properties...</source>
<translation>Debugger-Einstellungen...</translation>
</message>
<message>
- <location line="+6"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+4"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
<message>
- <location line="+5"/>
<source>Use Alternating Row Colors</source>
<translation>Alternierende Farben für Zeilen benutzen</translation>
</message>
<message>
- <location line="+7"/>
<source>Show a Message Box When Receiving a Signal</source>
<translation>Empfang eines Signals durch Dialogbox anzeigen</translation>
</message>
<message>
- <location line="+8"/>
<source>Log Time Stamps</source>
<translation>Zeitstempel loggen</translation>
</message>
<message>
- <location line="+14"/>
<source>Operate by Instruction</source>
<translation>Auf Anweisungsebene arbeiten</translation>
</message>
<message>
- <location line="+12"/>
<source>Dereference Pointers Automatically</source>
<translation>Zeiger automatisch dereferenzieren</translation>
</message>
<message>
- <location line="+4"/>
<source>This switches the Locals&Watchers view to automatically dereference pointers. This saves a level in the tree view, but also loses data for the now-missing intermediate level.</source>
- <translation>Bewirkt, dass Zeiger im Fenster "Lokale Variablen und Überwachte Ausdrücke" automatisch dereferenziert werden. Das vereinfacht die Baumanzeige, allerdings fehlt die Information über die Zwischenebene.</translation>
+ <translation type="obsolete">Bewirkt, dass Zeiger im Fenster "Lokale Variablen und Überwachte Ausdrücke" automatisch dereferenziert werden. Das vereinfacht die Baumanzeige, allerdings fehlt die Information über die Zwischenebene.</translation>
</message>
<message>
- <location line="+11"/>
<source>Show "std::" Namespace in Types</source>
<translation>Leerzeichen &anstelle Tabulatoren einfügen</translation>
</message>
<message>
- <location line="+8"/>
<source>Show Qt's Namespace in Types</source>
<translation>Leerzeichen &anstelle Tabulatoren einfügen</translation>
</message>
<message>
- <location line="+8"/>
<source>Sort Members of Classes and Structs Alphabetically</source>
<translation>Mitglieder von Klassen und Strukturen alphabetisch sortieren</translation>
</message>
<message>
- <location line="+11"/>
<source>Use Debugging Helpers</source>
<translation>Ausgabe-Hilfsbibliothek benutzen</translation>
</message>
<message>
- <location line="+22"/>
<source>Debug Debugging Helpers</source>
<translation>Debug-Version der Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
- <location line="+8"/>
+ <source>Use QML Observer</source>
+ <translation type="obsolete">QML-Beobachter benutzen</translation>
+ </message>
+ <message>
<source>Use Code Model</source>
<translation>Code-Modell verwenden</translation>
</message>
<message>
- <location line="+1"/>
<source>Selecting this causes the C++ Code Model being asked for variable scope information. This might result in slightly faster debugger operation but may fail for optimized code.</source>
<translation>Benutzt das Code-Modell von Qt Creator, um Informationen bezüglich des Gültigkeitsbereiches von Variablen zu erhalten. Bewirkt eine schnellere Anzeige der Werte, kann aber bei optimiertem Code fehlschlagen.</translation>
</message>
<message>
- <location line="+9"/>
<source>Recheck Debugging Helper Availability</source>
- <translation>Verfügbarkeit der Ausgabe-Hilfsbibliothek prüfen</translation>
+ <translation type="obsolete">Verfügbarkeit der Ausgabe-Hilfsbibliothek prüfen</translation>
</message>
<message>
- <location line="+7"/>
<source>Synchronize Breakpoints</source>
<translation>Haltepunkte synchronisieren</translation>
</message>
<message>
- <location line="+4"/>
<source>Use Precise Breakpoints</source>
- <translation>Genaue Haltepunkte verwenden</translation>
+ <translation type="obsolete">Genaue Haltepunkte verwenden</translation>
</message>
<message>
- <location line="+1"/>
<source>Selecting this causes breakpoint synchronization being done after each step. This results in up-to-date breakpoint information on whether a breakpoint has been resolved after loading shared libraries, but slows down stepping.</source>
- <translation>Der Gdb-Prozess hat nach %1 Sekunde nicht auf das Kommando reagiert. Das könnte bedeuten, dass er sich in einer Endlosschleife befindet oder für die Operation mehr Zeit benötigt.
+ <translation type="obsolete">Der Gdb-Prozess hat nach %1 Sekunde nicht auf das Kommando reagiert. Das könnte bedeuten, dass er sich in einer Endlosschleife befindet oder für die Operation mehr Zeit benötigt.
Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</message>
<message>
- <location line="+11"/>
<source>Adjust Breakpoint Locations</source>
<translation>Positionen der Haltepunkte korrigieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Not all source code lines generate executable code. Putting a breakpoint on such a line acts as if the breakpoint was set on the next line that generated code. Selecting 'Adjust Breakpoint Locations' shifts the red breakpoint markers in such cases to the location of the true breakpoint.</source>
<translation>Nicht alle Quellcode-Zeilen bewirken die Erzeugung von ausführbarem Code. Wenn man auf solche Zeilen einen Haltepunkt setzt, verhält er sich so, als ob er auf die nächste Zeile gesetzt worden wäre. Das Aktivieren der Einstellung 'Positionen der Haltepunkte korrigieren' bewirkt, dass der Haltepunkt-Marker in so einem Fall auf die Stelle des resultierenden Haltepunkts verschoben wird.</translation>
</message>
<message>
- <location line="+13"/>
<source>Break on "throw"</source>
<translation>Bei "throw" anhalten</translation>
</message>
<message>
- <location line="+8"/>
<source>Break on "catch"</source>
<translation>Bei "catch" anhalten</translation>
</message>
<message>
- <location line="+23"/>
<source>Automatically Quit Debugger</source>
<translation>Debugger automatisch beenden</translation>
</message>
<message>
- <location line="+18"/>
<source>Use Tooltips in Locals View When Debugging</source>
<translation>Tooltips für Anzeige der lokalen Variablen</translation>
</message>
<message>
- <location line="+9"/>
<source>Use Tooltips in Breakpoints View When Debugging</source>
<translation>Tooltips im Haltepunkt-Fenster</translation>
</message>
<message>
- <location line="+9"/>
<source>Show Address Data in Breakpoints View When Debugging</source>
<translation>Adresse des Haltepunkts anzeigen</translation>
</message>
<message>
- <location line="+9"/>
<source>Show Address Data in Stack View When Debugging</source>
<translation>Adressen im Stack-Fenster anzeigen</translation>
</message>
<message>
- <location line="+9"/>
<source>List Source Files</source>
<translation>Quelldateien anzeigen</translation>
</message>
<message>
- <location line="+7"/>
<source>Skip Known Frames</source>
<translation>Bekannte Stellen überspringen</translation>
</message>
<message>
- <location line="+1"/>
<source>Selecting this results in well-known but usually not interesting frames belonging to reference counting and signal emission being skipped while single-stepping.</source>
<translation>Bewirkt, dass nicht relevante Aufrufe (wie zum Beispiel zur Referenzzählung und zur Signalübermittlung gehörige Aufrufe) beim Einzelschritt übersprungen werden.</translation>
</message>
<message>
- <location line="+9"/>
<source>Enable Reverse Debugging</source>
<translation>Rückwärts Debuggen aktivieren</translation>
</message>
<message>
- <location line="+8"/>
<source>Register For Post-Mortem Debugging</source>
<translation>Qt Creator als Post-Mortem-Debugger registrieren</translation>
</message>
<message>
- <location line="+32"/>
<source>Reload Full Stack</source>
<translation>Stack vollständig neu laden</translation>
</message>
<message>
- <location line="+4"/>
<source>Create Full Backtrace</source>
<translation>Vollständigen Backtrace erzeugen</translation>
</message>
<message>
- <location line="+4"/>
<source>Execute Line</source>
<translation>Zeile ausführen</translation>
</message>
<message>
- <location line="-112"/>
<source>Use tooltips in main editor when debugging</source>
<translation>Tooltips im Haupt-Editor beim Debuggen benutzen</translation>
</message>
<message>
- <location line="+1"/>
+ <source>This switches the Locals&&Watchers view to automatically dereference pointers. This saves a level in the tree view, but also loses data for the now-missing intermediate level.</source>
+ <translation>Bewirkt, dass Zeiger im Fenster "Lokale Variablen und Überwachte Ausdrücke" automatisch dereferenziert werden. Das vereinfacht die Baumanzeige, allerdings fehlt die Information über die Zwischenebene.</translation>
+ </message>
+ <message>
<source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
<translation>Diese Option aktiviert Tooltips für Variablen beim Debuggen. Da es das Debuggen verlangsamt und wegen der fehlenden Bereichsinformation nicht zuverlässig ist, ist es per Vorgabe deaktiviert.</translation>
</message>
<message>
- <location line="+11"/>
<source>Checking this will enable tooltips in the locals view during debugging.</source>
<translation>Schaltet Tooltips für die Anzeige der lokalen Variablen während des Debuggens ein.</translation>
</message>
<message>
- <location line="+9"/>
<source>Checking this will enable tooltips in the breakpoints view during debugging.</source>
<translation>Schaltet Tooltips im Haltepunkt-Fenster während des Debuggens ein.</translation>
</message>
<message>
- <location line="+9"/>
<source>Checking this will show a column with address information in the breakpoint view during debugging.</source>
<translation>Fügt eine Spalte mit den Adressen der Haltepunkte zur Anzeige während des Debuggens hinzu.</translation>
</message>
<message>
- <location line="+9"/>
<source>Checking this will show a column with address information in the stack view during debugging.</source>
<translation>Fügt eine Spalte mit Adressinformation zur Anzeige während des Debuggens hinzu.</translation>
</message>
@@ -3492,17 +2849,14 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+147"/>
<source>Debugging Helper</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
- <location line="+24"/>
<source>Choose DebuggingHelper Location</source>
<translation>Pfad zur Ausgabe-Hilfsbibliothek einstellen</translation>
</message>
<message>
- <location line="+31"/>
<source>Ctrl+Shift+F11</source>
<translation>Ctrl+Shift+F11</translation>
</message>
@@ -3510,122 +2864,96 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::GdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+271"/>
<source>The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
- <translation>Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend.</translation>
+ <translation type="obsolete">Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend.</translation>
</message>
<message>
- <location line="+5"/>
<source>The Gdb process crashed some time after starting successfully.</source>
<translation>Der Gdb-Prozess ist einige Zeit nach dem Start abgestürzt.</translation>
</message>
<message>
- <location line="+3"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
<translation>Zeitüberschreitung bei der letzten waitFor...()-Funktion. Der Status des QProcess ist unverändert, und waitFor...() kann noch einmal gerufen.</translation>
</message>
<message>
- <location line="+4"/>
<source>An error occurred when attempting to write to the Gdb process. For example, the process may not be running, or it may have closed its input channel.</source>
<translation>Ein Fehler trat beim Versuch des Schreibens zum Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
</message>
<message>
- <location line="+4"/>
<source>An error occurred when attempting to read from the Gdb process. For example, the process may not be running.</source>
<translation>Ein Fehler trat beim Versuch des Lesens vom Gdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
- <location line="+1152"/>
<source><p>The inferior stopped because it received a signal from the Operating System.<p><table><tr><td>Signal name : </td><td>%1</td></tr><tr><td>Signal meaning : </td><td>%2</td></tr></table></source>
<translation><p>Der Prozess wurde nach Erhalt eines Signals vom Betriebssystem angehalten.<p><table><tr><td>Name des Signals : </td><td>%1</td></tr><tr><td>Bedeutung : </td><td>%2</td></tr></table></translation>
</message>
<message>
- <location line="+7"/>
<source>Signal received</source>
<translation>Signal erhalten</translation>
</message>
<message>
- <location line="-950"/>
<source>Reading %1...</source>
<translation>Lese %1...</translation>
</message>
<message>
- <location line="+700"/>
<source>Application exited with exit code %1</source>
<translation>Die Anwendung wurde beendet, Rückgabewert %1</translation>
</message>
<message>
- <location line="+3"/>
<source>Application exited after receiving signal %1</source>
<translation>Die Anwendung wurde nach Erhalt des Signals %1 beendet.</translation>
</message>
<message>
- <location line="+3"/>
<source>Application exited normally</source>
<translation>Die Anwendung wurde normal beendet.</translation>
</message>
<message>
- <location line="+54"/>
<source>Loading %1...</source>
<translation>Lade %1...</translation>
</message>
<message>
- <location line="+173"/>
<source>Stopped: "%1"</source>
<translation>Angehalten: "%1"</translation>
</message>
<message>
- <location line="+19"/>
<source>Stopped: %1 by signal %2</source>
<translation>Angehalten: %1, Signal %2</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+132"/>
<source>Stopped.</source>
<translation>Angehalten.</translation>
</message>
<message>
- <location line="-20"/>
- <location line="+349"/>
<source>Execution Error</source>
<translation>Fehler bei der Ausführung</translation>
</message>
<message>
- <location line="-348"/>
- <location line="+349"/>
<source>Cannot continue debugged process:
</source>
<translation>Der zu debuggende Prozess kann nicht fortgesetzt werden:
</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+713"/>
<source>The debugging helper library was not found at %1.</source>
<translation>Die Ausgabe-Hilfsbibliothek konnte nicht unter %1 gefunden werden.</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+2253"/>
<source>Cannot find debugger initialization script</source>
<translation>Das Initialisierungsskript konnte nicht gefunden werden</translation>
</message>
<message>
- <location line="+1"/>
<source>The debugger settings point to a script file at '%1' which is not accessible. If a script file is not needed, consider clearing that entry to avoid this warning. </source>
<translation>Auf die in den Debugger-Einstellungen angegebene Skriptdatei '%1' kann nicht zugegriffen werden. Wenn kein Skript benötigt wird, können Sie die Einstellung rücksetzen, um diese Warnung zu umgehen.</translation>
</message>
<message>
- <location line="-1543"/>
<source>Unable to run '%1': %2</source>
<translation>'%1' kann nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+164"/>
<source>Retrieving data for stack view...</source>
<translation>Daten der Stack-Anzeige werden empfangen...</translation>
</message>
<message numerus="yes">
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="-582"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation>
<numerusform>Daten der für die Anzeige der lokalen Variablen werden empfangen (noch eine ausstehende Anfrage) ...</numerusform>
@@ -3633,7 +2961,6 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+339"/>
<source><%n items></source>
<extracomment>In string list</extracomment>
<translation>
@@ -3642,24 +2969,20 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</translation>
</message>
<message>
- <location line="+284"/>
<source>Debugging helpers not found.</source>
<translation>Die Ausgabe-Hilfsbibliothek konnte nicht gefunden werden.</translation>
</message>
<message>
- <location line="+19"/>
<source>Debugging helpers: Qt version mismatch</source>
<translation>Ausgabe-Hilfsbibliothek: Die verwendeten Versionen der Qt-Bibliothek stimmen nicht überein.</translation>
</message>
<message>
- <location line="+1"/>
<source>The Qt version used to build the debugging helpers (%1) does not match the Qt version used to build the debugged application (%2).
This might yield incorrect results.</source>
<translation>Die Qt-Version, die zur Erstellung der Ausgabe-Hilfsbibliothek verwendet (%1) wurde, entspricht nicht der Version in der zu debuggenden Anwendung (%2).
</translation>
</message>
<message numerus="yes">
- <location line="-32"/>
<source>Dumper version %1, %n custom dumpers found.</source>
<translation>
<numerusform>Version der Ausgabe-Hilfsbibliothek: %1, ein unterstützter Datentyp.</numerusform>
@@ -3667,333 +2990,270 @@ This might yield incorrect results.</source>
</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="-2501"/>
<source>An unknown error in the Gdb process occurred. </source>
<translation>Im Gdb-Prozess trat ein unbekannter Fehler auf.</translation>
</message>
<message>
- <location line="+106"/>
<source>Library %1 loaded</source>
<translation>Bibliothek %1 geladen</translation>
</message>
<message>
- <location line="+9"/>
<source>Library %1 unloaded</source>
<translation>Bibliothek %1 entladen</translation>
</message>
<message>
- <location line="+12"/>
<source>Thread group %1 created</source>
<translation>Thread-Gruppe %1 erzeugt</translation>
</message>
<message>
- <location line="+11"/>
<source>Thread %1 created</source>
<translation>Thread %1 erzeugt</translation>
</message>
<message>
- <location line="+4"/>
<source>Thread group %1 exited</source>
<translation>Thread-Gruppe %1 beendet</translation>
</message>
<message>
- <location line="+5"/>
<source>Thread %1 in group %2 exited</source>
<translation>Thread %1 in Gruppe %2 beendet</translation>
</message>
<message>
- <location line="+4"/>
<source>Thread %1 selected</source>
<translation>Thread %1 ausgewählt</translation>
</message>
<message>
- <location line="+200"/>
<source>Stop requested...</source>
<translation>Stop angefordert...</translation>
</message>
<message>
- <location line="+124"/>
<source>Stopping temporarily</source>
<translation>Halte an</translation>
</message>
<message>
- <location line="+14"/>
<source>Processing queued commands</source>
<translation>Kommando-Warteschlange wird abgearbeitet</translation>
</message>
<message>
- <location line="+68"/>
<source>The gdb process has not responded to a command within %1 seconds. This could mean it is stuck in an endless loop or taking longer than expected to perform the operation.
You can choose between waiting longer or abort debugging.</source>
<translation>Der Gdb-Prozess hat nach %1 Sekunde nicht auf das Kommando reagiert. Das könnte bedeuten, dass er sich in einer Endlosschleife befinded oder für die Operation mehr Zeit benötigt.
Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</message>
<message>
- <location line="+6"/>
<source>Gdb not responding</source>
<translation>Gdb antwortet nicht</translation>
</message>
<message>
- <location line="+2"/>
<source>Give gdb more time</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Stop debugging</source>
<translation>Debuggen beenden</translation>
</message>
<message>
- <location line="+39"/>
- <location line="+30"/>
<source>Executable failed</source>
<translation>Fehler bei Ausführung</translation>
</message>
<message>
- <location line="-29"/>
<source>Process failed to start</source>
<translation>Der Prozess konnte nicht gestartet werden</translation>
</message>
<message>
- <location line="+30"/>
<source>Executable failed: %1</source>
<translation>Fehler bei Ausführung: %1</translation>
</message>
<message>
- <location line="+142"/>
<source><unknown></source>
<translation><unbekannt></translation>
</message>
<message>
- <location line="+15"/>
<source>Jumped. Stopped</source>
<translation>Ãœbersprungen / Angehalten</translation>
</message>
<message>
- <location line="+19"/>
<source>Target line hit. Stopped</source>
<translation>Zeile erreicht / Angehalten</translation>
</message>
<message>
- <location line="+341"/>
<source> <Unknown> </source>
<comment>name</comment>
<translation><Unbekannt></translation>
</message>
<message>
- <location line="+1"/>
<source> <Unknown> </source>
<comment>meaning</comment>
<translation><Unbekannt></translation>
</message>
<message>
- <location line="+209"/>
<source>Failed to shut down application</source>
<translation>Die Anwendung konnte nicht beendet werden</translation>
</message>
<message>
- <location line="+70"/>
<source>There is no gdb binary available for '%1'</source>
<translation>Gdb: Es wurde keine ausführbare Datei für '%1' angegeben</translation>
</message>
<message>
- <location line="+94"/>
<source>Continuing after temporary stop...</source>
<translation>Setze nach temporärem Anhalten fort...</translation>
</message>
<message>
- <location line="-8"/>
<source>Running requested...</source>
<translation>Fortsetzung angefordert...</translation>
</message>
<message>
- <location line="-388"/>
+ <source>The Gdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.
+%2</source>
+ <translation>Der Start des Gdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend.
+%2</translation>
+ </message>
+ <message>
<source>Watchpoint %1 at %2 triggered:</source>
<translation>Watchpoint %1 bei %2 ausgelöst:</translation>
</message>
<message>
- <location line="+5"/>
<source>Stopped at breakpoint %1 in thread %2</source>
<translation>An Haltepunkt %1 im Thread %2 angehalten</translation>
</message>
<message>
- <location line="+114"/>
<source>Raw structure</source>
<translation>Rohdaten</translation>
</message>
<message>
- <location line="+293"/>
<source>Step requested...</source>
<translation>Einzelschritt angefordert...</translation>
</message>
<message>
- <location line="+35"/>
<source>Step by instruction requested...</source>
<translation>Einzelschritt über Anweisung angefordert...</translation>
</message>
<message>
- <location line="+13"/>
<source>Finish function requested...</source>
<translation>Ausführung bis Funktionsende angefordert...</translation>
</message>
<message>
- <location line="+9"/>
<source>Step next requested...</source>
<translation>Einzelschritt angefordert...</translation>
</message>
<message>
- <location line="+36"/>
<source>Step next instruction requested...</source>
<translation>Einzelschritt über Anweisung angefordert...</translation>
</message>
<message>
- <location line="+12"/>
<source>Run to line %1 requested...</source>
<translation>Ausführung bis Zeile %1 angefordert...</translation>
</message>
<message>
- <location line="+22"/>
<source>Run to function %1 requested...</source>
<translation>Ausführung bis Funktion %1 angefordert...</translation>
</message>
<message>
- <location line="+39"/>
<source>Immediate return from function requested...</source>
<translation>Herausspringen aus innerer Funktion...</translation>
</message>
<message>
- <location line="+709"/>
<source><unknown></source>
<comment>address</comment>
<extracomment>End address of loaded module</extracomment>
<translation><unbekannt></translation>
</message>
<message>
- <location line="+74"/>
<source>Retrieving data for stack view thread 0x%1...</source>
<translation>Daten der Stack-Anzeige für Thread 0x%1 werden empfangen...</translation>
</message>
<message>
- <location line="+99"/>
<source>Jumping out of bogus frame...</source>
<translation>Verlasse ungültigen Stack-Rahmen...</translation>
</message>
<message>
- <location line="+174"/>
- <location line="+24"/>
<source>Snapshot Creation Error</source>
<translation>Fehler bei der Erzeugung eines Snapshots</translation>
</message>
<message>
- <location line="-23"/>
<source>Cannot create snapshot file.</source>
<translation>Es konnte keine Snapshot-Datei erstellt werden.</translation>
</message>
<message>
- <location line="+24"/>
<source>Cannot create snapshot:
</source>
<translation>Es konnte kein Snapshot erstellt werden:
</translation>
</message>
<message>
- <location line="+385"/>
<source>Finished retrieving data</source>
<translation>Alle Daten erhalten</translation>
</message>
<message>
- <location line="+80"/>
<source>Custom dumper setup: %1</source>
<translation>Ausgabe-Hilfsbibliothek-Initialisierung: %1</translation>
</message>
<message>
- <location line="+791"/>
<source>Failed to start application: </source>
<translation>Die Anwendung konnte nicht gestartet werden: </translation>
</message>
<message>
- <location line="+6"/>
<source>Failed to start application</source>
<translation>Anwendung konnte nicht gestartet</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="-279"/>
<source><0 items></source>
<translation><leer></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="-746"/>
<source><shadowed></source>
<extracomment>Type of local variable or parameter shadowed by another variable of the same name in a nested block.</extracomment>
<translation><überlagert></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/classicgdbengine.cpp" line="+406"/>
<source><n/a></source>
<translation><k.a.></translation>
</message>
<message>
- <location line="+2"/>
<source><anonymous union></source>
<translation><Datentyp anonyme Union></translation>
</message>
<message>
- <location line="+37"/>
<source><no information></source>
<extracomment>About variable's value</extracomment>
<translation><keine Angabe></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+313"/>
- <location line="+26"/>
- <location line="+15"/>
- <location line="+64"/>
<source>Disassembler failed: %1</source>
<translation>Fehler beim Disassemblieren: %1</translation>
</message>
<message>
- <location line="+202"/>
<source>Gdb I/O Error</source>
<translation>Gdb Ein/Ausgabefehler</translation>
</message>
<message>
- <location line="+33"/>
<source>Unexpected Gdb Exit</source>
<translation>Gdb unerwartet beendet</translation>
</message>
<message>
- <location line="-3"/>
<source>The gdb process exited unexpectedly (%1).</source>
<translation>Der Gdb-Prozess wurde plötzlich beendet (%1).</translation>
</message>
<message>
- <location line="+2"/>
<source>crashed</source>
<translation>abgestürzt</translation>
</message>
<message>
- <location line="+0"/>
<source>code %1</source>
<translation>Rückgabewert %1</translation>
</message>
<message>
- <location line="+11"/>
<source>Adapter start failed</source>
<translation>Der Start des Adapters schlug fehl</translation>
</message>
<message>
- <location line="+21"/>
<source>Setting up inferior...</source>
<translation>Bereite zu debuggenden Prozess vor...</translation>
</message>
<message>
- <location line="+30"/>
- <location line="+1"/>
<source>Setting breakpoints...</source>
<translation>Setze Haltepunkte...</translation>
</message>
<message>
- <location line="+50"/>
<source>Adapter crashed</source>
<translation>Der Adapter ist abgestürzt</translation>
</message>
@@ -4001,12 +3261,10 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::GdbOptionsPage</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdboptionspage.cpp" line="+52"/>
<source>Gdb</source>
<translation>Gdb</translation>
</message>
<message>
- <location line="+25"/>
<source>Choose Location of Startup Script File</source>
<translation>Pfad zu Startup-Skript</translation>
</message>
@@ -4014,17 +3272,14 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::MemoryViewAgent</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggeragents.cpp" line="+111"/>
<source>Memory $</source>
<translation>Speicher $</translation>
</message>
<message>
- <location line="+27"/>
<source>No memory viewer available</source>
<translation>Es ist kein Speicher-Anzeigemodul verfügbar</translation>
</message>
<message>
- <location line="+1"/>
<source>The memory contents cannot be shown as no viewer plugin for binary data has been loaded.</source>
<translation>Der Speicherinhalt kann nicht angezeigt werden, da kein Plugin zur Anzeige binärer Daten geladen ist.</translation>
</message>
@@ -4032,58 +3287,46 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::ModulesModel</name>
<message>
- <location filename="../../../src/plugins/debugger/moduleshandler.cpp" line="+139"/>
<source>yes</source>
<translation>ja</translation>
</message>
<message>
- <location line="-1"/>
<source>no</source>
<translation>nein</translation>
</message>
<message>
- <location line="-42"/>
<source>Module name</source>
<translation>Modulname</translation>
</message>
<message>
- <location line="+1"/>
<source>Module path</source>
<translation>Modulpfad</translation>
</message>
<message>
- <location line="+1"/>
<source>Symbols read</source>
<translation>Symbole gelesen</translation>
</message>
<message>
- <location line="+1"/>
<source>Symbols type</source>
<translation>Symboltyp</translation>
</message>
<message>
- <location line="+1"/>
<source>Start address</source>
<translation>Startadresse</translation>
</message>
<message>
- <location line="+1"/>
<source>End address</source>
<translation>Endadresse</translation>
</message>
<message>
- <location line="+36"/>
- <location line="+8"/>
<source>unknown</source>
<translation>unbekannt</translation>
</message>
<message>
- <location line="+1"/>
<source>plain</source>
<translation>plain</translation>
</message>
<message>
- <location line="+1"/>
<source>fast</source>
<translation>schnell</translation>
</message>
@@ -4091,67 +3334,54 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::ModulesWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/moduleswindow.cpp" line="+59"/>
<source>Modules</source>
<translation>Module</translation>
</message>
<message>
- <location line="+53"/>
<source>Update Module List</source>
<translation>Modulliste aktualisieren</translation>
</message>
<message>
- <location line="+5"/>
<source>Show Source Files for Module "%1"</source>
<translation>Quelldateien des Moduls "%1"</translation>
</message>
<message>
- <location line="+5"/>
<source>Load Symbols for All Modules</source>
<translation>Symbole aller Module laden</translation>
</message>
<message>
- <location line="+5"/>
<source>Examine All Modules</source>
<translation>Alle Module untersuchen</translation>
</message>
<message>
- <location line="+8"/>
<source>Load Symbols for Module</source>
<translation>Symbole des Moduls laden</translation>
</message>
<message>
- <location line="+2"/>
<source>Edit File</source>
<translation>Datei zum Editieren anfordern</translation>
</message>
<message>
- <location line="+2"/>
<source>Show Symbols</source>
<translation>Symbole anzeigen</translation>
</message>
<message>
- <location line="+4"/>
<source>Load Symbols for Module "%1"</source>
<translation>Symbole des Moduls "%1" laden</translation>
</message>
<message>
- <location line="+4"/>
<source>Edit File "%1"</source>
<translation>Datei "%1" editieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Show Symbols in File "%1"</source>
<translation>Symbole der Datei "%1" laden</translation>
</message>
<message>
- <location line="+12"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+2"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
@@ -4159,17 +3389,14 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::OutputCollector</name>
<message>
- <location filename="../../../src/plugins/debugger/outputcollector.cpp" line="+95"/>
<source>Cannot create temporary file: %1</source>
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="+11"/>
<source>Cannot create FiFo %1: %2</source>
<translation>Die FiFo %1 konnte nicht erzeugt werden: %2</translation>
</message>
<message>
- <location line="+6"/>
<source>Cannot open FiFo %1: %2</source>
<translation>Die FiFo %1 konnte nicht geöffnet werden: %2</translation>
</message>
@@ -4177,12 +3404,10 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::RegisterHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/registerhandler.cpp" line="+150"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+1"/>
<source>Value (base %1)</source>
<translation>Wert (Basis %1)</translation>
</message>
@@ -4190,52 +3415,42 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::RegisterWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/registerwindow.cpp" line="+151"/>
<source>Registers</source>
<translation>Register</translation>
</message>
<message>
- <location line="+23"/>
<source>Reload Register Listing</source>
<translation>Register neu laden</translation>
</message>
<message>
- <location line="+10"/>
<source>Open Memory Editor</source>
<translation>Speicher-Editor öffnen</translation>
</message>
<message>
- <location line="+3"/>
<source>Open Memory Editor at %1</source>
<translation>Speicher-Editor bei %1 öffnen</translation>
</message>
<message>
- <location line="+7"/>
<source>Hexadecimal</source>
<translation>Hexadezimal</translation>
</message>
<message>
- <location line="+3"/>
<source>Decimal</source>
<translation>Dezimal</translation>
</message>
<message>
- <location line="+3"/>
<source>Octal</source>
<translation>Oktal</translation>
</message>
<message>
- <location line="+3"/>
<source>Binary</source>
<translation>Binär</translation>
</message>
<message>
- <location line="+5"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+2"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
@@ -4243,37 +3458,30 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::ScriptEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/script/scriptengine.cpp" line="+268"/>
<source>Error:</source>
<translation>Fehler:</translation>
</message>
<message>
- <location line="+74"/>
<source>Running requested...</source>
<translation>Fortsetzung angefordert...</translation>
</message>
<message>
- <location line="+197"/>
<source>'%1' contains no identifier</source>
<translation>'%1' enthält keinen Bezeichner</translation>
</message>
<message>
- <location line="+5"/>
<source>String literal %1</source>
<translation>Zeichenketten-Literal %1</translation>
</message>
<message>
- <location line="+15"/>
<source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
<translation>Werte Ausdruck '%1' mit potentiellen Seiteneffekten nicht aus</translation>
</message>
<message>
- <location line="+103"/>
<source>Stopped at %1:%2.</source>
<translation>Angehalten bei %1:%2.</translation>
</message>
<message>
- <location line="+51"/>
<source>Stopped.</source>
<translation>Angehalten.</translation>
</message>
@@ -4281,22 +3489,18 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::SourceFilesWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/sourcefileswindow.cpp" line="+64"/>
<source>Source Files</source>
<translation>Quelldateien</translation>
</message>
<message>
- <location line="+26"/>
<source>Reload Data</source>
<translation>Daten aktualisieren</translation>
</message>
<message>
- <location line="+6"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
<message>
- <location line="+3"/>
<source>Open File "%1"'</source>
<translation>Datei '"%1" öffnen</translation>
</message>
@@ -4304,73 +3508,54 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::StackHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+99"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location line="+2"/>
<source><More></source>
<translation><Mehr></translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/stackframe.cpp" line="+73"/>
- <location line="+19"/>
<source>Address:</source>
<translation>Adresse:</translation>
</message>
<message>
- <location line="-14"/>
- <location line="+19"/>
<source>Function:</source>
<translation>Funktion:</translation>
</message>
<message>
- <location line="-18"/>
- <location line="+19"/>
<source>File:</source>
<translation>Datei:</translation>
</message>
<message>
- <location line="-18"/>
- <location line="+20"/>
<source>Line:</source>
<translation>Zeile:</translation>
</message>
<message>
- <location line="-19"/>
- <location line="+20"/>
<source>From:</source>
<translation>Von:</translation>
</message>
<message>
- <location line="-19"/>
- <location line="+20"/>
<source>To:</source>
<translation>Bis:</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+68"/>
<source>Level</source>
<translation>Tiefe</translation>
</message>
<message>
- <location line="+1"/>
<source>Function</source>
<translation>Funktion</translation>
</message>
<message>
- <location line="+1"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>Line</source>
<translation>Zeile</translation>
</message>
<message>
- <location line="+1"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
@@ -4378,42 +3563,34 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::StackWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/stackwindow.cpp" line="+62"/>
<source>Stack</source>
<translation>Stack</translation>
</message>
<message>
- <location line="+45"/>
<source>Copy Contents to Clipboard</source>
<translation>Inhalt in Zwischenablage kopieren</translation>
</message>
<message>
- <location line="+8"/>
<source>Open Memory Editor</source>
<translation>Speicher-Editor öffnen</translation>
</message>
<message>
- <location line="+3"/>
<source>Open Memory Editor at 0x%1</source>
<translation>Speicher-Editor bei %1 öffnen</translation>
</message>
<message>
- <location line="+9"/>
<source>Open Disassembler at 0x%1</source>
<translation>Disassembler bei %1 öffnen</translation>
</message>
<message>
- <location line="-3"/>
<source>Open Disassembler</source>
<translation>Disassembler öffnen</translation>
</message>
<message>
- <location line="+13"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+3"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
@@ -4421,22 +3598,18 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::StartExternalDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="+193"/>
<source>Select Executable</source>
<translation>Ausführbare Datei auswählen</translation>
</message>
<message>
- <location line="+5"/>
<source>Select Working Directory</source>
<translation>Wählen Sie das Arbeitsverzeichnis aus</translation>
</message>
<message>
- <location line="+8"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
<message>
- <location line="+1"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
@@ -4444,22 +3617,18 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::StartRemoteDialog</name>
<message>
- <location line="+60"/>
<source>Select Debugger</source>
<translation>Debugger auswählen</translation>
</message>
<message>
- <location line="+2"/>
<source>Select Executable</source>
<translation>Ausführbare Datei auswählen</translation>
</message>
<message>
- <location line="+1"/>
<source>Select Sysroot</source>
<translation>Sysroot auswählen</translation>
</message>
<message>
- <location line="+2"/>
<source>Select Start Script</source>
<translation>Startskript auswählen</translation>
</message>
@@ -4467,72 +3636,58 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::ThreadsHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/threadshandler.cpp" line="+71"/>
<source>Thread&nbsp;id:</source>
<translation>Thread-Id:</translation>
</message>
<message>
- <location line="+3"/>
<source>Target&nbsp;id:</source>
<translation>Ziel-Id:</translation>
</message>
<message>
- <location line="+3"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location line="+3"/>
<source>State:</source>
<translation>Status:</translation>
</message>
<message>
- <location line="+3"/>
<source>Core:</source>
<translation>Prozessorkern:</translation>
</message>
<message>
- <location line="+4"/>
<source>Stopped&nbsp;at:</source>
<translation>Angehalten&nbsp;bei:</translation>
</message>
<message>
- <location line="+95"/>
<source>Function</source>
<translation>Funktion</translation>
</message>
<message>
- <location line="+2"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location line="+2"/>
<source>Line</source>
<translation>Zeile</translation>
</message>
<message>
- <location line="+2"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location line="+2"/>
<source>Core</source>
<translation>Prozessorkern:</translation>
</message>
<message>
- <location line="+2"/>
<source>State</source>
<translation>Status</translation>
</message>
<message>
- <location line="+2"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="-14"/>
<source>Thread ID</source>
<translation>Thread-Id</translation>
</message>
@@ -4540,17 +3695,14 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::ThreadsWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/threadswindow.cpp" line="+53"/>
<source>Thread</source>
<translation>Thread</translation>
</message>
<message>
- <location line="+22"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+2"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
@@ -4558,27 +3710,22 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::TrkGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/trkgdbadapter.cpp" line="+1461"/>
<source>Port specification missing.</source>
<translation>Es wurde kein Port angegeben.</translation>
</message>
<message>
- <location line="+7"/>
<source>Unable to acquire a device on '%1'. It appears to be in use.</source>
<translation>Es kann nicht auf das Gerät "%1" zugegriffen werden. Offenbar ist es bereits in Benutzung.</translation>
</message>
<message>
- <location line="+122"/>
<source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
<translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-Id: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation>
</message>
<message>
- <location line="+9"/>
<source>The reported code segment address (0x%1) might be invalid. Symbol resolution or setting breakoints may not work.</source>
<translation>Die erhaltene Startadresse des Codesegments (%0x1) ist eventuell ungültig. Bei Auflösen von Symbolen oder beim Setzen von Haltpunkten könnten Probleme auftreten.</translation>
</message>
<message>
- <location line="+30"/>
<source>Connecting to TRK server adapter failed:
</source>
<translation>Die Verbindung zum TRK-Server-Adapter schlug fehl:
@@ -4588,14 +3735,11 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::WatchData</name>
<message>
- <location filename="../../../src/plugins/debugger/watchdata.cpp" line="+269"/>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+78"/>
<source><not in scope></source>
<extracomment>Value of variable in Debugger Locals display for variables out of scope (stopped above initialization).</extracomment>
<translation><nicht im Bereich></translation>
</message>
<message>
- <location line="+9"/>
<source>%1 <shadowed %2></source>
<extracomment>Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count.</extracomment>
<translation>%1 <überlagert %2></translation>
@@ -4604,52 +3748,42 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::WatchHandler</name>
<message>
- <location line="-29"/>
<source>Expression</source>
<translation>Ausdruck</translation>
</message>
<message>
- <location line="+5"/>
<source> ... <cut off></source>
<translation>...<Rest abgeschnitten></translation>
</message>
<message>
- <location line="+3"/>
<source>Object Address</source>
<translation>Adresse des Objekts</translation>
</message>
<message>
- <location line="+2"/>
<source>Internal ID</source>
<translation>Interner Name</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+53"/>
<source>Return Value</source>
<translation>Rückgabewert</translation>
</message>
<message>
- <location line="+344"/>
<source><empty></source>
<translation><leer></translation>
</message>
<message>
- <location line="+2"/>
<source><uninitialized></source>
<translation><nicht initialisiert></translation>
</message>
<message>
- <location line="+2"/>
<source><invalid></source>
<translation><ungültig></translation>
</message>
<message>
- <location line="+2"/>
<source><not accessible></source>
<translation><nicht zugänglich></translation>
</message>
<message numerus="yes">
- <location line="+3"/>
<source><%n items></source>
<translation>
<numerusform><ein Element></numerusform>
@@ -4657,62 +3791,50 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
</translation>
</message>
<message>
- <location line="+905"/>
<source>%1 Object at %2</source>
<translation>Objekt vom Typ %1 bei %2</translation>
</message>
<message>
- <location line="+1"/>
<source>%1 Object at Unknown Address</source>
<translation>Objekt vom Typ %1 an unbekannter Adresse</translation>
</message>
<message>
- <location line="+316"/>
<source>Locals & Watchers</source>
<translation>Lokale Variablen und Überwachte Ausdrücke</translation>
</message>
<message>
- <location line="-1233"/>
<source><Edit></source>
<translation><Editieren></translation>
</message>
<message>
- <location line="-348"/>
<source>Root</source>
<translation>Wurzelelement</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchdata.cpp" line="-11"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+10"/>
<source>Locals</source>
<translation>Lokale Variablen</translation>
</message>
<message>
- <location line="+8"/>
<source>Tooltip</source>
<translation>Tooltip</translation>
</message>
<message>
- <location line="-4"/>
<source>Watchers</source>
<translation>Überwachte Ausdrücke</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/watchdata.cpp" line="+8"/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location line="-6"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location line="+10"/>
<source>Generation</source>
<translation>Generation</translation>
</message>
@@ -4720,67 +3842,54 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::WatchModel</name>
<message>
- <location filename="../../../src/plugins/debugger/watchhandler.cpp" line="+623"/>
<source>decimal</source>
<translation>dezimal</translation>
</message>
<message>
- <location line="+0"/>
<source>hexadecimal</source>
<translation>Hexadezimal</translation>
</message>
<message>
- <location line="+1"/>
<source>binary</source>
<translation>binär</translation>
</message>
<message>
- <location line="+0"/>
<source>octal</source>
<translation>oktal</translation>
</message>
<message>
- <location line="-44"/>
<source><Edit></source>
<translation><Editieren></translation>
</message>
<message>
- <location line="+47"/>
<source>Raw pointer</source>
<translation>Zeigerwert</translation>
</message>
<message>
- <location line="+1"/>
<source>Latin1 string</source>
<translation>Latin1-Zeichenkette</translation>
</message>
<message>
- <location line="+1"/>
<source>UTF8 string</source>
<translation>UTF8-Zeichenkette</translation>
</message>
<message>
- <location line="+1"/>
<source>UTF16 string</source>
<translation>UTF16-Zeichenkette</translation>
</message>
<message>
- <location line="+1"/>
<source>UCS4 string</source>
<translation>UCS4-Zeichenkette</translation>
</message>
<message>
- <location line="+175"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+1"/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location line="+1"/>
<source>Type</source>
<translation>Typ</translation>
</message>
@@ -4788,113 +3897,90 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>Debugger::Internal::WatchWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/watchwindow.cpp" line="+159"/>
<source>Locals and Watchers</source>
<translation>Lokale Variablen und Überwachte Ausdrücke</translation>
</message>
<message>
- <location line="+130"/>
<source>Change Format for Type</source>
<translation>Format für Typ ändern</translation>
</message>
<message>
- <location line="-20"/>
<source>Change Format for Type "%1"</source>
<translation>Format für den Typ '%1' ändern</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+30"/>
<source>Automatic</source>
<translation>Automatisch</translation>
</message>
<message>
- <location line="-5"/>
<source>Change Format for Object Named "%1"</source>
<translation>Format für das Objekt "%1" ändern</translation>
</message>
<message>
- <location line="+21"/>
<source>Change Format for Object</source>
<translation>Format für das Objekt ändern</translation>
</message>
<message>
- <location line="+10"/>
<source>Insert New Watch Item</source>
<translation>Neuen Überwachten Ausdruck einfügen</translation>
</message>
<message>
- <location line="+2"/>
<source>Select Widget to Watch</source>
<translation>Widget zur Überwachung auswählen</translation>
</message>
<message>
- <location line="+6"/>
<source>Open Memory Editor...</source>
<translation>Speicher-Editor öffnen...</translation>
</message>
<message>
- <location line="+9"/>
<source>Open Memory Editor at Object's Address (0x%1)</source>
<translation>Speicher-Editor bei der Adresse des Objekts (0x%1) öffnen</translation>
</message>
<message>
- <location line="+4"/>
<source>Open Memory Editor at Referenced Address (0x%1)</source>
<translation>Speicher-Editor bei der referenzierten Adresse (0x%1) öffnen</translation>
</message>
<message>
- <location line="+9"/>
<source>Break on Changes at Object's Address (0x%1)</source>
<translation>Beim Speicherzugriff auf die Adresse des Objekts (0x%1) anhalten</translation>
</message>
<message>
- <location line="+7"/>
<source>Break on Changes at Referenced Address (0x%1)</source>
<translation>Beim Speicherzugriff auf die referenzierte Adresse (0x%1) anhalten</translation>
</message>
<message>
- <location line="+8"/>
<source>Break on Changing Contents</source>
<translation>Bei Änderung des Inhalts anhalten</translation>
</message>
<message>
- <location line="+4"/>
<source>Watch Expression</source>
<translation>Ãœberwachter Ausdruck</translation>
</message>
<message>
- <location line="+1"/>
<source>Watch Expression "%1"</source>
<translation>Ãœberwachter Ausdruck "%1"</translation>
</message>
<message>
- <location line="+4"/>
<source>Remove Watch Expression</source>
<translation>Überwachten Ausdruck "%1" löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Remove Watch Expression "%1"</source>
<translation>Überwachten Ausdruck "%1" löschen</translation>
</message>
<message>
- <location line="+26"/>
<source>Refresh Code Model Snapshot</source>
<translation>Code-Modell Stand auf aktuellen Stand bringen.</translation>
</message>
<message>
- <location line="+5"/>
<source>Show View Contents in Editor</source>
<translation>Ansicht in einem Editor öffnen</translation>
</message>
<message>
- <location line="+12"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+2"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
@@ -4902,32 +3988,26 @@ Sie haben die Wahl zwischen Abwarten oder Abbrechen.</translation>
<context>
<name>DebuggingHelperOptionPage</name>
<message>
- <location filename="../../../src/plugins/debugger/dumperoptionpage.ui"/>
<source>Use debugging helper from custom location</source>
<translation>Benutze Ausgabe-Hilfsbibliothek von</translation>
</message>
<message>
- <location/>
<source>Location: </source>
<translation>Pfad:</translation>
</message>
<message>
- <location/>
<source>Debug debugging helper</source>
<translation>Debug-Version der Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
- <location/>
<source>Makes use of Qt Creator's code model to find out if a variable has already been assigned a value at the point the debugger interrupts.</source>
<translation>Benutzt das Code-Modell von Qt Creator um herauszufinden, ob eine Variable an der Stelle der Unterbrechung durch den Debugger bereits einen Wert hat.</translation>
</message>
<message>
- <location/>
<source>Use code model</source>
<translation>Code-Modell verwenden</translation>
</message>
<message>
- <location/>
<source><html><head/><body>
<p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Watchers&quot; view.</p>
<p> It is not strictly necessary for debugging with Qt Creator. </p></body></html></source>
@@ -4936,20 +4016,29 @@ Die Ausgabe-Hilfsbibliothek dient lediglich zur formatierten Ausgabe von Objekte
<p>Zum Debuggen mit Qt Creator ist sie jedoch nicht unbedingt erforderlich. </p></body></html></translation>
</message>
<message>
- <location/>
<source>Use Debugging Helper</source>
<translation>Ausgabe-Hilfsbibliothek benutzen</translation>
</message>
+ <message>
+ <source>QML Observer is used to offer additional debugging facilities to QML applications, such as interactive preview of code changes and inspection tools.
+
+It is not strictly necessary for debugging with Qt Creator.</source>
+ <translation type="obsolete">Der QML-Beobachter stellt zusätzliche Debugging-Funktionalität für QML-Anwendungen zur Verfügung, wie zum Beispiel interaktive Vorschau von Code-Änderungen und weitere Werkzeuge zur Untersuchung.
+
+Er ist jedoch keine notwendige Voraussetzung für das Debuggen mit Qt Creator.</translation>
+ </message>
+ <message>
+ <source>Use QML Observer</source>
+ <translation type="obsolete">QML-Beobachter benutzen</translation>
+ </message>
</context>
<context>
<name>DependenciesModel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+131"/>
<source>Unable to Add Dependency</source>
<translation>Die Abhängigkeit konnte nicht hinzugefügt werden</translation>
</message>
<message>
- <location line="+1"/>
<source>This would create a circular dependency.</source>
<translation>Dadurch würde eine zirkuläre Abhängigkeit entstehen.</translation>
</message>
@@ -4957,45 +4046,36 @@ Die Ausgabe-Hilfsbibliothek dient lediglich zur formatierten Ausgabe von Objekte
<context>
<name>Designer</name>
<message>
- <location filename="../../../src/shared/qrceditor/resourcefile.cpp" line="+54"/>
<source>The file name is empty.</source>
<translation>Der Dateiname ist leer.</translation>
</message>
<message>
- <location line="+54"/>
<source>XML error on line %1, col %2: %3</source>
<translation>XML-Fehler auf Zeile %1, Spalte %2: %3</translation>
</message>
<message>
- <location line="+7"/>
<source>The <RCC> root element is missing.</source>
<translation>Das Wurzelelement (<RCC>) fehlt.</translation>
</message>
<message>
- <location filename="../../../src/plugins/designer/designerconstants.h" line="+46"/>
<source>Designer</source>
<translation>Designer</translation>
</message>
<message>
- <location line="+2"/>
<source>Class Generation</source>
<translation>Klassenerzeugung</translation>
</message>
<message>
- <location line="-6"/>
- <location line="+11"/>
<source>Form Editor</source>
<translation>Formulareditor</translation>
</message>
<message>
- <location filename="../../../src/plugins/designer/codemodelhelpers.cpp" line="+129"/>
<source>The generated header of the form '%1' could not be found.
Rebuilding the project might help.</source>
<translation>Die automatisch erstellte Header-Datei '%1' des Formulars konnte nicht gefunden werden.
Versuchen Sie, das Projekt neu zu erstellen.</translation>
</message>
<message>
- <location line="+6"/>
<source>The generated header '%1' could not be found in the code model.
Rebuilding the project might help.</source>
<translation>Die automatisch erstellte Header-Datei '%1' konnte im Code-Modell nicht gefunden werden.
@@ -5005,7 +4085,6 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::FormWindowEditor</name>
<message>
- <location filename="../../../src/plugins/designer/formwindoweditor.cpp" line="+129"/>
<source>untitled</source>
<translation>kein Titel</translation>
</message>
@@ -5013,42 +4092,34 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::CppSettingsPageWidget</name>
<message>
- <location filename="../../../src/plugins/designer/cpp/cppsettingspagewidget.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Embedding of the UI Class</source>
<translation>Verwendung der UI-Klasse</translation>
</message>
<message>
- <location/>
<source>Aggregation as a pointer member</source>
<translation>Aggregation als Zeiger</translation>
</message>
<message>
- <location/>
<source>Aggregation</source>
<translation>Aggregation</translation>
</message>
<message>
- <location/>
<source>Code Generation</source>
<translation>Code-Erzeugung</translation>
</message>
<message>
- <location/>
<source>Support for changing languages at runtime</source>
<translation>Wechsel der Sprache zur Laufzeit unterstützen</translation>
</message>
<message>
- <location/>
<source>Use Qt module name in #include-directive</source>
<translation>Qt-Modulnamen in #include-Direktive verwenden</translation>
</message>
<message>
- <location/>
<source>Multiple inheritance</source>
<translation>Mehrfachvererbung</translation>
</message>
@@ -5056,17 +4127,14 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormClassWizardDialog</name>
<message>
- <location filename="../../../src/plugins/designer/cpp/formclasswizarddialog.cpp" line="+52"/>
<source>Qt Designer Form Class</source>
<translation>Qt-Designer-Formularklasse</translation>
</message>
<message>
- <location line="+3"/>
<source>Form Template</source>
<translation>Formularvorlage</translation>
</message>
<message>
- <location line="+5"/>
<source>Class Details</source>
<translation>Klasse</translation>
</message>
@@ -5074,22 +4142,18 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormClassWizardPage</name>
<message>
- <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.cpp" line="+149"/>
<source>%1 - Error</source>
<translation>%1 - Fehler</translation>
</message>
<message>
- <location filename="../../../src/plugins/designer/cpp/formclasswizardpage.ui"/>
<source>Class</source>
<translation>Klasse</translation>
</message>
<message>
- <location/>
<source>Configure...</source>
<translation>Einstellungen...</translation>
</message>
<message>
- <location/>
<source>Choose a Class Name</source>
<translation>Name der Klasse</translation>
</message>
@@ -5097,22 +4161,18 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/designer/formeditorplugin.cpp" line="+130"/>
<source>Qt Designer Form</source>
<translation>Qt-Designer-Formular</translation>
</message>
<message>
- <location line="+10"/>
<source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt C++ Project.</source>
<translation>Erstellt ein Qt-Designer-Formular mit zugehörigem Klassenrumpf (bestehend aus C++-Header- und -Quelldatei) für ein existierendes C++-Projekt.</translation>
</message>
<message>
- <location line="-8"/>
<source>Creates a Qt Designer form that you can add to a Qt C++ project. This is useful if you already have an existing class for the UI business logic.</source>
<translation>Erstellt ein Qt-Designer-Formular für ein C++-Projekt. Verwenden Sie diese Vorlage, wenn bereits eine Klasse für den Programmablauf existiert.</translation>
</message>
<message>
- <location line="+6"/>
<source>Qt Designer Form Class</source>
<translation>Qt-Designer-Formularklasse</translation>
</message>
@@ -5120,146 +4180,114 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormEditorW</name>
<message>
- <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+360"/>
<source>Widget Box</source>
<translation>Widget-Box</translation>
</message>
<message>
- <location line="-111"/>
- <location line="+117"/>
<source>Object Inspector</source>
<translation>Objektanzeige</translation>
</message>
<message>
- <location line="-114"/>
- <location line="+120"/>
<source>Property Editor</source>
<translation>Eigenschaften</translation>
</message>
<message>
- <location line="-114"/>
- <location line="+125"/>
<source>Action Editor</source>
<translation>Aktionseditor</translation>
</message>
<message>
- <location line="+43"/>
<source>For&m Editor</source>
<translation>For&mulareditor</translation>
</message>
<message>
- <location line="+35"/>
<source>F3</source>
<translation>F3</translation>
</message>
<message>
- <location line="+5"/>
<source>F4</source>
<translation>F4</translation>
</message>
<message>
- <location line="+14"/>
<source>Meta+H</source>
<translation>Meta+H</translation>
</message>
<message>
- <location line="+0"/>
<source>Ctrl+H</source>
<translation>Ctrl+H</translation>
</message>
<message>
- <location line="+5"/>
<source>Meta+L</source>
<translation>Meta+L</translation>
</message>
<message>
- <location line="+0"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location line="+17"/>
<source>Meta+G</source>
<translation>Meta+G</translation>
</message>
<message>
- <location line="+0"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location line="+9"/>
<source>Meta+J</source>
<translation>Meta+J</translation>
</message>
<message>
- <location line="+0"/>
<source>Ctrl+J</source>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="+22"/>
<source>Alt+Shift+R</source>
<translation>Alt+Shift+R</translation>
</message>
<message>
- <location line="+14"/>
<source>Switch Source/Form</source>
<translation>Zwischen Quelldatei und Formular wechseln</translation>
</message>
<message>
- <location line="+7"/>
<source>Shift+F4</source>
<translation>Shift+F4</translation>
</message>
<message>
- <location line="-299"/>
- <location line="+123"/>
<source>Signals && Slots Editor</source>
<translation>Signale und Slots</translation>
</message>
<message>
- <location line="-132"/>
<source>Widget box</source>
<translation>Widget-Box</translation>
</message>
<message>
- <location line="+214"/>
<source>Edit Widgets</source>
<translation>Widgets bearbeiten</translation>
</message>
<message>
- <location line="+5"/>
<source>Edit Signals/Slots</source>
<translation>Signale und Slots bearbeiten</translation>
</message>
<message>
- <location line="+5"/>
<source>Edit Buddies</source>
<translation>Buddies bearbeiten</translation>
</message>
<message>
- <location line="+5"/>
<source>Edit Tab Order</source>
<translation>Tabulatorreihenfolge bearbeiten</translation>
</message>
<message>
- <location line="+86"/>
<source>About Qt Designer plugins....</source>
<translation>Plugins...</translation>
</message>
<message>
- <location line="+33"/>
<source>Preview in</source>
<translation>Vorschau in</translation>
</message>
<message>
- <location line="+47"/>
<source>Designer</source>
<translation>Designer</translation>
</message>
<message>
- <location line="+174"/>
<source>The image could not be created: %1</source>
<translation>Das Bild konnte nicht erstellt werden: %1</translation>
</message>
@@ -5267,12 +4295,10 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormTemplateWizardPage</name>
<message>
- <location filename="../../../src/plugins/designer/formtemplatewizardpage.cpp" line="+62"/>
<source>Choose a Form Template</source>
<translation>Formularvorlage auswählen</translation>
</message>
<message>
- <location line="+30"/>
<source>%1 - Error</source>
<translation>%1 - Fehler</translation>
</message>
@@ -5280,17 +4306,14 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormWindowFile</name>
<message>
- <location filename="../../../src/plugins/designer/formwindowfile.cpp" line="+80"/>
<source>Error saving %1</source>
<translation>Fehler beim Speichern von %1</translation>
</message>
<message>
- <location line="+101"/>
<source>Unable to open %1: %2</source>
<translation>%1 kann nicht geöffnet werden: %2</translation>
</message>
<message>
- <location line="+12"/>
<source>Unable to write to %1: %2</source>
<translation>Die Datei %1 kann nicht geschrieben werden: %2</translation>
</message>
@@ -5298,12 +4321,10 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::FormWizardDialog</name>
<message>
- <location filename="../../../src/plugins/designer/formwizarddialog.cpp" line="+60"/>
<source>Qt Designer Form</source>
<translation>Qt-Designer-Formular</translation>
</message>
<message>
- <location line="+2"/>
<source>Form Template</source>
<translation>Formularvorlage</translation>
</message>
@@ -5311,29 +4332,24 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>Designer::Internal::QtCreatorIntegration</name>
<message>
- <location filename="../../../src/plugins/designer/qtcreatorintegration.cpp" line="+84"/>
<source>The class definition of '%1' could not be found in %2.</source>
<translation>Die Definition der Klasse '%1' konnte in %2 nicht gefunden werden.</translation>
</message>
<message>
- <location line="+329"/>
<source>Error finding/adding a slot.</source>
<translation>Fehler beim Auffinden/Hinzufügen des Slot-Codes.</translation>
</message>
<message>
- <location line="+58"/>
<source>Internal error: No project could be found for %1.</source>
<translation>Interner Fehler: Es konnte kein zu %1 gehöriges Projekt gefunden werden.</translation>
</message>
<message>
- <location line="+20"/>
<source>No documents matching '%1' could be found.
Rebuilding the project might help.</source>
<translation>Es konnten keine dem Suchmuster '%1' entsprechenden Dokumente gefunden werden.
Versuchen Sie, das Projekt neu zu erstellen.</translation>
</message>
<message>
- <location line="+61"/>
<source>Unable to add the method definition.</source>
<translation>Die Definition der Methode konnte nicht hinzugefügt werden.</translation>
</message>
@@ -5341,22 +4357,18 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>DocSettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/docsettingspage.ui"/>
<source>Registered Documentation</source>
<translation>Registrierte Dokumentationen</translation>
</message>
<message>
- <location/>
<source>Add...</source>
<translation>Hinzufügen...</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Add and remove compressed help files, .qch.</source>
<translation>Hinzufügen oder Entfernen von komprimierten Hilfedateien (.qch).</translation>
</message>
@@ -5364,57 +4376,46 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>ExtensionSystem::Internal::PluginDetailsView</name>
<message>
- <location filename="../../../src/libs/extensionsystem/plugindetailsview.ui"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location/>
<source>Version:</source>
<translation>Version:</translation>
</message>
<message>
- <location/>
<source>Vendor:</source>
<translation>Anbieter:</translation>
</message>
<message>
- <location/>
<source>Location:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location/>
<source>Description:</source>
<translation>Beschreibung:</translation>
</message>
<message>
- <location/>
<source>Copyright:</source>
<translation>Copyright:</translation>
</message>
<message>
- <location/>
<source>License:</source>
<translation>Lizenz:</translation>
</message>
<message>
- <location/>
<source>Dependencies:</source>
<translation>Abhängigkeiten:</translation>
</message>
<message>
- <location/>
<source>Group:</source>
<translation>Gruppe:</translation>
</message>
<message>
- <location/>
<source>Compatibility version:</source>
<translation>Kompatibel zu Version:</translation>
</message>
<message>
- <location/>
<source>URL:</source>
<translation>URL:</translation>
</message>
@@ -5422,12 +4423,10 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>ExtensionSystem::Internal::PluginErrorView</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginerrorview.ui"/>
<source>State:</source>
<translation>Status:</translation>
</message>
<message>
- <location/>
<source>Error message:</source>
<translation></translation>
</message>
@@ -5435,17 +4434,14 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>ExtensionSystem::Internal::PluginSpecPrivate</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+471"/>
<source>File does not exist: %1</source>
<translation>Die Datei '%1' existiert nicht.</translation>
</message>
<message>
- <location line="+2"/>
<source>Could not open file for read: %1</source>
<translation>Die Datei konnte nicht zum Lesen geöffnet werden: %1</translation>
</message>
<message>
- <location line="+16"/>
<source>Error parsing file %1: %2, at line %3, column %4</source>
<translation>Fehler beim Lesen der Datei %1: %2 auf Zeile %3, Spalte %4</translation>
</message>
@@ -5453,22 +4449,18 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>ExtensionSystem::Internal::PluginView</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginview.ui"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location/>
<source>Version</source>
<translation>Version</translation>
</message>
<message>
- <location/>
<source>Vendor</source>
<translation>Anbieter</translation>
</message>
<message>
- <location/>
<source>Load</source>
<translation>Geladen</translation>
</message>
@@ -5476,82 +4468,66 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>ExtensionSystem::PluginErrorView</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginerrorview.cpp" line="+79"/>
<source>Invalid</source>
<translation>Ungültig</translation>
</message>
<message>
- <location line="+1"/>
<source>Description file found, but error on read</source>
<translation>Fehlerhafte Beschreibungsdatei gefunden</translation>
</message>
<message>
- <location line="+3"/>
<source>Read</source>
<translation>Gelesen</translation>
</message>
<message>
- <location line="+1"/>
<source>Description successfully read</source>
<translation>Beschreibungsdatei gelesen</translation>
</message>
<message>
- <location line="+3"/>
<source>Resolved</source>
<translation>Abhängigkeiten bestimmt</translation>
</message>
<message>
- <location line="+1"/>
<source>Dependencies are successfully resolved</source>
<translation>Die Abhängigkeiten wurden erfolgreich bestimmt</translation>
</message>
<message>
- <location line="+3"/>
<source>Loaded</source>
<translation>Geladen</translation>
</message>
<message>
- <location line="+1"/>
<source>Library is loaded</source>
<translation>Die Bibliothek wurde geladen</translation>
</message>
<message>
- <location line="+3"/>
<source>Initialized</source>
<translation>Initialisiert</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin's initialization method succeeded</source>
<translation>Die Initialisierungsmethode des Plugins wurde erfolgreich abgearbeitet</translation>
</message>
<message>
- <location line="+3"/>
<source>Running</source>
<translation>Läuft</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin successfully loaded and running</source>
<translation>Das Plugin wurde erfolgreich geladen und läuft</translation>
</message>
<message>
- <location line="+3"/>
<source>Stopped</source>
<translation>Angehalten</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin was shut down</source>
<translation>Das Plugin wurde angehalten</translation>
</message>
<message>
- <location line="+3"/>
<source>Deleted</source>
<translation>Gelöscht</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin ended its life cycle and was deleted</source>
<translation>Das Plugin wurde nach Ablauf seiner Nutzungsdauer gelöscht</translation>
</message>
@@ -5559,27 +4535,22 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
<context>
<name>ExtensionSystem::PluginManager</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginmanager.cpp" line="+846"/>
<source>Circular dependency detected:
</source>
<translation>Zirkuläre Abhängigkeit festgestellt:
</translation>
</message>
<message>
- <location line="+3"/>
<source>%1(%2) depends on
</source>
<translation>%1 (%2) hängt von
</translation>
</message>
<message>
- <location line="+3"/>
<source>%1(%2)</source>
<translation>%1(%2)</translation>
</message>
<message>
- <location line="+15"/>
- <location line="+41"/>
<source>Cannot load plugin because dependency failed to load: %1(%2)
Reason: %3</source>
<translation>Das Plugin kann nicht geladen werden, weil eine Abhängigkeit nicht geladen werden konnte: %1(%2)
@@ -5589,12 +4560,10 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimactions.cpp" line="+120"/>
<source>Use Vim-style Editing</source>
<translation>Vim benutzen</translation>
</message>
<message>
- <location line="+8"/>
<source>Read .vimrc</source>
<translation>.vimrc lesen</translation>
</message>
@@ -5602,33 +4571,26 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+1646"/>
<source>Not implemented in FakeVim</source>
<translation>In FakeVim nicht implementiert</translation>
</message>
<message>
- <location line="-24"/>
<source>%1%2%</source>
<translation>%1%2%</translation>
</message>
<message>
- <location line="+2"/>
<source>%1All</source>
<translation>%1Alle</translation>
</message>
<message>
- <location line="+1717"/>
- <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+959"/>
<source>"%1" %2 %3L, %4C written</source>
<translation>"%1" %2 %3L, %4C geschrieben</translation>
</message>
<message>
- <location line="+31"/>
<source>"%1" %2L, %3C</source>
<translation>"%1" %2L, %3C</translation>
</message>
<message numerus="yes">
- <location line="+31"/>
<source>%n lines filtered</source>
<translation>
<numerusform>Eine Zeile gefiltert</numerusform>
@@ -5637,37 +4599,30 @@ Grund: %3</translation>
</translation>
</message>
<message>
- <location line="+67"/>
<source>Can't open file %1</source>
<translation>Die Datei '%1' kann nicht geöffnet werden</translation>
</message>
<message>
- <location line="-3120"/>
<source>Mark '%1' not set</source>
<translation>Die Marke '%1' ist nicht gesetzt</translation>
</message>
<message>
- <location line="+2910"/>
<source>Unknown option: </source>
<translation>Unbekannte Option: </translation>
</message>
<message>
- <location line="+60"/>
<source>File "%1" exists (add ! to override)</source>
<translation>Die Datei '%1' existiert bereits (Fügen Sie ! an, um sie zu überschreiben)</translation>
</message>
<message>
- <location line="+14"/>
<source>Cannot open file "%1" for writing</source>
<translation>Die Datei '%1' kann nicht zum Schreiben geöffnet werden</translation>
</message>
<message>
- <location line="+15"/>
<source>Cannot open file "%1" for reading</source>
<translation>Die Datei '%1' kann nicht zum Lesen geöffnet werden</translation>
</message>
<message numerus="yes">
- <location line="+73"/>
<source>%n lines %1ed %2 time</source>
<translation>
<numerusform>%1 auf eine Zeile %2-mal angewandt</numerusform>
@@ -5675,27 +4630,22 @@ Grund: %3</translation>
</translation>
</message>
<message>
- <location line="+215"/>
<source>Pattern not found: </source>
<translation>Suchmuster nicht gefunden: </translation>
</message>
<message>
- <location line="+7"/>
<source>search hit BOTTOM, continuing at TOP</source>
<translation>Die Suche hat das Ende erreicht, setze am Anfang fort</translation>
</message>
<message>
- <location line="+1"/>
<source>search hit TOP, continuing at BOTTOM</source>
<translation>Die Suche hat den Anfang erreicht, setze am Ende fort</translation>
</message>
<message>
- <location line="+827"/>
<source>Already at oldest change</source>
<translation>Älteste Änderung erreicht</translation>
</message>
<message>
- <location line="+17"/>
<source>Already at newest change</source>
<translation>Letzte Änderung erreicht</translation>
</message>
@@ -5703,12 +4653,10 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimOptionPage</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="-827"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location line="+2"/>
<source>FakeVim</source>
<translation>FakeVim</translation>
</message>
@@ -5716,17 +4664,14 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimPluginPrivate</name>
<message>
- <location line="+829"/>
<source>File not saved</source>
<translation>Datei nicht gespeichert</translation>
</message>
<message>
- <location line="+8"/>
<source>Saving succeeded</source>
<translation>Gespeichert</translation>
</message>
<message numerus="yes">
- <location line="+2"/>
<source>%n files not saved</source>
<translation>
<numerusform>Eine Datei nicht gespeichert</numerusform>
@@ -5734,7 +4679,6 @@ Grund: %3</translation>
</translation>
</message>
<message>
- <location line="+174"/>
<source>FakeVim Information</source>
<translation>Informationen zu FakeVim</translation>
</message>
@@ -5742,115 +4686,101 @@ Grund: %3</translation>
<context>
<name>FakeVimOptionPage</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimoptions.ui"/>
<source>Shift width:</source>
<translation>Einrückung:</translation>
</message>
<message>
- <location/>
<source>Tabulator size:</source>
<translation>Tabulatorweite:</translation>
</message>
<message>
- <location/>
<source>Backspace:</source>
<translation>Rücktaste:</translation>
</message>
<message>
- <location/>
<source>Use FakeVim</source>
<translation>FakeVim benutzen</translation>
</message>
<message>
- <location/>
<source>Read .vimrc</source>
<translation>.vimrc lesen</translation>
</message>
<message>
- <location/>
<source>Vim Behavior</source>
<translation>Vim-Verhalten</translation>
</message>
<message>
- <location/>
<source>Automatic indentation</source>
<translation>Automatische Einrückung</translation>
</message>
<message>
- <location/>
<source>Start of line</source>
<translation>Zeilenanfang</translation>
</message>
<message>
- <location/>
<source>Smart indentation</source>
<translation>Intelligente Einrückung</translation>
</message>
<message>
- <location/>
<source>Use search dialog</source>
<translation>Suchdialog verwenden</translation>
</message>
<message>
- <location/>
<source>Expand tabulators</source>
<translation>Tabulatoren expandieren</translation>
</message>
<message>
- <location/>
<source>Smart tabulators</source>
<translation>"Smart"-Tabularmodus</translation>
</message>
<message>
- <location/>
<source>Highlight search results</source>
<translation>Suchergebnisse hervorheben</translation>
</message>
<message>
- <location/>
<source>Incremental search</source>
<translation>Inkrementelle Suche</translation>
</message>
<message>
- <location/>
<source>Keyword characters:</source>
<translation></translation>
</message>
<message>
- <location/>
<source>Copy Text Editor Settings</source>
<translation>Texteditor-Einstellungen übernehmen</translation>
</message>
<message>
- <location/>
<source>Set Qt Style</source>
<translation>Qt-Stil setzen</translation>
</message>
<message>
- <location/>
<source>Set Plain Style</source>
<translation>Einfachen Stil setzen</translation>
</message>
<message>
- <location/>
<source>Show position of text marks</source>
<translation>Position der Textmarken anzeigen</translation>
</message>
<message>
- <location/>
<source>Vim tabstop option</source>
<translation>Vim-Tabulator-Einstellung</translation>
</message>
+ <message>
+ <source>Checking this box passes key sequences like Ctrl-S to the Creator core instead of interpreting them in FakeVim. This gives easier access to Creator core functionality at the price of losing some features of FakeVim.</source>
+ <translation>Bewirkt, dass bestimmte Tastenfolgen wie Strg-S nicht in FakeVim behandelt werden, sondern an Qt Creator weitergeleitet werden. Das erleichtert den Zugang zu Kernfunktionen von Qt Creator auf Kosten einiger Funktionen von FakeVim.</translation>
+ </message>
+ <message>
+ <source>Pass control key</source>
+ <translation>Strg-Taste weiterleiten</translation>
+ </message>
</context>
<context>
<name>FilterNameDialogClass</name>
<message>
- <location filename="../../../src/shared/help/filternamedialog.ui"/>
<source>Add Filter Name</source>
<translation>Filternamen hinzufügen</translation>
</message>
<message>
- <location/>
<source>Filter Name:</source>
<translation>Filtername:</translation>
</message>
@@ -5858,32 +4788,26 @@ Grund: %3</translation>
<context>
<name>FilterSettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/filtersettingspage.ui"/>
<source>Filters</source>
<translation>Filter</translation>
</message>
<message>
- <location/>
<source>1</source>
<translation>1</translation>
</message>
<message>
- <location/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Attributes</source>
<translation>Attribute</translation>
</message>
<message>
- <location/>
<source><html><body>
<p>
Add, modify, and remove document filters, which determine the documentation set displayed in the Help mode. The attributes are defined in the documents. Select them to display a set of relevant documentation. Note that some attributes are defined in several documents.
@@ -5891,7 +4815,6 @@ Add, modify, and remove document filters, which determine the documentation set
<translation><html><body><p>Hinzufügen, Ändern oder Entfernen von Dokumentenfiltern, die die im Hilfsmodus angezeigte Dokumentation festlegen. Die Attribute sind in den Dokumenten definiert. Durch die Angabe der Attribute kann die relevante Dokumentation ausgewählt werden. Beachten Sie, dass einige Attribute in mehreren Dokumenten erscheinen.</p></body></html></translation>
</message>
<message>
- <location/>
<source>No user defined filters available or no filter selected.</source>
<translation></translation>
</message>
@@ -5899,52 +4822,42 @@ Add, modify, and remove document filters, which determine the documentation set
<context>
<name>Find::Internal::FindDialog</name>
<message>
- <location filename="../../../src/plugins/find/finddialog.ui"/>
<source>Search for...</source>
<translation>Suche...</translation>
</message>
<message>
- <location/>
<source>Sc&ope:</source>
<translation>&Bereich:</translation>
</message>
<message>
- <location/>
<source>&Search</source>
<translation>&Suchen</translation>
</message>
<message>
- <location/>
<source>Search &for:</source>
<translation>Suche &nach:</translation>
</message>
<message>
- <location/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location/>
<source>&Case sensitive</source>
<translation>&Groß/Kleinschreibung</translation>
</message>
<message>
- <location/>
<source>&Whole words only</source>
<translation>Ganze &Worte</translation>
</message>
<message>
- <location/>
<source>Search && Replace</source>
<translation>Suchen und Ersetzen</translation>
</message>
<message>
- <location/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location/>
<source>Use regular e&xpressions</source>
<translation>Benutze reguläre Ausdrücke</translation>
</message>
@@ -5952,68 +4865,54 @@ Add, modify, and remove document filters, which determine the documentation set
<context>
<name>Find::Internal::FindToolBar</name>
<message>
- <location filename="../../../src/plugins/find/findtoolbar.cpp" line="+147"/>
<source>Find/Replace</source>
<translation>Suchen/Ersetzen</translation>
</message>
<message>
- <location line="+7"/>
<source>Enter Find String</source>
<translation>Suchmuster eingeben</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location line="+6"/>
<source>Find Next</source>
<translation>Nächste Fundstelle</translation>
</message>
<message>
- <location line="+7"/>
<source>Find Previous</source>
<translation>Vorhergehende Fundstelle</translation>
</message>
<message>
- <location line="+7"/>
<source>Replace</source>
<translation>Ersetzen</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+1"/>
<source>Replace && Find</source>
<translation></translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+=</source>
<translation>Ctrl+=</translation>
</message>
<message>
- <location line="+5"/>
<source>Replace && Find Previous</source>
<translation>Ersetzen und rückwärts weitersuchen</translation>
</message>
<message>
- <location line="+7"/>
<source>Replace All</source>
<translation>Alles ersetzen</translation>
</message>
<message>
- <location line="+6"/>
<source>Case Sensitive</source>
<translation>Groß/Kleinschreibung</translation>
</message>
<message>
- <location line="+9"/>
<source>Whole Words Only</source>
<translation>Ganze Worte</translation>
</message>
<message>
- <location line="+9"/>
<source>Use Regular Expressions</source>
<translation>Reguläre Ausdrücke verwenden</translation>
</message>
@@ -6021,42 +4920,34 @@ Add, modify, and remove document filters, which determine the documentation set
<context>
<name>Find::Internal::FindWidget</name>
<message>
- <location filename="../../../src/plugins/find/findwidget.ui"/>
<source>Find</source>
<translation>Suchen</translation>
</message>
<message>
- <location/>
<source>Find:</source>
<translation>Suchen:</translation>
</message>
<message>
- <location/>
<source>Replace with:</source>
<translation>Ersetzen durch:</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location/>
<source>Replace</source>
<translation>Ersetzen</translation>
</message>
<message>
- <location/>
<source>Replace && Find</source>
<translation>Ersetzen und weitersuchen</translation>
</message>
<message>
- <location/>
<source>Replace All</source>
<translation>Alle ersetzen</translation>
</message>
<message>
- <location/>
<source>Advanced...</source>
<translation>Erweitert...</translation>
</message>
@@ -6064,32 +4955,26 @@ Add, modify, and remove document filters, which determine the documentation set
<context>
<name>Find::SearchResultWindow</name>
<message>
- <location filename="../../../src/plugins/find/searchresultwindow.h" line="+117"/>
<source>Search Results</source>
<translation>Suchergebnisse</translation>
</message>
<message>
- <location filename="../../../src/plugins/find/searchresultwindow.cpp" line="+318"/>
<source>No matches found!</source>
<translation>Es wurden keine Treffer gefunden!</translation>
</message>
<message>
- <location line="+7"/>
<source>Expand All</source>
<translation>Alles aufklappen</translation>
</message>
<message>
- <location line="+8"/>
<source>Replace with:</source>
<translation>Ersetzen durch:</translation>
</message>
<message>
- <location line="+4"/>
<source>Replace all occurrences</source>
<translation>Alle Vorkommen ersetzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Replace</source>
<translation>Ersetzen</translation>
</message>
@@ -6097,65 +4982,53 @@ Add, modify, and remove document filters, which determine the documentation set
<context>
<name>GdbOptionsPage</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdboptionspage.ui"/>
<source>Environment:</source>
<translation>Umgebung:</translation>
</message>
<message>
- <location/>
<source>This is either empty or points to a file containing gdb commands that will be executed immediately after gdb starts up.</source>
<translation>Ein Skript mit Kommandos, die unmittelbar nach dem Gdb-Start ausgeführt werden (optional).</translation>
</message>
<message>
- <location/>
<source>Gdb startup script:</source>
<translation>Gdb-Startskript:</translation>
</message>
<message>
- <location/>
<source>This is the slowest but safest option.</source>
<translation>Die sicherste Einstellung, zugleich aber auch die langsamste.</translation>
</message>
<message>
- <location/>
<source>Try to set breakpoints in plugins always automatically.</source>
<translation>Versuche, Haltepunkte in Plugins automatisch zu setzen.</translation>
</message>
<message>
- <location/>
<source>Try to set breakpoints in selected plugins</source>
<translation>Versuche, Haltepunkte in ausgewählten Plugins zu setzen</translation>
</message>
<message>
- <location/>
<source>Matching regular expression: </source>
<translation>Regulärer Ausdruck: </translation>
</message>
<message>
- <location/>
<source>Never set breakpoints in plugins automatically</source>
<translation>Haltepunkte in Plugins niemals automatisch setzen</translation>
</message>
<message>
- <location/>
<source>When this option is checked, the debugger plugin attempts
to extract full path information for all source files from gdb. This is a
slow process but enables setting breakpoints in files with the same file
name in different directories.</source>
- <translation>Diese Option bewirkt, dass der Debugger versucht, die vollständigen Pfade aller Quelldateien von gdb zu erhalten. Das ist zeitaufwändig, gestattet aber das Setzen von Haltepunkten in Quelldateien gleichen Namens in verschiedenen Ordnern.</translation>
+ <translation type="obsolete">Diese Option bewirkt, dass der Debugger versucht, die vollständigen Pfade aller Quelldateien von gdb zu erhalten. Das ist zeitaufwändig, gestattet aber das Setzen von Haltepunkten in Quelldateien gleichen Namens in verschiedenen Ordnern.</translation>
</message>
<message>
- <location/>
<source>Use full path information to set breakpoints</source>
- <translation>Vollständige Pfadinformation beim Setzen der Haltepunkte verwenden</translation>
+ <translation type="obsolete">Vollständige Pfadinformation beim Setzen der Haltepunkte verwenden</translation>
</message>
<message>
- <location/>
<source>Gdb timeout:</source>
<translation>Gdb-Timeout:</translation>
</message>
<message>
- <location/>
<source>This is the number of seconds Qt Creator will wait before
it terminates non-responsive gdb process. The default value of 20 seconds
should be sufficient for most applications, but there are situations when
@@ -6164,38 +5037,31 @@ on slow machines. In this case, the value should be increased.</source>
<translation>Anzahl der Sekunden, die Qt Creator abwartet, bevor gdb-Prozesse abgebrochen werden, die nicht mehr reagieren. Die Vorgabe von 20 Sekunden sollte für die meisten Anwendungsfälle ausreichen, aber es können Situationen auftreten, in denen das Laden großer Bibliotheken oder das Auflisten der Quelldateien viel länger dauert (auf langsamen Maschinen). In diesem Falle sollte der Wert erhöht werden.</translation>
</message>
<message>
- <location/>
<source>Gdb</source>
<translation>Gdb</translation>
</message>
<message>
- <location/>
<source>Enable reverse debugging</source>
<translation>Rückwärts Debuggen aktivieren</translation>
</message>
<message>
- <location/>
<source>When this option is checked, 'Step Into' compresses several steps into one in certain situations, leading to 'less noisy' debugging. So will, e.g., the atomic
reference counting code be skipped, and a single 'Step Into' for a signal emission will end up directly in the slot connected to it.</source>
<translation>Diese Option bewirkt, dass 'Einzelschritt in' in bestimmten Situationen mehrere Schritte zusammenfasst, was das Debuggen beschleunigt. Zum Beispiel wird der Code des atomaren Referenzzählung übersprungen; und bei der Emission eines Signals gelangt man zum verbundenen Slot.</translation>
</message>
<message>
- <location/>
<source>Skip known frames when stepping</source>
<translation>Bekannte Stellen beim Einzelschritt überspringen</translation>
</message>
<message>
- <location/>
<source>Show a message box when receiving a signal</source>
<translation>Empfang eines Signals durch Dialogbox anzeigen</translation>
</message>
<message>
- <location/>
<source>Behavior of Breakpoint Setting in Plugins</source>
<translation>Setzen von Haltepunkten in Plugins</translation>
</message>
<message>
- <location/>
<source>Adjust Breakpoint Locations</source>
<translation>Positionen der Haltepunkte korrigieren</translation>
</message>
@@ -6203,145 +5069,121 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GeneralSettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/generalsettingspage.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Font</source>
<translation>Zeichensatz</translation>
</message>
<message>
- <location/>
<source>Family:</source>
<translation>Name:</translation>
</message>
<message>
- <location/>
<source>Style:</source>
<translation>Stil:</translation>
</message>
<message>
- <location/>
<source>Size:</source>
<translation>Größe:</translation>
</message>
<message>
- <location/>
<source>Startup</source>
<translation>Start</translation>
</message>
<message>
- <location/>
<source>On context help:</source>
<translation>Kontexthilfe:</translation>
</message>
<message>
- <location/>
<source>On help start:</source>
<translation>Zu Beginn:</translation>
</message>
<message>
- <location/>
<source>Use &Current Page</source>
<translation>&Aktuelle Seite nehmen</translation>
</message>
<message>
- <location/>
<source>Use &Blank Page</source>
<translation>&Leere Seite</translation>
</message>
<message>
- <location/>
<source>Restore to Default</source>
<translation>&Vorgabe wiederherstellen</translation>
</message>
<message>
- <location/>
<source>Help Bookmarks</source>
<translation>Hilfe-Lesezeichen</translation>
</message>
<message>
- <location/>
<source>Import...</source>
<translation>Importieren...</translation>
</message>
<message>
- <location/>
<source>Export...</source>
<translation>Exportieren...</translation>
</message>
<message>
- <location/>
<source>Home page:</source>
<translation>Startseite:</translation>
</message>
<message>
- <location/>
<source>Show Side-by-Side if Possible</source>
<translation>Möglichst nebeneinander zeigen</translation>
</message>
<message>
- <location/>
<source>Always Show Side-by-Side</source>
<translation>Immer nebeneinander zeigen</translation>
</message>
<message>
- <location/>
<source>Always Start Full Help</source>
<translation>Stets Vollbild</translation>
</message>
<message>
- <location/>
<source>Show My Home Page</source>
<translation>Startseite zeigen</translation>
</message>
<message>
- <location/>
<source>Show a Blank Page</source>
<translation>Leere Seite zeigen</translation>
</message>
<message>
- <location/>
<source>Show My Tabs from Last Session</source>
<translation>Reiter aus letzter Sitzung zeigen</translation>
</message>
<message>
- <location/>
<source>Always Show Help in External Window</source>
<translation>Hilfe stets in separatem Fenster anzeigen</translation>
</message>
<message>
- <location/>
<source>Behaviour</source>
<translation>Verhalten</translation>
</message>
<message>
- <location/>
<source>Switch to editor context after last help page is closed.</source>
<translation>Nach Schließen der letzten Hilfeseite zum Editor schalten.</translation>
</message>
<message>
- <location/>
<source>Return to editor on closing the last page</source>
+ <translation type="obsolete">Nach Schließen der letzten Hilfeseite zum Editor schalten</translation>
+ </message>
+ <message>
+ <source>Return to editor on closing the last page</source>
<translation>Nach Schließen der letzten Hilfeseite zum Editor schalten</translation>
</message>
</context>
<context>
<name>GenericMakeStep</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.ui"/>
<source>Override %1:</source>
<translation>Ãœberschreibe %1:</translation>
</message>
<message>
- <location/>
<source>Make arguments:</source>
<translation>Kommandozeilenargumente für make:</translation>
</message>
<message>
- <location/>
<source>Targets:</source>
<translation>Ziele:</translation>
</message>
@@ -6349,17 +5191,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericBuildConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericbuildconfiguration.cpp" line="+153"/>
<source>Build</source>
<translation>Erstellen</translation>
</message>
<message>
- <location line="+23"/>
<source>New Configuration</source>
<translation>Neue Konfiguration</translation>
</message>
<message>
- <location line="+1"/>
<source>New configuration name:</source>
<translation>Name der neuen Konfiguration:</translation>
</message>
@@ -6367,17 +5206,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericBuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericproject.cpp" line="+482"/>
<source>Build directory:</source>
<translation>Build-Verzeichnis:</translation>
</message>
<message>
- <location line="+17"/>
<source>Tool chain:</source>
<translation>Toolchain:</translation>
</message>
<message>
- <location line="+8"/>
<source>Generic Manager</source>
<translation>Generische Verwaltung</translation>
</message>
@@ -6385,18 +5221,15 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericMakeStepConfigWidget</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="+233"/>
<source>Make</source>
<comment>GenericMakestep display name.</comment>
<translation>Make</translation>
</message>
<message>
- <location line="+6"/>
<source>Override %1:</source>
<translation>Ãœberschreibe %1:</translation>
</message>
<message>
- <location line="+29"/>
<source><b>Make:</b> %1 %2</source>
<translation><b>Make-Kommando:</b> %1 %2</translation>
</message>
@@ -6404,12 +5237,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericProjectWizard</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericprojectwizard.cpp" line="+109"/>
<source>Import Existing Project</source>
<translation>Import eines existierenden Projekts</translation>
</message>
<message>
- <location line="+2"/>
<source>Imports existing projects that do not use qmake or CMake. This allows you to use Qt Creator as a code editor.</source>
<translation>Importiert bereits existierende Projekte, die weder qmake noch CMake verwenden. Dadurch kann Qt Creator als Code-Editor benutzt werden.</translation>
</message>
@@ -6417,27 +5248,22 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GenericProjectManager::Internal::GenericProjectWizardDialog</name>
<message>
- <location line="-50"/>
<source>Import Existing Project</source>
<translation>Import eines existierenden Projekts</translation>
</message>
<message>
- <location line="+4"/>
<source>Project Name and Location</source>
<translation>Name und Ordner des Projekts</translation>
</message>
<message>
- <location line="+1"/>
<source>Project name:</source>
<translation>Projektname:</translation>
</message>
<message>
- <location line="+1"/>
<source>Location:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location line="+3"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
@@ -6445,105 +5271,89 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::CloneWizardPage</name>
<message>
- <location filename="../../../src/plugins/git/clonewizardpage.cpp" line="+62"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
<message>
- <location line="+1"/>
<source>Specify repository URL, checkout directory and path.</source>
<translation>Geben Sie Repository-URL und Pfad an.</translation>
</message>
<message>
- <location line="+1"/>
<source>Clone URL:</source>
<translation>Clone-URL:</translation>
</message>
<message>
- <location line="+1"/>
<source>Delete master branch</source>
<translation>Master-Branch löschen</translation>
</message>
+ <message>
+ <source>Delete the master branch after checking out the repository.</source>
+ <translation>Bewirkt, dass der Master-Branch nach Checkout des Repositories gelöscht wird.</translation>
+ </message>
</context>
<context>
<name>Git::Internal::BranchDialog</name>
<message>
- <location filename="../../../src/plugins/git/branchdialog.cpp" line="+88"/>
<source>Checkout</source>
<translation>Auschecken</translation>
</message>
<message>
- <location line="+3"/>
<source>Diff</source>
<translation>Diff</translation>
</message>
<message>
- <location line="+3"/>
<source>Log</source>
<translation>Log</translation>
</message>
<message>
- <location line="+3"/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+109"/>
<source>Delete Branch</source>
<translation>Branch löschen</translation>
</message>
<message>
- <location line="+0"/>
<source>Would you like to delete the branch '%1'?</source>
<translation>Möchten Sie den Branch '%1' löschen?</translation>
</message>
<message>
- <location line="+16"/>
<source>Failed to delete branch</source>
<translation>Das Löschen des Branches schlug fehl</translation>
</message>
<message>
- <location line="+17"/>
<source>Failed to create branch</source>
<translation>Das Erstellen des Branches schlug fehl</translation>
</message>
<message>
- <location line="+53"/>
<source>Failed to stash</source>
<translation>Die Operation 'stash' schlug fehl</translation>
</message>
<message>
- <location line="+6"/>
<source>Checkout failed</source>
<translation>Fehlschlag bei Checkout</translation>
</message>
<message>
- <location line="+33"/>
<source>Would you like to create a local branch '%1' tracking the remote branch '%2'?</source>
<translation>Möchten Sie einen lokalen Branch '%1' erstellen, der dem entfernten Branch '%2' folgt?</translation>
</message>
<message>
- <location line="+1"/>
<source>Create branch</source>
<translation>Branch erstellen</translation>
</message>
<message>
- <location line="+15"/>
<source>Failed to create a tracking branch</source>
<translation>Das Erstellen des Branches schlug fehl</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/branchdialog.ui"/>
<source>Branches</source>
<translation>Branches</translation>
</message>
<message>
- <location/>
<source>Remote Branches</source>
<translation>Nichtlokale Branches</translation>
</message>
@@ -6551,22 +5361,18 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::ChangeSelectionDialog</name>
<message>
- <location filename="../../../src/plugins/git/changeselectiondialog.cpp" line="+43"/>
<source>Select a Git Commit</source>
<translation>Wählen Sie einen Commit aus</translation>
</message>
<message>
- <location line="+22"/>
<source>Select Git Repository</source>
<translation>Wählen ein Git-Repository aus</translation>
</message>
<message>
- <location line="+17"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="+1"/>
<source>Selected directory is not a Git repository</source>
<translation>Das ausgewählte Verzeichnis ist kein Git-Repository</translation>
</message>
@@ -6574,12 +5380,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::CloneWizard</name>
<message>
- <location filename="../../../src/plugins/git/clonewizard.cpp" line="+55"/>
<source>Clones a Git repository and tries to load the contained project.</source>
<translation>Erstellt einen Clone eines Git-Repositories und versucht, das darin enthaltene Projekt zu laden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Git Repository Clone</source>
<translation>Git-Repository Clone</translation>
</message>
@@ -6587,75 +5391,60 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::GitClient</name>
<message>
- <location filename="../../../src/plugins/git/gitclient.cpp" line="+73"/>
<source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source>
<translatorcomment>Not used.</translatorcomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
<source>Unable to determine the repository for %1.</source>
<translation>Das Repository von %1 konnte nicht bestimmt werden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Unable to parse the file output.</source>
<translation>Die Ausgabe der Datei konnte nicht ausgewertet werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Waiting for data...</source>
<translation>Warte auf Daten...</translation>
</message>
<message>
- <location line="+75"/>
<source>Git Diff</source>
<translation>Git Diff</translation>
</message>
<message>
- <location line="+49"/>
<source>Git Diff %1</source>
<translation>Git Diff %1</translation>
</message>
<message>
- <location line="+17"/>
<source>Git Diff Branch %1</source>
<translation>Git Diff Branch %1</translation>
</message>
<message>
- <location line="+37"/>
<source>Git Log</source>
<translation>Git Log</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+25"/>
<source>Git Log %1</source>
<translation>Git Log %1</translation>
</message>
<message>
- <location line="+20"/>
<source>Cannot describe '%1'.</source>
<translation>Zur Änderung '%1' können keine Details angezeigt werden.</translation>
</message>
<message>
- <location line="+15"/>
<source>Git Show %1</source>
<translation>Git Show %1</translation>
</message>
<message>
- <location line="+36"/>
<source>Git Blame %1</source>
<translation>Git Blame %1</translation>
</message>
<message>
- <location line="+29"/>
<source>Unable to checkout %1 of %2: %3</source>
<extracomment>Meaning of the arguments: %1: Branch, %2: Repository, %3: Error message</extracomment>
<translation>Die Operation 'checkout' schlug für den Branch %1 des Repositories %2 fehl: %3</translation>
</message>
<message numerus="yes">
- <location line="+60"/>
<source>Unable to add %n file(s) to %1: %2</source>
<translation>
<numerusform>Keine der %n Dateien konnte zu %1 hinzugefügt werden: %2</numerusform>
@@ -6663,7 +5452,6 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message numerus="yes">
- <location line="+23"/>
<source>Unable to remove %n file(s) from %1: %2</source>
<translation>
<numerusform>Eine Datei konnte nicht aus dem Repository %1 entfernt werden: %2</numerusform>
@@ -6671,17 +5459,14 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message>
- <location line="+21"/>
<source>Unable to move from %1 to %2: %3</source>
<translation>Fehler beim Umbenennen von %1 zu %2: %3</translation>
</message>
<message>
- <location line="+33"/>
<source>Unable to reset %1: %2</source>
<translation>Das Repository %1 konnte nicht zurückgesetzt werden: %2</translation>
</message>
<message numerus="yes">
- <location line="+1"/>
<source>Unable to reset %n file(s) in %1: %2</source>
<translation>
<numerusform>Keine der %n Dateien in %1 konnte zurückgesetzt werden: %2</numerusform>
@@ -6689,91 +5474,74 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message>
- <location line="+56"/>
<source>Unable to checkout %1 of %2 in %3: %4</source>
<extracomment>Meaning of the arguments: %1: revision, %2: files, %3: repository, %4: Error message</extracomment>
<translation>Die Operation 'checkout' schlug für die Revision %1 von %2 im Repository %3 fehl: %4</translation>
</message>
<message>
- <location line="+17"/>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<extracomment>Failed to find parent revisions of a SHA1 for "annotate previous"</extracomment>
<translation>Die übergeordnete Revision von %1 im Repository %2 konnte nicht bestimmt werden: %3</translation>
</message>
<message>
- <location line="+5"/>
<source>Invalid revision</source>
<translation>Ungültige Revision</translation>
</message>
<message>
- <location line="+90"/>
<source>Unable to retrieve branch of %1: %2</source>
<translation>Der Branch des Repositories %1 kann nicht bestimmt werden: %2</translation>
</message>
<message>
- <location line="+22"/>
<source>Unable to retrieve top revision of %1: %2</source>
<translation>Der aktuelle Stand des Repositories %1 kann nicht bestimmt werden: %2</translation>
</message>
<message>
- <location line="+62"/>
<source>Unable to describe revision %1 in %2: %3</source>
<translation>Die Beschreibung der Revision %1 im Repository %2 kann nicht bestimmt werden: %3</translation>
</message>
<message>
- <location line="+45"/>
<source>Description:</source>
<translation>Beschreibung:</translation>
</message>
<message>
- <location line="+0"/>
<source>Stash Description</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location line="+96"/>
<source>Unable to run a 'git branch' command in %1: %2</source>
<translation>Das Kommando 'git branch' konnte nicht in %1 ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+22"/>
<source>Unable to run 'git show' in %1: %2</source>
<translation>Das Kommando 'git show' konnte in %1 nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+20"/>
<source>Unable to run 'git clean' in %1: %2</source>
<translation>Das Kommando 'git clean' konnte in %1 nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+23"/>
<source>There were warnings while applying %1 to %2:
%3</source>
<translation>Beim Anwenden der Patch-Datei %1 auf das Repository %2 traten Warnungen auf:
%3</translation>
</message>
<message>
- <location line="+2"/>
<source>Unable apply patch %1 to %2: %3</source>
<translation>Die Patch-Datei %1 konnte nicht auf das Repository %2 angewandt werden: %3</translation>
</message>
<message>
- <location line="+295"/>
<source>Cannot locate %1.</source>
<translation>%1 konnte nicht gefunden werden.</translation>
</message>
<message>
- <location line="+50"/>
<source>Unable to launch %1.</source>
<translation>%1 konnte nicht ausgeführt werden.</translation>
</message>
<message>
- <location line="+50"/>
<source>You did not checkout a branch.</source>
<translation>Es ist kein Branch vorhanden.</translation>
</message>
<message numerus="yes">
- <location line="+89"/>
<source>Amended %1 (%n file(s)).
</source>
<translation>
@@ -6782,83 +5550,67 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message>
- <location line="+1"/>
<source>Amended %1.</source>
<translation>Abgabe %1 geändert.</translation>
</message>
<message>
- <location line="+260"/>
<source>Git SVN Log</source>
<translation>Git SVN Log</translation>
</message>
<message>
- <location line="+48"/>
<source>Unable to restore stash %1: %2</source>
<translation>Der Stash %1 kann nicht wiederhergestellt werden: %2</translation>
</message>
<message>
- <location line="+2"/>
<source>Unable to restore stash %1 to branch %2: %3</source>
<translation>Der Stash %1 kann nicht im Branch %2 wiederhergestellt werden: %3</translation>
</message>
<message>
- <location line="+33"/>
<source>Unable to remove stashes of %1: %2</source>
<translation>Das Entfernen von Stashes aus dem Repository %1 schlug fehl: %2</translation>
</message>
<message>
- <location line="+2"/>
<source>Unable to remove stash %1 of %2: %3</source>
<translation>Das Entfernen des Stash %1 aus dem Repository %2 schlug fehl: %3</translation>
</message>
<message>
- <location line="+40"/>
<source>Unable retrieve stash list of %1: %2</source>
<translation>Die Liste der Stashes des Repositories %1 kann nicht bestimmt werden: %2</translation>
</message>
<message>
- <location line="+99"/>
<source>Unable to determine git version: %1</source>
<translation>Die verwendete git-Version konnte nicht bestimmt werden: %1</translation>
</message>
<message>
- <location line="-1089"/>
<source>Unable stash in %1: %2</source>
<translation>Die Operation 'stash' schlug in %1 fehl: %2</translation>
</message>
<message>
- <location line="+34"/>
<source>Unable to resolve stash message '%1' in %2</source>
<extracomment>Look-up of a stash via its descriptive message failed.</extracomment>
<translation>Es konnte kein Stash mit der Beschreibung '%1' im Repository %2 gefunden werden</translation>
</message>
<message>
- <location line="+281"/>
<source>Changes</source>
<translation>Änderungen</translation>
</message>
<message>
- <location line="+1"/>
<source>You have modified files. Would you like to stash your changes?</source>
<translation>Es wurden Dateien geändert. Möchten Sie stash ausführen?</translation>
</message>
<message>
- <location line="+55"/>
<source>Unable to obtain the status: %1</source>
<translation>Der Status konnte nicht abgefragt werden: %1</translation>
</message>
<message>
- <location line="+125"/>
<source>The repository %1 is not initialized yet.</source>
<translation>Das Repository ist noch nicht initialisiert.</translation>
</message>
<message>
- <location line="+74"/>
<source>Unable to retrieve the last commit data of the repository %1.</source>
<translation>Die Daten der letzten Abgabe im Repository %1 konnte nicht bestimmt werden.</translation>
</message>
<message numerus="yes">
- <location line="+32"/>
<source>Committed %n file(s).
</source>
<translation>
@@ -6867,7 +5619,6 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message numerus="yes">
- <location line="+67"/>
<source>Unable to commit %n file(s): %1
</source>
<translation>
@@ -6878,27 +5629,22 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message>
- <location line="+82"/>
<source>Revert</source>
<translation>Rückgängig machen</translation>
</message>
<message>
- <location line="+1"/>
<source>The file has been changed. Do you want to revert it?</source>
<translation>Die Datei wurde geändert. Möchten Sie die Änderungen rückgängig machen?</translation>
</message>
<message>
- <location line="+29"/>
<source>The file is not modified.</source>
<translation>Datei ungeändert.</translation>
</message>
<message>
- <location line="+48"/>
<source>The command 'git pull --rebase' failed, aborting rebase.</source>
<translation>Das Kommando 'git pull --rebase' schlug fehl, rebase-Operation wird abgebrochen.</translation>
</message>
<message>
- <location line="+55"/>
<source>There are no modified files.</source>
<translation>Es gibt keine geänderten Dateien.</translation>
</message>
@@ -6906,369 +5652,295 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::GitPlugin</name>
<message>
- <location filename="../../../src/plugins/git/gitplugin.cpp" line="+311"/>
<source>&Git</source>
<translation>&Git</translation>
</message>
<message>
- <location line="+6"/>
<source>Diff Current File</source>
<translation>Diff für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Diff "%1"</source>
<translation>Diff für "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+G,Alt+D</source>
<translation>Alt+G,Alt+D</translation>
</message>
<message>
- <location line="+4"/>
<source>Log File</source>
<translation>Log für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Log of "%1"</source>
<translation>Log für "%1"</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+G,Alt+L</source>
<translation>Alt+G,Alt+L</translation>
</message>
<message>
- <location line="+4"/>
<source>Blame</source>
<translation>Blame für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Blame for "%1"</source>
<translation>Blame für "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+G,Alt+B</source>
<translation>Alt+G,Alt+B</translation>
</message>
<message>
- <location line="+13"/>
<source>Alt+G,Alt+U</source>
<translation>Alt+G,Alt+U</translation>
</message>
<message>
- <location line="+4"/>
<source>Stage File for Commit</source>
<translation>Datei zu Commit hinzufügen (stage)</translation>
</message>
<message>
- <location line="+0"/>
<source>Stage "%1" for Commit</source>
<translation>"%1" zu Commit hinzufügen (stage)</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+G,Alt+A</source>
<translation>Alt+G,Alt+A</translation>
</message>
<message>
- <location line="+4"/>
<source>Unstage File from Commit</source>
<translation>Datei aus Commit entfernen (unstage)</translation>
</message>
<message>
- <location line="+0"/>
<source>Unstage "%1" from Commit</source>
<translation>"%1" aus Commit entfernen (unstage)</translation>
</message>
<message>
- <location line="+7"/>
<source>Diff Current Project</source>
<translation>Diff für Projekt</translation>
</message>
<message>
- <location line="+0"/>
<source>Diff Project "%1"</source>
<translation>Diff für Projekt "%1"</translation>
</message>
<message>
- <location line="+68"/>
<source>Stash Snapshot...</source>
<translation>Snapshot als Stash speichern...</translation>
</message>
<message>
- <location line="+42"/>
<source>Stashes...</source>
<translation>Stashes...</translation>
</message>
<message>
- <location line="+123"/>
<source>Would you like to revert 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>
- <location line="-225"/>
<source>Log Project</source>
<translation>Log für Projekt</translation>
</message>
<message>
- <location line="+0"/>
<source>Log Project "%1"</source>
<translation>Log für Projekt "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+G,Alt+K</source>
<translation>Alt+G,Alt+K</translation>
</message>
<message>
- <location line="+62"/>
<source>Stash</source>
<translation>Stash</translation>
</message>
<message>
- <location line="-3"/>
<source>Saves the current state of your work.</source>
<translation>Sichert den gegenwärtigen Arbeitsstand.</translation>
</message>
<message>
- <location line="-96"/>
<source>Undo Unstaged Changes</source>
<translation>Nicht bereitgestellte Änderungen rückgängig machen</translation>
</message>
<message>
- <location line="+0"/>
<source>Undo Unstaged Changes for "%1"</source>
<translation>Nicht bereitgestellte Änderungen in "%1" rückgängig machen</translation>
</message>
<message>
- <location line="+6"/>
<source>Undo Uncommitted Changes</source>
<translation>Nicht eingetragene Änderungen rückgängig machen</translation>
</message>
<message>
- <location line="+0"/>
<source>Undo Uncommitted Changes for "%1"</source>
<translation>Nicht eingetragene Änderungen in "%1" rückgängig machen</translation>
</message>
<message>
- <location line="+35"/>
<source>Clean Project...</source>
<translation>Projekt bereinigen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Clean Project "%1"...</source>
<translation>Projekt "%1" bereinigen...</translation>
</message>
<message>
- <location line="+7"/>
<source>Diff Repository</source>
<translation>Diff des Repositories</translation>
</message>
<message>
- <location line="+4"/>
<source>Repository Status</source>
<translation>Status des Repositories</translation>
</message>
<message>
- <location line="+4"/>
<source>Log Repository</source>
<translation>Log des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Apply Patch</source>
<translation>Patch anwenden</translation>
</message>
<message>
- <location line="+0"/>
<source>Apply "%1"</source>
<translation>Patch "%1"anwenden</translation>
</message>
<message>
- <location line="+8"/>
<source>Apply Patch...</source>
<translation>Patch anwenden...</translation>
</message>
<message>
- <location line="+4"/>
<source>Undo Repository Changes</source>
<translation>Änderungen des Repositories rückgängig machen</translation>
</message>
<message>
- <location line="+3"/>
<source>Create Repository...</source>
<translation>Repository erzeugen...</translation>
</message>
<message>
- <location line="+6"/>
<source>Clean Repository...</source>
<translation>Repository bereinigen...</translation>
</message>
<message>
- <location line="+4"/>
<source>Launch gitk</source>
<translation>gitk starten</translation>
</message>
<message>
- <location line="+14"/>
<source>Saves the current state of your work and resets the repository.</source>
<translation>Speichert den gegenwärtigen Stand der Arbeit und setzt das Repository zurück.</translation>
</message>
<message>
- <location line="+7"/>
<source>Pull</source>
<translation>Pull</translation>
</message>
<message>
- <location line="+4"/>
<source>Stash Pop</source>
<translation>Stash Pop</translation>
</message>
<message>
- <location line="+2"/>
<source>Restores changes saved to the stash list using "Stash".</source>
<translation>Stellt den gesicherten Zustand von "Stash" wieder her.</translation>
</message>
<message>
- <location line="+3"/>
<source>Commit...</source>
<translation>Commit...</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+G,Alt+C</source>
<translation>Alt+G,Alt+C</translation>
</message>
<message>
- <location line="+3"/>
<source>Amend Last Commit...</source>
<translation>Letzte Abgabe ändern</translation>
</message>
<message>
- <location line="+4"/>
<source>Push</source>
<translation>Push</translation>
</message>
<message>
- <location line="+6"/>
<source>Branches...</source>
<translation>Branches...</translation>
</message>
<message>
- <location line="+7"/>
<source>Show Commit...</source>
<translation>Commit anzeigen...</translation>
</message>
<message>
- <location line="+8"/>
<source>Subversion</source>
<translation>Subversion</translation>
</message>
<message>
- <location line="+4"/>
<source>Log</source>
<translation>Log</translation>
</message>
<message>
- <location line="+239"/>
<source>Closing Git Editor</source>
<translation>Git-Editor schließen</translation>
</message>
<message>
- <location line="+120"/>
<source>Repository Clean</source>
<translation>Repository bereinigt</translation>
</message>
<message>
- <location line="+66"/>
<source>Choose Patch</source>
<translation>Patch-Datei auswählen</translation>
</message>
<message>
- <location line="-472"/>
- <location line="+51"/>
<source>Fetch</source>
<translation>Fetch</translation>
</message>
<message>
- <location line="+17"/>
<source>Commit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location line="+5"/>
<source>Diff Selected Files</source>
<translation>Diff für Auswahl</translation>
</message>
<message>
- <location line="+3"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+3"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+79"/>
<source>Revert</source>
<translation>Rückgängig machen</translation>
</message>
<message>
- <location line="+38"/>
<source>Another submit is currently being executed.</source>
<translation>Another submit is currently being executed.</translation>
</message>
<message>
- <location line="+28"/>
<source>Cannot create temporary file: %1</source>
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="+25"/>
<source>Amend %1</source>
<translation>Abgabe %1 ändern</translation>
</message>
<message>
- <location line="+0"/>
<source>Git Commit</source>
<translation>Git Commit</translation>
</message>
<message>
- <location line="+38"/>
<source>Do you want to commit the change?</source>
<translation>Möchten Sie den Commit ausführen?</translation>
</message>
<message>
- <location line="+1"/>
<source>The commit message check failed. Do you want to commit the change?</source>
<translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie den Commit trotzdem ausführen?</translation>
</message>
<message>
- <location line="+113"/>
<source>Unable to retrieve file list</source>
<translation>Die Dateiliste konnte nicht bestimmt werden</translation>
</message>
<message>
- <location line="+6"/>
<source>The repository is clean.</source>
<translation>Das Repository wurde bereits bereinigt.</translation>
</message>
<message>
- <location line="+63"/>
<source>Patches (*.patch *.diff)</source>
<translation>Patch-Dateien (*.patch *.diff)</translation>
</message>
<message>
- <location line="+12"/>
<source>Patch %1 successfully applied to %2</source>
<translation>Die Patch-Datei %1 wurde erfolgreich auf das Repository %2 angewandt</translation>
</message>
@@ -7276,7 +5948,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::GitSettings</name>
<message>
- <location filename="../../../src/plugins/git/gitsettings.cpp" line="+140"/>
<source>The binary '%1' could not be located in the path '%2'</source>
<translation>Die ausführbare Datei '%1' konnte nicht im Pfad '%2' gefunden werden</translation>
</message>
@@ -7284,42 +5955,34 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::GitSubmitPanel</name>
<message>
- <location filename="../../../src/plugins/git/gitsubmitpanel.ui"/>
<source>General Information</source>
<translation>Allgemeine Informationen</translation>
</message>
<message>
- <location/>
<source>Repository:</source>
<translation>Repository:</translation>
</message>
<message>
- <location/>
<source>repository</source>
<translation>repository</translation>
</message>
<message>
- <location/>
<source>Branch:</source>
<translation>Branch:</translation>
</message>
<message>
- <location/>
<source>branch</source>
<translation>branch</translation>
</message>
<message>
- <location/>
<source>Commit Information</source>
<translation>Informationen zu Commit</translation>
</message>
<message>
- <location/>
<source>Author:</source>
<translation>Autor:</translation>
</message>
<message>
- <location/>
<source>Email:</source>
<translation>E-Mail-Adresse:</translation>
</message>
@@ -7327,12 +5990,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::LocalBranchModel</name>
<message>
- <location filename="../../../src/plugins/git/branchmodel.cpp" line="+194"/>
<source><New branch></source>
<translation><Neuer Branch></translation>
</message>
<message>
- <location line="+1"/>
<source>Type to create a new branch</source>
<translation>Geben Sie den Namen des neuen Branches ein</translation>
</message>
@@ -7340,102 +6001,82 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Git::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/git/settingspage.cpp" line="+131"/>
<source>Git</source>
<translation>Git</translation>
</message>
<message>
- <location line="+21"/>
<source>Git Settings</source>
<translation>Git-Einstellungen</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/settingspage.ui"/>
<source>PATH:</source>
<translation>Pfad-Variable:</translation>
</message>
<message>
- <location/>
<source><b>Note:</b></source>
<translation><b>Hinweis:</b></translation>
</message>
<message>
- <location/>
<source>Git needs to find Perl in the environment as well.</source>
<translation>Git benötigt Perl.</translation>
</message>
<message>
- <location/>
<source>Log commit display count:</source>
<translation>Log-Anzeige beschränken auf:</translation>
</message>
<message>
- <location/>
<source>Note that huge amount of commits might take some time.</source>
<translation>Beachten Sie, dass eine hohe Anzahl lange Wartezeiten hervorrufen kann.</translation>
</message>
<message>
- <location/>
<source>Omit date from annotation output</source>
<translation>Datum in Annotation weglassen</translation>
</message>
<message>
- <location/>
<source>Miscellaneous</source>
<translation>Sonstige Einstellungen</translation>
</message>
<message>
- <location/>
<source>Timeout:</source>
<translation>Zeitlimit:</translation>
</message>
<message>
- <location/>
<source>s</source>
<translation>s</translation>
</message>
<message>
- <location/>
<source>Prompt on submit</source>
<translation>Abgabe bestätigen</translation>
</message>
<message>
- <location/>
<source>Ignore whitespace changes in annotation</source>
<translation>Änderungen der Leerzeichen bei Annotation weglassen</translation>
</message>
<message>
- <location/>
<source>Use "patience diff" algorithm</source>
<translation>"patience diff"-Algorithmus verwenden</translation>
</message>
<message>
- <location/>
<source>Pull with rebase</source>
<translation>pull mit rebase</translation>
</message>
<message>
- <location/>
<source>Environment Variables</source>
<translation>Umgebungsvariablen</translation>
</message>
<message>
- <location/>
<source>From System</source>
<translation>Vom System</translation>
</message>
<message>
- <location/>
<source>Set "HOME" environment variable</source>
<translation>Umgebungsvariable "HOME" setzen</translation>
</message>
<message>
- <location/>
<source>Gitk</source>
<translation>Gitk</translation>
</message>
<message>
- <location/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
@@ -7443,7 +6084,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>GitCommand</name>
<message>
- <location filename="../../../src/plugins/git/gitcommand.cpp" line="+58"/>
<source>
'%1' failed (exit code %2).
</source>
@@ -7452,7 +6092,6 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message>
- <location line="+1"/>
<source>
'%1' completed (exit code %2).
</source>
@@ -7464,17 +6103,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::Gitorious</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitorious.cpp" line="+471"/>
<source>Error parsing reply from '%1': %2</source>
<translation>Fehler beim Auswerten der Antwort von '%1': %2</translation>
</message>
<message>
- <location line="+45"/>
<source>Request failed for '%1': %2</source>
<translation>Die Anforderung '%1' schlug fehl: %2</translation>
</message>
<message>
- <location line="+80"/>
<source>Open source projects that use Git.</source>
<translation>Open-Source-Projekte, die git verwenden</translation>
</message>
@@ -7482,12 +6118,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::GitoriousCloneWizard</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitoriousclonewizard.cpp" line="+83"/>
<source>Clones a Gitorious repository and tries to load the contained project.</source>
<translation>Erstellt einen Clone eines Gitorious-Repositories und versucht, das darin enthaltene Projekt zu laden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Gitorious Repository Clone</source>
<translation>Gitorious-Repository Clone</translation>
</message>
@@ -7495,27 +6129,22 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::GitoriousHostWidget</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.ui"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitorioushostwidget.cpp" line="+86"/>
<source><New Host></source>
<translation><Neuer Server></translation>
</message>
<message>
- <location line="+18"/>
<source>Host</source>
<translation>Server</translation>
</message>
<message>
- <location line="+0"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+0"/>
<source>Description</source>
<translation>Beschreibung</translation>
</message>
@@ -7523,12 +6152,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::GitoriousHostWizardPage</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitorioushostwizardpage.cpp" line="+76"/>
<source>Host</source>
<translation>Server</translation>
</message>
<message>
- <location line="+1"/>
<source>Select a host.</source>
<translation>Wählen Sie einen Server aus.</translation>
</message>
@@ -7536,27 +6163,22 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::GitoriousProjectWidget</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location/>
<source>Keep updating</source>
<translation>Liste weiter ergänzen</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwidget.cpp" line="+81"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location line="+0"/>
<source>Description</source>
<translation>Beschreibung</translation>
</message>
@@ -7564,12 +6186,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::GitoriousProjectWizardPage</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp" line="+53"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location line="+5"/>
<source>Choose a project from '%1'</source>
<translation>Wählen Sie ein Projekt von '%1'.</translation>
</message>
@@ -7577,57 +6197,46 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Gitorious::Internal::GitoriousRepositoryWizardPage</name>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp" line="+82"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+0"/>
<source>Owner</source>
<translation>Verwalter</translation>
</message>
<message>
- <location line="+0"/>
<source>Description</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location line="+19"/>
<source>Repository</source>
<translation>Repository</translation>
</message>
<message>
- <location line="+55"/>
<source>Choose a repository of the project '%1'.</source>
<translation>Wählen Sie ein Repository des Projekts '%1'.</translation>
</message>
<message>
- <location line="+9"/>
<source>Mainline Repositories</source>
<translation>Mainline-Repositories</translation>
</message>
<message>
- <location line="+0"/>
<source>Clones</source>
<translation>Clones</translation>
</message>
<message>
- <location line="+0"/>
<source>Baseline Repositories</source>
<translation>Baseline-Repositories</translation>
</message>
<message>
- <location line="+0"/>
<source>Shared Project Repositories</source>
<translation>Shared Project Repositories</translation>
</message>
<message>
- <location line="+0"/>
<source>Personal Repositories</source>
<translation>Persönliche Repositories</translation>
</message>
@@ -7635,32 +6244,26 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>HelloWorld::Internal::HelloWorldPlugin</name>
<message>
- <location filename="../../../src/plugins/helloworld/helloworldplugin.cpp" line="+84"/>
<source>Say "&Hello World!"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>&Hello World</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
<source>Hello world!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Hello World PushButton!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
<source>Hello World!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
<source>Hello World! Beautiful day today, isn't it?</source>
<translation type="unfinished"></translation>
</message>
@@ -7668,12 +6271,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>HelloWorld::Internal::HelloWorldWindow</name>
<message>
- <location filename="../../../src/plugins/helloworld/helloworldwindow.cpp" line="+41"/>
<source>Focus me to activate my context!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Hello, world!</source>
<translation type="unfinished"></translation>
</message>
@@ -7681,7 +6282,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::CentralWidget</name>
<message>
- <location filename="../../../src/plugins/help/centralwidget.cpp" line="+237"/>
<source>Print Document</source>
<translation>Dokument drucken</translation>
</message>
@@ -7689,17 +6289,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::DocSettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/docsettingspage.cpp" line="+54"/>
<source>Documentation</source>
<translation>Dokumentation</translation>
</message>
<message>
- <location line="+45"/>
<source>Add Documentation</source>
<translation>Dokumentation hinzufügen</translation>
</message>
<message>
- <location line="+0"/>
<source>Qt Help Files (*.qch)</source>
<translation>Qt-Hilfedateien (*.qch)</translation>
</message>
@@ -7707,32 +6304,26 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::FilterSettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/filtersettingspage.cpp" line="+55"/>
<source>Filters</source>
<translation>Filter</translation>
</message>
<message>
- <location line="+51"/>
<source>Unfiltered</source>
<translation>Ungefiltert</translation>
</message>
<message>
- <location line="+152"/>
<source>No user defined filters available or no filter selected.</source>
<translation>Es sind keine benutzerdefinierten Filter vorhanden beziehungsweise ausgewählt.</translation>
</message>
<message>
- <location line="+4"/>
<source>The filter "%1" will show every documentation file available, as no attributes are specified.</source>
<translation>Das Filter "%1" wird die alle vorhandenen Dokumentationen anzeigen, da keine Attribute angegeben wurden.</translation>
</message>
<message>
- <location line="+4"/>
<source>The filter "%1" will only show documentation files that have the attribute %2 specified.</source>
<translation>Das Filter "%1" wird die Dokumentationsdateien anzeigen, die über das Attribut %2 verfügen.</translation>
</message>
<message>
- <location line="+4"/>
<source>The filter "%1" will only show documentation files that have the attributes %2 specified.</source>
<translation>Das Filter "%1" wird die Dokumentationsdateien anzeigen, die über eines der Attribute %2 verfügen.</translation>
</message>
@@ -7740,28 +6331,22 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::GeneralSettingsPage</name>
<message>
- <location filename="../../../src/plugins/help/generalsettingspage.cpp" line="+72"/>
<source>General Settings</source>
<translation>Allgemeine Einstellungen</translation>
</message>
<message>
- <location line="+163"/>
<source>Import Bookmarks</source>
<translation>Lesezeichen importieren</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+22"/>
<source>Files (*.xbel)</source>
<translation>XBEL-Dateien (*.xbel)</translation>
</message>
<message>
- <location line="-8"/>
<source>There was an error while importing bookmarks!</source>
<translation>Beim Importieren der Lesezeichen trat ein Fehler auf.</translation>
</message>
<message>
- <location line="+7"/>
<source>Save File</source>
<translation>Datei speichern</translation>
</message>
@@ -7769,7 +6354,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::HelpIndexFilter</name>
<message>
- <location filename="../../../src/plugins/help/helpindexfilter.cpp" line="+60"/>
<source>Help Index</source>
<translation>Hilfe - Index</translation>
</message>
@@ -7777,7 +6361,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::HelpMode</name>
<message>
- <location filename="../../../src/plugins/help/helpmode.cpp" line="+41"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
@@ -7785,166 +6368,130 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::HelpPlugin</name>
<message>
- <location filename="../../../src/plugins/help/helpplugin.cpp" line="+99"/>
<source>Contents</source>
<translation>Inhalt</translation>
</message>
<message>
- <location line="-1"/>
<source>Index</source>
<translation>Index</translation>
</message>
<message>
- <location line="+3"/>
<source>Search</source>
<translation>Suche</translation>
</message>
<message>
- <location line="-1"/>
<source>Bookmarks</source>
<translation>Lesezeichen</translation>
</message>
<message>
- <location line="+89"/>
- <location line="+745"/>
<source>Home</source>
<translation>Startseite</translation>
</message>
<message>
- <location line="-739"/>
- <location line="+743"/>
<source>Previous Page</source>
<translation>Vorangehender Seite</translation>
</message>
<message>
- <location line="-735"/>
- <location line="+742"/>
<source>Next Page</source>
<translation>Nächste Seite</translation>
</message>
<message>
- <location line="-689"/>
<source>Increase Font Size</source>
<translation>Schrift vergrößern</translation>
</message>
<message>
- <location line="+3"/>
<source>Ctrl++</source>
<translation>Ctrl++</translation>
</message>
<message>
- <location line="+4"/>
<source>Decrease Font Size</source>
<translation>Schrift verkleinern</translation>
</message>
<message>
- <location line="+3"/>
<source>Ctrl+-</source>
<translation>Ctrl+-</translation>
</message>
<message>
- <location line="+4"/>
<source>Reset Font Size</source>
<translation>Schriftgröße zurücksetzen</translation>
</message>
<message>
- <location line="+4"/>
<source>Ctrl+0</source>
<translation>Ctrl+0</translation>
</message>
<message>
- <location line="+25"/>
<source>Alt+Tab</source>
<translation>Alt+Tab</translation>
</message>
<message>
- <location line="+1"/>
<source>Alt+Shift+Tab</source>
<translation>Alt+Shift+Tab</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Tab</source>
<translation>Ctrl+Tab</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+Shift+Tab</source>
<translation>Ctrl+Shift+Tab</translation>
</message>
<message>
- <location line="+140"/>
<source>Activate Search in Help mode</source>
<translation>Suche im Modus "Hilfe" aktivieren</translation>
</message>
<message>
- <location line="+15"/>
<source>Activate Bookmarks in Help mode</source>
<translation>Lesezeichen im Modus "Hilfe" aktivieren</translation>
</message>
<message>
- <location line="+8"/>
<source>Open Pages</source>
<translation>Offene Seiten</translation>
</message>
<message>
- <location line="+4"/>
<source>Activate Open Pages in Help mode</source>
<translation>Offene Seiten im Hilfsmodus aktivieren</translation>
</message>
<message>
- <location line="+60"/>
<source>Go to Help Mode</source>
<translation>Schalte in Hilfsmodus</translation>
</message>
<message>
- <location line="+4"/>
<source>Previous</source>
<translation>Vorige</translation>
</message>
<message>
- <location line="+383"/>
<source>Close current page</source>
<translation>Diese Seite schließen</translation>
</message>
<message>
- <location line="-381"/>
<source>Next</source>
<translation>Nächste</translation>
</message>
<message>
- <location line="-323"/>
- <location line="+739"/>
<source>Add Bookmark</source>
<translation>Lesezeichen hinzufügen</translation>
</message>
<message>
- <location line="-721"/>
<source>Context Help</source>
<translation>Kontexthilfe</translation>
</message>
<message>
- <location line="+184"/>
<source>Activate Index in Help mode</source>
<translation>Index im Modus "Hilfe" zeigen</translation>
</message>
<message>
- <location line="+14"/>
<source>Activate Contents in Help mode</source>
<translation>Inhalt im Modus "Hilfe" zeigen</translation>
</message>
<message>
- <location line="+85"/>
<source>Unfiltered</source>
<translation>Kein</translation>
</message>
<message>
- <location line="+323"/>
<source><html><head><title>No Documentation</title></head><body><br/><center><b>%1</b><br/>No documentation available.</center></body></html></source>
<translation><html><head><title>Dokumentation fehlt</title></head><body><br/><center><b>%1</b><br/>Es ist keine Dokumentation verfügbar.</center></body></html></translation>
</message>
<message>
- <location line="+64"/>
<source>Filtered by:</source>
<translation>Filter:</translation>
</message>
@@ -7952,37 +6499,30 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::SearchWidget</name>
<message>
- <location filename="../../../src/plugins/help/searchwidget.cpp" line="+173"/>
<source>Indexing</source>
<translation>Indizierung</translation>
</message>
<message>
- <location line="+2"/>
<source>Indexing Documentation...</source>
<translation>Indiziere Dokumentation...</translation>
</message>
<message>
- <location line="+52"/>
<source>Open Link</source>
<translation>Verweis öffnen</translation>
</message>
<message>
- <location line="+1"/>
<source>Open Link as New Page</source>
<translation>Verweis in neuer Seite öffnen</translation>
</message>
<message>
- <location line="+1"/>
<source>Copy Link</source>
<translation>Verweis kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Reload</source>
<translation>Neu laden</translation>
</message>
@@ -7990,12 +6530,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Help::Internal::XbelReader</name>
<message>
- <location filename="../../../src/plugins/help/xbelsupport.cpp" line="+119"/>
<source>The file is not an XBEL version 1.0 file.</source>
<translation>Die Datei ist keine XBEL-Datei der Version 1.0.</translation>
</message>
<message>
- <location line="+73"/>
<source>Unknown title</source>
<translation>Unbekannter Titel</translation>
</message>
@@ -8003,12 +6541,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>HelpViewer</name>
<message>
- <location filename="../../../src/plugins/help/helpviewer.cpp" line="+51"/>
<source><title>about:blank</title></source>
<translation><title>about:blank</title></translation>
</message>
<message>
- <location line="+3"/>
<source><title>Error 404...</title><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'%1'</h3></div></source>
<translation><title>Fehler 404...</title><div align="center"><br><br><h1>Die Seite konnte nicht gefunden werden</h1><br><h3>'%1'</h3></div></translation>
</message>
@@ -8016,17 +6552,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>IndexWindow</name>
<message>
- <location filename="../../../src/shared/help/indexwindow.cpp" line="+68"/>
<source>&Look for:</source>
<translation>&Suche nach:</translation>
</message>
<message>
- <location line="+77"/>
<source>Open Link</source>
<translation>Adresse öffnen</translation>
</message>
<message>
- <location line="+1"/>
<source>Open Link as New Page</source>
<translation>Verweis in neuer Seite öffnen</translation>
</message>
@@ -8034,12 +6567,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Locator</name>
<message>
- <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
<source>Filters</source>
<translation>Filter</translation>
</message>
<message>
- <location line="+2"/>
<source>Locator</source>
<translation>Locator</translation>
</message>
@@ -8047,174 +6578,140 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>MainWindow</name>
<message>
- <location filename="../../../src/tools/qml/standalone/mainwindow.cpp" line="+193"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
- <location line="-45"/>
<source>Ctrl+O</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-57"/>
<source>Bauhaus</source>
<comment>MainWindowClass</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
<source>&File</source>
<translation>&Datei</translation>
</message>
<message>
- <location line="+3"/>
<source>&New...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
<source>&Open...</source>
<translation>&Öffnen...</translation>
</message>
<message>
- <location line="+5"/>
<source>Recent Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
<source>&Save</source>
<translation>&Speichern</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
<source>Save &As...</source>
<translation>Speichern &unter...</translation>
</message>
<message>
- <location line="+7"/>
<source>&Preview</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+8"/>
<source>&Preview with Debug</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
<source>&Quit</source>
<translation>&Beenden</translation>
</message>
<message>
- <location line="+6"/>
<source>&Edit</source>
<translation>&Bearbeiten</translation>
</message>
<message>
- <location line="+5"/>
<source>Ctrl+Z</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
<source>Ctrl+Y</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+Z</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
<source>&Copy</source>
<translation>&Kopieren</translation>
</message>
<message>
- <location line="+6"/>
<source>&Cut</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
<source>&Paste</source>
<translation>&Einfügen</translation>
</message>
<message>
- <location line="+6"/>
<source>&Delete</source>
<translation>&Löschen</translation>
</message>
<message>
- <location line="+2"/>
<source>Del</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
<source>Backspace</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
<source>&View</source>
<translation>&Ansicht</translation>
</message>
<message>
- <location line="+59"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <location line="+4"/>
<source>&About...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+51"/>
<source>Properties</source>
<translation>Eigenschaften</translation>
</message>
<message>
- <location line="+94"/>
<source>Could not open file <%1></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
<source>Qml Errors:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>
%1 %2:%3 - %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
<source>
%1:%2 - %3</source>
<translation type="unfinished"></translation>
@@ -8223,12 +6720,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.ui"/>
<source>Override %1:</source>
<translation>Ãœberschreibe %1:</translation>
</message>
<message>
- <location/>
<source>Make arguments:</source>
<translation>Kommandozeilenargumente für make:</translation>
</message>
@@ -8236,218 +6731,175 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>MimeType</name>
<message>
- <location filename="mime_tr.h" line="+1"/>
<source>CMake Project file</source>
<translation>CMake-Projektdatei</translation>
</message>
<message>
- <location line="+1"/>
<source>C Source file</source>
<translation>C-Quelldatei</translation>
</message>
<message>
- <location line="+1"/>
<source>C Header file</source>
<translation>C-Header-Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>C++ Header file</source>
<translation>C++-Header-Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>C++ header</source>
<translation>C++ Header-Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>C++ Source file</source>
<translation>C++-Quelldatei</translation>
</message>
<message>
- <location line="+1"/>
<source>C++ source code</source>
<translation>C++-Quelldatei</translation>
</message>
<message>
- <location line="+1"/>
<source>Objective-C source code</source>
<translation>Objective-C-Quelldatei</translation>
</message>
<message>
- <location line="+1"/>
<source>CVS submit template</source>
<translation>CVS submit template</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Designer file</source>
<translation>Qt-Designer-Datei</translation>
</message>
<message>
- <location line="+19"/>
<source>QML file</source>
<translation>QML-Datei</translation>
</message>
<message>
- <location line="-18"/>
<source>Generic Qt Creator Project file</source>
<translation>Allgemeine Qt-Creator-Projektdatei</translation>
</message>
<message>
- <location line="+4"/>
<source>BMP image</source>
<translation>BMP-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>GIF image</source>
<translation>GIF-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>ICO image</source>
<translation>ICO-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>JPEG image</source>
<translation>JPEG-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>MNG video</source>
<translation>MNG-Videodatei</translation>
</message>
<message>
- <location line="+1"/>
<source>PBM image</source>
<translation>PBM-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>PGM image</source>
<translation>PGM-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>PNG image</source>
<translation>PNG-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>PPM image</source>
<translation>PPM-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>SVG image</source>
<translation>SVG-Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>TIFF image</source>
<translation>TIFF-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>XBM image</source>
<translation>XBM-Bilddatei</translation>
</message>
<message>
- <location line="+1"/>
<source>XPM image</source>
<translation>XPM-Bilddatei</translation>
</message>
<message>
- <location line="-15"/>
<source>Generic Project Files</source>
<translation>Allgemeine Projektdateien</translation>
</message>
<message>
- <location line="+1"/>
<source>Generic Project Include Paths</source>
<translation>Include-Pfade für allgemeines Projekt</translation>
</message>
<message>
- <location line="+1"/>
<source>Generic Project Configuration File</source>
<translation>Projekt-Konfigurationsdatei für allgemeine Projekte</translation>
</message>
<message>
- <location line="+14"/>
<source>Perforce submit template</source>
<translation>Perforce submit template</translation>
</message>
<message>
- <location line="+3"/>
<source>QML Project file</source>
<oldsource>Qml Project file</oldsource>
<translation>QML-Projektdatei</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Project file</source>
<translation>Qt-Projektdatei</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Project include file</source>
<translation>Qt-Projekt-Include-Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Project feature file</source>
<translation>Qt-Projekt-Feature-Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>message catalog</source>
<translation>Meldungsdatei</translation>
</message>
<message>
- <location line="-5"/>
<source>Qt Script file</source>
<translation>Qt-Skript-Datei</translation>
</message>
<message>
- <location line="+6"/>
<source>Qt Resource file</source>
<translation>Qt-Ressourcendatei</translation>
</message>
<message>
- <location line="+1"/>
<source>Subversion submit template</source>
<translation>Subversion submit template</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Creator task list file</source>
- <translation type="unfinished"></translation>
+ <translation>Qt Creator Task-Liste</translation>
</message>
<message>
- <location line="+1"/>
<source>Plain text document</source>
<translation>Textdatei</translation>
</message>
<message>
- <location line="+1"/>
<source>XML document</source>
<translation>XML-Dokument</translation>
</message>
<message>
- <location line="+1"/>
<source>Assembler</source>
<translation>Assembler</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Creator Generic Assembler</source>
<translation>Generischer Assembler (Qt-Creator)</translation>
</message>
<message>
- <location line="+1"/>
<source>Differences between files</source>
<translation>Vergleichsergebnis</translation>
</message>
@@ -8455,9 +6907,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>MyMain</name>
<message>
- <location filename="../../../src/libs/aggregation/examples/text/main.cpp" line="+57"/>
- <location line="+1"/>
- <location line="+1"/>
<source>N/A</source>
<translation type="unfinished"></translation>
</message>
@@ -8465,183 +6914,130 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>NameDemanglerPrivate</name>
<message>
- <location filename="../../../src/plugins/debugger/name_demangler.cpp" line="+331"/>
<source>Premature end of input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+90"/>
<source>Invalid encoding</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+54"/>
<source>Invalid name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+40"/>
- <location line="+9"/>
<source>Invalid nested-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+111"/>
- <location line="+8"/>
<source>Invalid template args</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
- <location line="+8"/>
<source>Invalid template-param</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
<source>Invalid qualifiers: unexpected 'volatile'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
<source>Invalid qualifiers: 'const' appears twice</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
<source>Invalid non-negative number</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
- <location line="+9"/>
- <location line="+2"/>
<source>Invalid template-arg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
- <location line="+15"/>
- <location line="+43"/>
<source>Invalid expression</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
<source>Invalid primary expression</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
- <location line="+5"/>
- <location line="+3"/>
<source>Invalid expr-primary</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+135"/>
- <location line="+5"/>
- <location line="+68"/>
<source>Invalid type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+138"/>
<source>Invalid built-in type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Invalid builtin-type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <location line="+8"/>
<source>Invalid function type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+80"/>
- <location line="+328"/>
<source>Invalid unqualified-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-237"/>
<source>Invalid operator-name '%s'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <location line="+10"/>
<source>Invalid array-type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
<source>Invalid pointer-to-member-type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+47"/>
- <location line="+10"/>
- <location line="+36"/>
<source>Invalid substitution</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
<source>Invalid substitution: element %1 was requested, but there are only %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
<source>Invalid substitution: There are no elements</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+103"/>
<source>Invalid special-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+43"/>
- <location line="+4"/>
- <location line="+13"/>
<source>Invalid local-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
<source>Invalid discriminator</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
- <location line="+11"/>
- <location line="+4"/>
<source>Invalid ctor-dtor-name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+48"/>
- <location line="+3"/>
<source>Invalid call-offset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
<source>Invalid v-offset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
<source>Invalid digit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
<source>At position %1: </source>
<translation type="unfinished"></translation>
</message>
@@ -8649,7 +7045,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>NickNameDialog</name>
<message>
- <location filename="../../../src/plugins/vcsbase/nicknamedialog.ui"/>
<source>Nicknames</source>
<translation type="unfinished"></translation>
</message>
@@ -8657,57 +7052,46 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>OpenWith::Editors</name>
<message>
- <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+107"/>
<source>Plain Text Editor</source>
<translation>Texteditor</translation>
</message>
<message>
- <location filename="../../../src/plugins/bineditor/bineditorconstants.h" line="+37"/>
<source>Binary Editor</source>
<translation>Binäreditor</translation>
</message>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+40"/>
<source>C++ Editor</source>
<translation>C++-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+48"/>
<source>.pro File Editor</source>
<translation>.pro-Dateieditor</translation>
</message>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericprojectconstants.h" line="+47"/>
<source>.files Editor</source>
<translation>.files-Dateieditor</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditorconstants.h" line="+48"/>
<source>QMLJS Editor</source>
<translation>QMLJS-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectconstants.h" line="+47"/>
<source>.qmlproject Editor</source>
<translation>.qmlproject-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/externaleditors.cpp" line="+102"/>
<source>Qt Designer</source>
<translation>Qt Designer</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Linguist</source>
<translation>Qt Linguist</translation>
</message>
<message>
- <location filename="../../../src/plugins/resourceeditor/resourceeditorconstants.h" line="+38"/>
<source>Resource Editor</source>
<translation>Ressourceneditor</translation>
</message>
<message>
- <location filename="../../../src/plugins/imageviewer/imageviewerconstants.h" line="+38"/>
<source>Image Viewer</source>
<translation>Bildbetrachter</translation>
</message>
@@ -8715,12 +7099,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>OpenWithDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.ui"/>
<source>Open File With...</source>
<translation>Öffne Datei mit...</translation>
</message>
<message>
- <location/>
<source>Open file extension with:</source>
<translation>Öffne Endung mit:</translation>
</message>
@@ -8728,17 +7110,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>PasteBinComSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cpaster/pastebindotcomsettings.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Server prefix:</source>
<translation>Server-Präfix:</translation>
</message>
<message>
- <location/>
<source><html><head/><body>
<p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</p>
<p>Note that the plugin will use this for posting as well as fetching.</p></body></html></source>
@@ -8750,12 +7129,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::ChangeNumberDialog</name>
<message>
- <location filename="../../../src/plugins/perforce/changenumberdialog.ui"/>
<source>Change Number</source>
<translation>Change-Nummer</translation>
</message>
<message>
- <location/>
<source>Change Number:</source>
<translation>Change-Nummer:</translation>
</message>
@@ -8763,22 +7140,18 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::PendingChangesDialog</name>
<message>
- <location filename="../../../src/plugins/perforce/pendingchangesdialog.ui"/>
<source>P4 Pending Changes</source>
<translation>P4 Ausstehende Changes</translation>
</message>
<message>
- <location/>
<source>Submit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../../../src/plugins/perforce/pendingchangesdialog.cpp" line="+46"/>
<source>Change %1: %2</source>
<translation>Change %1: %2</translation>
</message>
@@ -8786,403 +7159,320 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::PerforcePlugin</name>
<message>
- <location filename="../../../src/plugins/perforce/perforceplugin.cpp" line="+265"/>
<source>&Perforce</source>
<translation>&Perforce</translation>
</message>
<message>
- <location line="+36"/>
<source>Edit</source>
<translation>Anfordern</translation>
</message>
<message>
- <location line="+0"/>
<source>Edit "%1"</source>
<translation>"%1" anfordern</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+P,Alt+E</source>
<translation>Alt+P,Alt+E</translation>
</message>
<message>
- <location line="+1"/>
<source>Edit File</source>
<translation>Datei zum Editieren anfordern</translation>
</message>
<message>
- <location line="+5"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+0"/>
<source>Add "%1"</source>
<translation>"%1" hinzufügen</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+P,Alt+A</source>
<translation>Alt+P,Alt+A</translation>
</message>
<message>
- <location line="+1"/>
<source>Add File</source>
<translation>Datei hinzufügen</translation>
</message>
<message>
- <location line="+8"/>
<source>Delete File</source>
<translation>Datei löschen</translation>
</message>
<message>
- <location line="+5"/>
<source>Revert</source>
<translation>Rückgängig machen</translation>
</message>
<message>
- <location line="+0"/>
<source>Revert "%1"</source>
<translation>Änderungen in "%1" rückgängig machen (revert)</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+P,Alt+R</source>
<translation>Alt+P,Alt+R</translation>
</message>
<message>
- <location line="+1"/>
<source>Revert File</source>
<translation>Änderungen in Datei rückgängig machen (revert)</translation>
</message>
<message>
- <location line="-57"/>
- <location line="+3"/>
<source>Diff Current File</source>
<translation>Diff für Datei</translation>
</message>
<message>
- <location line="-3"/>
<source>Diff "%1"</source>
<translation>Diff für "%1"</translation>
</message>
<message>
- <location line="+64"/>
<source>Diff Current Project/Session</source>
<translation>Diff für Projekt/Sitzung</translation>
</message>
<message>
- <location line="+1"/>
<source>Diff Project "%1"</source>
<translation>Diff für Projekt "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+P,Alt+D</source>
<translation>Alt+P,Alt+D</translation>
</message>
<message>
- <location line="+46"/>
<source>Diff Opened Files</source>
<translation>Diff für angeforderte Dateien</translation>
</message>
<message>
- <location line="+6"/>
<source>Opened</source>
<translation>Angefordert</translation>
</message>
<message>
- <location line="+2"/>
<source>Alt+P,Alt+O</source>
<translation>Alt+P,Alt+O</translation>
</message>
<message>
- <location line="-41"/>
<source>Submit Project</source>
<translation>Projekt abgeben</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+P,Alt+S</source>
<translation>Alt+P,Alt+S</translation>
</message>
<message>
- <location line="+49"/>
<source>Pending Changes...</source>
<translation>Ausstehende Changes...</translation>
</message>
<message>
- <location line="-43"/>
<source>Update Project "%1"</source>
<translation>Projekt "%1"auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+57"/>
<source>Describe...</source>
<translation>Change anzeigen...</translation>
</message>
<message>
- <location line="-139"/>
- <location line="+3"/>
<source>Annotate Current File</source>
<translation>Annotation für Datei</translation>
</message>
<message>
- <location line="-3"/>
<source>Annotate "%1"</source>
<translation>Annotation für "%1"</translation>
</message>
<message>
- <location line="+144"/>
<source>Annotate...</source>
<translation>Annotation...</translation>
</message>
<message>
- <location line="-136"/>
- <location line="+4"/>
<source>Filelog Current File</source>
<translation>Filelog für Datei</translation>
</message>
<message>
- <location line="-4"/>
<source>Filelog "%1"</source>
<translation>Filelog für "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+P,Alt+F</source>
<translation>Alt+P,Alt+F</translation>
</message>
<message>
- <location line="+138"/>
<source>Filelog...</source>
<translation>Filelog...</translation>
</message>
<message>
- <location line="-18"/>
<source>Update All</source>
<translation>Auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="-94"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Delete "%1"...</source>
<translation>Lösche "%1"...</translation>
</message>
<message>
- <location line="+29"/>
<source>Log Project "%1"</source>
<translation>Log für Projekt "%1"</translation>
</message>
<message>
- <location line="+0"/>
<source>Log Project</source>
<translation>Log für Projekt</translation>
</message>
<message>
- <location line="+7"/>
<source>Submit Project "%1"</source>
<translation>Projekt "%1" abgeben</translation>
</message>
<message>
- <location line="+8"/>
<source>Update Current Project</source>
<translation>Projekt auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+9"/>
<source>Revert Unchanged</source>
<translation>Angeforderte, ungeänderte Dateien rücksetzen</translation>
</message>
<message>
- <location line="+0"/>
<source>Revert Unchanged Files of Project "%1"</source>
<translation>Angeforderte, ungeänderte Dateien des Projekts "%1" rücksetzen</translation>
</message>
<message>
- <location line="+7"/>
<source>Revert Project</source>
<translation>Änderungen des Projekts rückgängig machen</translation>
</message>
<message>
- <location line="+0"/>
<source>Revert Project "%1"</source>
<translation>Änderungen des Projekts "%1" rückgängig machen</translation>
</message>
<message>
- <location line="+22"/>
<source>Repository Log</source>
<translation>Log des Repositories</translation>
</message>
<message>
- <location line="+35"/>
<source>Submit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location line="+5"/>
<source>Diff Selected Files</source>
<translation>Diff für Auswahl</translation>
</message>
<message>
- <location line="+3"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+3"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+43"/>
- <location line="+52"/>
<source>p4 revert</source>
<translation>Rückgängig machen</translation>
</message>
<message>
- <location line="-51"/>
<source>The file has been changed. Do you want to revert it?</source>
<translation>Die Datei wurde geändert. Möchten Sie die Änderungen rückgängig machen?</translation>
</message>
<message>
- <location line="+50"/>
<source>Do you want to revert all changes to the project "%1"?</source>
<translation>Möchten Sie alle ausstehenden Änderungen des Projektes "%1" rückgängig machen?</translation>
</message>
<message>
- <location line="+75"/>
<source>Another submit is currently executed.</source>
<translation>Es läuft bereits ein Submit-Vorgang.</translation>
</message>
<message>
- <location line="+10"/>
<source>Cannot create temporary file.</source>
<translation>Es konnte keine temporäre Datei erstellt werden.</translation>
</message>
<message>
- <location line="+39"/>
<source>Project has no files</source>
<translation>Das Projekt hat keine Dateien</translation>
</message>
<message>
- <location line="+51"/>
<source>p4 annotate</source>
<translation>Annotationen</translation>
</message>
<message>
- <location line="+36"/>
<source>p4 annotate %1</source>
<translation>p4 annotate %1</translation>
</message>
<message>
- <location line="+16"/>
<source>p4 filelog</source>
<translation>Filelog</translation>
</message>
<message>
- <location line="+36"/>
<source>p4 filelog %1</source>
<translation>p4 filelog %1</translation>
</message>
<message>
- <location line="+191"/>
<source>The process terminated with exit code %1.</source>
<translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
- <location line="+338"/>
<source>p4 submit failed: %1</source>
<translation>Fehler beim Abgeben: %1</translation>
</message>
<message>
- <location line="+76"/>
<source>Error running "where" on %1: %2</source>
<extracomment>Failed to run p4 "where" to resolve a Perforce file name to a local file system name.</extracomment>
<translation>Fehler bei der Ausführung von "where" bei Datei "%1": %2</translation>
</message>
<message>
- <location line="+32"/>
<source>The file is not mapped</source>
<extracomment>File is not managed by Perforce</extracomment>
<translation>Die Datei wird nicht von Perforce verwaltet</translation>
</message>
<message>
- <location line="+24"/>
<source>Perforce repository: %1</source>
<translation>Perforce-Repository: %1</translation>
</message>
<message>
- <location line="+9"/>
<source>Perforce: Unable to determine the repository: %1</source>
<translation>Perforce: Das Repository von konnte nicht bestimmt werden: %1</translation>
</message>
<message>
- <location line="-484"/>
<source>The process terminated abnormally.</source>
<translation>Der Prozess wurde in anormaler Weise beendet.</translation>
</message>
<message>
- <location line="-10"/>
<source>Could not start perforce '%1'. Please check your settings in the preferences.</source>
<translation>Das Perforce-Kommando '%1' konnte nicht gestartet werden. Bitte überprüfen Sie die Einstellungen.</translation>
</message>
<message>
- <location line="+5"/>
<source>Perforce did not respond within timeout limit (%1 ms).</source>
<translation>Keine Antwort von Perforce innerhalb des Zeitlimits (%1 ms).</translation>
</message>
<message>
- <location line="+108"/>
<source>Unable to write input data to process %1: %2</source>
<translation>Es konnten keine Eingabedaten an den Prozess %1 übergeben werden: %2</translation>
</message>
<message>
- <location line="+53"/>
<source>Perforce is not correctly configured.</source>
<translation>Perforce ist nicht richtig konfiguriert.</translation>
</message>
<message>
- <location line="+99"/>
<source>p4 diff %1</source>
<translation>p4 diff %1</translation>
</message>
<message>
- <location line="+15"/>
<source>p4 describe %1</source>
<translation>p4 describe %1</translation>
</message>
<message>
- <location line="+36"/>
<source>Closing p4 Editor</source>
<translation>P4-Editor schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you want to submit this change list?</source>
<translation>Möchten Sie die Änderungen abgeben?</translation>
</message>
<message>
- <location line="+1"/>
<source>The commit message check failed. Do you want to submit this change list</source>
<translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie den Submit-Vorgang trotzdem ausführen?</translation>
</message>
<message>
- <location line="+23"/>
<source>Cannot open temporary file.</source>
<translation>Die temporäre Datei konnte nicht geöffnet werden.</translation>
</message>
<message>
- <location line="+17"/>
<source>Pending change</source>
<translation>Ausstehende Änderung</translation>
</message>
<message>
- <location line="+0"/>
<source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
<translation>Der Submit-Vorgang konnte nicht ausgeführt werden, weil Ihr Arbeitsbereich nicht auf dem aktuellsten Stand ist. Es wurde ein ausstehender Submit-Vorgang erzeugt.</translation>
</message>
@@ -9190,7 +7480,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::PerforceSubmitEditor</name>
<message>
- <location filename="../../../src/plugins/perforce/perforcesubmiteditor.cpp" line="+49"/>
<source>Perforce Submit</source>
<translation>Perforce Submit</translation>
</message>
@@ -9198,12 +7487,10 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::PromptDialog</name>
<message>
- <location filename="../../../src/plugins/perforce/promptdialog.ui"/>
<source>Perforce Prompt</source>
<translation>Perforce Prompt</translation>
</message>
<message>
- <location/>
<source>OK</source>
<translation>OK</translation>
</message>
@@ -9211,72 +7498,58 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/perforce/settingspage.cpp" line="+139"/>
<source>Perforce</source>
<translation>Perforce</translation>
</message>
<message>
- <location filename="../../../src/plugins/perforce/settingspage.ui"/>
<source>Test</source>
<translation>Test</translation>
</message>
<message>
- <location/>
<source>Configuration</source>
<translation>Konfiguration</translation>
</message>
<message>
- <location/>
<source>Miscellaneous</source>
<translation>Sonstige Einstellungen</translation>
</message>
<message>
- <location/>
<source>Timeout:</source>
<translation>Zeitlimit:</translation>
</message>
<message>
- <location/>
<source>s</source>
<translation>s</translation>
</message>
<message>
- <location/>
<source>Prompt on submit</source>
<translation>Abgabe bestätigen</translation>
</message>
<message>
- <location/>
<source>Log count:</source>
<translation>Log-Anzeige beschränken auf:</translation>
</message>
<message>
- <location/>
<source>P4 command:</source>
<translation>P4-Kommando:</translation>
</message>
<message>
- <location/>
<source>P4 client:</source>
<translation>P4 Client:</translation>
</message>
<message>
- <location/>
<source>P4 user:</source>
<translation>P4 Nutzer:</translation>
</message>
<message>
- <location/>
<source>P4 port:</source>
<translation>P4 Port-Nummer:</translation>
</message>
<message>
- <location/>
<source>Environment Variables</source>
<translation>Umgebungsvariablen</translation>
</message>
<message>
- <location/>
<source>Automatically open files when editing</source>
<translation>Dateien bei Bearbeitung automatisch anfordern</translation>
</message>
@@ -9284,17 +7557,14 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::SettingsPageWidget</name>
<message>
- <location filename="../../../src/plugins/perforce/settingspage.cpp" line="-72"/>
<source>Testing...</source>
<translation>Test läuft...</translation>
</message>
<message>
- <location line="+7"/>
<source>Test succeeded (%1).</source>
<translation>Der Test war erfolgreich (%1).</translation>
</message>
<message>
- <location line="-24"/>
<source>Perforce Command</source>
<translation>Perforce-Kommando</translation>
</message>
@@ -9302,22 +7572,18 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>Perforce::Internal::SubmitPanel</name>
<message>
- <location filename="../../../src/plugins/perforce/submitpanel.ui"/>
<source>Submit</source>
<translation>Abschicken</translation>
</message>
<message>
- <location/>
<source>Change:</source>
<translation>Änderung:</translation>
</message>
<message>
- <location/>
<source>Client:</source>
<translation>Client:</translation>
</message>
<message>
- <location/>
<source>User:</source>
<translation>Nutzer:</translation>
</message>
@@ -9325,27 +7591,22 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>PluginDialog</name>
<message>
- <location filename="../../../src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp" line="+55"/>
<source>Details</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location line="+1"/>
<source>Error Details</source>
<translation>Fehlermeldungen</translation>
</message>
<message>
- <location line="+7"/>
<source>Installed Plugins</source>
<translation>Installierte Plugins</translation>
</message>
<message>
- <location line="+33"/>
<source>Plugin Details of %1</source>
<translation>Beschreibung zu %1</translation>
</message>
<message>
- <location line="+20"/>
<source>Plugin Errors of %1</source>
<translation>Fehlermeldungen von %1</translation>
</message>
@@ -9353,24 +7614,18 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>PluginManager</name>
<message>
- <location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+109"/>
- <location line="+18"/>
<source>The plugin '%1' does not exist.</source>
<translation>Es existiert kein Plugin '%1'.</translation>
</message>
<message>
- <location line="+52"/>
<source>Unknown option %1</source>
<translation>Ungültiges Kommandozeilenargument %1</translation>
</message>
<message>
- <location line="+12"/>
<source>The option %1 requires an argument.</source>
<translation>Das Kommandozeilenargument %1erfordert ein Argument</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp" line="+181"/>
- <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="+204"/>
<source>Failed Plugins</source>
<translation>Nicht geladene Plugins (Fehlschlag beim Ladevorgang)</translation>
</message>
@@ -9378,77 +7633,62 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>PluginSpec</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginspec.cpp" line="+32"/>
<source>'%1' misses attribute '%2'</source>
<translation>Das Attribut '%1' fehlt bei '%2'</translation>
</message>
<message>
- <location line="+5"/>
<source>'%1' has invalid format</source>
<translation>'%1' ist in einem ungültigem Format</translation>
</message>
<message>
- <location line="+5"/>
<source>Invalid element '%1'</source>
<translation>Ungültiges Element '%1'</translation>
</message>
<message>
- <location line="+5"/>
<source>Unexpected closing element '%1'</source>
<translation>Falsch platziertes schließendes Element '%1'</translation>
</message>
<message>
- <location line="+5"/>
<source>Unexpected token</source>
<translation>Falsch platziertes Token</translation>
</message>
<message>
- <location line="+11"/>
<source>Expected element '%1' as top level element</source>
<translation>Das Wurzelelement muss '%1' sein</translation>
</message>
<message>
- <location line="+244"/>
<source>Resolving dependencies failed because state != Read</source>
<translation>Das Bestimmen der Abhängigkeiten schlug fehl, weil der Status != Gelesen ist</translation>
</message>
<message>
- <location line="+19"/>
<source>Could not resolve dependency '%1(%2)'</source>
<translation>Die Abhängigkeit '%1 (%2)' konnte nicht aufgelöst werden</translation>
</message>
<message>
- <location line="+43"/>
<source>Loading the library failed because state != Resolved</source>
<translation>Das Laden der Bibliothek schlug fehl, weil der Status != 'Abhängigkeiten bestimmt' ist</translation>
</message>
<message>
- <location line="+36"/>
<source>Plugin is not valid (does not derive from IPlugin)</source>
<translation>Das Plugin ist ungültig (nicht von Klasse IPlugin abgeleitet)</translation>
</message>
<message>
- <location line="+21"/>
<source>Initializing the plugin failed because state != Loaded</source>
<translation>Die Initialisierung des Plugins schlug fehl, weil der Status != Geladen ist</translation>
</message>
<message>
- <location line="+5"/>
<source>Internal error: have no plugin instance to initialize</source>
<translation>Interner Fehler: Es existiert keine Plugininstanz zur Initialisierung</translation>
</message>
<message>
- <location line="+6"/>
<source>Plugin initialization failed: %1</source>
<translation>Die Initialisierung des Plugins schlug fehl: %1</translation>
</message>
<message>
- <location line="+19"/>
<source>Cannot perform extensionsInitialized because state != Initialized</source>
<translation>extensionsInitialized kann nicht abgearbeitet werden, weil der Status != Initialisiert ist</translation>
</message>
<message>
- <location line="+5"/>
<source>Internal error: have no plugin instance to perform extensionsInitialized</source>
<translation>Interner Fehler: Es existiert keine Plugininstanz zur Abarbeitung von extensionsInitialized</translation>
</message>
@@ -9456,47 +7696,43 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>ProjectExplorer::AbstractProcessStep</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+208"/>
<source>Starting: "%1" %2
</source>
<translation>Starte "%1" %2
</translation>
</message>
<message>
- <location line="+6"/>
<source>The process "%1" exited normally.</source>
<translation>Der Prozess "%1" wurde normal beendet.</translation>
</message>
<message>
- <location line="+4"/>
<source>The process "%1" exited with code %2.</source>
<translation>Der Prozess "%1" wurde mit dem Rückgabewert %2 beendet.</translation>
</message>
<message>
- <location line="+4"/>
<source>The process "%1" crashed.</source>
<translation>Der Prozess "%1" ist abgestürzt.</translation>
</message>
<message>
- <location line="+6"/>
+ <source>Could not start process "%1" %2</source>
+ <translation>Der Prozess "%1" %2 nicht gestartet werden</translation>
+ </message>
+ <message>
<source>Could not start process "%1"</source>
- <translation>Der Prozess :"%1" konnte nicht gestartet werden</translation>
+ <translation type="obsolete">Der Prozess :"%1" konnte nicht gestartet werden</translation>
</message>
</context>
<context>
<name>ProjectExplorer::ApplicationLauncher</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/applicationlauncher_x11.cpp" line="+149"/>
<source>Failed to start program. Path or permissions wrong?</source>
<translation>Das Programm konnte nicht gestartet werden. Möglicherweise stimmt der Pfad nicht oder die Berechtigungen sind sind ausreichend?</translation>
</message>
<message>
- <location line="+3"/>
<source>The program has unexpectedly finished.</source>
<translation>Das Programm ist abgestürzt.</translation>
</message>
<message>
- <location line="+3"/>
<source>Some error has occurred while running the program.</source>
<translation>Bei der Ausführung des Programms trat ein Fehler auf.</translation>
</message>
@@ -9504,7 +7740,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>ProjectExplorer::BuildManager</name>
<message numerus="yes">
- <location filename="../../../src/plugins/projectexplorer/buildmanager.cpp" line="+65"/>
<source>Finished %1 of %n build steps</source>
<translation>
<numerusform>Build-Schritt %1 von %n beendet</numerusform>
@@ -9512,46 +7747,35 @@ on slow machines. In this case, the value should be increased.</source>
</translation>
</message>
<message>
- <location line="+84"/>
<source>Build System</source>
<comment>Category for build system isses listened under 'Build Issues'</comment>
<translation>Build System</translation>
</message>
<message>
- <location line="+52"/>
<source>Build canceled</source>
<translation>Erstellen abgebrochen</translation>
</message>
<message>
- <location line="+25"/>
<source>Canceled build.</source>
<translation>Erstellen abgebrochen.</translation>
</message>
<message>
- <location line="+125"/>
- <location line="+71"/>
<source>When executing build step '%1'</source>
<translation>Bei der Ausführung von Build-Schritt '%1'</translation>
</message>
<message>
- <location line="-41"/>
<source>Running build steps for project %1...</source>
<translation>Führe Build-Schritte für Projekt %1 aus...</translation>
</message>
<message>
- <location line="-90"/>
<source>Build</source>
<translation>Erstellen</translation>
</message>
<message>
- <location line="+59"/>
- <location line="+3"/>
- <location line="+68"/>
<source>Error while building project %1 (target: %2)</source>
<translation>Fehler beim Erstellen des Projekts %1(Ziel: %2)</translation>
</message>
<message>
- <location line="-273"/>
<source>Compile</source>
<comment>Category for compiler isses listened under 'Build Issues'</comment>
<translation>Compilierung</translation>
@@ -9560,32 +7784,26 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>ProjectExplorer::CustomExecutableRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="+483"/>
<source>Custom Executable</source>
<translation>Benutzerdefinierte, ausführbare Datei</translation>
</message>
<message>
- <location line="-120"/>
<source>Could not find the executable, please specify one.</source>
<translation>Es konnte keine ausführbare Datei gefunden werden; bitte geben Sie eine an.</translation>
</message>
<message>
- <location line="+61"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+2"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+2"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
<message>
- <location line="+57"/>
<source>Run %1</source>
<translation>Führe %1 aus</translation>
</message>
@@ -9593,7 +7811,6 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>ProjectExplorer::CustomExecutableRunConfigurationFactory</name>
<message>
- <location line="+144"/>
<source>Custom Executable</source>
<translation>Benutzerdefinierte ausführbare Datei</translation>
</message>
@@ -9601,22 +7818,18 @@ on slow machines. In this case, the value should be increased.</source>
<context>
<name>ProjectExplorer::DebuggingHelperLibrary</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+149"/>
<source>The target directory %1 could not be created.</source>
<translation>Das Zielverzeichnis %1 konnte nicht erstellt werden.</translation>
</message>
<message>
- <location line="+11"/>
<source>The existing file %1 could not be removed.</source>
<translation>Die existierende Datei %1 konnte nicht entfernt werden.</translation>
</message>
<message>
- <location line="+5"/>
<source>The file %1 could not be copied to %2.</source>
<translation>Die Datei %1 konnte nicht nach %2 kopiert werden.</translation>
</message>
<message>
- <location line="+25"/>
<source>The debugger helpers could not be built in any of the directories:
- %1
@@ -9626,62 +7839,54 @@ Reason: %2</source>
Fehler: %2</translation>
</message>
<message>
- <location line="+17"/>
+ <source>GDB helper</source>
+ <translation>GDB-Hilfsbibliothek</translation>
+ </message>
+ <message>
<source>Building debugging helper library in %1
</source>
- <translation>Erstelle Ausgabe-Hilfsbibliothek in %1
+ <translation type="obsolete">Erstelle Ausgabe-Hilfsbibliothek in %1
</translation>
</message>
<message>
- <location line="+7"/>
<source>Running %1 %2...
</source>
- <translation>Führe %1 %2 aus...
+ <translation type="obsolete">Führe %1 %2 aus...
</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+21"/>
<source>%1 not found in PATH
</source>
<translation>%1 konnte im Pfad (PATH) nicht gefunden werden
</translation>
</message>
<message>
- <location line="-16"/>
- <location line="+11"/>
<source>Running %1 ...
</source>
- <translation>Führe %1 aus...
+ <translation type="obsolete">Führe %1 aus...
</translation>
</message>
</context>
<context>
<name>ProjectExplorer::EnvironmentModel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+185"/>
<source>Variable</source>
<translation>Variable</translation>
</message>
<message>
- <location line="+0"/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location line="+104"/>
<source><VALUE></source>
<extracomment>Value when inserting a new variable</extracomment>
<translation><Wert></translation>
</message>
<message>
- <location line="-179"/>
<source><UNSET></source>
<translation><Nicht gesetzt></translation>
</message>
<message>
- <location line="+177"/>
- <location line="+260"/>
<source><VARIABLE></source>
<extracomment>Name when inserting a new variable</extracomment>
<translation><Variable></translation>
@@ -9690,42 +7895,34 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::EnvironmentWidget</name>
<message>
- <location line="-80"/>
<source>&Edit</source>
<translation>&Bearbeiten</translation>
</message>
<message>
- <location line="+4"/>
<source>&Add</source>
<translation>Hinzu&fügen</translation>
</message>
<message>
- <location line="+5"/>
<source>&Reset</source>
<translation>&Rücksetzen</translation>
</message>
<message>
- <location line="+5"/>
<source>&Unset</source>
<translation>&Leeren</translation>
</message>
<message>
- <location line="+69"/>
<source>Unset <b>%1</b></source>
<translation>Setze <b%1</b> zurück</translation>
</message>
<message>
- <location line="+2"/>
<source>Set <b>%1</b> to <b>%2</b></source>
<translation>Setze <b>%1</b> auf <b>%2</b></translation>
</message>
<message>
- <location line="+5"/>
<source>Using <b>%1</b></source>
<translation>Verwende <b>%1</b></translation>
</message>
<message>
- <location line="+2"/>
<source>Using <b>%1</b> and</source>
<translation>Verwende <b>%1</b> und</translation>
</message>
@@ -9733,7 +7930,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::AllProjectsFilter</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/allprojectsfilter.h" line="+51"/>
<source>Files in Any Project</source>
<translation>Dateien aus allen Projekten</translation>
</message>
@@ -9741,12 +7937,10 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::AllProjectsFind</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/allprojectsfind.cpp" line="+65"/>
<source>All Projects</source>
<translation>Alle Projekte</translation>
</message>
<message>
- <location line="+46"/>
<source>File &pattern:</source>
<translation>Such&muster für Dateinamen:</translation>
</message>
@@ -9754,63 +7948,51 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::BuildSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="+240"/>
<source>&Clone Selected</source>
<translation>Auswahl duplizieren</translation>
</message>
<message>
- <location line="-104"/>
<source>No build settings available</source>
<translation>Es sind keine Build-Einstellungen verfügbar</translation>
</message>
<message>
- <location line="+13"/>
<source>Edit build configuration:</source>
<translation>Build-Konfiguration bearbeiten:</translation>
</message>
<message>
- <location line="+7"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+7"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location line="+5"/>
<source>Rename</source>
<translation>Umbenennen</translation>
</message>
<message>
- <location line="+152"/>
<source>Remove Build Configuration</source>
<translation>Build-Konfiguration löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you really want to delete the build configuration <b>%1</b>?</source>
<translation>Möchten Sie die Build-Konfiguration <b>%1</b> löschen?</translation>
</message>
<message>
- <location line="+41"/>
<source>Clone Configuration</source>
<extracomment>Title of a the cloned BuildConfiguration window, text of the window</extracomment>
<translation>Duplizierte Konfiguration</translation>
</message>
<message>
- <location line="+0"/>
<source>New configuration name:</source>
<translation>Name der neuen Konfiguration:</translation>
</message>
<message>
- <location line="-28"/>
<source>Rename...</source>
<translation>Umbenennen...</translation>
</message>
<message>
- <location line="+1"/>
<source>New name for build configuration <b>%1</b>:</source>
<translation>Neuer Name der Build-Konfiguration <b>%1</b>:</translation>
</message>
@@ -9818,12 +8000,10 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::BuildStepsPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="+348"/>
<source>Build Steps</source>
<translation>Erstellungsschritte</translation>
</message>
<message>
- <location line="+2"/>
<source>Clean Steps</source>
<translation>Schritte zur Bereinigung</translation>
</message>
@@ -9831,8 +8011,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::CompileOutputWindow</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.cpp" line="+59"/>
- <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+63"/>
<source>Compile Output</source>
<translation>Kompilierung</translation>
</message>
@@ -9840,7 +8018,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::CurrentProjectFilter</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/currentprojectfilter.h" line="+52"/>
<source>Files in Current Project</source>
<translation>Dateien im aktuellen Projekt</translation>
</message>
@@ -9848,12 +8025,10 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::CurrentProjectFind</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/currentprojectfind.cpp" line="+65"/>
<source>Current Project</source>
<translation>Aktuelles Projekt</translation>
</message>
<message>
- <location line="+41"/>
<source>File &pattern:</source>
<translation>Such&muster für Dateinamen:</translation>
</message>
@@ -9861,63 +8036,51 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customexecutablerunconfiguration.cpp" line="-535"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
<message>
- <location line="+4"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
- <location line="+5"/>
<source>Working directory:</source>
<translation>Arbeitsverzeichnis:</translation>
</message>
<message>
- <location line="+2"/>
<source>Run in &Terminal</source>
<translation>In &Terminal Ausführen</translation>
</message>
<message>
- <location line="+8"/>
<source>Debugger:</source>
<translation>Debugger:</translation>
</message>
<message>
- <location line="+23"/>
<source>Run Environment</source>
<translation>Ausführungsumgebung</translation>
</message>
<message>
- <location line="+10"/>
<source>Base environment for this runconfiguration:</source>
<translation>Basisumgebung für diese Ausführungskonfiguration</translation>
</message>
<message>
- <location line="+4"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+1"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
<message>
- <location line="+120"/>
<source>No Executable specified.</source>
<translation>Es wurde keine ausführbaren Datei angegeben.
</translation>
</message>
<message>
- <location line="+2"/>
<source>Running executable: <b>%1</b> %2</source>
<translation>Führe aus: <b>%1</b> %2</translation>
</message>
@@ -9925,7 +8088,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::EditorSettingsPropertiesPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.ui"/>
<source>Default file encoding:</source>
<translation>Encoding-Vorgabe:</translation>
</message>
@@ -9933,12 +8095,10 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::FolderNavigationWidgetFactory</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="+466"/>
<source>File System</source>
<translation>Dateisystem</translation>
</message>
<message>
- <location line="+27"/>
<source>Synchronize with Editor</source>
<translation>Mit Editor synchronisieren</translation>
</message>
@@ -9946,12 +8106,10 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::LocalApplicationRunControl</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/applicationrunconfiguration.cpp" line="+123"/>
<source>Starting %1...</source>
<translation>Starte %1...</translation>
</message>
<message>
- <location line="+29"/>
<source>%1 exited with code %2</source>
<translation>%1 beendet, Rückgabewert %2</translation>
</message>
@@ -9959,7 +8117,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::LocalApplicationRunControlFactory</name>
<message>
- <location line="-75"/>
<source>Run</source>
<translation>Ausführen</translation>
</message>
@@ -9967,23 +8124,18 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::OutputPane</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/outputwindow.cpp" line="+95"/>
<source>Re-run this run-configuration</source>
<translation>Ausführungskonfiguration noch einmal ausführen</translation>
</message>
<message>
- <location line="-12"/>
- <location line="+22"/>
<source>Stop</source>
<translation>Anhalten</translation>
</message>
<message>
- <location line="+102"/>
<source>Application Output</source>
<translation>Ausgabe der Anwendung</translation>
</message>
<message>
- <location line="+60"/>
<source>Application Output Window</source>
<translation>Ausgabe der Anwendung</translation>
</message>
@@ -9991,7 +8143,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::OutputWindow</name>
<message>
- <location line="+414"/>
<source>Additional output omitted
</source>
<translation>Weitere Ausgaben wurden weggelassen
@@ -10001,13 +8152,11 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProcessStep</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/processstep.cpp" line="+79"/>
<source>Custom Process Step</source>
<extracomment>Default ProcessStep display name</extracomment>
<translation>Benutzerdefinierter Verarbeitungsschritt</translation>
</message>
<message>
- <location line="+161"/>
<source>Custom Process Step</source>
<comment>item in combobox</comment>
<translation>Benutzerdefinierter Verarbeitungsschritt</translation>
@@ -10016,12 +8165,10 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProcessStepConfigWidget</name>
<message>
- <location line="+29"/>
<source><b>%1</b> %2 %3 %4</source>
<translation><b>%1</b> %2 %3 %4</translation>
</message>
<message>
- <location line="+4"/>
<source>(disabled)</source>
<translation>(deaktiviert)</translation>
</message>
@@ -10029,22 +8176,18 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProcessStepWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/processstep.ui"/>
<source>Command:</source>
<translation>Kommando:</translation>
</message>
<message>
- <location/>
<source>Enable custom process step</source>
<translation>Benutzerdefinierten Verarbeitungsschritt aktivieren</translation>
</message>
<message>
- <location/>
<source>Working directory:</source>
<translation>Arbeitsverzeichnis:</translation>
</message>
<message>
- <location/>
<source>Command arguments:</source>
<translation>Kommandozeilenargumente:</translation>
</message>
@@ -10052,7 +8195,6 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProjectExplorerSettingsPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.cpp" line="+134"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
@@ -10060,67 +8202,54 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProjectExplorerSettingsPageUi</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorersettingspage.ui"/>
<source>Build and Run</source>
<translation>Erstellung und Ausführung</translation>
</message>
<message>
- <location/>
<source>Use jom instead of nmake</source>
<translation>jom an Stelle von nmake verwenden</translation>
</message>
<message>
- <location/>
<source>Current directory</source>
<translation>Arbeitsordner</translation>
</message>
<message>
- <location/>
<source>directoryButtonGroup</source>
<translation>directoryButtonGroup</translation>
</message>
<message>
- <location/>
<source>Directory</source>
<translation>Ordner</translation>
</message>
<message>
- <location/>
<source>Projects Directory</source>
<translation>Projektordner</translation>
</message>
<message>
- <location/>
<source>Save all files before build</source>
<translation>Alle Dateien vor Erstellen speichern</translation>
</message>
<message>
- <location/>
<source>Show compiler output on building</source>
<translation>Compiler-Ausgabe beim Erstellen anzeigen</translation>
</message>
<message>
- <location/>
<source>Clear old application output on a new run</source>
<translation>Ausgabe vorangegangener Ausführungen löschen</translation>
</message>
<message>
- <location/>
<source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="ftp://ftp.qt.nokia.com/jom/">ftp://ftp.qt.nokia.com/jom/</a>. Disable it if you experience problems with your builds.</source>
<translation><i>jom</i> ist ein Ersatz für <i>nmake</i>, der den Kompilationsprozess auf mehrere Prozessorkerne verteilt. Eine aktuelle Version erhalten Sie von <a href="ftp://ftp.qt.nokia.com/jom/">ftp://ftp.qt.nokia.com/jom/</a>. Deaktivieren Sie die Einstellungen, wenn Probleme beim Build auftreten.</translation>
</message>
<message>
- <location/>
<source>Always build project before deploying it</source>
<translation>Projekt vor Deployment stets erstellen </translation>
</message>
<message>
- <location/>
<source>Always deploy project before running it</source>
<translation>Vor Ausführung des Projekts stets Deployment durchführen</translation>
</message>
<message>
- <location/>
<source>Word-wrap application output</source>
<translation>Ausgabe der Anwendung umbrechen</translation>
</message>
@@ -10128,18 +8257,15 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProjectFileFactory</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/pluginfilefactory.cpp" line="+65"/>
<source>Project File Factory</source>
<comment>ProjectExplorer::ProjectFileFactory display name.</comment>
<translation>Project File Factory</translation>
</message>
<message>
- <location line="+9"/>
<source>Could not open the following project: '%1'</source>
<translation>Das Projekt '%1' konnte nicht geöffnet werden</translation>
</message>
<message>
- <location line="+30"/>
<source>All Projects</source>
<translation>Alle Projekte</translation>
</message>
@@ -10147,21 +8273,16 @@ Fehler: %2</translation>
<context>
<name>ProjectExplorer::Internal::ProjectFileWizardExtension</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectfilewizardextension.cpp" line="+259"/>
<source><Implicitly Add></source>
<translation><Implizites Hinzufügen></translation>
</message>
<message>
- <location line="+2"/>
<source>The files are implicitly added to the projects:
</source>
<translation>Die folgenden Dateien werden den Projekten implizit hinzugefügt:
</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+36"/>
- <location line="+28"/>
<source><None></source>
<extracomment>No version control system selected
----------
@@ -10169,25 +8290,21 @@ No project selected</extracomment>
<translation><Kein></translation>
</message>
<message>
- <location line="+58"/>
<source>Failed to add subproject '%1'
to project '%2'.</source>
<translation>Das untergeordnete Projekt '%1'
konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
</message>
<message>
- <location line="+16"/>
<source>Failed to add one or more files to project
'%1' (%2).</source>
<translation>Einige Dateien (%2) konnten nicht zum Projekt '%1' hinzugefügt werden.</translation>
</message>
<message>
- <location line="+21"/>
<source>A version control system repository could not be created in '%1'.</source>
<translation>Das Versionskontrollsystem konnte im Ordner '%1' kein Rpository anlegen.</translation>
</message>
<message>
- <location line="+8"/>
<source>Failed to add '%1' to the version control system.</source>
<translation>'%1' konnte nicht unter Versionskontrolle gestellt werden.</translation>
</message>
@@ -10195,17 +8312,22 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::ProjectTreeWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projecttreewidget.cpp" line="+109"/>
<source>Simplify tree</source>
- <translation>Baum vereinfachen</translation>
+ <translation type="obsolete">Baum vereinfachen</translation>
</message>
<message>
- <location line="+5"/>
<source>Hide generated files</source>
+ <translation type="obsolete">Generierte Dateien nicht zeigen</translation>
+ </message>
+ <message>
+ <source>Simplify Tree</source>
+ <translation>Baum vereinfachen</translation>
+ </message>
+ <message>
+ <source>Hide Generated Files</source>
<translation>Generierte Dateien nicht zeigen</translation>
</message>
<message>
- <location line="+23"/>
<source>Synchronize with Editor</source>
<translation>Mit Editor synchronisieren</translation>
</message>
@@ -10213,20 +8335,21 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::ProjectTreeWidgetFactory</name>
<message>
- <location line="+203"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+26"/>
- <source>Filter tree</source>
+ <source>Filter Tree</source>
<translation>Baum filtern</translation>
</message>
+ <message>
+ <source>Filter tree</source>
+ <translation type="obsolete">Baum filtern</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::ProjectWelcomePage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomepage.h" line="+47"/>
<source>Develop</source>
<translation>Entwicklung</translation>
</message>
@@ -10234,47 +8357,38 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::ProjectWelcomePageWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Manage Sessions...</source>
<translation>Sitzungen...</translation>
</message>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.cpp" line="+132"/>
<source>%1 (last session)</source>
<translation>%1 (zuletzt benutzt)</translation>
</message>
<message>
- <location line="+3"/>
<source>%1 (current session)</source>
<translation>%1 (aktuelle Sitzung)</translation>
</message>
<message>
- <location line="+48"/>
<source>New Project</source>
<translation>Neues Projekt</translation>
</message>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomepagewidget.ui"/>
<source>Recent Projects</source>
<translation>Zuletzt bearbeitete Projekte</translation>
</message>
<message>
- <location/>
<source>Create Project...</source>
<translation>Projekt erstellen...</translation>
</message>
<message>
- <location/>
<source>Recent Sessions</source>
<translation>Zuletzt benutzte Sitzungen</translation>
</message>
<message>
- <location/>
<source>Open Project...</source>
<translation>Projekt öffnen...</translation>
</message>
@@ -10282,17 +8396,14 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::ProjectWizardPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwizardpage.cpp" line="+46"/>
<source>Summary</source>
<translation>Zusammenfassung</translation>
</message>
<message>
- <location line="+76"/>
<source>Files to be added:</source>
<translation>Zu erzeugende Dateien:</translation>
</message>
<message>
- <location line="+0"/>
<source>Files to be added in</source>
<translation>Hinzufügende Dateien in</translation>
</message>
@@ -10300,22 +8411,18 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::RemoveFileDialog</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/removefiledialog.ui"/>
<source>Remove File</source>
<translation>Datei entfernen</translation>
</message>
<message>
- <location/>
<source>&Delete file permanently</source>
<translation>Datei &löschen</translation>
</message>
<message>
- <location/>
<source>&Remove from Version Control</source>
<translation>Aus &Versionskontrolle entfernen</translation>
</message>
<message>
- <location/>
<source>File to remove:</source>
<translation>Datei:</translation>
</message>
@@ -10323,27 +8430,22 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::RunSettingsPropertiesPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.ui"/>
<source>Run configuration:</source>
<translation>Ausführungskonfiguration:</translation>
</message>
<message>
- <location/>
<source>Deployment:</source>
<translation>Deployment:</translation>
</message>
<message>
- <location/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Rename</source>
<translation>Umbenennen</translation>
</message>
@@ -10351,38 +8453,30 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::RunSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="+258"/>
<source>Remove Run Configuration?</source>
<translation>Aktive Ausführungskonfiguration löschen?</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you really want to delete the run configuration <b>%1</b>?</source>
<translation>Möchten Sie die Ausführungskonfiguration <b>%1</b> löschen?</translation>
</message>
<message>
- <location line="+29"/>
- <location line="+100"/>
<source>Rename...</source>
<translation>Umbenennen...</translation>
</message>
<message>
- <location line="-99"/>
<source>New name for run configuration <b>%1</b>:</source>
<translation>Neuer Name der Ausführungskonfiguration <b>%1</b>:</translation>
</message>
<message>
- <location line="+79"/>
<source>Remove Deploy Configuration?</source>
<translation>Deployment-Konfiguration löschen?</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you really want to delete deploy configuration <b>%1</b>?</source>
<translation>Möchten Sie die Deployment-Konfiguration<b>%1</b> löschen?</translation>
</message>
<message>
- <location line="+20"/>
<source>New name for deploy configuration <b>%1</b>:</source>
<translation>Neuer Name der Deployment-Konfiguration <b>%1</b>:</translation>
</message>
@@ -10390,58 +8484,46 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::SessionDialog</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
<source>Session Manager</source>
<translation>Sitzungsverwaltung</translation>
</message>
<message>
- <location/>
<source>&New</source>
<translation>&Neu</translation>
</message>
<message>
- <location/>
<source>&Rename</source>
<translation>Umbenennen</translation>
</message>
<message>
- <location/>
<source>C&lone</source>
<translation>&Duplizieren</translation>
</message>
<message>
- <location/>
<source>&Delete</source>
<translation>&Löschen</translation>
</message>
<message>
- <location/>
<source>&Switch to</source>
<translation>&Gehe zu Sitzung</translation>
</message>
<message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+207"/>
- <location line="+20"/>
<source>New session name</source>
<translation>Name der neuen Sitzung</translation>
</message>
<message>
- <location line="+26"/>
<source>Rename session</source>
<translation>Sitzung umbenennen</translation>
</message>
<message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
<source><a href="qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html">What is a Session?</a></source>
<translation><a href="qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.htm">Was ist eine Sitzung?</a></translation>
</message>
<message>
- <location/>
<source>Automatically restore the last session when Qt Creator is started.</source>
<translation>Stellt die letzte Sitzung beim Start von Qt Creator automatisch wieder her.</translation>
</message>
<message>
- <location/>
<source>Restore last session on startup</source>
<translation>Bei Start letzte Sitzung laden</translation>
</message>
@@ -10449,7 +8531,6 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::SessionFile</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+147"/>
<source>Session</source>
<translation>Sitzung</translation>
</message>
@@ -10457,7 +8538,6 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::TaskDelegate</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+1020"/>
<source>File not found: %1</source>
<translation>Datei nicht gefunden: %1</translation>
</message>
@@ -10465,12 +8545,10 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::WinGuiProcess</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/winguiprocess.cpp" line="+125"/>
<source>The process could not be started!</source>
<translation>Der Prozess konnte nicht gestartet werden!</translation>
</message>
<message>
- <location line="+5"/>
<source>Cannot retrieve debugging output!</source>
<translation>Es konnte keine Debug-Ausgabe erhalten werden!</translation>
</message>
@@ -10478,7 +8556,6 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::Internal::WizardPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwizardpage.ui"/>
<source>The following files will be added:
@@ -10491,17 +8568,14 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
</translation>
</message>
<message>
- <location/>
<source>Add to &project:</source>
<translation>Zu Projekt &hinzufügen:</translation>
</message>
<message>
- <location/>
<source>Add to &version control:</source>
<translation>Unter &Versionskontrolle stellen:</translation>
</message>
<message>
- <location/>
<source>Project Management</source>
<translation>Projektverwaltung</translation>
</message>
@@ -10509,373 +8583,291 @@ konnte dem Projekt '%2' nicht hinzugefügt werden.</translation>
<context>
<name>ProjectExplorer::ProjectExplorerPlugin</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorer.cpp" line="+280"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+87"/>
<source>&Build</source>
<translation>&Erstellen</translation>
</message>
<message>
- <location line="+6"/>
<source>&Debug</source>
<translation>&Debuggen</translation>
</message>
<message>
- <location line="+5"/>
<source>&Start Debugging</source>
<translation>&Debuggen</translation>
</message>
<message>
- <location line="+44"/>
<source>Open With</source>
<translation>Öffnen mit</translation>
</message>
<message>
- <location line="+60"/>
<source>Session Manager...</source>
<translation>Sitzungsverwaltung</translation>
</message>
<message>
- <location line="+5"/>
<source>New Project...</source>
<translation>Neues Projekt...</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+N</source>
<translation>Ctrl+Shift+N</translation>
</message>
<message>
- <location line="+4"/>
<source>Load Project...</source>
<translation>Projekt laden</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+O</source>
<translation>Ctrl+Shift+O</translation>
</message>
<message>
- <location line="+4"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
<message>
- <location line="+29"/>
<source>Close Project</source>
<translation>Projekt schließen</translation>
</message>
<message>
- <location line="+9"/>
<source>Close All Projects</source>
<translation>Alle Projekte schließen</translation>
</message>
<message>
- <location line="+7"/>
<source>Session</source>
<translation>Sitzung</translation>
</message>
<message>
- <location line="+9"/>
<source>Build All</source>
<translation>Alles erstellen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+B</source>
<translation>Ctrl+Shift+B</translation>
</message>
<message>
- <location line="+9"/>
<source>Rebuild All</source>
<translation>Alles neu erstellen</translation>
</message>
<message>
- <location line="+6"/>
<source>Deploy All</source>
<translation>Vollständiges Deployment durchführen</translation>
</message>
<message>
- <location line="+8"/>
<source>Clean All</source>
<translation>Alles bereinigen</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+33"/>
<source>Build Project</source>
<translation>Projekt erstellen</translation>
</message>
<message>
- <location line="-28"/>
<source>Ctrl+B</source>
<translation>Ctrl+B</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+32"/>
<source>Rebuild Project</source>
<translation>Projekt neu erstellen</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+32"/>
<source>Deploy Project</source>
<translation>Deployment des Projekts durchführen</translation>
</message>
<message>
- <location line="-32"/>
- <location line="+32"/>
<source>Deploy Project "%1"</source>
<translation>Deployment des Projekts %1" durchführen</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+32"/>
<source>Clean Project</source>
<translation>Projekt bereinigen</translation>
</message>
<message>
- <location line="+16"/>
<source>Deploy Without Dependencies</source>
<translation>Deployment unter Ausschluss der Abhängigkeiten durchführen</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+9"/>
<source>Run</source>
<translation>Ausführen</translation>
</message>
<message>
- <location line="-5"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
- <location line="+10"/>
<source>Cancel Build</source>
<translation>Erstellen abbrechen</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+4"/>
<source>Start Debugging</source>
<translation>Debuggen</translation>
</message>
<message>
- <location line="+1"/>
<source>F5</source>
<translation>F5</translation>
</message>
<message>
- <location line="+5"/>
<source>Add New...</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+8"/>
<source>Add Existing Files...</source>
<translation>Existierende Datei hinzufügen</translation>
</message>
<message>
- <location line="+8"/>
<source>Remove File...</source>
<translation>Datei entfernen...</translation>
</message>
<message>
- <location line="+1363"/>
<source>Adding Files to Project Failed</source>
<translation>Das Hinzufügen der Dateien zum Projekt schlug fehl</translation>
</message>
<message>
- <location line="+23"/>
<source>Adding to Version Control Failed</source>
<translation>Die Hinzufügen der Dateien zur Versionsverwaltung schlug fehl</translation>
</message>
<message>
- <location line="+58"/>
<source>Removing File Failed</source>
<translation>Fehlschlag bei Entfernen der Datei</translation>
</message>
<message>
- <location line="+15"/>
- <location line="+35"/>
<source>Deleting File Failed</source>
<translation>Fehlschlag beim Löschen der Datei</translation>
</message>
<message>
- <location line="-1482"/>
<source>Delete File...</source>
<translation>Datei löschen...</translation>
</message>
<message>
- <location line="+6"/>
<source>Rename</source>
<translation>Umbenennen</translation>
</message>
<message>
- <location line="+10"/>
<source>Set as Startup Project</source>
<translation>Als Startprojekts setzen</translation>
</message>
<message>
- <location line="+20"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location line="+121"/>
<source>Load Project</source>
<translation>Projekt laden</translation>
</message>
<message>
- <location line="+96"/>
<source>New Project</source>
<comment>Title of dialog</comment>
<translation>Neues Projekt</translation>
</message>
<message>
- <location line="+706"/>
<source>Cancel Build && Close</source>
<translation>Erstellen abbrechen und schließen</translation>
</message>
<message>
- <location line="+3"/>
<source>Close Qt Creator?</source>
<translation>Qt Creator schließen?</translation>
</message>
<message>
- <location line="+1"/>
<source>A project is currently being built.</source>
<translation>Es wird gerade ein Projekt erstellt.</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you want to cancel the build process and close Qt Creator anyway?</source>
<translation>Möchten Sie die Erstellung abbrechen und Qt Creator schließen?</translation>
</message>
<message>
- <location line="+500"/>
<source>Delete File</source>
<translation>Datei löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Delete %1 from file system?</source>
<translation>Soll die Datei %1 gelöscht werden?</translation>
</message>
<message>
- <location line="+192"/>
<source>Projects (%1)</source>
<translation>Projekte (%1)</translation>
</message>
<message>
- <location line="+1"/>
<source>All Files (*)</source>
<translation>Alle Dateien (*)</translation>
</message>
<message>
- <location line="-1856"/>
<source>Close Project "%1"</source>
<translation>Projekt "%1" schließen</translation>
</message>
<message>
- <location line="-6"/>
<source>Recent P&rojects</source>
<translation>Zuletzt bearbeitete P&rojekte</translation>
</message>
<message>
- <location line="+62"/>
- <location line="+33"/>
<source>Build Project "%1"</source>
<translation>Projekt '%1" erstellen</translation>
</message>
<message>
- <location line="-24"/>
- <location line="+32"/>
<source>Rebuild Project "%1"</source>
<translation>Projekt "%1" neu erstellen</translation>
</message>
<message>
- <location line="-16"/>
- <location line="+32"/>
<source>Clean Project "%1"</source>
<translation>Projekt "%1" bereinigen</translation>
</message>
<message>
- <location line="+8"/>
<source>Build Without Dependencies</source>
<translation>Erstellen unter Ausschluss der Abhängigkeiten</translation>
</message>
<message>
- <location line="+4"/>
<source>Rebuild Without Dependencies</source>
<translation>Neu erstellen unter Ausschluss der Abhängigkeiten</translation>
</message>
<message>
- <location line="+8"/>
<source>Clean Without Dependencies</source>
<translation>Bereinigen unter Ausschluss der Abhängigkeiten</translation>
</message>
<message>
- <location line="+59"/>
<source>Remove Project...</source>
<extracomment>Remove project from parent profile (Project explorer view); will not physically delete any files.</extracomment>
<translation>Projekt entfernen...</translation>
</message>
<message>
- <location line="+38"/>
<source>Open Build/Run Target Selector...</source>
<translation>Zielauswahl für Build/Auswahl öffnen...</translation>
</message>
<message>
- <location line="+753"/>
<source>Always save files before build</source>
<translation>Alle Dateien vor Erstellen speichern</translation>
</message>
<message>
- <location line="+175"/>
<source>Do Not Close</source>
<translation>Nicht Schließen</translation>
</message>
<message>
- <location line="+188"/>
<source>Cannot run without a project.</source>
<translation>Ausführung ohne Projekt nicht möglich.</translation>
</message>
<message>
- <location line="+1"/>
<source>Cannot debug without a project.</source>
<translation>Debuggen ohne Projekt nicht möglich.</translation>
</message>
<message>
- <location line="+171"/>
<source>New File</source>
<comment>Title of dialog</comment>
<translation>Neue Datei</translation>
</message>
<message>
- <location line="+14"/>
<source>Add Existing Files</source>
<translation>Existierende Dateien hinzufügen</translation>
</message>
<message>
- <location line="+15"/>
<source>Could not add following files to project %1:
</source>
<translation>Die folgenden Dateien konnten nicht zum Projekt %1 hinzugefügt werden:
</translation>
</message>
<message>
- <location line="+12"/>
<source>Add to Version Control</source>
<translation>Unter Versionsverwaltung stellen</translation>
</message>
<message>
- <location line="+1"/>
<source>Add files
%1
to version control (%2)?</source>
@@ -10884,20 +8876,16 @@ to version control (%2)?</source>
unter Versionsverwaltung (%2) gestellt werden?</translation>
</message>
<message>
- <location line="+10"/>
<source>Could not add following files to version control (%1)
</source>
<translation>Die folgenden Dateien konnten nicht unter Versionsverwaltung (%1) gestellt werden
</translation>
</message>
<message>
- <location line="+61"/>
<source>Could not remove file %1 from project %2.</source>
<translation>Die Datei %1 konnte nicht vom Projekt %2 entfernt werden.</translation>
</message>
<message>
- <location line="+15"/>
- <location line="+35"/>
<source>Could not delete file %1.</source>
<translation>Die Datei %1 konnte nicht gelöscht werden.</translation>
</message>
@@ -10905,47 +8893,38 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>ProjectExplorer::Internal::BuildConfigDialog</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildconfigdialog.cpp" line="+68"/>
<source>This can happen if the active build configuration uses the wrong Qt version and/or tool chain for the active run configuration (for example, running in Symbian emulator requires building with the WINSCW tool chain).</source>
<translation>Das kann passieren, wenn die aktive Build-Konfiguration eine für die aktive Ausführungskonfiguration ungeeignete Qt-Version und/oder Toolchain benutzt (zum Beispiel erfordert die Ausführung im Symbian-Emulator die Toolchain WINSCW).</translation>
</message>
<message>
- <location line="-6"/>
<source>Run configuration does not match build configuration</source>
<translation>Die Ausführungskonfiguration entspricht nicht der Build-Konfiguration</translation>
</message>
<message>
- <location line="-9"/>
<source>Change build configuration && continue</source>
<translation>Ändere Build-Konfiguration und setze fort</translation>
</message>
<message>
- <location line="+2"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location line="+2"/>
<source>Continue anyway</source>
<translation>Trotzdem fortsetzen</translation>
</message>
<message>
- <location line="+6"/>
<source>The active build configuration builds a target that cannot be used by the active run configuration.</source>
<translation>Die aktive Build-Konfiguration erstellt ein Ziel, das von der aktiven Ausführungskonfiguration nicht verwendet werden kann.</translation>
</message>
<message>
- <location line="+27"/>
<source>Active run configuration</source>
<translation>Aktive Ausführungskonfiguration</translation>
</message>
<message>
- <location line="+3"/>
<source>Choose build configuration:</source>
<translation>Build-Konfiguration wählen:</translation>
</message>
<message>
- <location line="-9"/>
<source>No valid build configuration found.</source>
<translation>Es konnte keine gültige Build-Konfiguration gefunden werden.</translation>
</message>
@@ -10953,53 +8932,42 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>ProjectExplorer::SessionManager</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/session.cpp" line="+489"/>
<source>Error while restoring session</source>
<translation>Beim Wiederherstellen der Sitzung ist ein Fehler aufgetreten</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not restore session %1</source>
<translation>Die Sitzung %1 konnte nicht wiederhergestellt werden</translation>
</message>
<message>
- <location line="+12"/>
<source>Failed to restore project files</source>
<translation>Fehlschlag beim Wiederherstellen der Dateien des Projekts</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not restore the following project files:<br><b>%1</b></source>
<translation>Die folgende Dateien konnten nicht wiederhergestellt werden: <br><b>%1</b></translation>
</message>
<message>
- <location line="+2"/>
<source>Keep projects in Session</source>
<translation>Projekte in Sitzung belassen</translation>
</message>
<message>
- <location line="+1"/>
<source>Remove projects from Session</source>
<translation>Projekte aus Sitzung entfernen</translation>
</message>
<message>
- <location line="+40"/>
<source>Error while saving session</source>
<translation>Fehler beim Speichern der Sitzung</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not save session to file %1</source>
<translation>Die Sitzung konnte nicht unter %1 gespeichert werden</translation>
</message>
<message>
- <location line="+207"/>
<source>Qt Creator</source>
<translation>Qt Creator</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+21"/>
<source>Untitled</source>
<translation>Kein Titel</translation>
</message>
@@ -11007,7 +8975,6 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>ProjectWelcomePage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwelcomeplugin.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
@@ -11015,32 +8982,26 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QMakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qmakestep.ui"/>
<source>Additional arguments:</source>
<translation>Zusätzliche Argumente:</translation>
</message>
<message>
- <location/>
<source>Effective qmake call:</source>
<translation>Resultierender qmake-Aufruf:</translation>
</message>
<message>
- <location/>
<source>qmake build configuration:</source>
<translation>qmake Build-Konfiguration:</translation>
</message>
<message>
- <location/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
- <location/>
<source>Release</source>
<translation>Release</translation>
</message>
<message>
- <location/>
<source>Debug and release</source>
<translation>Debug und Release</translation>
</message>
@@ -11048,57 +9009,46 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../../../src/plugins/qtestlib/qtestlibplugin.cpp" line="+59"/>
<source>Pass</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Expected Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Expected Pass</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Debug</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Critical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Fatal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Skipped</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
@@ -11106,17 +9056,14 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QTestLib::Internal::QTestOutputPane</name>
<message>
- <location line="+266"/>
<source>Test Results</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
<source>Result</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
<source>Message</source>
<translation>Bezeichnung</translation>
</message>
@@ -11124,12 +9071,10 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QTestLib::Internal::QTestOutputWidget</name>
<message>
- <location line="+45"/>
<source>All Incidents</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
<source>Show Only:</source>
<translation type="unfinished"></translation>
</message>
@@ -11137,32 +9082,26 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QrcEditor</name>
<message>
- <location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Properties</source>
<translation>Eigenschaften</translation>
</message>
<message>
- <location/>
<source>Prefix:</source>
<translation>Präfix:</translation>
</message>
<message>
- <location/>
<source>Language:</source>
<translation>Sprache:</translation>
</message>
<message>
- <location/>
<source>Alias:</source>
<translation>Aliasname:</translation>
</message>
@@ -11170,132 +9109,106 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::ClassDefinition</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>The header file</source>
<translation>Header-Datei</translation>
</message>
<message>
- <location/>
<source>&Sources</source>
<translation>&Quellen</translation>
</message>
<message>
- <location/>
<source>Widget librar&y:</source>
<translation>Widget-&Bibliothek:</translation>
</message>
<message>
- <location/>
<source>Widget project &file:</source>
<translation>Widget-&Projektdatei:</translation>
</message>
<message>
- <location/>
<source>Widget h&eader file:</source>
<translation>Widget-&Header-Datei:</translation>
</message>
<message>
- <location/>
<source>Widge&t source file:</source>
<translation>Widget-&Quelldatei:</translation>
</message>
<message>
- <location/>
<source>Widget &base class:</source>
<translation>&Basisklasse des Widgets:</translation>
</message>
<message>
- <location/>
<source>QWidget</source>
<translation>QWidget</translation>
</message>
<message>
- <location/>
<source>Plugin class &name:</source>
<translation>Klassen&name des Plugins:</translation>
</message>
<message>
- <location/>
<source>Plugin &header file:</source>
<translation>He&ader-Datei des Plugins:</translation>
</message>
<message>
- <location/>
<source>Plugin sou&rce file:</source>
<translation>Q&uelldatei des Plugins:</translation>
</message>
<message>
- <location/>
<source>Icon file:</source>
<translation>Icon-Datei:</translation>
</message>
<message>
- <location/>
<source>&Link library</source>
<translation>&Bibliothek</translation>
</message>
<message>
- <location/>
<source>Create s&keleton</source>
<translation>&Gerüst erzeugen</translation>
</message>
<message>
- <location/>
<source>Include pro&ject</source>
<translation>Einbinden (*.pri-Datei)</translation>
</message>
<message>
- <location/>
<source>&Description</source>
<translation>&Beschreibung</translation>
</message>
<message>
- <location/>
<source>G&roup:</source>
<translation>&Kategorie:</translation>
</message>
<message>
- <location/>
<source>&Tooltip:</source>
<translation>&Tooltip:</translation>
</message>
<message>
- <location/>
<source>W&hat's this:</source>
<translation>W&hat's this:</translation>
</message>
<message>
- <location/>
<source>The widget is a &container</source>
<translation>&Containerwidget</translation>
</message>
<message>
- <location/>
<source>Property defa&ults</source>
<translation>&Vorgabewerte der Eigenschaften</translation>
</message>
<message>
- <location/>
<source>dom&XML:</source>
<translation>dom&XML:</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp" line="+44"/>
<source>Select Icon</source>
<translation>Icon auswählen</translation>
</message>
<message>
- <location line="+1"/>
<source>Icon files (*.png *.ico *.jpg *.xpm *.tif *.svg)</source>
<translation>Icon-Dateien (*.png *.ico *.jpg *.xpm *.tif *.svg)</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui"/>
<source>The header file has to be specified in source code.</source>
<translation>Die Header-Datei muss im Quellcode angegeben werden.</translation>
</message>
@@ -11303,17 +9216,14 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::ClassList</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp" line="+69"/>
<source><New class></source>
<translation><Neue Klasse></translation>
</message>
<message>
- <location line="+74"/>
<source>Confirm Delete</source>
<translation>Löschen Bestätigen</translation>
</message>
<message>
- <location line="+1"/>
<source>Delete class %1 from list?</source>
<translation>Soll die Klasse %1 aus der Liste gelöscht werden?</translation>
</message>
@@ -11321,12 +9231,10 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>Qt4ProjectManager::Internal::ConsoleAppWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp" line="+59"/>
<source>Qt Console Application</source>
<translation>Qt Konsolenanwendung</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a project containing a single main.cpp file with a stub implementation.
Preselects a desktop Qt for building the application if available.</source>
@@ -11338,7 +9246,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::ConsoleAppWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp" line="+51"/>
<source>This wizard generates a Qt4 console application project. The application derives from QCoreApplication and does not provide a GUI.</source>
<translation>Dieser Wizard erstellt eine Qt4 Konsolenanwendung. Sie leitet von der Klasse QCoreApplication ab und hat keine Benutzeroberfläche.</translation>
</message>
@@ -11346,47 +9253,38 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::CustomWidgetPluginWizardPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location/>
<source>Plugin and Collection Class Information</source>
<translation>Plugin und Parameter der Collection-Klasse</translation>
</message>
<message>
- <location/>
<source>Specify the properties of the plugin library and the collection class.</source>
<translation>Geben Sie die Parameter der Plugin-Bibliothek und der Collection-Klasse an.</translation>
</message>
<message>
- <location/>
<source>Collection class:</source>
<translation>Collection-Klasse:</translation>
</message>
<message>
- <location/>
<source>Collection header file:</source>
<translation>Collection-Header-Datei:</translation>
</message>
<message>
- <location/>
<source>Collection source file:</source>
<translation>Collection-Quelldatei:</translation>
</message>
<message>
- <location/>
<source>Plugin name:</source>
<translation>Name des Plugins</translation>
</message>
<message>
- <location/>
<source>Resource file:</source>
<translation>Ressourcendatei:</translation>
</message>
<message>
- <location/>
<source>icons.qrc</source>
<translation>icons.qrc</translation>
</message>
@@ -11394,27 +9292,22 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::CustomWidgetWidgetsWizardPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui"/>
<source>Custom Qt Widget Wizard</source>
<translation>Wizard zur Erstellung benutzerdefinierter Qt-Widgets</translation>
</message>
<message>
- <location/>
<source>Custom Widget List</source>
<translation>Benutzerdefinierte Widgets</translation>
</message>
<message>
- <location/>
<source>Widget &Classes:</source>
<translation>&Klassen:</translation>
</message>
<message>
- <location/>
<source>Specify the list of custom widgets and their properties.</source>
<translation>Erstellen Sie eine Liste der benutzerdefinierten Widgets und ihrer Eigenschaften.</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
@@ -11422,12 +9315,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::CustomWidgetWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp" line="+48"/>
<source>Qt Custom Designer Widget</source>
<translation>Benutzerdefiniertes Widget für Qt Designer</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a Qt Custom Designer Widget or a Custom Widget Collection.</source>
<translation>Erstellt ein oder mehrere benutzerdefinierte Widgets für Qt Designer.</translation>
</message>
@@ -11435,17 +9326,14 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::CustomWidgetWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp" line="+52"/>
<source>This wizard generates a Qt4 Designer Custom Widget or a Qt4 Designer Custom Widget Collection project.</source>
<translation>Dieser Wizard erstellt ein Projekt mit einem oder mehreren benutzerdefinierten Widgets für Qt4 Designer.</translation>
</message>
<message>
- <location line="+6"/>
<source>Custom Widgets</source>
<translation>Benutzerdefinierte Widgets</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin Details</source>
<translation>Plugin-Parameter</translation>
</message>
@@ -11453,12 +9341,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::DesignerExternalEditor</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/externaleditors.cpp" line="+160"/>
<source>Qt Designer is not responding (%1).</source>
<translation>Qt Designer antwortet nicht (%1).</translation>
</message>
<message>
- <location line="+8"/>
<source>Unable to create server socket: %1</source>
<translation>Der Server-Socket konnte nicht erzeugt werden: %1</translation>
</message>
@@ -11466,12 +9352,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::EmptyProjectWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp" line="+46"/>
<source>Empty Qt Project</source>
<translation>Leeres Qt-Projekt</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a qmake-based project without any files. This allows you to create an application without any default classes.</source>
<translation>Erstellt ein auf qmake basierendes Qt-Projekt ohne Dateien und vorgegebene Klassen.</translation>
</message>
@@ -11479,7 +9363,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::EmptyProjectWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp" line="+45"/>
<source>This wizard generates an empty Qt4 project. Add files to it later on by using the other wizards.</source>
<translation>Dieser Wizard erstellt ein leeres Qt4-Projekt. Mit Hilfe der anderen Wizards können später Dateien hinzufügt werden.</translation>
</message>
@@ -11487,25 +9370,21 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::ExternalQtEditor</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/externaleditors.cpp" line="-202"/>
<source>Unable to start "%1"</source>
<translation>"%1" kann nicht gestartet werden</translation>
</message>
<message>
- <location line="+5"/>
<source>The application "%1" could not be found.</source>
- <translation>Die Anwendung "%" konnte nicht gefunden werden.</translation>
+ <translation>Die Anwendung "%1" konnte nicht gefunden werden.</translation>
</message>
</context>
<context>
<name>Qt4ProjectManager::Internal::FilesPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/filespage.cpp" line="+45"/>
<source>Class Information</source>
<translation>Parameter der Klasse</translation>
</message>
<message>
- <location line="+2"/>
<source>Specify basic information about the classes for which you want to generate skeleton source code files.</source>
<translation>Geben Sie Informationen bezüglich der Klassen ein, für die Sie Quelltexte generieren wollen.</translation>
</message>
@@ -11513,7 +9392,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::GettingStartedWelcomePage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepage.h" line="+47"/>
<source>Getting Started</source>
<translation>Schnelleinstieg</translation>
</message>
@@ -11521,215 +9399,204 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::GettingStartedWelcomePageWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Tutorials</source>
<translation>Anleitungen</translation>
</message>
<message>
- <location/>
<source>Did You Know?</source>
<translation>Schon gewusst?</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+74"/>
<source>The Qt Creator User Interface</source>
<translation>Die Benutzeroberfläche von Qt Creator</translation>
</message>
<message>
- <location line="+2"/>
<source>Building and Running an Example</source>
<translation>Ein Beispiel erstellen und ausführen</translation>
</message>
<message>
- <location line="+2"/>
<source>Creating a Qt C++ Application</source>
<translation>Erstellen einer C++-Anwendung mit Qt</translation>
</message>
<message>
- <location line="+2"/>
<source>Creating a Mobile Application</source>
<translation>Erstellen einer mobilen Anwendung</translation>
</message>
<message>
- <location line="+2"/>
<source>Creating a Qt Quick Application</source>
<translation>Erstellen einer Qt-Quick-Anwendung</translation>
</message>
<message>
- <location line="+193"/>
<source>Copy Project to writable Location?</source>
<translation>Soll das Projekt in ein schreibbares Verzeichnis kopiert werden?</translation>
</message>
<message>
- <location line="+3"/>
<source><p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p></source>
<translation><p>Das zu öffnende Projekt befindet sich in einem schreibgeschützten Verzeichnis:</p><blockquote>%1</blockquote><p>Bitte geben Sie ein schreibbares Verzeichnis an und wählen dann "Projekt kopieren und öffnen", um eine modifizierbare Kopie des Projektes erhalten, oder "Projekt beibehalten und öffnen", um das Projekt im gegenwärtigen Verzeichnis zu öffnen</p><p><b>Hinweis:</b> Im gegenwärtigen.Verzeichnis kann das Projekt weder compiliert noch modifiziert werden.</p></translation>
</message>
<message>
- <location line="+8"/>
<source>&Location:</source>
<translation>&Verzeichnis:</translation>
</message>
<message>
- <location line="+12"/>
<source>&Copy Project and Open</source>
<translation>Projekt &kopieren und öffnen</translation>
</message>
<message>
- <location line="+2"/>
<source>&Keep Project and Open</source>
<translation>Projekt &beibehalten und öffnen</translation>
</message>
<message>
- <location line="+10"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="+1"/>
<source>The specified location already exists. Please specify a valid location.</source>
<translation>Das angegebene Verzeichnis existiert bereits. Bitte geben Sie ein gültiges Verzeichnis an.</translation>
</message>
<message>
- <location line="+47"/>
<source>New Project</source>
<translation>Neues Projekt</translation>
</message>
<message>
- <location line="+24"/>
- <location line="+7"/>
<source>Cmd</source>
<comment>Shortcut key</comment>
<translation>Kommando-Taste</translation>
</message>
<message>
- <location line="-5"/>
<source>Alt</source>
<comment>Shortcut key</comment>
<translation>Alt</translation>
</message>
<message>
- <location line="+7"/>
<source>Ctrl</source>
<comment>Shortcut key</comment>
<translation>Strg</translation>
</message>
<message>
- <location line="+7"/>
<source>If you add external libraries to your project, Qt Creator will automatically offer syntax highlighting and code completion.</source>
<translation>Qt Creator bietet automatisch Syntax-Hervorhebung und Code-Vervollständigung an, wenn Sie externe Bibliotheken zu Ihrem Projekt hinzufügen.</translation>
</message>
<message>
- <location line="+12"/>
<source>You can quickly search methods, classes, help and more using the <a href="qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html">Locator bar</a> (<tt>%1+K</tt>).</source>
<translation>Mit der <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">Locator-Leiste</a> (<tt>%1+K</tt>) können Sie schnell nach Methoden, Klassen, Hilfe und anderem suchen.</translation>
</message>
<message>
- <location line="+2"/>
<source>You can add custom build steps in the <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html">build settings</a>.</source>
<translation>Sie können eigene Erstellungsschritte in den <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html">'Build'-Einstellungen</a> hinzufügen.</translation>
</message>
<message>
- <location line="+2"/>
<source>Within a session, you can add <a href="qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html">dependencies</a> between projects.</source>
<translation>In einer Sitzung können Sie <a href="qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html">Abhängigkeiten</a> zwischen Projekten herstellen.</translation>
</message>
<message>
- <location line="-19"/>
+ <source><a href='%1'>Details...</a></source>
+ <translation><a href='%1'>Details...</a></translation>
+ </message>
+ <message>
+ <source><a href='%1'>Take Tutorial</a></source>
+ <translation><a href='%1'>Tutorial beginnen</a></translation>
+ </message>
+ <message>
<source>You can show and hide the side bar using <tt>%1+0<tt>.</source>
<translation>Sie können die Seitenleiste mit <tt>%1+0</tt> anzeigen oder ausblenden.</translation>
</message>
<message>
- <location line="-264"/>
- <location line="+55"/>
<source>Choose an Example...</source>
<translation>Beispiel wählen...</translation>
</message>
<message>
- <location line="+210"/>
<source>You can fine tune the <tt>Find</tt> function by selecting &quot;Whole Words&quot; or &quot;Case Sensitive&quot;. Simply click on the icons on the right end of the line edit.</source>
<translation>Sie können die <tt>Finden</tt>-Funktion durch Auswahl von &quot;Ganze Wörter&quot; oder &quot;Groß/Kleinschreibung&quot; steuern. Klicken Sie einfach auf die Symbole rechts vom Eingabefeld.</translation>
</message>
<message>
- <location line="+4"/>
<source>The code completion is CamelCase-aware. For example, to complete <tt>namespaceUri</tt> you can just type <tt>nU</tt> and hit <tt>Ctrl+Space</tt>.</source>
<translation>Die Code-Vervollständigung versteht CamelCase. Sie können zum Beipiel statt <tt>namespaceUri</tt> einfach <tt>nU</tt> schreiben und danach <tt>Strg+Leertaste</tt> drücken.</translation>
</message>
<message>
- <location line="+2"/>
<source>You can force code completion at any time using <tt>Ctrl+Space</tt>.</source>
<translation>Sie können die Code-Vervollständigung jederzeit mittels <tt>Strg+Leertaste</tt> erzwingen.</translation>
</message>
<message>
- <location line="+1"/>
<source>You can start Qt Creator with a session by calling <tt>qtcreator &lt;sessionname&gt;</tt>.</source>
<translation>Sie können Qt Creator jederzeit mit einer Sitzung starten, in dem Sie <tt>qtcreator &lt;Sitzungsname&gt;</tt> aufrufen.</translation>
</message>
<message>
- <location line="+1"/>
<source>You can return to edit mode from any other mode at any time by hitting <tt>Escape</tt>.</source>
<translation>Sie können stets mittels <tt>Escape</tt>-Taste aus jedem anderen Modus in den Editier-Modus zurückkehren.</translation>
</message>
<message>
- <location line="+2"/>
<source>You can switch between the output pane by hitting <tt>%1+n</tt> where n is the number denoted on the buttons at the window bottom:<ul><li>1 - Build Issues</li><li>2 - Search Results</li><li>3 - Application Output</li><li>4 - Compile Output</li></ul></source>
<translation>Sie können zwischen den Ausgabepanelen umschalten, in dem Sie <tt>%1+n</tt> drücken, wobei n die Zahl ist, die auf den Schaltflächen am unteren Fensterrand befindet: <ul><li>1 - Build-Probleme</li><li>2 - Suchergebnisse</li><li>3 - Ausgabe der Anwendung</li><li>4 - Kompilierung</li></ul></translation>
</message>
<message>
- <location line="+10"/>
<source>You can set the preferred editor encoding for every project in <tt>Projects -> Editor Settings -> Default Encoding</tt>.</source>
<translation>Sie können ihre Encoding-Vorgabe für den Editor für jedes Projekt in <tt>Projekte -> Editoreinstellungen -> Encoding-Vorgabe</tt> einstellen.</translation>
</message>
<message>
- <location line="+1"/>
<source>You can use Qt Creator with a number of <a href="qthelp://com.nokia.qtcreator/doc/creator-version-control.html">revision control systems</a> such as Subversion, Perforce, CVS and Git.</source>
<translation>Sie können Qt Creator mit einer Reihe von <a href="qthelp://com.nokia.qtcreator/doc/creator-version-control.html">Revisionskontrollsystemen</a> wie Subversion, Perforce, CVS oder Git verwenden.</translation>
</message>
<message>
- <location line="+2"/>
<source>In the editor, <tt>F2</tt> follows symbol definition, <tt>Shift+F2</tt> toggles declaration and definition while <tt>F4</tt> toggles header file and source file.</source>
<translation>Im Editor können Sie <tt>F2</tt> verwenden, um ein Symbol zu verfolgen; <tt>Shift+F2</tt> wechselt zwischen Deklaration und Definition. <tt>F4</tt> schaltet zwischen Header- und Quelldatei um.</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui"/>
<source>Examples not installed...</source>
- <translation>Beispiele nicht installiert...</translation>
+ <translation type="obsolete">Beispiele nicht installiert...</translation>
</message>
<message>
- <location/>
<source>Create Project...</source>
<translation>Projekt erstellen...</translation>
</message>
<message>
- <location/>
<source>Explore Qt C++ Examples</source>
- <translation>Qt C++-Beispiele öffnen</translation>
+ <translation type="obsolete">Qt C++-Beispiele öffnen</translation>
</message>
<message>
- <location/>
<source>Explore Qt Quick Examples</source>
- <translation>Qt-Quick-Beispiele öffnen</translation>
+ <translation type="obsolete">Qt-Quick-Beispiele öffnen</translation>
</message>
<message>
- <location/>
<source>Open Project...</source>
<translation>Projekt öffnen...</translation>
</message>
+ <message>
+ <source>Examples</source>
+ <translation>Beispiele</translation>
+ </message>
+ <message>
+ <source>Explore Qt C++ examples:</source>
+ <translation>Qt C++-Beispiele erkunden:</translation>
+ </message>
+ <message>
+ <source>Examples Not Installed...</source>
+ <translation>Beispiele nicht installiert...</translation>
+ </message>
+ <message>
+ <source>Explore Qt Quick examples:</source>
+ <translation>Qt-Quick-Beispiele erkunden:</translation>
+ </message>
+ <message>
+ <source>Explore Qt C++ mobile examples:</source>
+ <translation>Mobile Qt C++-Beispiele erkunden:</translation>
+ </message>
+ <message>
+ <source>Featured</source>
+ <translation>Kurz vorgestellt</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::GuiAppWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizard.cpp" line="+83"/>
<source>Qt Gui Application</source>
<translation>Qt-Gui-Anwendung</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a Qt application for the desktop. Includes a Qt Designer-based main window.
Preselects a desktop Qt for building the application if available.</source>
@@ -11738,7 +9605,6 @@ Preselects a desktop Qt for building the application if available.</source>
Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfügbar ist.</translation>
</message>
<message>
- <location line="+165"/>
<source>The template file '%1' could not be opened for reading: %2</source>
<translation>Die Vorgabendatei '%1' konnte nicht zum Lesen geöffnet werden: %2</translation>
</message>
@@ -11746,12 +9612,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::GuiAppWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp" line="+61"/>
<source>This wizard generates a Qt4 GUI application project. The application derives by default from QApplication and includes an empty widget.</source>
<translation>Dieser Wizard erstellt eine Qt4-GUI-Anwendung. Sie leitet von der Klasse QApplication ab und enthält ein leeres Widget.</translation>
</message>
<message>
- <location line="+10"/>
<source>Details</source>
<translation>Details</translation>
</message>
@@ -11759,12 +9623,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::LibraryWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizard.cpp" line="+55"/>
<source>C++ Library</source>
<translation>C++-Bibliothek</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a C++ library based on qmake. This can be used to create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul>.</source>
<translation>Erstellt qmake-basierte C++-Bibliotheken:<ul><li>Dynamisch linkbare C++-Bibliothek zur Verwendung mit <tt>QPluginLoader</tt> zur Laufzeit (Plugin)</li><li>Statisch oder dynamisch linkbare C++-Bibliothek zur Verwendung in einem anderen Projekt zur Linkzeit</li></ul>.</translation>
</message>
@@ -11772,40 +9634,37 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::LibraryWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp" line="+115"/>
<source>Shared Library</source>
<translation>Dynamisch gebunden</translation>
</message>
<message>
- <location line="+2"/>
<source>Statically Linked Library</source>
<translation>Statisch gebunden</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt 4 Plugin</source>
<translation>Qt 4 Plugin</translation>
</message>
<message>
- <location line="+2"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location line="+25"/>
<source>This wizard generates a C++ library project.</source>
<translation>Dieser Wizard erstellt ein C++-Bibliotheksprojekt.</translation>
</message>
<message>
- <location line="+10"/>
<source>Details</source>
<translation>Details</translation>
</message>
+ <message>
+ <source>Symbian Specific</source>
+ <translation>Symbian-spezifisch</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::MakeStepFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+427"/>
<source>Make</source>
<translation>Make</translation>
</message>
@@ -11813,12 +9672,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::ModulesPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/modulespage.cpp" line="+51"/>
<source>Select Required Modules</source>
<translation>Auswahl der benötigten Module</translation>
</message>
<message>
- <location line="+1"/>
<source>Select the modules you want to include in your project. The recommended modules for this project are selected by default.</source>
<translation>Wählen Sie die Module aus, die Sie in Ihrem Projekt verwenden wollen. Die empfohlenen Module für dieses Projekt sind bereits ausgewählt.</translation>
</message>
@@ -11826,17 +9683,14 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::PluginGenerator</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp" line="+62"/>
<source>Cannot open icon file %1.</source>
<translation>Die Icon-Datei %1 kann nicht geöffnet werden.</translation>
</message>
<message>
- <location line="+108"/>
<source>Creating multiple widget libraries (%1, %2) in one project (%3) is not supported.</source>
<translation>Die Erzeugung von mehreren Bibliotheken (%1, %2) in einem Projekt (%3) wird nicht unterstützen.</translation>
</message>
<message>
- <location line="+139"/>
<source>Cannot open %1: %2</source>
<translation>Die Datei %1 kann nicht geöffnet werden: %2</translation>
</message>
@@ -11844,7 +9698,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::ProjectLoadWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/projectloadwizard.cpp" line="+57"/>
<source>Project setup</source>
<translation>Projekt einrichten</translation>
</message>
@@ -11852,7 +9705,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::QMakeStepFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+521"/>
<source>qmake</source>
<translation>qmake</translation>
</message>
@@ -11860,64 +9712,50 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::Qt4PriFileNode</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4nodes.cpp" line="+85"/>
<source>Headers</source>
<translation>Header-Dateien</translation>
</message>
<message>
- <location line="+3"/>
<source>Sources</source>
<translation>Quelldateien</translation>
</message>
<message>
- <location line="+3"/>
<source>Forms</source>
<translation>Formulardateien</translation>
</message>
<message>
- <location line="+3"/>
<source>Resources</source>
<translation>Ressourcendateien</translation>
</message>
<message>
- <location line="+3"/>
<source>QML</source>
<translation>QML</translation>
</message>
<message>
- <location line="+3"/>
<source>Other files</source>
<translation>Andere Dateien</translation>
</message>
<message>
- <location line="+823"/>
- <location line="+7"/>
- <location line="+95"/>
<source>Failed!</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="-102"/>
<source>Could not open the file for edit with VCS.</source>
<translation>Die Datei konnte nicht mit Hilfe der Versionsverwaltung schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+122"/>
<source>Error while reading .pro file %1: %2</source>
<translation>Fehler beim Lesen der pro-Datei %1: %2</translation>
</message>
<message>
- <location line="-115"/>
<source>Could not set permissions to writable.</source>
<translation>Die Datei konnte schreibbar gemacht werden.</translation>
</message>
<message>
- <location line="+28"/>
<source>There are unsaved changes for project file %1.</source>
<translation>Die Projektdatei %1 hat noch nicht gespeicherte Änderungen.</translation>
</message>
<message>
- <location line="+68"/>
<source>Could not write project file %1.</source>
<translation>Die Projektdatei %1 konnte nicht geschrieben werden.</translation>
</message>
@@ -11925,12 +9763,10 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::Qt4ProFileNode</name>
<message>
- <location line="+352"/>
<source>Error while parsing file %1. Giving up.</source>
<translation>Fehler beim Auswerten von %1. Abbruch.</translation>
</message>
<message>
- <location line="+452"/>
<source>Could not find .pro file for sub dir '%1' in '%2'</source>
<translation>Die .pro-Datei des Unterverzeichnisses '%1' konnte in '%2' nicht gefunden werden</translation>
</message>
@@ -11938,83 +9774,67 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
<source><a href="import">Import existing build</a></source>
<translation><a href="import">Existierenden Build importieren</a></translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp" line="+78"/>
<source>Shadow Build Directory</source>
<translation>Shadow-Build-Verzeichnis</translation>
</message>
<message>
- <location line="+44"/>
<source>using <font color="#ff0000">invalid</font> Qt Version: <b>%1</b><br>%2</source>
<translation>verwende <font color="#ff0000">ungültige</font> Qt-Version: <b>%1</b><br>%2</translation>
</message>
<message>
- <location line="+3"/>
<source>No Qt Version found.</source>
<translation>Es konnte keine Qt-Version gefunden werden.</translation>
</message>
<message>
- <location line="+4"/>
<source>using Qt version: <b>%1</b><br>with tool chain <b>%2</b><br>building in <b>%3</b></source>
<translation>verwende Qt-Version: <b>%1</b><br>mit Toolchain <b>%2</b><br>Erstellung in <b>%3</b></translation>
</message>
<message>
- <location line="+26"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location line="+82"/>
<source>Invalid Qt version</source>
<translation>Ungültige Qt-Version</translation>
</message>
<message>
- <location line="+107"/>
<source>Error:</source>
<translation>Fehler:</translation>
</message>
<message>
- <location line="+4"/>
<source>Warning:</source>
<translation>Warnung:</translation>
</message>
<message>
- <location line="+19"/>
<source>An incompatible build exists in %1, which will be overwritten.</source>
<comment>%1 build directory</comment>
<translation>Im Ordner %1 existiert ein inkompatibler Build, der überschrieben wird.</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectconfigwidget.ui"/>
<source>Manage</source>
<translation>Verwaltung</translation>
</message>
<message>
- <location/>
<source>problemLabel</source>
<translation>problemLabel</translation>
</message>
<message>
- <location/>
<source>Qt version:</source>
<translation>Qt-Version:</translation>
</message>
<message>
- <location/>
<source>Tool chain:</source>
<translation>Toolchain:</translation>
</message>
<message>
- <location/>
<source>Shadow build:</source>
<translation>Shadow-Build:</translation>
</message>
<message>
- <location/>
<source>Build directory:</source>
<translation>Build-Verzeichnis:</translation>
</message>
@@ -12022,28 +9842,22 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::Qt4ProjectManagerPlugin</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp" line="+187"/>
- <location line="+5"/>
<source>Run qmake</source>
<translation>qmake ausführen</translation>
</message>
<message>
- <location line="+9"/>
<source>Build</source>
<translation>Erstellen</translation>
</message>
<message>
- <location line="+8"/>
<source>Rebuild</source>
<translation>Neu erstellen</translation>
</message>
<message>
- <location line="+8"/>
<source>Clean</source>
<translation>Bereinigen</translation>
</message>
<message>
- <location line="+24"/>
<source>Add Library...</source>
<translation>Bibliothek hinzufügen...</translation>
</message>
@@ -12051,22 +9865,18 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4runconfiguration.cpp" line="+547"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+2"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+2"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
<message>
- <location line="+102"/>
<source>Qt4 RunConfiguration</source>
<translation>Qt4 RunConfiguration</translation>
</message>
@@ -12074,67 +9884,54 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::Qt4RunConfigurationWidget</name>
<message>
- <location line="-450"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
- <location line="+9"/>
<source>Select Working Directory</source>
<translation>Wählen Sie das Arbeitsverzeichnis aus</translation>
</message>
<message>
- <location line="+10"/>
<source>Working directory:</source>
<translation>Arbeitsverzeichnis:</translation>
</message>
<message>
- <location line="+2"/>
<source>Run in terminal</source>
<translation>In Terminal ausführen</translation>
</message>
<message>
- <location line="+9"/>
<source>Debugger:</source>
<translation>Debugger:</translation>
</message>
<message>
- <location line="+20"/>
<source>Run Environment</source>
<translation>Ausführungsumgebung</translation>
</message>
<message>
- <location line="+10"/>
<source>Base environment for this runconfiguration:</source>
<translation>Basisumgebung für diese Ausführungskonfiguration</translation>
</message>
<message>
- <location line="+4"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+1"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
<message>
- <location line="-68"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
<message>
- <location line="+14"/>
<source>Reset to default</source>
<translation>Zurücksetzen</translation>
</message>
<message>
- <location line="+30"/>
<source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
<translation>Debug-Version von Frameworks verwenden (DYLD_IMAGE_SUFFIX=_debug)</translation>
</message>
@@ -12142,98 +9939,89 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::QtOptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtoptionspage.cpp" line="+150"/>
<source><specify a name></source>
<translation><Geben Sie einen Namen an></translation>
</message>
<message>
- <location line="+1"/>
<source><specify a qmake location></source>
<translation><Geben Sie den Pfad zu qmake an></translation>
</message>
<message>
- <location line="+9"/>
<source>Select qmake Executable</source>
<translation>Wählen Sie die ausführbare qmake-Datei aus</translation>
</message>
<message>
- <location line="+2"/>
<source>Select the MinGW Directory</source>
<translation>Wählen Sie das MinGW-Verzeichnis aus</translation>
</message>
<message>
- <location line="+2"/>
<source>Select Carbide Install Directory</source>
<translation>Carbide-Installationsordner auswählen</translation>
</message>
<message>
- <location line="+2"/>
<source>Select S60 SDK Root</source>
<translation>Hauptordner des S60 SDK auswählen</translation>
</message>
<message>
- <location line="+2"/>
<source>Select the CSL ARM Toolchain (GCCE) Directory</source>
<translation>Ordner der CSL ARM Toolchain (GCCE)</translation>
</message>
<message>
- <location line="+11"/>
<source>Auto-detected</source>
<translation>Automatisch bestimmt</translation>
</message>
<message>
- <location line="+3"/>
<source>Manual</source>
<translation>Benutzerdefiniert</translation>
</message>
<message>
- <location line="+134"/>
<source>Building helpers</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
- <location line="+63"/>
+ <source>Binary not found</source>
+ <translation>Ausführbare Datei nicht gefunden</translation>
+ </message>
+ <message>
+ <source><html><body><table><tr><td colspan="2"><b>GDB debugging helpers</b></td></tr><tr><td>File:</td><td><pre>%1</pre></td></tr><tr><td>Last&nbsp;modified:</td><td>%2</td></tr><tr><td>Size:</td><td>%3 Bytes</td></tr><tr><td colspan="2"><b>QML type dumper</b></td></tr><tr><td>File:</td><td><pre>%4</pre></td></tr><tr><td>Last&nbsp;modified:</td><td>%5</td></tr><tr><td>Size:</td><td>%6 Bytes</td></tr><tr><td colspan="2"><b>QML observer</b></td></tr><tr><td>File:</td><td><pre>%7</pre></td></tr><tr><td>Last&nbsp;modified:</td><td>%8</td></tr><tr><td>Size:</td><td>%9 Bytes</td></tr></table></body></html></source>
+ <extracomment>Tooltip showing the debugging helper library file.</extracomment>
+ <translation><html><body><table><tr><td colspan="2"><b>GDB-Ausgabe-Hilfsbibliothek</b></td></tr><tr><td>Datei:</td><td><pre>%1</pre></td></tr><tr><td>Zuletzt&nbsp;geändert:</td><td>%2</td></tr><tr><td>Größe:</td><td>%3 Bytes</td></tr><tr><td colspan="2"><b>QML-Typausgabe</b></td></tr><tr><td>Datei:</td><td><pre>%4</pre></td></tr><tr><td>Zuletzt&nbsp;geändert:</td><td>%5</td></tr><tr><td>Größe:</td><td>%6 Bytes</td></tr><tr><td colspan="2"><b>QML observer</b></td></tr><tr><td>Größe:</td><td><pre>%7</pre></td></tr><tr><td>Zuletzt&nbsp;geändert:</td><td>%8</td></tr><tr><td>Größe:</td><td>%9 Bytes</td></tr></table></body></html></translation>
+ </message>
+ <message>
<source><html><body><table><tr><td>File:</td><td><pre>%1</pre></td></tr><tr><td>Last&nbsp;modified:</td><td>%2</td></tr><tr><td>Size:</td><td>%3 Bytes</td></tr></table></body></html></source>
<extracomment>Tooltip showing the debugging helper library file.</extracomment>
- <translation><html><body><table><tr><td>Datei:</td><td><pre>%1</pre></td></tr><tr><td>Letzte Änderung:</td><td>%2</td></tr><tr><td>Größe:</td><td>%3 Bytes</td></tr></table></body></html></translation>
+ <translation type="obsolete"><html><body><table><tr><td>Datei:</td><td><pre>%1</pre></td></tr><tr><td>Letzte Änderung:</td><td>%2</td></tr><tr><td>Größe:</td><td>%3 Bytes</td></tr></table></body></html></translation>
</message>
<message>
- <location line="+103"/>
<source>This Qt Version has a unknown toolchain.</source>
<translation>Dieser Qt-Version ist keine bekannte Toolchain zugeordnet.</translation>
</message>
<message>
- <location line="+44"/>
<source>Desktop</source>
<comment>Qt Version is meant for the desktop</comment>
<translation>Desktop</translation>
</message>
<message>
- <location line="+3"/>
<source>Symbian</source>
<comment>Qt Version is meant for Symbian</comment>
<translation>Symbian</translation>
</message>
<message>
- <location line="+2"/>
<source>Maemo</source>
<comment>Qt Version is meant for Maemo</comment>
<translation>Maemo</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt Simulator</source>
<comment>Qt Version is meant for Qt Simulator</comment>
<translation>Qt Simulator</translation>
</message>
<message>
- <location line="+2"/>
<source>unkown</source>
<comment>No idea what this Qt Version is meant for!</comment>
<translation>unbekannt</translation>
</message>
<message>
- <location line="+1"/>
<source>Found Qt version %1, using mkspec %2 (%3)</source>
<translation>Es wurde die Qt-Version %1 mit mkspec %2 (%3) gefunden</translation>
</message>
@@ -12241,105 +10029,89 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.ui"/>
<source>+</source>
<translation>+</translation>
</message>
<message>
- <location/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location/>
<source>Debugging Helper</source>
<translation>Ausgabe-Hilfsbibliothek</translation>
</message>
<message>
- <location/>
<source>Show &Log</source>
<translation>&Protokoll anzeigen</translation>
</message>
<message>
- <location/>
<source>&Rebuild</source>
<translation>&Neu erstellen</translation>
</message>
<message>
- <location/>
<source>S60 SDK:</source>
<translation>S60 SDK:</translation>
</message>
<message>
- <location/>
<source>qmake Location</source>
<translation>QMake-Pfad</translation>
</message>
<message>
- <location/>
<source>Toolchain:</source>
<translation>Toolchain:</translation>
</message>
<message>
- <location/>
<source>Version name:</source>
<translation>Name der Version:</translation>
</message>
<message>
- <location/>
<source>qmake location:</source>
<translation>QMake-Pfad:</translation>
</message>
<message>
- <location/>
<source>MinGW directory:</source>
<translation>MinGW-Verzeichnis:</translation>
</message>
<message>
- <location/>
<source>CSL/GCCE directory:</source>
<translation>CSL/GCCE:</translation>
</message>
<message>
- <location/>
<source>Carbide directory:</source>
<translation>Carbide-Ordner:</translation>
</message>
<message>
- <location/>
<source>Debugging helper:</source>
- <translation>Ausgabe-Hilfsbibliothek:</translation>
+ <translation type="obsolete">Ausgabe-Hilfsbibliothek:</translation>
</message>
<message>
- <location/>
<source>Unable to detect MSVC version.</source>
<translation>Die verwendete MSVC-Version konnte nicht bestimmt werden.</translation>
</message>
+ <message>
+ <source>Debugging helpers:</source>
+ <translation>Ausgabe-Hilfsbibliotheken:</translation>
+ </message>
</context>
<context>
<name>Qt4ProjectManager::Internal::S60DeviceDebugRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+745"/>
<source>Warning: Cannot locate the symbol file belonging to %1.</source>
<translation>Warnung: Die zu %1 gehörige Symboldatei konnte nicht gefunden werden.</translation>
</message>
<message>
- <location line="+17"/>
<source>Debugger for Symbian Platform</source>
<translation>Debugger für Symbian-Plattform</translation>
</message>
<message>
- <location line="+7"/>
<source>Debugging</source>
<translation>Debuggen</translation>
</message>
<message>
- <location line="+6"/>
<source>Launching debugger...</source>
<translation>Starte Debugger...</translation>
</message>
@@ -12347,14 +10119,11 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfiguration</name>
<message>
- <location line="-646"/>
- <location line="+84"/>
<source>%1 on Symbian Device</source>
<extracomment>S60 device runconfiguration default display name, %1 is base pro-File name</extracomment>
<translation>%1 auf Symbian-Gerät</translation>
</message>
<message>
- <location line="-81"/>
<source>Run on Symbian device</source>
<extracomment>S60 device runconfiguration default display name (no profile set)</extracomment>
<translation>Ausführung auf Symbian-Gerät</translation>
@@ -12363,7 +10132,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationFactory</name>
<message>
- <location line="+249"/>
<source>%1 on Symbian Device</source>
<translation>%1 auf Symbian-Gerät</translation>
</message>
@@ -12371,7 +10139,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp" line="+72"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
@@ -12379,74 +10146,60 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
<context>
<name>Qt4ProjectManager::Internal::S60DeviceRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp" line="+313"/>
<source>Could not start application: %1</source>
<translation>Die Anwendung konnte nicht gestartet werden: %1</translation>
</message>
<message>
- <location line="-12"/>
<source>Starting application...</source>
<translation>Starte Anwendung...</translation>
</message>
<message>
- <location line="-196"/>
<source>Launching</source>
<translation>Starte</translation>
</message>
<message>
- <location line="+8"/>
<source>There is no device plugged in.</source>
<translation>Es ist kein Gerät angeschlossen.</translation>
</message>
<message>
- <location line="+5"/>
<source>Executable file: %1</source>
<translation>Ausführbare Datei: %1</translation>
</message>
<message>
- <location line="+9"/>
<source>Debugger for Symbian Platform</source>
<translation>Debugger für Symbian-Plattform</translation>
</message>
<message>
- <location line="+63"/>
<source>Could not connect to phone on port '%1': %2
Check if the phone is connected and App TRK is running.</source>
<translation>Es konnte keine Verbindung zum Gerät über den Port '%1' hergestellt werden: %2
Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' läuft.</translation>
</message>
<message>
- <location line="+9"/>
<source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
<translation>Es konnte keine Verbindung zu App TRK über den Port '%1' hergestellt werden. Bitte versuchen Sie, App TRK neu zu starten.</translation>
</message>
<message>
- <location line="+29"/>
<source>Waiting for App TRK</source>
<translation>Warte auf App TRK</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Creator is waiting for the TRK application to connect.<br>Please make sure the application is running on your mobile phone and the right port is configured in the project settings.</source>
<translation>Qt Creator wartet auf eine Verbindung zur TRK-Anwendung.<br>Bitte starten Sie die Anwendung auf dem Mobiltelefon und prüfen Sie die Einstellung des Ports in der Projektkonfiguration.</translation>
</message>
<message>
- <location line="+24"/>
<source>Canceled.</source>
<translation>Abgebrochen.</translation>
</message>
<message>
- <location line="+18"/>
<source>The device '%1' has been disconnected</source>
<translation>Das Gerät '%1' wurde entfernt</translation>
</message>
<message>
- <location line="+35"/>
<source>Application running with pid %1.</source>
<translation>Die Anwendung läuft mit der Prozess-Id: %1.</translation>
</message>
<message>
- <location line="-10"/>
<source>Finished.</source>
<translation>Beendet.</translation>
</message>
@@ -12454,37 +10207,30 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60DevicesPreferencePane</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="+370"/>
<source>S60 SDKs</source>
<translation>S60 SDKs</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Change Qt version</source>
<translation>Qt-Version ändern</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
@@ -12492,8 +10238,6 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp" line="+99"/>
- <location line="+58"/>
<source>%1 in Symbian Emulator</source>
<extracomment>S60 emulator run configuration default display name, %1 is base pro-File name
----------
@@ -12501,7 +10245,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<translation>%1 im Symbian-Emulator</translation>
</message>
<message>
- <location line="-55"/>
<source>Run on Symbian Emulator</source>
<extracomment>S60 emulator run configuration default display name (no pro-file name)</extracomment>
<translation>Ausführung im Symbian-Emulator</translation>
@@ -12510,7 +10253,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationFactory</name>
<message>
- <location line="+187"/>
<source>%1 in Symbian Emulator</source>
<translation>%1 im Symbian-Emulator</translation>
</message>
@@ -12518,7 +10260,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunConfigurationWidget</name>
<message>
- <location line="-87"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
@@ -12526,17 +10267,14 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::Internal::S60EmulatorRunControl</name>
<message>
- <location line="+117"/>
<source>Starting %1...</source>
<translation>Starte %1...</translation>
</message>
<message>
- <location line="+22"/>
<source>[Qt Message]</source>
<translation>[Qt-Meldung]</translation>
</message>
<message>
- <location line="+10"/>
<source>%1 exited with code %2</source>
<translation>%1 beendet, Rückgabewert %2</translation>
</message>
@@ -12544,17 +10282,14 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::Internal::S60Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60manager.cpp" line="+117"/>
<source>Run in Emulator</source>
<translation>Im Emulator ausführen</translation>
</message>
<message>
- <location line="+5"/>
<source>Run on Device</source>
<translation>Auf Gerät ausführen</translation>
</message>
<message>
- <location line="+8"/>
<source>Debug on Device</source>
<translation>Auf Gerät Debuggen</translation>
</message>
@@ -12562,13 +10297,11 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::MakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-341"/>
<source>Make</source>
<comment>Qt4 MakeStep display name.</comment>
<translation>Make</translation>
</message>
<message>
- <location line="+55"/>
<source>Could not find make command: %1 in the build environment</source>
<translation>Das 'make'-Kommando '%1' konnte in der Build-Umgebung nicht gefunden werden</translation>
</message>
@@ -12576,17 +10309,14 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::MakeStepConfigWidget</name>
<message>
- <location line="+133"/>
<source>Override %1:</source>
<translation>Ãœberschreibe %1:</translation>
</message>
<message>
- <location line="+16"/>
<source><b>Make:</b> %1 not found in the environment.</source>
<translation><b>Make-Schritt:</b> %1 konnte in der Umgebung nicht gefunden werden.</translation>
</message>
<message>
- <location line="+20"/>
<source><b>Make:</b> %1 %2 in %3</source>
<translation><b>Make-Kommando:</b> %1 %2 in %3</translation>
</message>
@@ -12594,18 +10324,15 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::QMakeStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-437"/>
<source>qmake</source>
<extracomment>QMakeStep default display name</extracomment>
<translation>qmake</translation>
</message>
<message>
- <location line="+136"/>
<source>Configuration is faulty, please check the Build Issues view for details.</source>
<translation>Die Konfiguration ist fehlerhaft. Details befinden sich in der Ansicht "Build-Probleme".</translation>
</message>
<message>
- <location line="+6"/>
<source>Configuration unchanged, skipping qmake step.</source>
<translation>Unveränderte Konfiguration, qmake-Schritt wird übersprungen.</translation>
</message>
@@ -12613,12 +10340,10 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::QMakeStepConfigWidget</name>
<message>
- <location line="+198"/>
<source><b>qmake:</b> No Qt version set. Cannot run qmake.</source>
<translation><b>qmake:</b> Es ist keine Qt-Version eingestellt. qmake kann nicht ausgeführt werden.</translation>
</message>
<message>
- <location line="+14"/>
<source><b>qmake:</b> %1 %2</source>
<translation><b>qmake:</b> %1 %2</translation>
</message>
@@ -12626,12 +10351,10 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::Qt4Manager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanager.cpp" line="+228"/>
<source>Failed opening project '%1': Project file does not exist</source>
<translation>Das Projekt %1 konnte nicht geöffnet werden: Die Projektdatei existiert nicht</translation>
</message>
<message>
- <location line="+6"/>
<source>Failed opening project '%1': Project already open</source>
<translation>Das Projekt %1 konnte nicht geöffnet werden da es bereits geladen ist</translation>
</message>
@@ -12639,48 +10362,38 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+396"/>
<source><not found></source>
<translation><nicht gefunden></translation>
</message>
<message>
- <location line="+6"/>
- <location line="+6"/>
<source>Qt in PATH</source>
<translation>Qt aus PATH</translation>
</message>
<message>
- <location line="+190"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location line="+2"/>
<source>Source:</source>
<translation>Ordner:</translation>
</message>
<message>
- <location line="+2"/>
<source>mkspec:</source>
<translation>mkspec:</translation>
</message>
<message>
- <location line="+2"/>
<source>qmake:</source>
<translation>qmake:</translation>
</message>
<message>
- <location line="+4"/>
<source>Default:</source>
<translation>Vorgabe:</translation>
</message>
<message>
- <location line="+6"/>
<source>Version:</source>
<translation>Version:</translation>
</message>
<message>
- <location line="+3"/>
<source>Debugging helper:</source>
<translation>Ausgabe-Hilfsbibliothek:</translation>
</message>
@@ -12688,82 +10401,66 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>QtModulesInfo</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtmodulesinfo.cpp" line="+55"/>
<source>Core non-GUI classes used by other modules</source>
<translation>Basisklassen (nicht-GUI), die von anderen Modulen verwendet werden</translation>
</message>
<message>
- <location line="+4"/>
<source>Graphical user interface components</source>
<translation>Komponenten für graphische Benutzeroberflächen</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for network programming</source>
<translation>Klassen für Netzwerkprogrammierung</translation>
</message>
<message>
- <location line="+4"/>
<source>OpenGL support classes</source>
<translation>Klassen fürOpenGL-Unterstützung</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for database integration using SQL</source>
<translation>Klassen für Datenbankintegration unter Verwendung von SQL</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for evaluating Qt Scripts</source>
<translation>Klassen für die Auswertung von Qt-Skripten</translation>
</message>
<message>
- <location line="+4"/>
<source>Additional Qt Script components</source>
<translation>Zusätzliche Qt-Skript-Komponenten</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for displaying the contents of SVG files</source>
<translation>Klassen zur Anzeige des Inhalts von SVG-Dateien</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for displaying and editing Web content</source>
<translation>Klassen zum Anzeigen und Bearbeiten von Web-Inhalten</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for handling XML</source>
<translation>Klassen zur Behandlung von XML</translation>
</message>
<message>
- <location line="+4"/>
<source>An XQuery/XPath engine for XML and custom data models</source>
<translation>Ein XQuery/XPath-Engine für XML und benutzerdefinierte Datenmodelle</translation>
</message>
<message>
- <location line="+4"/>
<source>Multimedia framework classes</source>
<translation>Multimedia-Framework</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for low-level multimedia functionality</source>
<translation>Klassen für Multimedia-Funktionalität</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes that ease porting from Qt 3 to Qt 4</source>
<translation>Klassen, die die Portierung von Qt 3 nach Qt 4 erleichtern</translation>
</message>
<message>
- <location line="+4"/>
<source>Tool classes for unit testing</source>
<translation>Hilfsklassen zum Unit-Testen</translation>
</message>
<message>
- <location line="+4"/>
<source>Classes for Inter-Process Communication using the D-Bus</source>
<translation>Klassen zur Interprozess-Kommunikation unter Verwendung von D-BUS</translation>
</message>
@@ -12771,17 +10468,14 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Locator::ILocatorFilter</name>
<message>
- <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
<source>Filter Configuration</source>
<translation>Filterkonfiguration</translation>
</message>
<message>
- <location line="+5"/>
<source>Limit to prefix</source>
<translation>Auf Präfix beschränken</translation>
</message>
<message>
- <location line="+3"/>
<source>Prefix:</source>
<translation>Präfix:</translation>
</message>
@@ -12789,28 +10483,22 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Locator::Internal::DirectoryFilter</name>
<message>
- <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+45"/>
<source>Generic Directory Filter</source>
<translation>Allgemeines Verzeichnisfilter</translation>
</message>
<message>
- <location line="+60"/>
<source>Filter Configuration</source>
<translation>Filterkonfiguration</translation>
</message>
<message>
- <location line="+45"/>
- <location line="+11"/>
<source>Select Directory</source>
<translation>Arbeitsordner</translation>
</message>
<message>
- <location line="+31"/>
<source>%1 filter update: 0 files</source>
<translation>%1 Filterstatus: Keine Dateien</translation>
</message>
<message numerus="yes">
- <location line="+12"/>
<source>%1 filter update: %n files</source>
<translation>
<numerusform>%1 Filterstatus: Eine Datei</numerusform>
@@ -12818,7 +10506,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
</translation>
</message>
<message>
- <location line="+10"/>
<source>%1 filter update: canceled</source>
<translation>%1 Filterstatus: Abgebrochen</translation>
</message>
@@ -12826,54 +10513,44 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<context>
<name>Locator::Internal::DirectoryFilterOptions</name>
<message>
- <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location/>
<source>Specify file name filters, separated by comma. Filters may contain wildcards.</source>
<translation>Eine Liste von durch Kommata getrennte Filtern für Dateinamen. Die Filter können Suchmuster enthalten.</translation>
</message>
<message>
- <location/>
<source>Prefix:</source>
<translation>Präfix:</translation>
</message>
<message>
- <location/>
<source>Limit to prefix</source>
<translation>Auf Präfix beschränken</translation>
</message>
<message>
- <location/>
<source>Add...</source>
<translation>Hinzufügen...</translation>
</message>
<message>
- <location/>
<source>Edit...</source>
<translation>Ändern...</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Directories:</source>
<translation>Verzeichnisse:</translation>
</message>
<message>
- <location/>
<source>Specify a short word/abbreviation that can be used to restrict completions to files from this directory tree.
To do this, you type this shortcut and a space in the Locator entry field, and then the word to search for.</source>
<translation>Geben Sie ein Kürzel oder eine Abkürzung ein, die die Funde auf Dateien von diesem Verzeichnis beschränkt.
Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeichen und dem Suchbegriff.</translation>
</message>
<message>
- <location/>
<source>File types:</source>
<translation>Dateitypen:</translation>
</message>
@@ -12881,7 +10558,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::FileSystemFilter</name>
<message>
- <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+56"/>
<source>Files in File System</source>
<translation>Dateien aus Dateisystem</translation>
</message>
@@ -12889,27 +10565,22 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::FileSystemFilterOptions</name>
<message>
- <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
<source>Filter configuration</source>
<translation>Filterkonfiguration</translation>
</message>
<message>
- <location/>
<source>Prefix:</source>
<translation>Präfix:</translation>
</message>
<message>
- <location/>
<source>Limit to prefix</source>
<translation>Auf Präfix beschränken</translation>
</message>
<message>
- <location/>
<source>Include hidden files</source>
<translation>Versteckte Dateien zeigen</translation>
</message>
<message>
- <location/>
<source>Filter:</source>
<translation>Filter:</translation>
</message>
@@ -12917,7 +10588,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::OpenDocumentsFilter</name>
<message>
- <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+55"/>
<source>Open Documents</source>
<translation>Offene Dokumente</translation>
</message>
@@ -12925,7 +10595,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::LocatorFiltersFilter</name>
<message>
- <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
<source>Available filters</source>
<translation>Verfügbare Filter</translation>
</message>
@@ -12933,7 +10602,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::LocatorPlugin</name>
<message>
- <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+254"/>
<source>Indexing</source>
<translation>Indizierung</translation>
</message>
@@ -12941,32 +10609,26 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::LocatorWidget</name>
<message>
- <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+269"/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Configure...</source>
<translation>Einstellungen...</translation>
</message>
<message>
- <location line="+7"/>
<source>Locate...</source>
<translation>Finden...</translation>
</message>
<message>
- <location line="+16"/>
<source>Type to locate</source>
<translation>Suchmuster</translation>
</message>
<message>
- <location line="+1"/>
<source>Options</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location line="+215"/>
<source><type here></source>
<translation><Tippen Sie hier></translation>
</message>
@@ -12974,7 +10636,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/locator/settingspage.cpp" line="+168"/>
<source>%1 (prefix: %2)</source>
<translation>%1 (Präfix: %2)</translation>
</message>
@@ -12982,32 +10643,26 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Locator::Internal::SettingsWidget</name>
<message>
- <location filename="../../../src/plugins/locator/settingspage.ui"/>
<source>Configure Filters</source>
<translation>Filterkonfiguration</translation>
</message>
<message>
- <location/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Edit</source>
<translation>Editieren</translation>
</message>
<message>
- <location/>
<source> min</source>
<translation> Minuten</translation>
</message>
<message>
- <location/>
<source>Refresh interval:</source>
<translation>Aktualisierungsintervall:</translation>
</message>
@@ -13015,102 +10670,82 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>RegExp::Internal::RegExpWindow</name>
<message>
- <location filename="../../../src/plugins/regexp/regexpwindow.cpp" line="+46"/>
<source>&Pattern:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>&Text:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
<source>&Minimal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+30"/>
<source>Wildcard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-37"/>
<source>&Escaped pattern:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>&Pattern syntax:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
<source>Case &sensitive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Index of match:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Matched length:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+25"/>
<source>Regular Expression v1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
<source>Regular Expression v2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
<source>Fixed String</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+39"/>
<source>Capture %1:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
<source>Match:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
<source>Regular Expression</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+129"/>
<source>Enter Pattern from Code...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
<source>Clear Patterns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
<source>Clear Text</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
<source>Enter Pattern from Code</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
<source>Pattern</source>
<translation type="unfinished"></translation>
</message>
@@ -13118,22 +10753,18 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>ResourceEditor::Internal::ResourceEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/resourceeditor/resourceeditorplugin.cpp" line="+78"/>
<source>Creates a Qt Resource file (.qrc) that you can add to a Qt C++ project.</source>
<translation>Erstellt eine C++-Quelldatei für ein C++-Projekt.</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Resource file</source>
<translation>Qt-Ressourcendatei</translation>
</message>
<message>
- <location line="+12"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+1"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
@@ -13141,7 +10772,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>ResourceEditor::Internal::ResourceEditorW</name>
<message>
- <location filename="../../../src/plugins/resourceeditor/resourceeditorw.cpp" line="+116"/>
<source>untitled</source>
<translation>kein Titel</translation>
</message>
@@ -13149,17 +10779,14 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>SaveItemsDialog</name>
<message>
- <location filename="../../../src/plugins/coreplugin/dialogs/saveitemsdialog.ui"/>
<source>Save Changes</source>
<translation>Änderungen speichern</translation>
</message>
<message>
- <location/>
<source>The following files have unsaved changes:</source>
<translation>Die folgenden Dateien wurden geändert:</translation>
</message>
<message>
- <location/>
<source>Automatically save all files before building</source>
<translation>Geänderte Dateien vorm Erstellen automatisch speichern</translation>
</message>
@@ -13167,62 +10794,54 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>SharedTools::QrcEditor</name>
<message>
- <location filename="../../../src/shared/qrceditor/qrceditor.cpp" line="+58"/>
<source>Add Files</source>
<translation>Dateien hinzufügen</translation>
</message>
<message>
- <location line="+1"/>
<source>Add Prefix</source>
<translation>Präfix hinzufügen</translation>
</message>
<message>
- <location line="+159"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location line="+4"/>
<source>Skip</source>
<translation>Ãœberspringen</translation>
</message>
<message>
- <location line="+3"/>
<source>Abort</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location line="+27"/>
+ <source>Choose Copy Location</source>
+ <translation>Wählen Sie ein Ziel zum Kopieren</translation>
+ </message>
+ <message>
<source>Overwriting Failed</source>
<translation>Fehler beim Ãœberschreiben</translation>
</message>
<message>
- <location line="+11"/>
<source>Copying Failed</source>
<translation>Fehlschlag beim Kopieren</translation>
</message>
<message>
- <location line="-47"/>
<source>Invalid file location</source>
<translation>Ungültiger Pfad</translation>
</message>
<message>
- <location line="+11"/>
<source>The file %1 is not in a subdirectory of the resource file. You now have the option to copy this file to a valid location.</source>
<translation>Die Datei %1 befindet sich nicht in einem Unterverzeichnis der Ressourcendatei. Sie können sie jetzt an die richtige Stelle kopieren.</translation>
</message>
<message>
- <location line="+15"/>
<source>Choose copy location</source>
- <translation>Wählen Sie ein Ziel zum Kopieren</translation>
+ <translation type="obsolete">Wählen Sie ein Ziel zum Kopieren</translation>
</message>
<message>
- <location line="+11"/>
<source>Could not overwrite file %1.</source>
<translation>Die Datei %1 konnte nicht überschrieben werden.</translation>
</message>
<message>
- <location line="+11"/>
<source>Could not copy the file to %1.</source>
<translation>Die Datei konnte nicht nach %1 kopiert werden.</translation>
</message>
@@ -13230,72 +10849,58 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>SharedTools::ResourceView</name>
<message>
- <location filename="../../../src/shared/qrceditor/resourceview.cpp" line="+355"/>
<source>Add Files...</source>
<translation>Dateien hinzufügen...</translation>
</message>
<message>
- <location line="+1"/>
<source>Change Alias...</source>
<translation>Alias ändern...</translation>
</message>
<message>
- <location line="+1"/>
<source>Add Prefix...</source>
<translation>Präfix hinzufügen...</translation>
</message>
<message>
- <location line="+1"/>
<source>Change Prefix...</source>
<translation>Präfix ändern...</translation>
</message>
<message>
- <location line="+1"/>
<source>Change Language...</source>
<translation>Sprache ändern...</translation>
</message>
<message>
- <location line="+2"/>
<source>Remove Item</source>
<translation>Element löschen</translation>
</message>
<message>
- <location line="+41"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
<message>
- <location line="+95"/>
<source>Input prefix:</source>
<translation>Präfix:</translation>
</message>
<message>
- <location line="-93"/>
<source>All files (*)</source>
<translation>Alle Dateien (*)</translation>
</message>
<message>
- <location line="+93"/>
<source>Change Prefix</source>
<translation>Präfix ändern</translation>
</message>
<message>
- <location line="+13"/>
<source>Change Language</source>
<translation>Sprache ändern</translation>
</message>
<message>
- <location line="+0"/>
<source>Language:</source>
<translation>Sprache:</translation>
</message>
<message>
- <location line="+16"/>
<source>Change File Alias</source>
<translation>Dateialias ändern</translation>
</message>
<message>
- <location line="+0"/>
<source>Alias:</source>
<translation>Aliasname:</translation>
</message>
@@ -13303,7 +10908,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>ShowBuildLog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/showbuildlog.ui"/>
<source>Debugging Helper Build Log</source>
<translation>Erstellungsprotokoll der Ausgabe-Hilfsbibliothek</translation>
</message>
@@ -13311,7 +10915,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Snippets::Internal::SnippetsPlugin</name>
<message>
- <location filename="../../../src/plugins/snippets/snippetsplugin.cpp" line="+94"/>
<source>Snippets</source>
<translation>Snippets</translation>
</message>
@@ -13319,7 +10922,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Snippets::Internal::SnippetsWindow</name>
<message>
- <location filename="../../../src/plugins/snippets/snippetswindow.cpp" line="+58"/>
<source>Snippets</source>
<translation>Snippets</translation>
</message>
@@ -13327,27 +10929,22 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>StartExternalDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/startexternaldialog.ui"/>
<source>Start Debugger</source>
<translation>Debugger starten</translation>
</message>
<message>
- <location/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
<message>
- <location/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
- <location/>
<source>Break at 'main':</source>
<translation>Haltepunkt bei 'main':</translation>
</message>
<message>
- <location/>
<source>Working directory:</source>
<translation>Arbeitsverzeichnis:</translation>
</message>
@@ -13355,42 +10952,34 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>StartRemoteDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/startremotedialog.ui"/>
<source>Start Debugger</source>
<translation>Debugger starten</translation>
</message>
<message>
- <location/>
<source>Architecture:</source>
<translation>Architektur:</translation>
</message>
<message>
- <location/>
<source>Host and port:</source>
<translation>Host und Portnummer:</translation>
</message>
<message>
- <location/>
<source>Use server start script:</source>
<translation>Server-Startskript benutzen:</translation>
</message>
<message>
- <location/>
<source>Server start script:</source>
<translation>Server-Startskript:</translation>
</message>
<message>
- <location/>
<source>Debugger:</source>
<translation>Debugger:</translation>
</message>
<message>
- <location/>
<source>Local executable:</source>
<translation>Ausführbare Datei (lokal):</translation>
</message>
<message>
- <location/>
<source>Sysroot:</source>
<translation>Sysroot:</translation>
</message>
@@ -13398,12 +10987,10 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::CheckoutWizard</name>
<message>
- <location filename="../../../src/plugins/subversion/checkoutwizard.cpp" line="+56"/>
<source>Checks out a Subversion repository and tries to load the contained project.</source>
<translation>Erstellt einen Checkout eines Subversion-Repositories und versucht, das darin enthaltene Projekt zu laden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Subversion Checkout</source>
<translation>Projekt aus Subversion-Repository</translation>
</message>
@@ -13411,17 +10998,14 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::CheckoutWizardPage</name>
<message>
- <location filename="../../../src/plugins/subversion/checkoutwizardpage.cpp" line="+38"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
<message>
- <location line="+1"/>
<source>Specify repository URL, checkout directory and path.</source>
<translation>Geben Sie Repository-URL, Ordner und Pfad an.</translation>
</message>
<message>
- <location line="+1"/>
<source>Repository:</source>
<translation>Repository:</translation>
</message>
@@ -13429,62 +11013,50 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/subversion/settingspage.ui"/>
<source>Authentication</source>
<translation>Authentifizierung</translation>
</message>
<message>
- <location/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
<message>
- <location filename="../../../src/plugins/subversion/settingspage.cpp" line="+106"/>
<source>Subversion</source>
<translation>Subversion</translation>
</message>
<message>
- <location filename="../../../src/plugins/subversion/settingspage.ui"/>
<source>Configuration</source>
<translation>Konfiguration</translation>
</message>
<message>
- <location/>
<source>Miscellaneous</source>
<translation>Sonstige Einstellungen</translation>
</message>
<message>
- <location/>
<source>Timeout:</source>
<translation>Zeitlimit:</translation>
</message>
<message>
- <location/>
<source>s</source>
<translation>s</translation>
</message>
<message>
- <location/>
<source>Prompt on submit</source>
<translation>Abgabe bestätigen</translation>
</message>
<message>
- <location/>
<source>Ignore whitespace changes in annotation</source>
<translation>Änderungen der Leerzeichen bei Annotation weglassen</translation>
</message>
<message>
- <location/>
<source>Log count:</source>
<translation>Log-Anzeige beschränken auf:</translation>
</message>
<message>
- <location/>
<source>Subversion command:</source>
<translation>Subversion-Kommando:</translation>
</message>
<message>
- <location/>
<source>Username:</source>
<translation>Nutzername:</translation>
</message>
@@ -13492,7 +11064,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::SettingsPageWidget</name>
<message>
- <location filename="../../../src/plugins/subversion/settingspage.cpp" line="-55"/>
<source>Subversion Command</source>
<translation>Subversion-Kommando</translation>
</message>
@@ -13500,262 +11071,210 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::SubversionPlugin</name>
<message>
- <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="+303"/>
<source>&Subversion</source>
<translation>&Subversion</translation>
</message>
<message>
- <location line="+35"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+0"/>
<source>Add "%1"</source>
<translation>"%1" hinzufügen</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+S,Alt+A</source>
<translation>Alt+S,Alt+A</translation>
</message>
<message>
- <location line="+32"/>
<source>Diff Project</source>
<translation>Diff für Projekt</translation>
</message>
<message>
- <location line="-65"/>
<source>Diff Current File</source>
<translation>Diff für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Diff "%1"</source>
<translation>Diff für "%1"</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+S,Alt+D</source>
<translation>Alt+S,Alt+D</translation>
</message>
<message>
- <location line="+124"/>
<source>Commit All Files</source>
<translation>Alle Dateien abgeben</translation>
</message>
<message>
- <location line="-90"/>
<source>Commit Current File</source>
<translation>Datei abgeben</translation>
</message>
<message>
- <location line="+0"/>
<source>Commit "%1"</source>
<translation>"%1" abgeben</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+S,Alt+C</source>
<translation>Alt+S,Alt+C</translation>
</message>
<message>
- <location line="-33"/>
<source>Filelog Current File</source>
<translation>Filelog für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Filelog "%1"</source>
<translation>Filelog für "%1"</translation>
</message>
<message>
- <location line="+9"/>
<source>Annotate Current File</source>
<translation>Annotation für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Annotate "%1"</source>
<translation>Annotation für "%1"</translation>
</message>
<message>
- <location line="+117"/>
<source>Describe...</source>
<translation>Beschreibung zu...</translation>
</message>
<message>
- <location line="-62"/>
<source>Project Status</source>
<translation>Status des Projekts (status)</translation>
</message>
<message>
- <location line="+15"/>
<source>Update Project</source>
<translation>Projekt auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+7"/>
<source>Commit Project</source>
<translation>Projekt abgeben</translation>
</message>
<message>
- <location line="+0"/>
<source>Commit Project "%1"</source>
<translation>Projekt "%1" abgeben</translation>
</message>
<message>
- <location line="+9"/>
<source>Diff Repository</source>
<translation>Diff des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Repository Status</source>
<translation>Status des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Log Repository</source>
<translation>Log des Repositories</translation>
</message>
<message>
- <location line="+6"/>
<source>Update Repository</source>
<translation></translation>
</message>
<message>
- <location line="+28"/>
<source>Commit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location line="+5"/>
<source>Diff Selected Files</source>
<translation>Diff für Auswahl</translation>
</message>
<message>
- <location line="+3"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+3"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+27"/>
<source>Closing Subversion Editor</source>
<translation>Subversion-Editor schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you want to commit the change?</source>
<translation>Möchten Sie den Commit ausführen?</translation>
</message>
<message>
- <location line="+1"/>
<source>The commit message check failed. Do you want to commit the change?</source>
<translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie den Commit trotzdem ausführen?</translation>
</message>
<message>
- <location line="+166"/>
<source>The file has been changed. Do you want to revert it?</source>
<translation>Die Datei wurde geändert. Möchten Sie sie zurücksetzen?</translation>
</message>
<message>
- <location line="-309"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Delete "%1"...</source>
<translation>Lösche "%1"...</translation>
</message>
<message>
- <location line="+8"/>
<source>Revert...</source>
<translation>Rückgängig machen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Revert "%1"...</source>
<translation>Änderungen in "%1" rückgängig machen...</translation>
</message>
<message>
- <location line="+10"/>
<source>Diff Project "%1"</source>
<translation>Diff für Projekt "%1"</translation>
</message>
<message>
- <location line="+8"/>
<source>Status of Project "%1"</source>
<translation>Status des Projekts "%1"</translation>
</message>
<message>
- <location line="+8"/>
<source>Log Project "%1"</source>
<translation>Log für Projekt "%1"</translation>
</message>
<message>
- <location line="+0"/>
<source>Log Project</source>
<translation>Log für Projekt</translation>
</message>
<message>
- <location line="+7"/>
<source>Update Project "%1"</source>
<translation>Projekt "%1"auf aktuellen Stand bringen</translation>
</message>
<message>
- <location line="+52"/>
<source>Revert Repository...</source>
<translation>Änderungen im gesamten Repository rückgängig machen...</translation>
</message>
<message>
- <location line="+184"/>
<source>Revert repository</source>
<translation>Alle Änderungen rückgängig machen</translation>
</message>
<message>
- <location line="+1"/>
<source>Would you like to revert all changes to the repository?</source>
<translation>Möchten Sie alle ausstehenden Änderungen des Repositories rückgängig machen?</translation>
</message>
<message>
- <location line="+10"/>
<source>Revert failed: %1</source>
<translation>Fehler beim Rücksetzen der Änderungen: %1</translation>
</message>
<message>
- <location line="+84"/>
<source>Another commit is currently being executed.</source>
<translation>Es läuft bereits ein Abgabevorgang.</translation>
</message>
<message>
- <location line="+15"/>
<source>There are no modified files.</source>
<translation>Es gibt keine geänderten Dateien.</translation>
</message>
<message>
- <location line="+8"/>
<source>Cannot create temporary file: %1</source>
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="+270"/>
<source>Describe</source>
<translation>Beschreibe</translation>
</message>
<message>
- <location line="+1"/>
<source>Revision number:</source>
<translation>Revisionsnummer:</translation>
</message>
<message>
- <location line="+60"/>
<source>No subversion executable specified!</source>
<translation>Es wurde keine ausführbaren Subversion-Datei angegeben!
</translation>
@@ -13764,7 +11283,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>Subversion::Internal::SubversionSubmitEditor</name>
<message>
- <location filename="../../../src/plugins/subversion/subversionsubmiteditor.cpp" line="+42"/>
<source>Subversion Submit</source>
<translation>Subversion Submit</translation>
</message>
@@ -13772,7 +11290,6 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>SymbolGroup</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/symbolgroupcontext.cpp" line="+53"/>
<source>Out of scope</source>
<translation>Nicht im Bereich</translation>
</message>
@@ -13780,13 +11297,10 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseFileFind</name>
<message>
- <location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+177"/>
- <location line="+21"/>
<source>%1 found</source>
<translation>%1 gefunden</translation>
</message>
<message>
- <location line="+6"/>
<source>List of comma separated wildcard filters</source>
<translation>Liste von Suchmustern, durch Kommas getrennt</translation>
</message>
@@ -13794,12 +11308,10 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextDocument</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+251"/>
<source>untitled</source>
<translation>kein Titel</translation>
</message>
<message>
- <location line="+67"/>
<source><em>Binary data</em></source>
<translation><em>Binäre Daten</em></translation>
</message>
@@ -13807,27 +11319,22 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/basetexteditor.cpp" line="+224"/>
<source>CTRL+D</source>
<translation>CTRL+D</translation>
</message>
<message>
- <location line="+62"/>
<source>Print Document</source>
<translation>Dokument drucken</translation>
</message>
<message>
- <location line="+252"/>
<source><b>Error:</b> Could not decode "%1" with "%2"-encoding. Editing not possible.</source>
<translation><b>Fehler:</b> Die Datei "%1" kann nicht mit dem Encoding "%2" dargestellt werden. Sie kann nicht editiert werden.</translation>
</message>
<message>
- <location line="+2"/>
<source>Select Encoding</source>
<translation>Encoding auswählen</translation>
</message>
<message>
- <location line="+41"/>
<source>The text is too large to be displayed (%1 MB).</source>
<translation>Texte dieser Größe (%1 MB) können nicht angezeigt werden.</translation>
</message>
@@ -13835,12 +11342,10 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
- <location line="+5069"/>
<source>Line: %1, Col: %2</source>
<translation>Zeile: %1, Spalte: %2</translation>
</message>
<message>
- <location line="+1"/>
<source>Line: %1, Col: 999</source>
<translation>Zeile: %1, Spalte: 999</translation>
</message>
@@ -13848,152 +11353,122 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BehaviorSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/behaviorsettingspage.ui"/>
<source>Storage</source>
<translation>Abspeichern</translation>
</message>
<message>
- <location/>
<source>Removes trailing whitespace on saving.</source>
<translation>Leerzeichen am Zeilenende beim Abspeichern entfernen.</translation>
</message>
<message>
- <location/>
<source>&Clean whitespace</source>
<translation>&Leerzeichen bereinigen</translation>
</message>
<message>
- <location/>
<source>Clean whitespace in entire document instead of only for changed parts.</source>
<translation>Bereinigt Leerzeichen im gesamten Dokument und nicht nur in den geänderten Teilen.</translation>
</message>
<message>
- <location/>
<source>In entire &document</source>
<translation>Im &gesamten Dokument</translation>
</message>
<message>
- <location/>
<source>Correct leading whitespace according to tab settings.</source>
<translation>Leerzeichen am Zeilenanfang entsprechend Tabulatoreinstellungen korrigieren.</translation>
</message>
<message>
- <location/>
<source>Clean indentation</source>
<translation>Einrückung korrigieren</translation>
</message>
<message>
- <location/>
<source>&Ensure newline at end of file</source>
<translation>&Zeilenvorschub am Dateiende anfügen</translation>
</message>
<message>
- <location/>
<source>Tabs and Indentation</source>
<translation>Tabulatoren und Einrückung</translation>
</message>
<message>
- <location/>
<source>Ta&b size:</source>
<translation>Tabulator&weite:</translation>
</message>
<message>
- <location/>
<source>&Indent size:</source>
<translation>&Einrückung:</translation>
</message>
<message>
- <location/>
<source>Backspace will go back one indentation level instead of one space.</source>
<translation>Die Rücktaste folgt der Einrückungstiefe anstatt nur ein Zeichen zu löschen.</translation>
</message>
<message>
- <location/>
<source>&Backspace follows indentation</source>
<translation>&Rücktaste folgt der Einrückungstiefe</translation>
</message>
<message>
- <location/>
<source>Insert &spaces instead of tabs</source>
<translation>Leerzeichen &anstelle Tabulatoren einfügen</translation>
</message>
<message>
- <location/>
<source>Enable automatic &indentation</source>
<translation>Automatische Ein&rückung</translation>
</message>
<message>
- <location/>
<source>Tab key performs auto-indent:</source>
<translation>Tabulator-Taste bewirkt automatische Einrückung:</translation>
</message>
<message>
- <location/>
<source>Never</source>
<translation>Niemals</translation>
</message>
<message>
- <location/>
<source>Always</source>
<translation>Immer</translation>
</message>
<message>
- <location/>
<source>Automatically determine based on the nearest indented line (previous line preferred over next line)</source>
<translation>Bestimme automatisch basierend auf der nächstliegenden, eingerückten Zeile (unter Bevorzugung der vorhergehenden Zeile)</translation>
</message>
<message>
- <location/>
<source>Based on the surrounding lines</source>
<translation>Basierend auf den umgebenden Zeilen</translation>
</message>
<message>
- <location/>
<source>Mouse</source>
<translation>Maus</translation>
</message>
<message>
- <location/>
<source>Enable &mouse navigation</source>
<translation>&Mausnavigation aktivieren</translation>
</message>
<message>
- <location/>
<source>Enable scroll &wheel zooming</source>
<translation>Zoom mittels Maus&rad aktivieren</translation>
</message>
<message>
- <location/>
<source>Block indentation style:</source>
<translation>Blockeinrückung:</translation>
</message>
<message>
- <location/>
<source>Exclude Braces</source>
<translation>Klammern ausschließen</translation>
</message>
<message>
- <location/>
<source>Include Braces</source>
<translation>Klammern einschließen</translation>
</message>
<message>
- <location/>
<source>GNU Style</source>
<translation>GNU-Stil</translation>
</message>
<message>
- <location/>
<source>In Leading White Space</source>
<translation>Nur in Leerzeichen am Zeilenanfang</translation>
</message>
<message>
- <location/>
<source>Align continuation lines:</source>
<translation>Einrückung von Fortsetzungszeilen:</translation>
</message>
<message>
- <location/>
<source><html><head/><body>
Influences the indentation of continuation lines.
@@ -14046,22 +11521,18 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen.
</ul></body></html></translation>
</message>
<message>
- <location/>
<source>Not At All</source>
<translation>Keine Einrückung</translation>
</message>
<message>
- <location/>
<source>With Spaces</source>
<translation>Leerzeichen</translation>
</message>
<message>
- <location/>
<source>With Regular Indent</source>
<translation>Benutze normale Einrückung</translation>
</message>
<message>
- <location/>
<source><html><head/><body>
Controls the indentation style of curly brace blocks.
@@ -14147,72 +11618,58 @@ void foo()
<context>
<name>TextEditor::DisplaySettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/displaysettingspage.ui"/>
<source>Display</source>
<translation>Anzeige</translation>
</message>
<message>
- <location/>
<source>Display line &numbers</source>
<translation>Zeilen&nummern anzeigen</translation>
</message>
<message>
- <location/>
<source>Display &folding markers</source>
<translation>Code&folding-Zeichen anzeigen</translation>
</message>
<message>
- <location/>
<source>Show tabs and spaces.</source>
<translation>Tabulatoren und Leerzeichen darstellen.</translation>
</message>
<message>
- <location/>
<source>&Visualize whitespace</source>
<translation>&Leerzeichen darstellen</translation>
</message>
<message>
- <location/>
<source>Highlight current &line</source>
<translation>Aktuelle &Zeile hervorheben</translation>
</message>
<message>
- <location/>
<source>Text Wrapping</source>
<translation>Umbruch</translation>
</message>
<message>
- <location/>
<source>Enable text &wrapping</source>
<translation>&Umbruch aktivieren</translation>
</message>
<message>
- <location/>
<source>Display right &margin at column:</source>
<translation>Rechten &Rand anzeigen bei Spalte:</translation>
</message>
<message>
- <location/>
<source>Highlight &blocks</source>
<translation>Blöcke hervorheben</translation>
</message>
<message>
- <location/>
<source>Mark &text changes</source>
<translation>Änderungen hervorheben</translation>
</message>
<message>
- <location/>
<source>&Animate matching parentheses</source>
<translation>Passende Klammern &animieren</translation>
</message>
<message>
- <location/>
<source>Auto-fold first &comment</source>
<translation>Ersten &Kommentarblock einklappen</translation>
</message>
<message>
- <location/>
<source>Center &cursor on scroll</source>
<translation>Cursor beim Scrollen in der &Mitte halten</translation>
</message>
@@ -14220,52 +11677,42 @@ void foo()
<context>
<name>TextEditor::FontSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+312"/>
<source>Font && Colors</source>
<translation>Zeichensatz && Farben</translation>
</message>
<message>
- <location line="+140"/>
<source>Copy Color Scheme</source>
<translation>Farbschema kopieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Color scheme name:</source>
<translation>Name des Farbschemas:</translation>
</message>
<message>
- <location line="+1"/>
<source>%1 (copy)</source>
<translation>%1 (Kopie)</translation>
</message>
<message>
- <location line="+45"/>
<source>Delete Color Scheme</source>
<translation>Farbschema löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Are you sure you want to delete this color scheme permanently?</source>
<translation>Möchten Sie das Farbschema löschen?</translation>
</message>
<message>
- <location line="+6"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="+28"/>
<source>Color Scheme Changed</source>
<translation>Farbschema geändert</translation>
</message>
<message>
- <location line="+1"/>
<source>The color scheme "%1" was modified, do you want to save the changes?</source>
<translation>Das Farbschema "%1" wurde geändert, möchten Sie es speichern?</translation>
</message>
<message>
- <location line="+7"/>
<source>Discard</source>
<translation>Löschen</translation>
</message>
@@ -14273,29 +11720,24 @@ void foo()
<context>
<name>TextEditor::Internal::CodecSelector</name>
<message>
- <location filename="../../../src/plugins/texteditor/codecselector.cpp" line="+72"/>
<source>Text Encoding</source>
<translation>Text-Encoding</translation>
</message>
<message>
- <location line="+4"/>
<source>
The following encodings are likely to fit:</source>
<translation>
Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
</message>
<message>
- <location line="+1"/>
<source>Select encoding for "%1".%2</source>
<translation>Auswahl des Encodings für "%1".%2</translation>
</message>
<message>
- <location line="+44"/>
<source>Reload with Encoding</source>
<translation>Neu laden</translation>
</message>
<message>
- <location line="+1"/>
<source>Save with Encoding</source>
<translation>Mit Encoding abspeichern</translation>
</message>
@@ -14303,7 +11745,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::ColorScheme</name>
<message>
- <location filename="../../../src/plugins/texteditor/colorscheme.cpp" line="+208"/>
<source>Not a color scheme file.</source>
<translation>Keine Farbschema-Datei.</translation>
</message>
@@ -14311,37 +11752,30 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::ColorSchemeEdit</name>
<message>
- <location filename="../../../src/plugins/texteditor/colorschemeedit.ui"/>
<source>Bold</source>
<translation>Fett</translation>
</message>
<message>
- <location/>
<source>Italic</source>
<translation>Kursiv</translation>
</message>
<message>
- <location/>
<source>Background:</source>
<translation>Hintergrund:</translation>
</message>
<message>
- <location/>
<source>Foreground:</source>
<translation>Zeichen:</translation>
</message>
<message>
- <location/>
<source>Erase background</source>
<translation>Hintergrund löschen</translation>
</message>
<message>
- <location/>
<source>x</source>
<translation>x</translation>
</message>
<message>
- <location/>
<source>Erase foreground</source>
<translation>Vordergrund löschen</translation>
</message>
@@ -14349,7 +11783,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::FindInCurrentFile</name>
<message>
- <location filename="../../../src/plugins/texteditor/findincurrentfile.cpp" line="+62"/>
<source>Current File</source>
<translation>Aktuelle Datei</translation>
</message>
@@ -14357,27 +11790,22 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::FindInFiles</name>
<message>
- <location filename="../../../src/plugins/texteditor/findinfiles.cpp" line="+57"/>
<source>Files on File System</source>
<translation>Dateien aus dem Dateisystem</translation>
</message>
<message>
- <location line="+23"/>
<source>&Directory:</source>
<translation>&Verzeichnis:</translation>
</message>
<message>
- <location line="+13"/>
<source>&Browse</source>
<translation>&Auswählen</translation>
</message>
<message>
- <location line="+4"/>
<source>File &pattern:</source>
<translation>Such&muster für Dateinamen:</translation>
</message>
<message>
- <location line="+21"/>
<source>Directory to search</source>
<translation>Verzeichnis</translation>
</message>
@@ -14385,7 +11813,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::FontSettings</name>
<message>
- <location filename="../../../src/plugins/texteditor/fontsettings.cpp" line="+147"/>
<source>Customized</source>
<translation>Benutzerdefiniert</translation>
</message>
@@ -14393,47 +11820,38 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::FontSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/fontsettingspage.ui"/>
<source>Font</source>
<translation>Zeichensatz</translation>
</message>
<message>
- <location/>
<source>Family:</source>
<translation>Name:</translation>
</message>
<message>
- <location/>
<source>Size:</source>
<translation>Größe:</translation>
</message>
<message>
- <location/>
<source>Color Scheme</source>
<translation>Farbschema</translation>
</message>
<message>
- <location/>
<source>Antialias</source>
<translation>Kantenglättung</translation>
</message>
<message>
- <location/>
<source>Copy...</source>
<translation>Kopieren...</translation>
</message>
<message>
- <location/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location/>
<source>%</source>
<translation>%</translation>
</message>
<message>
- <location/>
<source>Zoom:</source>
<translation>Vergrößerungsfaktor:</translation>
</message>
@@ -14441,12 +11859,10 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::Internal::LineNumberFilter</name>
<message>
- <location filename="../../../src/plugins/texteditor/linenumberfilter.cpp" line="+57"/>
<source>Line %1</source>
<translation>Zeile %1</translation>
</message>
<message>
- <location filename="../../../src/plugins/texteditor/linenumberfilter.h" line="+52"/>
<source>Line in Current Document</source>
<translation>Zeile im aktuellen Dokument</translation>
</message>
@@ -14454,362 +11870,290 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::TextEditorActionHandler</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditoractionhandler.cpp" line="+121"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+2"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+13"/>
<source>Select Encoding...</source>
<translation>Encoding auswählen...</translation>
</message>
<message>
- <location line="+6"/>
<source>Auto-&indent Selection</source>
<translation>Ein&rückung in Auswahl korrigieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location line="+5"/>
<source>Meta</source>
<translation>Meta</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl</source>
<translation>Ctrl</translation>
</message>
<message>
- <location line="+5"/>
<source>%1+E, R</source>
<translation>%1+E, R</translation>
</message>
<message>
- <location line="+5"/>
<source>&Visualize Whitespace</source>
<translation>&Leerzeichen anzeigen</translation>
</message>
<message>
- <location line="+8"/>
<source>Clean Whitespace</source>
<translation>Leerzeichen bereinigen</translation>
</message>
<message>
- <location line="+7"/>
<source>Enable Text &Wrapping</source>
<translation>Text&umbruch aktivieren</translation>
</message>
<message>
- <location line="+8"/>
<source>(Un)Comment &Selection</source>
<translation>Auswahl aus&kommentieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+/</source>
<translation>Ctrl+/</translation>
</message>
<message>
- <location line="+9"/>
<source>Delete &Line</source>
<translation>&Zeile löschen</translation>
</message>
<message>
- <location line="+4"/>
<source>Fold</source>
<translation>Einklappen</translation>
</message>
<message>
- <location line="+6"/>
<source>Unfold</source>
<translation>Ausklappen</translation>
</message>
<message>
- <location line="+6"/>
<source>(Un)&Fold All</source>
<translation>Alles Aus&klappen</translation>
</message>
<message>
- <location line="+17"/>
<source>Reset Font Size</source>
<translation>Schriftgröße zurücksetzen</translation>
</message>
<message>
- <location line="+3"/>
<source>Ctrl+0</source>
<translation>Ctrl+0</translation>
</message>
<message>
- <location line="+5"/>
<source>Go to Block Start</source>
<translation>Zum Blockanfang gehen</translation>
</message>
<message>
- <location line="+6"/>
<source>Go to Block End</source>
<translation>Zum Blockende gehen</translation>
</message>
<message>
- <location line="+6"/>
<source>Go to Block Start With Selection</source>
<translation>Bis Blockanfang markieren</translation>
</message>
<message>
- <location line="+5"/>
<source>Go to Block End With Selection</source>
<translation>Bis Blockende markieren</translation>
</message>
<message>
- <location line="-61"/>
<source>Shift+Del</source>
<translation>Shift+Del</translation>
</message>
<message>
- <location line="-38"/>
<source>&Rewrap Paragraph</source>
<translation>Abschnitt neu um&brechen</translation>
</message>
<message>
- <location line="+11"/>
<source>%1+E, %2+V</source>
<translation>%1+E, %2+V</translation>
</message>
<message>
- <location line="+14"/>
<source>%1+E, %2+W</source>
<translation>%1+E, %2+W</translation>
</message>
<message>
- <location line="+11"/>
<source>Cut &Line</source>
<translation>&Zeile ausschneiden</translation>
</message>
<message>
- <location line="+11"/>
<source>Ctrl+<</source>
<translation>Ctrl+<</translation>
</message>
<message>
- <location line="+6"/>
<source>Ctrl+></source>
<translation>Ctrl+></translation>
</message>
<message>
- <location line="+9"/>
<source>Increase Font Size</source>
<translation>Schrift vergrößern</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl++</source>
<translation>Ctrl++</translation>
</message>
<message>
- <location line="+4"/>
<source>Decrease Font Size</source>
<translation>Schrift verkleinern</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+-</source>
<translation>Ctrl+-</translation>
</message>
<message>
- <location line="+14"/>
<source>Ctrl+[</source>
<translation>Ctrl+[</translation>
</message>
<message>
- <location line="+6"/>
<source>Ctrl+]</source>
<translation>Ctrl+]</translation>
</message>
<message>
- <location line="+6"/>
<source>Ctrl+{</source>
<translation>Ctrl+{</translation>
</message>
<message>
- <location line="+5"/>
<source>Ctrl+}</source>
<translation>Ctrl+}</translation>
</message>
<message>
- <location line="+3"/>
<source>Select Block Up</source>
<translation>Einen Block nach oben auswählen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+U</source>
<translation>Ctrl+U</translation>
</message>
<message>
- <location line="+4"/>
<source>Select Block Down</source>
<translation>Einen Block nach unten auswählen</translation>
</message>
<message>
- <location line="+5"/>
<source>Move Line Up</source>
<translation>Eine Zeile nach oben gehen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+Up</source>
<translation>Ctrl+Shift+Up</translation>
</message>
<message>
- <location line="+3"/>
<source>Move Line Down</source>
<translation>Eine Zeile nach unten gehen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+Down</source>
<translation>Ctrl+Shift+Down</translation>
</message>
<message>
- <location line="+3"/>
<source>Copy Line Up</source>
<translation>Zeile nach oben kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Alt+Up</source>
<translation>Ctrl+Alt+Up</translation>
</message>
<message>
- <location line="+3"/>
<source>Copy Line Down</source>
<translation>Zeile nach unten kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Alt+Down</source>
<translation>Ctrl+Alt+Down</translation>
</message>
<message>
- <location line="+3"/>
<source>Join Lines</source>
<translation>Zeilen verbinden</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+J</source>
<translation>Ctrl+J</translation>
</message>
<message>
- <location line="+3"/>
<source>Insert Line Above Current Line</source>
<translation>Zeile oberhalb der aktuellen Zeile einfügen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+Return</source>
<translation>Ctrl+Shift+Return</translation>
</message>
<message>
- <location line="+3"/>
<source>Insert Line Below Current Line</source>
<translation>Zeile unterhalb der aktuellen Zeile einfügen</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Return</source>
<translation>Ctrl+Return</translation>
</message>
<message>
- <location line="+4"/>
<source>Goto Line Start</source>
<translation>Zeilenanfang</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Line End</source>
<translation>Zeilenende</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Next Line</source>
<translation>Nächste Zeile</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Previous Line</source>
<translation>Vorangehende Zeile</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Previous Character</source>
<translation>Vorangehendes Zeichen</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Next Character</source>
<translation>Nächstes Zeichen</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Previous Word</source>
<translation>Vorangehendes Wort</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Next Word</source>
<translation>Nächstes Wort</translation>
</message>
<message>
- <location line="+4"/>
<source>Goto Line Start With Selection</source>
<translation>Bis Zeilenanfang markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Line End With Selection</source>
<translation>Bis Zeilenende markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Next Line With Selection</source>
<translation>Bis zur nächsten Zeile markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Previous Line With Selection</source>
<translation>Bis zur vorangehenden Zeile markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Previous Character With Selection</source>
<translation>Vorangehendes Zeichen markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Next Character With Selection</source>
<translation>Nächstes Zeichen markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Previous Word With Selection</source>
<translation>Vorangehendes Wort markieren</translation>
</message>
<message>
- <location line="+3"/>
<source>Goto Next Word With Selection</source>
<translation>Nächstes Wort markieren</translation>
</message>
<message>
- <location line="+96"/>
<source><line number></source>
<translation><Zeilennummer></translation>
</message>
@@ -14817,172 +12161,138 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TextEditor::TextEditorSettings</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditorsettings.cpp" line="+105"/>
<source>Text</source>
<translation>Text</translation>
</message>
<message>
- <location line="+4"/>
<source>Link</source>
<translation>Link</translation>
</message>
<message>
- <location line="+1"/>
<source>Selection</source>
<translation>Auswahl</translation>
</message>
<message>
- <location line="+1"/>
<source>Line Number</source>
<translation>Zeilennummer</translation>
</message>
<message>
- <location line="+1"/>
<source>Search Result</source>
<translation>Suchergebnisse</translation>
</message>
<message>
- <location line="+1"/>
<source>Search Scope</source>
<translation>Suchbereich</translation>
</message>
<message>
- <location line="+1"/>
<source>Parentheses</source>
<translation>Klammern</translation>
</message>
<message>
- <location line="+1"/>
<source>Current Line</source>
<translation>Aktuelle Zeile</translation>
</message>
<message>
- <location line="+2"/>
<source>Current Line Number</source>
<translation>Zeilennummer</translation>
</message>
<message>
- <location line="+4"/>
<source>Occurrences</source>
<translation>Vorkommen</translation>
</message>
<message>
- <location line="+1"/>
<source>Unused Occurrence</source>
<translation>Nicht verwendet</translation>
</message>
<message>
- <location line="+1"/>
<source>Renaming Occurrence</source>
<translation>Umbenennung</translation>
</message>
<message>
- <location line="+3"/>
<source>Number</source>
<translation>Zahl</translation>
</message>
<message>
- <location line="+1"/>
<source>String</source>
<translation>Zeichenkette</translation>
</message>
<message>
- <location line="+1"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location line="+1"/>
<source>Local</source>
<translation>Lokale Variable</translation>
</message>
<message>
- <location line="+1"/>
<source>Field</source>
<translation>Feld</translation>
</message>
<message>
- <location line="+1"/>
<source>Static</source>
<translation>Statisch</translation>
</message>
<message>
- <location line="+2"/>
<source>Virtual Method</source>
<translation>Virtuelle Methode</translation>
</message>
<message>
- <location line="+4"/>
<source>Keyword</source>
<translation>Schlüsselwort</translation>
</message>
<message>
- <location line="+1"/>
<source>Operator</source>
<translation>Operator</translation>
</message>
<message>
- <location line="+1"/>
<source>Preprocessor</source>
<translation>Präprozessor</translation>
</message>
<message>
- <location line="+1"/>
<source>Label</source>
<translation>Sprungmarke</translation>
</message>
<message>
- <location line="+1"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
<message>
- <location line="+1"/>
<source>Doxygen Comment</source>
<translation>Doxygen-Kommentar</translation>
</message>
<message>
- <location line="+1"/>
<source>Doxygen Tag</source>
<translation>Doxygen-Schlüsselwort</translation>
</message>
<message>
- <location line="+1"/>
<source>Visual Whitespace</source>
<translation>Leerzeichen darstellen</translation>
</message>
<message>
- <location line="+1"/>
<source>Disabled Code</source>
<translation>Deaktivierter Code</translation>
</message>
<message>
- <location line="+3"/>
<source>Added Line</source>
<translation>Hinzugefügte Zeile</translation>
</message>
<message>
- <location line="+1"/>
<source>Removed Line</source>
<translation>Entfernte Zeile</translation>
</message>
<message>
- <location line="+1"/>
<source>Diff File</source>
<translation>Diff-Dateiangabe</translation>
</message>
<message>
- <location line="+1"/>
<source>Diff Location</source>
<translation>Diff-Zeilenangabe</translation>
</message>
<message>
- <location line="+10"/>
<source>Behavior</source>
<translation>Verhalten</translation>
</message>
<message>
- <location line="+7"/>
<source>Display</source>
<translation>Anzeige</translation>
</message>
@@ -14990,72 +12300,58 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>ToolChain</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/toolchain.cpp" line="+135"/>
<source>GCC</source>
<translation>GCC</translation>
</message>
<message>
- <location line="+2"/>
<source>Intel C++ Compiler (Linux)</source>
<translation>Intel C++ Compiler (Linux)</translation>
</message>
<message>
- <location line="+4"/>
<source>Microsoft Visual C++</source>
<translation>Microsoft Visual C++</translation>
</message>
<message>
- <location line="+2"/>
<source>Windows CE</source>
<translation>Windows CE</translation>
</message>
<message>
- <location line="+2"/>
<source>WINSCW</source>
<translation>WINSCW</translation>
</message>
<message>
- <location line="+2"/>
<source>GCCE</source>
<translation>GCCE</translation>
</message>
<message>
- <location line="+2"/>
<source>GCCE/GnuPoc</source>
<translation>GCCE/GnuPoc</translation>
</message>
<message>
- <location line="+2"/>
<source>RVCT (ARMV6)/GnuPoc</source>
<translation>RVCT (ARMV6)/GnuPoc</translation>
</message>
<message>
- <location line="+2"/>
<source>RVCT (ARMV5)</source>
<translation>RVCT (ARMV5)</translation>
</message>
<message>
- <location line="+2"/>
<source>RVCT (ARMV6)</source>
<translation>RVCT (ARMV6)</translation>
</message>
<message>
- <location line="+2"/>
<source>GCC for Maemo</source>
<translation>GCC for Maemo</translation>
</message>
<message>
- <location line="+2"/>
<source>Other</source>
<translation>Andere</translation>
</message>
<message>
- <location line="+2"/>
<source><Invalid></source>
<translation><Ungültig></translation>
</message>
<message>
- <location line="+6"/>
<source><Unknown></source>
<translation><Unbekannt></translation>
</message>
@@ -15063,32 +12359,26 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>TopicChooser</name>
<message>
- <location filename="../../../src/shared/help/topicchooser.cpp" line="+48"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location line="+1"/>
<source>Choose a topic for <b>%1</b>:</source>
<translation>Wählen Sie ein Thema für <b>%1</b>:</translation>
</message>
<message>
- <location filename="../../../src/shared/help/topicchooser.ui"/>
<source>Choose Topic</source>
<translation>Themenwahl</translation>
</message>
<message>
- <location/>
<source>&Topics</source>
<translation>&Themen</translation>
</message>
<message>
- <location/>
<source>&Display</source>
<translation>&Anzeigen</translation>
</message>
<message>
- <location/>
<source>&Close</source>
<translation>&Schließen</translation>
</message>
@@ -15096,7 +12386,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::CheckableMessageBox</name>
<message>
- <location filename="../../../src/libs/utils/checkablemessagebox.ui"/>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
@@ -15104,17 +12393,14 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::ClassNameValidatingLineEdit</name>
<message>
- <location filename="../../../src/libs/utils/classnamevalidatinglineedit.cpp" line="+84"/>
<source>The class name must not contain namespace delimiters.</source>
<translation>Der Klassenname darf keine Namensraum-Trenner enthalten.</translation>
</message>
<message>
- <location line="+4"/>
<source>Please enter a class name.</source>
<translation>Bitte geben Sie einen Klassennamen ein.</translation>
</message>
<message>
- <location line="+4"/>
<source>The class name contains invalid characters.</source>
<translation>Der Klassennamen enthält ungültige Zeichen.</translation>
</message>
@@ -15122,62 +12408,50 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::ConsoleProcess</name>
<message>
- <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+49"/>
<source>Cannot set up communication channel: %1</source>
<translation>Es konnte kein Kommunikationskanal hergestellt werden: %1</translation>
</message>
<message>
- <location line="+12"/>
<source>Cannot create temporary file: %1</source>
<translation>Es konnte keine temporäre Datei erstellt werden: %1</translation>
</message>
<message>
- <location line="+10"/>
<source>Unexpected output from helper program (%1).</source>
<translation>Die Ausgabe des Hilfsprogrammes (%1) kann nicht ausgewertet werden.</translation>
</message>
<message>
- <location line="-15"/>
<source>Press <RETURN> to close this window...</source>
<translation>Betätigen Sie die <RETURN> Taste, um das Fenster zu schließen...</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+162"/>
<source>Cannot start the terminal emulator '%1'.</source>
<translation>Der Terminal-Emulator '%1' konnte nicht gestartet werden.</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+10"/>
<source>Cannot create temporary directory '%1': %2</source>
<translation>Das temporäre Verzeichnis '%1' konnte nicht erstellt werden: %2</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/consoleprocess_unix.cpp" line="+49"/>
<source>Cannot create socket '%1': %2</source>
<translation>Der Socket '%1' konnte nicht erstellt werden: %2</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+10"/>
<source>Cannot change to working directory '%1': %2</source>
<translation>Es konnte nicht zum Arbeitsverzeichnis '%1' gewechselt werden: %2</translation>
</message>
<message>
- <location line="+5"/>
<source>Cannot execute '%1': %2</source>
<translation>Das Kommando '%1' konnte nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+179"/>
<source>The process '%1' could not be started: %2</source>
<translation>Der Prozess '%1; konnte nicht gestartet werden: %2</translation>
</message>
<message>
- <location line="+72"/>
<source>Cannot obtain a handle to the inferior: %1</source>
<translation>Der zu debuggende Prozess konnte nicht angesprochen werden: %1</translation>
</message>
<message>
- <location line="+30"/>
<source>Cannot obtain exit status from inferior: %1</source>
<translation>Der Rückgabewert des zu debuggenden Prozesses konnte nicht erhalten werden: %1</translation>
</message>
@@ -15185,7 +12459,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::DetailsButton</name>
<message>
- <location filename="../../../src/libs/utils/detailsbutton.cpp" line="+69"/>
<source>Details</source>
<translation>Details</translation>
</message>
@@ -15193,7 +12466,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::FileSearch</name>
<message numerus="yes">
- <location filename="../../../src/libs/utils/filesearch.cpp" line="+47"/>
<source>%1: canceled. %n occurrences found in %2 files.</source>
<translation>
<numerusform>%1: Abgebrochen. Eine Fundstelle in %2 Dateien.</numerusform>
@@ -15201,7 +12473,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+8"/>
<source>%1: %n occurrences found in %2 files.</source>
<translation>
<numerusform>%1: Eine Fundstelle in %2 Dateien.</numerusform>
@@ -15209,7 +12480,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
</translation>
</message>
<message numerus="yes">
- <location line="+8"/>
<source>%1: %n occurrences found in %2 of %3 files.</source>
<translation>
<numerusform>%1: Eine Fundstelle in %2 von %3 Dateien.</numerusform>
@@ -15220,87 +12490,70 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::NewClassWidget</name>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+448"/>
<source>Invalid base class name</source>
<translation>Der Name der Basisklasse ist ungültig</translation>
</message>
<message>
- <location line="+7"/>
<source>Invalid header file name: '%1'</source>
<translation>Ungültiger Header-Dateiname: '%1'</translation>
</message>
<message>
- <location line="+6"/>
<source>Invalid source file name: '%1'</source>
<translation>Ungültiger Quelldateiname: '%1'</translation>
</message>
<message>
- <location line="+8"/>
<source>Invalid form file name: '%1'</source>
<translation>Ungültiger Form-Dateiname: '%1'</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/newclasswidget.ui"/>
<source>Inherits QObject</source>
<translation>Erbt von Klasse QObject</translation>
</message>
<message>
- <location/>
<source>None</source>
<translation>Keine</translation>
</message>
<message>
- <location/>
<source>Inherits QWidget</source>
<translation>Erbt von Klasse QWidget</translation>
</message>
<message>
- <location/>
<source>Based on QSharedData</source>
<translation>Basierend auf QSharedData</translation>
</message>
<message>
- <location/>
<source>&Class name:</source>
<translation>&Klassenname:</translation>
</message>
<message>
- <location/>
<source>&Base class:</source>
<translation>&Basisklasse:</translation>
</message>
<message>
- <location/>
<source>&Type information:</source>
<translation>&Typinformation:</translation>
</message>
<message>
- <location/>
<source>&Header file:</source>
<translation>&Header-Datei:</translation>
</message>
<message>
- <location/>
<source>&Source file:</source>
<translation>&Quelldatei:</translation>
</message>
<message>
- <location/>
<source>&Generate form:</source>
<translation>Form-Datei &generieren:</translation>
</message>
<message>
- <location/>
<source>&Form file:</source>
<translation>&Form-Datei:</translation>
</message>
<message>
- <location/>
<source>&Path:</source>
<translation>&Pfad:</translation>
</message>
<message>
- <location/>
<source>Inherits QDeclarativeItem</source>
<translation>Erbt von Klasse QObject</translation>
</message>
@@ -15308,48 +12561,63 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::PathChooser</name>
<message>
- <location filename="../../../src/libs/utils/pathchooser.cpp" line="+49"/>
<source>Choose...</source>
<translation>Auswählen...</translation>
</message>
<message>
- <location line="+2"/>
<source>Browse...</source>
<translation>Auswählen...</translation>
</message>
<message>
- <location line="+138"/>
<source>Choose Directory</source>
<translation>Ordner wählen</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+6"/>
+ <source>Choose Executable</source>
+ <translation>Ausführbare Datei auswählen</translation>
+ </message>
+ <message>
<source>Choose File</source>
<translation>Datei wählen</translation>
</message>
<message>
- <location line="+44"/>
+ <source><not valid></source>
+ <extracomment>Selected path is not valid:</extracomment>
+ <translation><ungültig></translation>
+ </message>
+ <message>
<source>The path must not be empty.</source>
<translation>Der Pfad darf nicht leer sein.</translation>
</message>
<message>
- <location line="+12"/>
<source>The path '%1' does not exist.</source>
<translation>Der Pfad '%1' existiert nicht.</translation>
</message>
<message>
- <location line="+15"/>
+ <source>The path <b>%1</b> is not a directory.</source>
+ <translation>Der Pfad '%1' ist kein Ordner.</translation>
+ </message>
+ <message>
+ <source>The path <b>%1</b> is not a file.</source>
+ <translation>Der Pfad '%1' ist keine Datei.</translation>
+ </message>
+ <message>
+ <source>The path <b>%1</b> is not a executable file.</source>
+ <translation>Der Pfad <b> %1</b> ist keine ausführbare Datei.</translation>
+ </message>
+ <message>
+ <source>Full path: <b>%1</b></source>
+ <translation>Vollständiger Pfad: <b>%1</b></translation>
+ </message>
+ <message>
<source>The path '%1' is not a directory.</source>
- <translation>Der Pfad '%1' zeigt nicht zu einem Verzeichnis.</translation>
+ <translation type="obsolete">Der Pfad '%1' zeigt nicht zu einem Verzeichnis.</translation>
</message>
<message>
- <location line="+8"/>
<source>The path '%1' is not a file.</source>
- <translation>Der Pfad '%1' zeigt nicht zu einer Datei.</translation>
+ <translation type="obsolete">Der Pfad '%1' zeigt nicht zu einer Datei.</translation>
</message>
<message>
- <location line="+22"/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
@@ -15357,27 +12625,22 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::PathListEditor</name>
<message>
- <location filename="../../../src/libs/utils/pathlisteditor.cpp" line="+119"/>
<source>Insert...</source>
<translation>Einfügen...</translation>
</message>
<message>
- <location line="+4"/>
<source>Add...</source>
<translation>Hinzufügen...</translation>
</message>
<message>
- <location line="+1"/>
<source>Delete Line</source>
<translation>Zeile löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Clear</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="+130"/>
<source>From "%1"</source>
<translation>Von "%1"</translation>
</message>
@@ -15385,37 +12648,30 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::ProjectIntroPage</name>
<message>
- <location filename="../../../src/libs/utils/projectintropage.cpp" line="+65"/>
<source><Enter_Name></source>
<translation><Name></translation>
</message>
<message>
- <location line="+98"/>
<source>The project already exists.</source>
<translation>Das Projekt existiert bereits.</translation>
</message>
<message>
- <location line="+4"/>
<source>A file with that name already exists.</source>
<translation>Eine Datei dieses Namens existiert bereits.</translation>
</message>
<message>
- <location filename="../../../src/libs/utils/projectintropage.ui"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location/>
<source>Create in:</source>
<translation>Erzeugen in:</translation>
</message>
<message>
- <location/>
<source>Use as default project location</source>
<translation>Als Vorgabe für Projektordner verwenden</translation>
</message>
<message>
- <location/>
<source>Introduction and Project Location</source>
<translation>Einführung und Projektverzeichnis</translation>
</message>
@@ -15423,7 +12679,6 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::ProjectNameValidatingLineEdit</name>
<message>
- <location filename="../../../src/libs/utils/projectnamevalidatinglineedit.cpp" line="+50"/>
<source>Invalid character '.'.</source>
<translation>Ungültiges Zeichen '.'.</translation>
</message>
@@ -15431,22 +12686,18 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::SubmitEditorWidget</name>
<message>
- <location filename="../../../src/libs/utils/submiteditorwidget.ui"/>
<source>Subversion Submit</source>
<translation>Subversion Submit</translation>
</message>
<message>
- <location/>
<source>Des&cription</source>
<translation>&Beschreibung</translation>
</message>
<message>
- <location/>
<source>F&iles</source>
<translation>&Dateien</translation>
</message>
<message numerus="yes">
- <location filename="../../../src/libs/utils/submiteditorwidget.cpp" line="+460"/>
<source>Commit %1/%n Files</source>
<translation>
<numerusform>%1/%n Datei abgeben</numerusform>
@@ -15454,18 +12705,15 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
</translation>
</message>
<message>
- <location line="+1"/>
<source>Commit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location line="+113"/>
<source>Check All</source>
<extracomment>Check all for submit</extracomment>
<translation>Alle markieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Uncheck All</source>
<extracomment>Uncheck all for submit</extracomment>
<translation>Alle Markierungen entfernen</translation>
@@ -15474,17 +12722,14 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::WizardPage</name>
<message>
- <location filename="../../../src/libs/utils/filewizardpage.ui"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location/>
<source>Choose the Location</source>
<translation>Pfadangabe</translation>
</message>
@@ -15492,17 +12737,14 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>Utils::reloadPrompt</name>
<message>
- <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+44"/>
<source>File Changed</source>
<translation>Datei geändert</translation>
</message>
<message>
- <location line="+4"/>
<source>The unsaved file <i>%1</i> has been changed outside Qt Creator. Do you want to reload it and discard your changes?</source>
<translation>Die noch nicht gespeicherte Datei <i>%1</i> wurde außerhalb von Qt Creator geändert. Möchten Sie sie neu laden?</translation>
</message>
<message>
- <location line="+3"/>
<source>The file <i>%1</i> has changed outside Qt Creator. Do you want to reload it?</source>
<translation>Die Datei <i>%1</i> wurde außerhalb von Qt Creator geändert. Möchten Sie sie neu laden?</translation>
</message>
@@ -15510,17 +12752,14 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbaseconstants.h" line="+39"/>
<source>Version Control</source>
<translation>Versionskontrolle</translation>
</message>
<message>
- <location line="+3"/>
<source>Common</source>
<translation>Allgemein</translation>
</message>
<message>
- <location line="+2"/>
<source>Project from Version Control</source>
<translation>Projekt aus Versionskontrollsystem</translation>
</message>
@@ -15528,32 +12767,26 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::BaseCheckoutWizard</name>
<message>
- <location filename="../../../src/plugins/vcsbase/basecheckoutwizard.cpp" line="+114"/>
<source>Cannot Open Project</source>
<translation>Fehler beim Öffnen des Projekts</translation>
</message>
<message>
- <location line="+1"/>
<source>Failed to open project in '%1'.</source>
<translation>Es konnte kein Projekt in '%1' geöffnet werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Could not find any project files matching (%1) in the directory '%2'.</source>
<translation>Es konnten keine dem Muster (%1) entsprechenden Projektdateien in '%2' gefunden werden.</translation>
</message>
<message>
- <location line="+30"/>
<source>The Project Explorer is not available.</source>
<translation>Das ProjectExplorer-Plugin ist nicht verfügbar.</translation>
</message>
<message>
- <location line="+7"/>
<source>'%1' does not exist.</source>
<translation>'%1' existiert nicht.</translation>
</message>
<message>
- <location line="+10"/>
<source>Unable to open the project '%1'.</source>
<translation>Das Projekt '%1' konnte nicht geöffnet werden.</translation>
</message>
@@ -15561,50 +12794,73 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::BaseCheckoutWizardPage</name>
<message>
- <location filename="../../../src/plugins/vcsbase/basecheckoutwizardpage.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location/>
<source>Checkout Directory:</source>
<translation>Verzeichnis:</translation>
</message>
<message>
- <location/>
<source>Path:</source>
- <translation>Pfad:</translation>
+ <translation type="obsolete">Pfad:</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location/>
<source>Branch:</source>
<translation>Branch:</translation>
</message>
+ <message>
+ <source>Repository</source>
+ <translation>Repository</translation>
+ </message>
+ <message>
+ <source>The remote repository to check out.</source>
+ <translation>Das entfernte Repository.</translation>
+ </message>
+ <message>
+ <source>The development branch in the remote repository to check out.</source>
+ <translation>Der Branch im entfernten Repository.</translation>
+ </message>
+ <message>
+ <source>Retrieve list of branches in repository.</source>
+ <translation>Abfrage der Liste der Branches des Repositories.</translation>
+ </message>
+ <message>
+ <source>Working Copy</source>
+ <translation>Arbeitskopie</translation>
+ </message>
+ <message>
+ <source>The path in which the directory containing the checkout will be created.</source>
+ <translation>Der Pfad, unter dem der Ordner mit dem Checkout erstellt wird.</translation>
+ </message>
+ <message>
+ <source>Checkout Path:</source>
+ <translation>Checkout-Pfad:</translation>
+ </message>
+ <message>
+ <source>The local directory that will contain the code after the checkout.</source>
+ <translation>Der lokale Ordner, welcher nach dem Checkout den Code enthalten wird.</translation>
+ </message>
</context>
<context>
<name>VCSBase::Internal::CheckoutProgressWizardPage</name>
<message>
- <location filename="../../../src/plugins/vcsbase/checkoutprogresswizardpage.cpp" line="+48"/>
<source>Checkout</source>
<translation>Auschecken</translation>
</message>
<message>
- <location line="+19"/>
<source>Checkout started...</source>
<translation>Checkout begonnen...</translation>
</message>
<message>
- <location line="+14"/>
<source>Failed.</source>
<translation>Fehlgeschlagen.</translation>
</message>
<message>
- <location line="+13"/>
<source>Succeeded.</source>
<translation>Beendet.</translation>
</message>
@@ -15612,27 +12868,22 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::Internal::NickNameDialog</name>
<message>
- <location filename="../../../src/plugins/vcsbase/nicknamedialog.cpp" line="+218"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+0"/>
<source>E-mail</source>
<translation>E-Mail-Adresse</translation>
</message>
<message>
- <location line="+1"/>
<source>Alias</source>
<translation>Alias</translation>
</message>
<message>
- <location line="+0"/>
<source>Alias e-mail</source>
<translation>Alias-E-Mail-Adresse</translation>
</message>
<message>
- <location line="+15"/>
<source>Cannot open '%1': %2</source>
<translation>Die Datei '%1' kann nicht geöffnet werden: %2</translation>
</message>
@@ -15640,27 +12891,22 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::ProcessCheckoutJob</name>
<message>
- <location filename="../../../src/plugins/vcsbase/checkoutjobs.cpp" line="+125"/>
<source>Unable to start %1: %2</source>
<translation>%1 kann nicht gestartet werden: %2</translation>
</message>
<message>
- <location line="+16"/>
<source>The process terminated with exit code %1.</source>
<translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
- <location line="+4"/>
<source>The process returned exit code %1.</source>
<translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
- <location line="+4"/>
<source>The process terminated in an abnormal way.</source>
<translation>Der Prozess wurde in anormaler Weise beendet.</translation>
</message>
<message>
- <location line="+36"/>
<source>Stopping...</source>
<translation>Beende Prozess...</translation>
</message>
@@ -15668,12 +12914,10 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::SubmitFileModel</name>
<message>
- <location filename="../../../src/plugins/vcsbase/submitfilemodel.cpp" line="+43"/>
<source>State</source>
<translation>Status</translation>
</message>
<message>
- <location line="+0"/>
<source>File</source>
<translation>Datei</translation>
</message>
@@ -15681,17 +12925,14 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::VCSBaseEditor</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+171"/>
<source>Annotate "%1"</source>
<translation>Annotation für "%1"</translation>
</message>
<message>
- <location line="+1"/>
<source>Copy "%1"</source>
<translation>"%1" Kopieren</translation>
</message>
<message>
- <location line="+244"/>
<source>Describe change %1</source>
<translation>Details zur Änderung %1 anzeigen</translation>
</message>
@@ -15699,29 +12940,24 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::VCSBaseOutputWindow</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbaseoutputwindow.cpp" line="+159"/>
<source>Open "%1"</source>
<translation>"%1" öffnen</translation>
</message>
<message>
- <location line="+7"/>
<source>Clear</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="+113"/>
<source>Version Control</source>
<translation>Versionskontrolle</translation>
</message>
<message>
- <location line="+124"/>
<source>Executing: %1 %2
</source>
<translation>Kommando: %1 %2
</translation>
</message>
<message>
- <location line="+1"/>
<source>Executing in %1: %2 %3
</source>
<translation>Kommando [%1]: %2 %3
@@ -15731,57 +12967,46 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSBase::VCSBaseSubmitEditor</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbasesubmiteditor.cpp" line="+484"/>
<source>Prompt to submit</source>
<translation>Abgabe bestätigen</translation>
</message>
<message>
- <location line="-342"/>
<source>Check Message</source>
<translation>Beschreibung prüfen</translation>
</message>
<message>
- <location line="+6"/>
<source>Insert Name...</source>
<translation>Namen einfügen...</translation>
</message>
<message>
- <location line="+395"/>
<source>Submit Message Check Failed</source>
<translation>Die Überprüfung der Beschreibung schlug fehl</translation>
</message>
<message>
- <location line="+22"/>
<source>Executing %1</source>
<translation>Führe %1 aus</translation>
</message>
<message>
- <location line="+1"/>
<source>Executing [%1] %2</source>
<translation>Ausführung [%1] %2</translation>
</message>
<message>
- <location line="+14"/>
<source>Unable to open '%1': %2</source>
<translation>'%1' kann nicht geöffnet werden: %2</translation>
</message>
<message>
- <location line="+17"/>
<source>The check script '%1' could not be started: %2</source>
<translation>Das Skript zur Überprüfung '%1' konnte nicht gestartet werden: %2</translation>
</message>
<message>
- <location line="+7"/>
<source>The check script '%1' timed out.</source>
<translation>Zeitüberschreitung bei Ausführung des Skripts '%1' zur Überprüfung der Beschreibung.</translation>
</message>
<message>
- <location line="+5"/>
<source>The check script '%1' crashed</source>
<translation>Das Skript zur Überprüfung der Beschreibung ist abgestürzt</translation>
</message>
<message>
- <location line="+11"/>
<source>The check script returned exit code %1.</source>
<translation>Das Skript zur Überprüfung wurde beendet, Rückgabewert %1.</translation>
</message>
@@ -15789,12 +13014,10 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<context>
<name>VCSManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+175"/>
<source>Version Control</source>
<translation>Versionskontrolle</translation>
</message>
<message>
- <location line="+1"/>
<source>Would you like to remove this file from the version control system (%1)?
Note: This might remove the local file.</source>
<translation>Möchten Sie die Datei aus der Versionskontrolle (%1) entfernen?
@@ -15804,47 +13027,38 @@ Hinweis: Unter Umständen wird die Datei gelöscht.</translation>
<context>
<name>ViewDialog</name>
<message>
- <location filename="../../../src/plugins/cpaster/pasteview.ui"/>
<source>Send to Codepaster</source>
<translation>An CodePaster senden</translation>
</message>
<message>
- <location/>
<source>&Username:</source>
<translation>&Nutzername:</translation>
</message>
<message>
- <location/>
<source><Username></source>
<translation><Nutzername></translation>
</message>
<message>
- <location/>
<source>&Description:</source>
<translation>&Beschreibung:</translation>
</message>
<message>
- <location/>
<source><Description></source>
<translation><Beschreibung></translation>
</message>
<message>
- <location/>
<source>Patch 1</source>
<translation>Patch 1</translation>
</message>
<message>
- <location/>
<source>Patch 2</source>
<translation>Patch 2</translation>
</message>
<message>
- <location/>
<source>Protocol:</source>
<translation>Protokoll:</translation>
</message>
<message>
- <location/>
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
@@ -15857,7 +13071,6 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">&lt;Kommentar&gt;</span></p></body></html></translation>
</message>
<message>
- <location/>
<source>Parts to Send to Server</source>
<translation>Zu versendende Ausschnitte</translation>
</message>
@@ -15865,7 +13078,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>Welcome::Internal::CommunityWelcomePage</name>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepage.h" line="+49"/>
<source>News && Support</source>
<translation>News && Support</translation>
</message>
@@ -15873,58 +13085,47 @@ p, li { white-space: pre-wrap; }
<context>
<name>Welcome::Internal::CommunityWelcomePageWidget</name>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>News From the Qt Labs</source>
<translation>Neuigkeiten aus den Qt Labs</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.cpp" line="+49"/>
<source><b>Qt LGPL Support</b><br /><font color='gray'>Buy commercial Qt support</font></source>
<translation><b>Qt LGPL Unterstützung</b><br/><font color='gray'>Erwerben Sie kommerzielle Unterstützung für Qt</font></translation>
</message>
<message>
- <location line="-3"/>
<source><b>Forum Nokia</b><br /><font color='gray'>Mobile application support</font></source>
<translation><b>Forum Nokia</b><br /><font color='gray'>Unterstützung für mobile Anwendungen</font></translation>
</message>
<message>
- <location line="+6"/>
<source><b>Qt DevNet</b><br /><font color='gray'>Qt Developer Resources</font></source>
<translation><b>Qt DevNet</b><br /><font color='gray'>Ressourcen für Qt-Entwickler </font></translation>
</message>
<message>
- <location line="+6"/>
<source><b>Qt Home</b><br /><font color='gray'>Qt by Nokia on the web</font></source>
<translation><b>Qt Home</b><br /><font color='gray'>Qt von Nokia im Web</font></translation>
</message>
<message>
- <location line="+3"/>
<source><b>Qt Git Hosting</b><br /><font color='gray'>Participate in Qt development</font></source>
<translation><b>Qt Git Hosting</b><br /><font color='gray'>Beteiligen Sie sich an der Entwicklung von Qt</font></translation>
</message>
<message>
- <location line="+3"/>
<source><b>Qt Apps</b><br /><font color='gray'>Find free Qt-based apps</font></source>
<translation><b>Qt Apps</b><br /><font color='gray'>Finden Sie freie, Qt-basierte Applikationen</font></translation>
</message>
<message>
- <location line="+34"/>
<source>http://labs.trolltech.com/blogs/feed</source>
<extracomment>Add localized feed here only if one exists</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/communitywelcomepagewidget.ui"/>
<source>Qt Support Sites</source>
<translation>Qt Support Sites</translation>
</message>
<message>
- <location/>
<source>Qt Links</source>
<translation>Qt Links</translation>
</message>
@@ -15932,7 +13133,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>Welcome::WelcomeMode</name>
<message>
- <location filename="../../../src/plugins/welcome/welcomemode.ui"/>
<source>#headerFrame {
border-image: url(:/welcome/images/center_frame_header.png) 0;
border-width: 0;
@@ -15941,17 +13141,14 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
<source>Help us make Qt Creator even better</source>
<translation>Helfen Sie uns, Qt Creator zu verbessern</translation>
</message>
<message>
- <location/>
<source>Feedback</source>
<translation>Feedback</translation>
</message>
<message>
- <location filename="../../../src/plugins/welcome/welcomemode.cpp" line="+131"/>
<source>Welcome</source>
<translation>Willkommen</translation>
</message>
@@ -15959,27 +13156,22 @@ p, li { white-space: pre-wrap; }
<context>
<name>mainClass</name>
<message>
- <location filename="../../../src/libs/aggregation/examples/text/main.ui"/>
<source>main</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
<source>Text1:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
<source>N/A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
<source>Text2:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location/>
<source>Text3:</source>
<translation type="unfinished"></translation>
</message>
@@ -15987,36 +13179,30 @@ p, li { white-space: pre-wrap; }
<context>
<name>Debugger::Internal::AbstractGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/abstractgdbadapter.cpp" line="+79"/>
<source>The Gdb process could not be stopped:
%1</source>
<translation>Der Gdb-Prozess konnte nicht angehalten werden:
%1</translation>
</message>
<message>
- <location line="+5"/>
<source>Application process could not be stopped:
%1</source>
<translation>Die Anwendung konnte nicht angehalten werden:
%1</translation>
</message>
<message>
- <location line="+5"/>
<source>Application started</source>
<translation>Anwendung gestartet</translation>
</message>
<message>
- <location line="+5"/>
<source>Application running</source>
<translation>Anwendung läuft</translation>
</message>
<message>
- <location line="+5"/>
<source>Attached to stopped application</source>
<translation>Debugger an angehaltene Anwendung angehängt</translation>
</message>
<message>
- <location line="+5"/>
<source>Connecting to remote server failed:
%1</source>
<translation>Die Verbindung zum Server konnte nicht hergestellt werden:
@@ -16026,64 +13212,50 @@ p, li { white-space: pre-wrap; }
<context>
<name>QmlParser</name>
<message>
- <location filename="../../../src/libs/qmljs/parser/qmljslexer.cpp" line="+558"/>
<source>Illegal character</source>
<translation>Ungültiges Zeichen</translation>
</message>
<message>
- <location line="+14"/>
<source>Unclosed string at end of line</source>
<translation>Zeichenkette am Zeilenende nicht geschlossen</translation>
</message>
<message>
- <location line="+26"/>
<source>Illegal escape squence</source>
<translation>Ungültige Escape-Sequenz</translation>
</message>
<message>
- <location line="+46"/>
<source>Illegal unicode escape sequence</source>
<translation>Ungültige Unicode-Escape-Sequenz</translation>
</message>
<message>
- <location line="+26"/>
<source>Unclosed comment at end of file</source>
<translation>Kommentar am Dateiende nicht geschlossen</translation>
</message>
<message>
- <location line="+87"/>
<source>Illegal syntax for exponential number</source>
<translation>Ungültige Syntax des Exponenten der Zahl</translation>
</message>
<message>
- <location line="+26"/>
<source>Identifier cannot start with numeric literal</source>
<translation>Bezeichner kann nicht mit numerischem Zeichen beginnen</translation>
</message>
<message>
- <location line="+331"/>
<source>Unterminated regular expression literal</source>
<translation>Regulärer Ausdruck nicht abgeschlossen</translation>
</message>
<message>
- <location line="+24"/>
<source>Invalid regular expression flag '%0'</source>
<translation>Ungültiger Modifikator für regulären Ausdruck '%0'</translation>
</message>
<message>
- <location filename="../../../src/libs/qmljs/parser/qmljsparser.cpp" line="+1828"/>
- <location line="+67"/>
<source>Syntax error</source>
<translation>Syntaxfehler</translation>
</message>
<message>
- <location line="-65"/>
<source>Unexpected token `%1'</source>
<translation>Unerwartetes Token '%1'</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+24"/>
<source>Expected token `%1'</source>
<translation>Es wird das Token '%1' erwartet</translation>
</message>
@@ -16091,27 +13263,22 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::Internal::S60Devices::Device</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devices.cpp" line="+91"/>
<source>Id:</source>
<translation>Id:</translation>
</message>
<message>
- <location line="+2"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
- <location line="+2"/>
<source>EPOC:</source>
<translation>EPOC:</translation>
</message>
<message>
- <location line="+2"/>
<source>Tools:</source>
<translation>Tools:</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt:</source>
<translation>Qt:</translation>
</message>
@@ -16119,37 +13286,30 @@ p, li { white-space: pre-wrap; }
<context>
<name>trk::BluetoothListener</name>
<message>
- <location filename="../../../src/shared/symbianutils/bluetoothlistener.cpp" line="+133"/>
<source>%1: Stopping listener %2...</source>
<translation>%1: Halte Prozess %2 an ...</translation>
</message>
<message>
- <location line="+30"/>
<source>%1: Starting Bluetooth listener %2...</source>
<translation>%1: Starte Prozess %2...</translation>
</message>
<message>
- <location line="+4"/>
<source>Unable to run '%1': %2</source>
<translation>'%1' kann nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+4"/>
<source>%1: Bluetooth listener running (%2).</source>
<translation>%1: Prozess läuft (%2).</translation>
</message>
<message>
- <location line="+25"/>
<source>%1: Process %2 terminated with exit code %3.</source>
<translation>%1: Der Prozess %2 wurde beendet, Rückgabewert %3.</translation>
</message>
<message>
- <location line="+4"/>
<source>%1: Process %2 crashed.</source>
<translation>%1: Der Prozess %2 ist abgestürzt.</translation>
</message>
<message>
- <location line="+8"/>
<source>%1: Process error %2: %3</source>
<translation>%1: Fehler bei Prozess %2: %3</translation>
</message>
@@ -16157,27 +13317,22 @@ p, li { white-space: pre-wrap; }
<context>
<name>trk::promptStartCommunication</name>
<message>
- <location filename="../../../src/shared/symbianutils/bluetoothlistener_gui.cpp" line="+68"/>
<source>Connection on %1 canceled.</source>
<translation>Die Verbindung auf %1 wurde abgebrochen.</translation>
</message>
<message>
- <location line="+16"/>
<source>Waiting for App TRK</source>
<translation>Warte auf App TRK</translation>
</message>
<message>
- <location line="+1"/>
<source>Waiting for App TRK to start on %1...</source>
<translation>Warte auf App TRK an %1...</translation>
</message>
<message>
- <location line="+9"/>
<source>Waiting for Bluetooth Connection</source>
<translation>Warte auf Bluetooth-Verbindung</translation>
</message>
<message>
- <location line="+1"/>
<source>Connecting to %1...</source>
<translation>Verbinde zu %1...</translation>
</message>
@@ -16185,7 +13340,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>trk::BaseCommunicationStarter</name>
<message numerus="yes">
- <location filename="../../../src/shared/symbianutils/communicationstarter.cpp" line="+158"/>
<source>%1: timed out after %n attempts using an interval of %2ms.</source>
<translation>
<numerusform>%1: Zeitüberschreitung nach einem Versuch (Intervall %2ms).</numerusform>
@@ -16193,12 +13347,10 @@ p, li { white-space: pre-wrap; }
</translation>
</message>
<message>
- <location line="+8"/>
<source>%1: Connection attempt %2 succeeded.</source>
<translation>%1: Verbindung im Versuch %2 hergestellt.</translation>
</message>
<message>
- <location line="+5"/>
<source>%1: Connection attempt %2 failed: %3 (retrying)...</source>
<translation>%1: Verbindung im Versuch %2 fehlgeschlagen: %3 (wird wiederholt)...</translation>
</message>
@@ -16206,40 +13358,33 @@ p, li { white-space: pre-wrap; }
<context>
<name>trk::Session</name>
<message>
- <location filename="../../../src/shared/symbianutils/trkutils.cpp" line="+101"/>
<source>CPU: v%1.%2%3%4</source>
<extracomment>CPU description of an S60 device %1 major verison, %2 minor version %3 real name of major verison, %4 real name of minor version</extracomment>
<translation>CPU: v%1.%2%3%4</translation>
</message>
<message>
- <location line="+18"/>
<source>App TRK: v%1.%2 TRK protocol: v%3.%4</source>
<translation>App TRK: v%1.%2 TRK-Protokoll: v%3.%4</translation>
</message>
<message>
- <location line="+16"/>
<source>%1, %2%3%4, %5</source>
<extracomment>s60description description of an S60 device %1 CPU description, %2 endianness %3 default type size (if any), %4 float size (if any) %5 TRK version</extracomment>
<translation>%1, %2%3%4, %5</translation>
</message>
<message>
- <location line="+2"/>
<source>big endian</source>
<translation>big endian</translation>
</message>
<message>
- <location line="+1"/>
<source>little endian</source>
<translation>little endian</translation>
</message>
<message>
- <location line="+6"/>
<source>, type size: %1</source>
<extracomment>will be inserted into s60description</extracomment>
<translation>, Typgröße: %1</translation>
</message>
<message>
- <location line="+3"/>
<source>, float size: %1</source>
<extracomment>will be inserted into s60description</extracomment>
<translation>, Gleitkomma-Größe: %1</translation>
@@ -16248,62 +13393,50 @@ p, li { white-space: pre-wrap; }
<context>
<name>Git::Internal::StashDialog</name>
<message>
- <location filename="../../../src/plugins/git/stashdialog.ui"/>
<source>Stashes</source>
<translation>Stashes</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/stashdialog.cpp" line="+88"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+0"/>
<source>Branch</source>
<translation>Branch</translation>
</message>
<message>
- <location line="+0"/>
<source>Message</source>
<translation>Bezeichnung</translation>
</message>
<message>
- <location line="+20"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+1"/>
<source>Show</source>
<translation>Anzeigen</translation>
</message>
<message>
- <location line="+1"/>
<source>Restore...</source>
<translation>Wiederherstellen...</translation>
</message>
<message>
- <location line="+3"/>
<source>Refresh</source>
<translation>Aktualisieren</translation>
</message>
<message>
- <location line="+56"/>
<source><No repository></source>
<translation><Kein Repository></translation>
</message>
<message>
- <location line="+1"/>
<source>Repository: %1</source>
<translation>Repository: %1</translation>
</message>
<message>
- <location line="+27"/>
<source>Do you want to delete all stashes?</source>
<translation>Möchten Sie alle Stashes löschen?</translation>
</message>
<message numerus="yes">
- <location line="+15"/>
<source>Do you want to delete %n stash(es)?</source>
<translation>
<numerusform>Möchten Sie einen Stash löschen?</numerusform>
@@ -16311,66 +13444,53 @@ p, li { white-space: pre-wrap; }
</translation>
</message>
<message>
- <location line="-105"/>
<source>Delete All...</source>
<translation>Alle löschen...</translation>
</message>
<message>
- <location line="+5"/>
<source>Restore to Branch...</source>
<extracomment>Restore a git stash to new branch to be created</extracomment>
<translation>Als Branch wiederherstellen...</translation>
</message>
<message>
- <location line="+84"/>
- <location line="+15"/>
<source>Delete Stashes</source>
<translation>Löschen von Stashes</translation>
</message>
<message>
- <location line="+54"/>
<source>Repository Modified</source>
<translation>Repository geändert</translation>
</message>
<message>
- <location line="+1"/>
<source>%1 cannot be restored since the repository is modified.
You can choose between stashing the changes or discarding them.</source>
<translation>%1 kann nicht wiederhergestellt werden, da Änderungen im Repository vorhanden sind.
Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translation>
</message>
<message>
- <location line="+3"/>
<source>Stash</source>
<translation>Stash</translation>
</message>
<message>
- <location line="+1"/>
<source>Discard</source>
<translation>Rücksetzen</translation>
</message>
<message>
- <location line="+47"/>
<source>Restore Stash to Branch</source>
<translation>Als Branch wiederherstellen</translation>
</message>
<message>
- <location line="+0"/>
<source>Branch:</source>
<translation>Branch:</translation>
</message>
<message>
- <location line="+4"/>
<source>Stash Restore</source>
<translation>Stash wiederherstellen</translation>
</message>
<message>
- <location line="+0"/>
<source>Would you like to restore %1?</source>
<translation>Möchten Sie %1 wiederherstellen?</translation>
</message>
<message>
- <location line="+8"/>
<source>Error restoring %1</source>
<translation>Fehler beim Wiederherstellen von %1</translation>
</message>
@@ -16378,42 +13498,34 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialcommitpanel.ui"/>
<source>General Information</source>
<translation>Allgemeine Informationen</translation>
</message>
<message>
- <location/>
<source>Repository:</source>
<translation>Repository:</translation>
</message>
<message>
- <location/>
<source>repository</source>
<translation>repository</translation>
</message>
<message>
- <location/>
<source>Branch:</source>
<translation>Branch:</translation>
</message>
<message>
- <location/>
<source>branch</source>
<translation>branch</translation>
</message>
<message>
- <location/>
<source>Commit Information</source>
<translation>Informationen zu Commit</translation>
</message>
<message>
- <location/>
<source>Author:</source>
<translation>Autor:</translation>
</message>
<message>
- <location/>
<source>Email:</source>
<translation>E-Mail-Adresse:</translation>
</message>
@@ -16421,77 +13533,62 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
- <location filename="../../../src/plugins/mercurial/optionspage.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Configuration</source>
<translation>Konfiguration</translation>
</message>
<message>
- <location/>
<source>Command:</source>
<translation>Kommando:</translation>
</message>
<message>
- <location/>
<source>User</source>
<translation>Nutzer</translation>
</message>
<message>
- <location/>
<source>Username to use by default on commit.</source>
<translation>Nutzername für Abgabe.</translation>
</message>
<message>
- <location/>
<source>Default username:</source>
<translation>Vorgabe für Nutzernamen:</translation>
</message>
<message>
- <location/>
<source>Email to use by default on commit.</source>
<translation>Email-Addresse für Abgabe.</translation>
</message>
<message>
- <location/>
<source>Miscellaneous</source>
<translation>Sonstige Einstellungen</translation>
</message>
<message>
- <location/>
<source>The number of recent commit logs to show, choose 0 to see all enteries</source>
<translation>Zahl der anzuzeigenden Logeinträge, 0 für unbegrenzt</translation>
</message>
<message>
- <location/>
<source>Timeout:</source>
<translation>Zeitlimit:</translation>
</message>
<message>
- <location/>
<source>s</source>
<translation>s</translation>
</message>
<message>
- <location/>
<source>Prompt on submit</source>
<translation>Abgabe bestätigen</translation>
</message>
<message>
- <location filename="../../../src/plugins/mercurial/optionspage.cpp" line="+97"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
- <location filename="../../../src/plugins/mercurial/optionspage.ui"/>
<source>Log count:</source>
<translation>Log-Anzeige beschränken auf:</translation>
</message>
<message>
- <location/>
<source>Default email:</source>
<translation>Vorgabe-Email:</translation>
</message>
@@ -16499,17 +13596,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
- <location filename="../../../src/plugins/mercurial/revertdialog.ui"/>
<source>Revert</source>
<translation>Rückgängig machen</translation>
</message>
<message>
- <location/>
<source>Specify a revision other than the default?</source>
<translation>Möchten Sie eine Revision angeben?</translation>
</message>
<message>
- <location/>
<source>Revision:</source>
<translation>Revision:</translation>
</message>
@@ -16517,27 +13611,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
- <location filename="../../../src/plugins/mercurial/srcdestdialog.ui"/>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<message>
- <location/>
<source>Local filesystem:</source>
<translation>Dateisystem:</translation>
</message>
<message>
- <location/>
<source>e.g. https://[user[:pass]@]host[:port]/[path]</source>
<translation>zum Beispiel https://[user[:pass]@]host[:port]/[path]</translation>
</message>
<message>
- <location/>
<source>Specify Url:</source>
<translation>URL:</translation>
</message>
<message>
- <location/>
<source>Default Location</source>
<translation>Vorgabe</translation>
</message>
@@ -16545,7 +13634,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::DoubleTabWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/doubletabwidget.ui"/>
<source>DoubleTabWidget</source>
<translation>DoubleTabWidget</translation>
</message>
@@ -16553,7 +13641,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::TargetSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/targetsettingswidget.ui"/>
<source>TargetSettingsWidget</source>
<translation>TargetSettingsWidget</translation>
</message>
@@ -16561,25 +13648,21 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::ItemLibrary</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp" line="+130"/>
<source>Library</source>
<comment>Title of library view</comment>
<translation>Bibliothek</translation>
</message>
<message>
- <location line="+43"/>
<source>Items</source>
<comment>Title of library items view</comment>
<translation>Elemente</translation>
</message>
<message>
- <location line="+1"/>
<source>Resources</source>
<comment>Title of library resources view</comment>
<translation>Ressourcen</translation>
</message>
<message>
- <location line="+5"/>
<source><Filter></source>
<comment>Library search input hint text</comment>
<translation><Filter></translation>
@@ -16588,72 +13671,58 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>BehaviorDialog</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui"/>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<message>
- <location/>
<source>Type:</source>
<translation>Typ:</translation>
</message>
<message>
- <location/>
<source>Animation</source>
<translation>Animation</translation>
</message>
<message>
- <location/>
<source>SpringFollow</source>
<translation>SpringFollow</translation>
</message>
<message>
- <location/>
<source>Settings</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location/>
<source>Duration:</source>
<translation>Dauer:</translation>
</message>
<message>
- <location/>
<source>Curve:</source>
<translation>Kurve:</translation>
</message>
<message>
- <location/>
<source>easeNone</source>
<translation>easeNone</translation>
</message>
<message>
- <location/>
<source>Source:</source>
<translation>Quelle:</translation>
</message>
<message>
- <location/>
<source>Velocity:</source>
<translation>Geschwindigkeit:</translation>
</message>
<message>
- <location/>
<source>Spring:</source>
<translation>Feder:</translation>
</message>
<message>
- <location/>
<source>Damping:</source>
<translation>Dämpfung:</translation>
</message>
<message>
- <location/>
<source>ID:</source>
<translation>ID:</translation>
</message>
<message>
- <location/>
<source>Property name:</source>
<translation>Name der Eigenschaft:</translation>
</message>
@@ -16661,7 +13730,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>GradientDialog</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/gradientdialog.ui"/>
<source>Edit Gradient</source>
<translation>Gradient bearbeiten</translation>
</message>
@@ -16669,304 +13737,242 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>GradientEditor</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/gradienteditor.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Gradient Editor</source>
<translation>Gradient Editor</translation>
</message>
<message>
- <location/>
<source>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.</source>
<translation>Dieser Bereich zeigt eine Vorschau des in Bearbeitung befindlichen Gradienten. Hier können Gradienttyp-spezifische Parameter, wie Start- und Endpunkt, Radius etc. per Drag & Drop bearbeitet werden.</translation>
</message>
<message>
- <location/>
<source>1</source>
<translation>1</translation>
</message>
<message>
- <location/>
<source>2</source>
<translation>2</translation>
</message>
<message>
- <location/>
<source>3</source>
<translation>3</translation>
</message>
<message>
- <location/>
<source>4</source>
<translation>4</translation>
</message>
<message>
- <location/>
<source>5</source>
<translation>5</translation>
</message>
<message>
- <location/>
<source>Gradient Stops Editor</source>
<translation></translation>
</message>
<message>
- <location/>
<source>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</source>
<translation></translation>
</message>
<message>
- <location/>
<source>Zoom</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location/>
<source>Reset Zoom</source>
<translation>Vergrößerung zurücksetzen</translation>
</message>
<message>
- <location/>
<source>Position</source>
<translation></translation>
</message>
<message>
- <location/>
<source>Hue</source>
<translation>Farbton</translation>
</message>
<message>
- <location/>
<source>H</source>
<translation>H</translation>
</message>
<message>
- <location/>
<source>Saturation</source>
<translation>Sättigung</translation>
</message>
<message>
- <location/>
<source>S</source>
<translation>S</translation>
</message>
<message>
- <location/>
<source>Sat</source>
<translation>Sättigung</translation>
</message>
<message>
- <location/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location/>
<source>V</source>
<translation>V</translation>
</message>
<message>
- <location/>
<source>Val</source>
<translation>Wert</translation>
</message>
<message>
- <location/>
<source>Alpha</source>
<translation>Alpha</translation>
</message>
<message>
- <location/>
<source>A</source>
<translation>A</translation>
</message>
<message>
- <location/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location/>
<source>Spread</source>
<translation>Ausbreitung</translation>
</message>
<message>
- <location/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location/>
<source>Current stop's color</source>
<translation>Farbe des Bezugspunkts</translation>
</message>
<message>
- <location/>
<source>Show HSV specification</source>
<translation>HSV-Spezifikation anzeigen</translation>
</message>
<message>
- <location/>
<source>HSV</source>
<translation>HSV</translation>
</message>
<message>
- <location/>
<source>Show RGB specification</source>
<translation>RGB-Spezifikation anzeigen</translation>
</message>
<message>
- <location/>
<source>RGB</source>
<translation>RGB</translation>
</message>
<message>
- <location/>
<source>Current stop's position</source>
<translation>Position des Bezugspunkts</translation>
</message>
<message>
- <location/>
<source>%</source>
<translation>%</translation>
</message>
<message>
- <location/>
<source>Zoom In</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location/>
<source>Zoom Out</source>
<translation>Verkleinern</translation>
</message>
<message>
- <location/>
<source>Toggle details extension</source>
<translation>Weitere Optionen einblenden</translation>
</message>
<message>
- <location/>
<source>></source>
<translation>></translation>
</message>
<message>
- <location/>
<source>Linear Type</source>
<translation>Typ linear</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location/>
<source>Radial Type</source>
<translation>Typ radial</translation>
</message>
<message>
- <location/>
<source>Conical Type</source>
<translation>Typ konisch</translation>
</message>
<message>
- <location/>
<source>Pad Spread</source>
<translation>Auffüllen</translation>
</message>
<message>
- <location/>
<source>Repeat Spread</source>
<translation>Wiederholen</translation>
</message>
<message>
- <location/>
<source>Reflect Spread</source>
<translation>Spiegeln</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/gradienteditor.cpp" line="+412"/>
<source>Start X</source>
<translation>Anfangswert X</translation>
</message>
<message>
- <location line="+4"/>
<source>Start Y</source>
<translation>Anfangswert Y</translation>
</message>
<message>
- <location line="+4"/>
<source>Final X</source>
<translation>Endwert X</translation>
</message>
<message>
- <location line="+4"/>
<source>Final Y</source>
<translation>Endwert Y</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+24"/>
<source>Central X</source>
<translation>Mittelpunkt X</translation>
</message>
<message>
- <location line="-20"/>
- <location line="+24"/>
<source>Central Y</source>
<translation>Mittelpunkt Y</translation>
</message>
<message>
- <location line="-20"/>
<source>Focal X</source>
<translation>Fokus X</translation>
</message>
<message>
- <location line="+4"/>
<source>Focal Y</source>
<translation>Fokus Y</translation>
</message>
<message>
- <location line="+4"/>
<source>Radius</source>
<translation>Radius</translation>
</message>
<message>
- <location line="+16"/>
<source>Angle</source>
<translation>Winkel</translation>
</message>
<message>
- <location line="+288"/>
<source>Linear</source>
<translation>Linear</translation>
</message>
<message>
- <location line="+1"/>
<source>Radial</source>
<translation>Radial</translation>
</message>
<message>
- <location line="+1"/>
<source>Conical</source>
<translation>Konisch</translation>
</message>
<message>
- <location line="+20"/>
<source>Pad</source>
<translation>Auffüllen</translation>
</message>
<message>
- <location line="+1"/>
<source>Repeat</source>
<translation>Wiederholen</translation>
</message>
<message>
- <location line="+1"/>
<source>Reflect</source>
<translation>Spiegeln</translation>
</message>
@@ -16974,7 +13980,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QtGradientDialog</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientdialog.ui"/>
<source>Edit Gradient</source>
<translation>Gradienten bearbeiten</translation>
</message>
@@ -16982,304 +13987,242 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QtGradientEditor</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradienteditor.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Gradient Editor</source>
<translation>Gradienten bearbeiten</translation>
</message>
<message>
- <location/>
<source>This area shows a preview of the gradient being edited. It also allows you to edit parameters specific to the gradient's type such as start and final point, radius, etc. by drag & drop.</source>
<translation>Dieser Bereich zeigt eine Vorschau des in Bearbeitung befindlichen Gradienten. Hier können Gradienttyp-spezifische Parameter, wie Start- und Endpunkt, Radius etc. per Drag & Drop bearbeitet werden.</translation>
</message>
<message>
- <location/>
<source>1</source>
<translation>1</translation>
</message>
<message>
- <location/>
<source>2</source>
<translation>2</translation>
</message>
<message>
- <location/>
<source>3</source>
<translation>3</translation>
</message>
<message>
- <location/>
<source>4</source>
<translation>4</translation>
</message>
<message>
- <location/>
<source>5</source>
<translation>5</translation>
</message>
<message>
- <location/>
<source>Gradient Stops Editor</source>
<translation>Bezugspunkte</translation>
</message>
<message>
- <location/>
<source>This area allows you to edit gradient stops. Double click on the existing stop handle to duplicate it. Double click outside of the existing stop handles to create a new stop. Drag & drop the handle to reposition it. Use right mouse button to popup context menu with extra actions.</source>
<translation>Diese Fläche dient zum Bearbeiten der Bezugspunkte. Doppelklicken Sie auf einen Bezugspunkt, um ihn zu duplizieren. Doppelklicken Sie auf die Fläche, um einen neuen Bezugspunkt zu erzeugen. Benutzen Sie Drag & Drop um einen Punkt zu verschieben. Die rechte Maustaste aktiviert ein Menü mit weiteren Optionen.</translation>
</message>
<message>
- <location/>
<source>Zoom</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location/>
<source>Reset Zoom</source>
<translation>Vergrößerung zurücksetzen</translation>
</message>
<message>
- <location/>
<source>Position</source>
<translation>Position</translation>
</message>
<message>
- <location/>
<source>Hue</source>
<translation>Farbton</translation>
</message>
<message>
- <location/>
<source>H</source>
<translation>H</translation>
</message>
<message>
- <location/>
<source>Saturation</source>
<translation>Sättigung</translation>
</message>
<message>
- <location/>
<source>S</source>
<translation>S</translation>
</message>
<message>
- <location/>
<source>Sat</source>
<translation>Sättigung</translation>
</message>
<message>
- <location/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location/>
<source>V</source>
<translation>V</translation>
</message>
<message>
- <location/>
<source>Val</source>
<translation>Wert</translation>
</message>
<message>
- <location/>
<source>Alpha</source>
<translation>Alpha</translation>
</message>
<message>
- <location/>
<source>A</source>
<translation>A</translation>
</message>
<message>
- <location/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location/>
<source>Spread</source>
<translation>Ausbreitung</translation>
</message>
<message>
- <location/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location/>
<source>Current stop's color</source>
<translation>Farbe des Bezugspunkts</translation>
</message>
<message>
- <location/>
<source>Show HSV specification</source>
<translation>HSV-Spezifikation anzeigen</translation>
</message>
<message>
- <location/>
<source>HSV</source>
<translation>HSV</translation>
</message>
<message>
- <location/>
<source>Show RGB specification</source>
<translation>RGB-Spezifikation anzeigen</translation>
</message>
<message>
- <location/>
<source>RGB</source>
<translation>RGB</translation>
</message>
<message>
- <location/>
<source>Current stop's position</source>
<translation>Position des Bezugspunkts</translation>
</message>
<message>
- <location/>
<source>%</source>
<translation>%</translation>
</message>
<message>
- <location/>
<source>Zoom In</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location/>
<source>Zoom Out</source>
<translation>Verkleinern</translation>
</message>
<message>
- <location/>
<source>Toggle details extension</source>
<translation>Weiter Optionen einblenden</translation>
</message>
<message>
- <location/>
<source>></source>
<translation>></translation>
</message>
<message>
- <location/>
<source>Linear Type</source>
<translation>Typ linear</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location/>
<source>Radial Type</source>
<translation>Typ radial</translation>
</message>
<message>
- <location/>
<source>Conical Type</source>
<translation>Typ konisch</translation>
</message>
<message>
- <location/>
<source>Pad Spread</source>
<translation>Auffüllen</translation>
</message>
<message>
- <location/>
<source>Repeat Spread</source>
<translation>Wiederholen</translation>
</message>
<message>
- <location/>
<source>Reflect Spread</source>
<translation>Spiegeln</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradienteditor.cpp" line="+431"/>
<source>Start X</source>
<translation>Anfangswert X</translation>
</message>
<message>
- <location line="+4"/>
<source>Start Y</source>
<translation>Anfangswert Y</translation>
</message>
<message>
- <location line="+4"/>
<source>Final X</source>
<translation>Endwert X</translation>
</message>
<message>
- <location line="+4"/>
<source>Final Y</source>
<translation>Endwert Y</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+24"/>
<source>Central X</source>
<translation>Mittelpunkt X</translation>
</message>
<message>
- <location line="-20"/>
- <location line="+24"/>
<source>Central Y</source>
<translation>Mittelpunkt Y</translation>
</message>
<message>
- <location line="-20"/>
<source>Focal X</source>
<translation>Fokus X</translation>
</message>
<message>
- <location line="+4"/>
<source>Focal Y</source>
<translation>Fokus Y</translation>
</message>
<message>
- <location line="+4"/>
<source>Radius</source>
<translation>Radius</translation>
</message>
<message>
- <location line="+16"/>
<source>Angle</source>
<translation>Winkel</translation>
</message>
<message>
- <location line="+288"/>
<source>Linear</source>
<translation>Linear</translation>
</message>
<message>
- <location line="+1"/>
<source>Radial</source>
<translation>Radial</translation>
</message>
<message>
- <location line="+1"/>
<source>Conical</source>
<translation>Konisch</translation>
</message>
<message>
- <location line="+20"/>
<source>Pad</source>
<translation>Auffüllen</translation>
</message>
<message>
- <location line="+1"/>
<source>Repeat</source>
<translation>Wiederholen</translation>
</message>
<message>
- <location line="+1"/>
<source>Reflect</source>
<translation>Spiegeln</translation>
</message>
@@ -17287,46 +14230,34 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QtGradientView</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.ui"/>
<source>Gradient View</source>
<translation>Gradientenanzeige</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.cpp" line="+208"/>
<source>New...</source>
<translation>Neu...</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.cpp" line="+1"/>
<source>Edit...</source>
<translation>Ändern...</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.cpp" line="+1"/>
<source>Rename</source>
<translation>Umbenennen</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.cpp" line="+1"/>
<source>Remove</source>
<translation>Löschen</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientview.cpp" line="-104"/>
<source>Grad</source>
<translation>Grad</translation>
</message>
<message>
- <location line="+26"/>
<source>Remove Gradient</source>
<translation>Gradient löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Are you sure you want to remove the selected gradient?</source>
<translation>Möchten Sie den ausgewählten Gradienten löschen?</translation>
</message>
@@ -17334,8 +14265,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QtGradientViewDialog</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientviewdialog.ui"/>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientviewdialog.h" line="+62"/>
<source>Select Gradient</source>
<translation>Gradienten auswählen</translation>
</message>
@@ -17343,27 +14272,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::Internal::SettingsPage</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/settingspage.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>Snapping</source>
<translation>Raster</translation>
</message>
<message>
- <location/>
<source>Item spacing</source>
<translation>Abstand</translation>
</message>
<message>
- <location/>
<source>Snap margin</source>
<translation>Rand</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+83"/>
<source>Qt Quick Designer</source>
<translation>Qt-Quick-Designer</translation>
</message>
@@ -17371,62 +14295,50 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::TestWizardPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/testwizardpage.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location/>
<source>Class name:</source>
<translation>Klassenname:</translation>
</message>
<message>
- <location/>
<source>Type:</source>
<translation>Typ</translation>
</message>
<message>
- <location/>
<source>Test</source>
<translation>Test</translation>
</message>
<message>
- <location/>
<source>Benchmark</source>
<translation>Benchmark</translation>
</message>
<message>
- <location/>
<source>File:</source>
<translation>Datei:</translation>
</message>
<message>
- <location/>
<source>Generate initialization and cleanup code</source>
<translation>Code für Initialisierung und Bereinigung generieren</translation>
</message>
<message>
- <location/>
<source>Test slot:</source>
<translation>Test slot:</translation>
</message>
<message>
- <location/>
<source>Requires QApplication</source>
<translation>Erfordert QApplication</translation>
</message>
<message>
- <location/>
<source>Use a test data set</source>
<translation>Testdatensatz anlegen</translation>
</message>
<message>
- <location/>
<source>Specify basic information about the test class for which you want to generate skeleton source code file.</source>
<translation>Geben Sie die grundlegenden Parameter der Testklasse an, für die eine Quelldatei generiert wird.</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/testwizardpage.cpp" line="+46"/>
<source>Test Class Information</source>
<translation>Parameter der Testklasse</translation>
</message>
@@ -17434,12 +14346,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Utils::FilterLineEdit</name>
<message>
- <location filename="../../../src/libs/utils/filterlineedit.cpp" line="+48"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location line="+1"/>
<source>Clear text</source>
<translation>Text löschen</translation>
</message>
@@ -17447,7 +14357,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Utils::UnixTools</name>
<message>
- <location filename="../../../src/libs/utils/unixutils.cpp" line="+60"/>
<source><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table></source>
<translation><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expandiert zu</th></tr><tr><td>%d</td><td>Ordner der aktuellen Datei</td></tr><tr><td>%f</td><td>Dateiname mit vollständigem Pfad</td></tr><tr><td>%n</td><td>Dateiname (ohne Pfad)</td></tr><tr><td>%%</td><td>%</td></tr></table></translation>
</message>
@@ -17455,27 +14364,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="-183"/>
<source>Run CMake target</source>
<translation>CMake-Ziel ausführen</translation>
</message>
<message>
- <location line="+45"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+2"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+2"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
<message>
- <location line="-48"/>
<source> (disabled)</source>
<translation> (deaktiviert)</translation>
</message>
@@ -17483,8 +14387,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CMakeProjectManager::Internal::CMakeTarget</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/cmaketarget.cpp" line="+52"/>
- <location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="+879"/>
<source>Desktop</source>
<comment>CMake Default target display name</comment>
<translation>Desktop</translation>
@@ -17493,7 +14395,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CMakeProjectManager::Internal::MakeStep</name>
<message>
- <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="-211"/>
<source>Make</source>
<extracomment>Default display name for the cmake make step.</extracomment>
<translation>Make</translation>
@@ -17502,7 +14403,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CMakeProjectManager::Internal::MakeStepFactory</name>
<message>
- <location line="+286"/>
<source>Make</source>
<comment>Display name for CMakeProjectManager::MakeStep id.</comment>
<translation>Make</translation>
@@ -17511,17 +14411,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Core</name>
<message>
- <location filename="../../../src/plugins/coreplugin/coreconstants.h" line="+138"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location line="+4"/>
<source>Environment</source>
<translation>Umgebung</translation>
</message>
<message>
- <location line="+3"/>
<source>All Files (*)</source>
<translation>Alle Dateien (*)</translation>
</message>
@@ -17529,7 +14426,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CodePaster</name>
<message>
- <location filename="../../../src/plugins/cpaster/cpasterconstants.h" line="+38"/>
<source>Code Pasting</source>
<translation>Code Pasting</translation>
</message>
@@ -17537,132 +14433,106 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>VCS</name>
<message>
- <location filename="../../../src/plugins/cvs/cvsconstants.h" line="+41"/>
<source>CVS Commit Editor</source>
<translation>CVS Commit-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/cvs/cvsplugin.cpp" line="-1074"/>
<source>CVS Command Log Editor</source>
<translation>CVS Kommando-Log-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>CVS File Log Editor</source>
<translation>CVS Datei-Log-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>CVS Annotation Editor</source>
<translation>CVS Annotations-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>CVS Diff Editor</source>
<translation>CVS Diff-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/git/gitconstants.h" line="+39"/>
<source>Git Command Log Editor</source>
<translation>Git Kommando-Log-Editor</translation>
</message>
<message>
- <location line="+3"/>
<source>Git File Log Editor</source>
<translation>Git Datei-Log-Editor</translation>
</message>
<message>
- <location line="+3"/>
<source>Git Annotation Editor</source>
<translation>Git Annotations-Editor</translation>
</message>
<message>
- <location line="+3"/>
<source>Git Diff Editor</source>
<translation>Git Diff-Editor</translation>
</message>
<message>
- <location line="+5"/>
<source>Git Submit Editor</source>
<translation>Git Submit-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/mercurial/constants.h" line="+58"/>
<source>Mercurial Command Log Editor</source>
<translation>Mercurial Kommando-Log-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>Mercurial File Log Editor</source>
<translation>Mercurial Datei-Log-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>Mercurial Annotation Editor</source>
<translation>Mercurial Annotations-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>Mercurial Diff Editor</source>
<translation>Mercurial Diff-Editor</translation>
</message>
<message>
- <location line="+7"/>
<source>Mercurial Commit Log Editor</source>
<translation>Mercurial Commit-Log-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/perforce/perforceconstants.h" line="+41"/>
<source>Perforce.SubmitEditor</source>
<translation>Perforce Submit-Editor</translation>
</message>
<message>
- <location line="+4"/>
<source>Perforce CommandLog Editor</source>
<translation>Perforce Kommando-Log-Editor</translation>
</message>
<message>
- <location line="+4"/>
<source>Perforce Log Editor</source>
<translation>Perforce Datei-Log-Editor</translation>
</message>
<message>
- <location line="+4"/>
<source>Perforce Diff Editor</source>
<translation>Perforce Diff-Editor</translation>
</message>
<message>
- <location line="+4"/>
<source>Perforce Annotation Editor</source>
<translation>Perforce Annotations-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/subversion/subversionconstants.h" line="+41"/>
<source>Subversion Editor</source>
<translation>Subversion-Editor</translation>
</message>
<message>
- <location line="+3"/>
<source>Subversion Commit Editor</source>
<translation>Subversion Commit-Editor</translation>
</message>
<message>
- <location filename="../../../src/plugins/subversion/subversionplugin.cpp" line="-969"/>
<source>Subversion Command Log Editor</source>
<translation>Subversion Command-Log-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>Subversion File Log Editor</source>
<translation>Subversion Datei-Log-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>Subversion Annotation Editor</source>
<translation>Subversion Annotations-Editor</translation>
</message>
<message>
- <location line="+6"/>
<source>Subversion Diff Editor</source>
<translation>Subversion Diff-Editor</translation>
</message>
@@ -17670,7 +14540,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CVS::Internal::CVSEditor</name>
<message>
- <location filename="../../../src/plugins/cvs/cvseditor.cpp" line="+57"/>
<source>Annotate revision "%1"</source>
<translation>Annotation für Revision "%1"</translation>
</message>
@@ -17678,7 +14547,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Debugger::Internal::CdbOptionsPage</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+46"/>
<source>CDB</source>
<translation>CDB</translation>
</message>
@@ -17686,17 +14554,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CdbSymbolGroupContext</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp" line="+143"/>
<source><Unknown Type></source>
<translation><Unbekannter Typ></translation>
</message>
<message>
- <location line="+14"/>
<source><Unknown Value></source>
<translation><Unbekannter Wert></translation>
</message>
<message>
- <location line="+324"/>
<source><Unknown></source>
<translation><Unbekannt></translation>
</message>
@@ -17704,12 +14569,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Debugger::Cdb</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/coreengine.cpp" line="+54"/>
<source>Unable to load the debugger engine library '%1': %2</source>
<translation>Die Debugger-Bibliothek '%1' konnte nicht geladen werden: %2</translation>
</message>
<message>
- <location line="+164"/>
<source>Unable to resolve '%1' in the debugger engine library '%2'</source>
<translation>'%1' konnte in der Debugger-Bibliothek '%2' nicht gefunden werden</translation>
</message>
@@ -17717,17 +14580,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>CdbCore::CoreEngine</name>
<message>
- <location line="+221"/>
<source>Unable to set the image path to %1: %2</source>
<translation>Der Suchpfad für ausführbare Dateien konnte nicht auf %1 gesetzt werden: %2</translation>
</message>
<message>
- <location line="+26"/>
<source>Unable to create a process '%1': %2</source>
<translation>Es konnte kein Prozess mit '%1' gestartet werden: %2</translation>
</message>
<message>
- <location line="+28"/>
<source>Attaching to a process failed for process id %1: %2</source>
<translation>Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
</message>
@@ -17735,12 +14595,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Debugger::Internal::SnapshotHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/snapshothandler.cpp" line="+199"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+1"/>
<source>File</source>
<translation>Datei</translation>
</message>
@@ -17748,27 +14606,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Debugger::Internal::SnapshotWindow</name>
<message>
- <location filename="../../../src/plugins/debugger/snapshotwindow.cpp" line="+69"/>
<source>Snapshots</source>
<translation>Snapshots</translation>
</message>
<message>
- <location line="+50"/>
<source>Create Snapshot</source>
<translation>Snapshot erzeugen</translation>
</message>
<message>
- <location line="+5"/>
<source>Remove Snapshot</source>
<translation>Snapshot löschen</translation>
</message>
<message>
- <location line="+5"/>
<source>Adjust Column Widths to Contents</source>
<translation>Spaltenbreite an Inhalt anpassen</translation>
</message>
<message>
- <location line="+3"/>
<source>Always Adjust Column Widths to Contents</source>
<translation>Spaltenbreite immer an Inhalt anpassen</translation>
</message>
@@ -17776,28 +14629,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>FakeVim::Internal::FakeVimExCommandsPage</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="-853"/>
- <location line="+26"/>
<source>Ex Command Mapping</source>
<translation>Zuordnung von Kommandos</translation>
</message>
<message>
- <location line="-24"/>
<source>FakeVim</source>
<translation>FakeVim</translation>
</message>
<message>
- <location line="+25"/>
<source>Ex Trigger Expression</source>
<translation>Kommando</translation>
</message>
<message>
- <location line="+1"/>
<source>Regular expression:</source>
<translation>Regulärer Ausdruck:</translation>
</message>
<message>
- <location line="+1"/>
<source>Ex Command</source>
<translation>Kommando</translation>
</message>
@@ -17805,7 +14652,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>GenericProjectManager::Internal::GenericMakeStep</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericmakestep.cpp" line="-212"/>
<source>Make</source>
<translation>Make</translation>
</message>
@@ -17813,12 +14659,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Git::Internal::GitEditor</name>
<message>
- <location filename="../../../src/plugins/git/giteditor.cpp" line="+68"/>
<source>Blame %1</source>
<translation>Blame für %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Blame parent revision %1</source>
<translation>Blame der übergeordneten Revision %1</translation>
</message>
@@ -17826,7 +14670,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Help</name>
<message>
- <location filename="../../../src/plugins/help/helpconstants.h" line="+61"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
@@ -17834,12 +14677,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::CloneWizard</name>
<message>
- <location filename="../../../src/plugins/mercurial/clonewizard.cpp" line="+56"/>
<source>Clones a Mercurial repository and tries to load the contained project.</source>
<translation>Erstellt einen Clone eines Mercurial-Repositories und versucht, das darin enthaltene Projekt zu laden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Mercurial Clone</source>
<translation>Mercurial Clone</translation>
</message>
@@ -17847,17 +14688,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
- <location filename="../../../src/plugins/mercurial/clonewizardpage.cpp" line="+37"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
<message>
- <location line="+1"/>
<source>Specify repository URL, checkout directory and path.</source>
<translation>Geben Sie Repository-URL, Ordner und Pfad an.</translation>
</message>
<message>
- <location line="+1"/>
<source>Clone URL:</source>
<translation>Clone-URL:</translation>
</message>
@@ -17865,7 +14703,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
- <location filename="../../../src/plugins/mercurial/commiteditor.cpp" line="+45"/>
<source>Commit Editor</source>
<translation>Commit-Editor</translation>
</message>
@@ -17873,43 +14710,34 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialclient.cpp" line="+192"/>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Die übergeordnete Revision von %1 im Repository %2 konnte nicht bestimmt werden: %3</translation>
</message>
<message>
- <location line="+6"/>
<source>Cannot parse output: %1</source>
<translation>Die Ausgabe kann nicht ausgewertet werden: %1</translation>
</message>
<message>
- <location line="+117"/>
<source>Hg Annotate %1</source>
<translation>Hg Annotate %1</translation>
</message>
<message>
- <location line="+20"/>
<source>Hg diff %1</source>
<translation>Hg diff %1</translation>
</message>
<message>
- <location line="+20"/>
- <location line="+196"/>
<source>Hg log %1</source>
<translation>Hg log %1</translation>
</message>
<message>
- <location line="-37"/>
<source>Hg incoming %1</source>
<translation>Hg eingehend %1</translation>
</message>
<message>
- <location line="+18"/>
<source>Hg outgoing %1</source>
<translation>Hg ausgehend %1</translation>
</message>
<message>
- <location line="+81"/>
<source>Working...</source>
<translation>Warte...</translation>
</message>
@@ -17917,7 +14745,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialcontrol.cpp" line="+47"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
@@ -17925,12 +14752,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::MercurialEditor</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialeditor.cpp" line="+57"/>
<source>Annotate %1</source>
<translation>Annotation für %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Annotate parent revision %1</source>
<translation>Annotation der übergeordneten Revision "%1"</translation>
</message>
@@ -17938,12 +14763,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::MercurialJobRunner</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialjobrunner.cpp" line="+160"/>
<source>Unable to start mercurial process '%1': %2</source>
<translation>Der Mercurial-Prozess '%1' konnte nicht gestartet werden: %2</translation>
</message>
<message>
- <location line="+6"/>
<source>Timed out after %1s waiting for mercurial process to finish.</source>
<translation>Ãœberschreitung des Zeitlimits von %1s beim Warten auf Beendigung des Mercurial-Prozesses.</translation>
</message>
@@ -17951,237 +14774,190 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
- <location filename="../../../src/plugins/mercurial/mercurialplugin.cpp" line="+214"/>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
- <location line="+22"/>
<source>Annotate Current File</source>
<translation>Annotation für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Annotate "%1"</source>
<translation>Annotation für "%1"</translation>
</message>
<message>
- <location line="+7"/>
<source>Diff Current File</source>
<translation>Diff für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Diff "%1"</source>
<translation>Diff für "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+H,Alt+D</source>
<translation>Alt+H,Alt+D</translation>
</message>
<message>
- <location line="+5"/>
<source>Log Current File</source>
<translation>Filelog für Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Log "%1"</source>
<translation>Log für "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+H,Alt+L</source>
<translation>Alt+H,Alt+L</translation>
</message>
<message>
- <location line="+5"/>
<source>Status Current File</source>
<translation>Status der Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Status "%1"</source>
<translation>Status von "%1"</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+H,Alt+S</source>
<translation>Alt+H,Alt+S</translation>
</message>
<message>
- <location line="+7"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location line="+0"/>
<source>Add "%1"</source>
<translation>"%1" hinzufügen</translation>
</message>
<message>
- <location line="+7"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Delete "%1"...</source>
<translation>Lösche "%1"...</translation>
</message>
<message>
- <location line="+7"/>
<source>Revert Current File...</source>
<translation>Änderungen der Datei rückgängig machen...</translation>
</message>
<message>
- <location line="+0"/>
<source>Revert "%1"...</source>
<translation>Änderungen in "%1" rückgängig machen...</translation>
</message>
<message>
- <location line="+59"/>
<source>Diff</source>
<translation>Diff</translation>
</message>
<message>
- <location line="+7"/>
<source>Log</source>
<translation>Log</translation>
</message>
<message>
- <location line="+7"/>
<source>Revert...</source>
<translation>Rückgängig machen...</translation>
</message>
<message>
- <location line="+7"/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
- <location line="+44"/>
<source>Pull...</source>
<translation>Pull...</translation>
</message>
<message>
- <location line="+7"/>
<source>Push...</source>
<translation>Push...</translation>
</message>
<message>
- <location line="+7"/>
<source>Update...</source>
<translation>Auf aktuellen Stand bringen...</translation>
</message>
<message>
- <location line="+7"/>
<source>Import...</source>
<translation>Importieren...</translation>
</message>
<message>
- <location line="+7"/>
<source>Incoming...</source>
<translation>Eingehend...</translation>
</message>
<message>
- <location line="+7"/>
<source>Outgoing...</source>
<translation>Ausgehend...</translation>
</message>
<message>
- <location line="+7"/>
<source>Commit...</source>
<translation>Abgeben...</translation>
</message>
<message>
- <location line="+3"/>
<source>Alt+H,Alt+C</source>
<translation>Alt+H,Alt+C</translation>
</message>
<message>
- <location line="+5"/>
<source>Create Repository...</source>
<translation>Repository erzeugen...</translation>
</message>
<message>
- <location line="+12"/>
<source>Pull Source</source>
<translation>Quelle</translation>
</message>
<message>
- <location line="+12"/>
<source>Push Destination</source>
<translation>Ziel</translation>
</message>
<message>
- <location line="+12"/>
<source>Update</source>
<translation>Aktualisieren</translation>
</message>
<message>
- <location line="+28"/>
<source>Incoming Source</source>
<translation>Quelle</translation>
</message>
<message>
- <location line="+18"/>
<source>Commit</source>
<translation>Abgeben</translation>
</message>
<message>
- <location line="+5"/>
<source>Diff Selected Files</source>
<translation>Diff für Auswahl</translation>
</message>
<message>
- <location line="+3"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+3"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+28"/>
<source>There are no changes to commit.</source>
<translation>Es sind keine ausstehenden Änderungen vorhanden.</translation>
</message>
<message>
- <location line="+13"/>
<source>Unable to generate a temporary file for the commit editor.</source>
<translation>Es konnte keine temporäre Datei für die Abgabe angelegt werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Unable to create an editor for the commit.</source>
<translation>Es konnte kein Editor für die Abgabe angelegt werden.</translation>
</message>
<message>
- <location line="+7"/>
<source>Unable to create a commit editor.</source>
<translation>Es konnte kein Editor für die Abgabe angelegt werden.</translation>
</message>
<message>
- <location line="+4"/>
<source>Commit changes for "%1".</source>
<translation>Änderungen in "%1" abgeben.</translation>
</message>
<message>
- <location line="+40"/>
<source>Do you want to commit the changes?</source>
<translation>Möchten Sie die Änderungen abgeben?</translation>
</message>
<message>
- <location line="+0"/>
<source>Close Commit Editor</source>
<translation>Abgabe schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Message check failed. Do you want to proceed?</source>
<translation>Die Überprüfung der Beschreibung schlug fehl. Möchten Sie die Dateien trotzdem abgeben?</translation>
</message>
@@ -18189,7 +14965,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
- <location filename="../../../src/plugins/mercurial/optionspage.cpp" line="-49"/>
<source>Mercurial Command</source>
<translation>Ausführbare Datei</translation>
</message>
@@ -18197,43 +14972,35 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Perforce::Internal::PerforceChecker</name>
<message>
- <location filename="../../../src/plugins/perforce/perforcechecker.cpp" line="+86"/>
<source>No executable specified</source>
<translation>Es wurde keine ausführbare Datei angegeben</translation>
</message>
<message>
- <location line="+26"/>
<source>"%1" timed out after %2ms.</source>
<translation>Zeitüberschreitung bei der Ausführung von "%1"(%2ms).</translation>
</message>
<message>
- <location line="+10"/>
<source>Unable to launch "%1": %2</source>
<translation>"%1" konnte nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+20"/>
<source>"%1" crashed.</source>
<translation>"%1" ist abgestürzt.</translation>
</message>
<message>
- <location line="+5"/>
<source>"%1" terminated with exit code %2: %3</source>
<translation>Der Prozess "%1" wurde beendet (Rückgabewert %2): %3</translation>
</message>
<message>
- <location line="+24"/>
<source>The client does not seem to contain any mapped files.</source>
<translation>Der Perforce-Client enthält offenbar keine Dateizuordnungen.</translation>
</message>
<message>
- <location line="+6"/>
<source>Unable to determine the client root.</source>
<extracomment>Unable to determine root of the p4 client installation</extracomment>
<translation>Das Wurzelverzeichnis der Perforce-Installation konnte nicht bestimmt werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>The repository "%1" does not exist.</source>
<translation>Es ist existiert kein Repository "%1".</translation>
</message>
@@ -18241,7 +15008,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Perforce::Internal::PerforceEditor</name>
<message>
- <location filename="../../../src/plugins/perforce/perforceeditor.cpp" line="+65"/>
<source>Annotate change list "%1"</source>
<translation>Annotation der Change-Liste "%1"</translation>
</message>
@@ -18249,12 +15015,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::BaseProjectWizardDialog</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/baseprojectwizarddialog.cpp" line="+83"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
<message>
- <location line="+63"/>
<source>untitled</source>
<extracomment>File path suggestion for a new project. If you choose to translate it, make sure it is a valid path name without blanks.</extracomment>
<translation>untitled</translation>
@@ -18263,7 +15027,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::DependenciesModel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="-29"/>
<source><No other projects in this session></source>
<translation><Es existieren keine anderen Projekte in der Sitzung></translation>
</message>
@@ -18271,67 +15034,54 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::FolderNavigationWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/foldernavigationwidget.cpp" line="-198"/>
<source>Open</source>
<translation>Öffnen</translation>
</message>
<message>
- <location line="+4"/>
<source>Open "%1"</source>
<translation>"%1" öffnen</translation>
</message>
<message>
- <location line="+19"/>
<source>Open with</source>
<translation>Öffnen mit</translation>
</message>
<message>
- <location line="+38"/>
<source>Show in Explorer...</source>
<translation>In Explorer anzeigen...</translation>
</message>
<message>
- <location line="+2"/>
<source>Show in Finder...</source>
<translation>In Finder anzeigen...</translation>
</message>
<message>
- <location line="-60"/>
<source>Open Parent Folder</source>
<translation>Öffne beinhaltenden Ordner</translation>
</message>
<message>
- <location line="+26"/>
<source>Choose Folder...</source>
<translation>Ordner auswählen...</translation>
</message>
<message>
- <location line="+12"/>
<source>Choose Folder</source>
<translation>Ordner auswählen</translation>
</message>
<message>
- <location line="+24"/>
<source>Show Containing Folder...</source>
<translation>Beinhaltenden Ordner anzeigen...</translation>
</message>
<message>
- <location line="+7"/>
<source>Open Command Prompt Here...</source>
<translation>Kommandoprompt öffnen...</translation>
</message>
<message>
- <location line="+2"/>
<source>Open Terminal Here...</source>
<translation>Terminalfenster hier öffnen...</translation>
</message>
<message>
- <location line="+9"/>
<source>Launching a file browser failed</source>
<translation>Das Starten des Datei-Browsers schlug fehl</translation>
</message>
<message>
- <location line="+1"/>
<source>Unable to start the file manager:
%1
@@ -18344,7 +15094,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</translation>
</message>
<message>
- <location line="+3"/>
<source>'%1' returned the following error:
%2</source>
@@ -18353,17 +15102,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
%2</translation>
</message>
<message>
- <location line="+1"/>
<source>Settings...</source>
<translation>Einstellungen...</translation>
</message>
<message>
- <location line="+14"/>
<source>Launching Windows Explorer Failed</source>
<translation>Das Starten des Windows-Explorers schlug fehl</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not find explorer.exe in path to launch Windows Explorer.</source>
<translation>Windows Explorer konnte nicht gestartet werden, da die Datei explorer.exe nicht im Pfad gefunden werden konnte.</translation>
</message>
@@ -18371,22 +15117,18 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::MiniTargetWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/miniprojecttargetselector.cpp" line="+192"/>
<source>Select active build configuration</source>
<translation>Build-Konfiguration wählen</translation>
</message>
<message>
- <location line="+10"/>
<source>Select active run configuration</source>
<translation>Ausführungskonfiguration wählen</translation>
</message>
<message>
- <location line="+65"/>
<source>Build:</source>
<translation>Erstellung:</translation>
</message>
<message>
- <location line="+7"/>
<source>Run:</source>
<translation>Ausführung:</translation>
</message>
@@ -18394,42 +15136,34 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::MiniProjectTargetSelector</name>
<message>
- <location line="+101"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location line="+11"/>
<source>Select active project</source>
<translation>Projekt auswählen</translation>
</message>
<message>
- <location line="+211"/>
<source>Build:</source>
<translation>Erstellung:</translation>
</message>
<message>
- <location line="+6"/>
<source>Run:</source>
<translation>Ausführung:</translation>
</message>
<message>
- <location line="+10"/>
<source><html><nobr><b>Project:</b> %1<br/>%2%3<b>Run:</b> %4%5</html></source>
<translation><html><nobr><b>Projekt:</b> %1<br/>%2%3<b>Ausführung:</b> %4%5</html></translation>
</message>
<message>
- <location line="+2"/>
<source><b>Target:</b> %1<br/></source>
<translation><b>Ziel:</b> %1<br/></translation>
</message>
<message>
- <location line="+2"/>
<source><b>Build:</b> %2<br/></source>
<translation><b>Erstellung:</b> %1<br/></translation>
</message>
<message>
- <location line="+2"/>
<source><br/>%1</source>
<translation><br/>%1</translation>
</message>
@@ -18437,7 +15171,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::ProjectConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectconfiguration.cpp" line="+53"/>
<source>Clone of %1</source>
<translation>Kopie von %1</translation>
</message>
@@ -18445,12 +15178,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectexplorerconstants.h" line="+199"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+11"/>
<source>Other Project</source>
<translation>Anderes Projekt</translation>
</message>
@@ -18458,17 +15189,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>ProjectExplorer::Internal::TargetSettingsPanelWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/targetsettingspanel.cpp" line="+104"/>
<source>No target defined.</source>
<translation>Es ist kein Ziel festgelegt.</translation>
</message>
<message>
- <location line="+109"/>
<source>Qt Creator</source>
<translation>Qt Creator</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you really want to remove the
"%1" target?</source>
<translation>Möchten Sie das Ziel "%1" entfernen?</translation>
@@ -18477,7 +15205,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>GenericProjectManager::GenericTarget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="-5"/>
<source>Desktop</source>
<comment>Generic desktop target display name</comment>
<translation>Desktop</translation>
@@ -18486,62 +15213,49 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::Qt4Target</name>
<message>
- <location line="+10"/>
- <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+67"/>
<source>Desktop</source>
<comment>Qt4 Desktop target display name</comment>
<translation>Desktop</translation>
</message>
<message>
- <location line="+4"/>
- <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+2"/>
<source>Symbian Emulator</source>
<comment>Qt4 Symbian Emulator target display name</comment>
<translation>Symbian-Emulator</translation>
</message>
<message>
- <location line="+4"/>
- <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+2"/>
<source>Symbian Device</source>
<comment>Qt4 Symbian Device target display name</comment>
<translation>Symbian-Gerät</translation>
</message>
<message>
- <location line="+4"/>
<source>Maemo Emulator</source>
<comment>Qt4 Maemo Emulator target display name</comment>
<translation>Maemo-Emulator</translation>
</message>
<message>
- <location line="+4"/>
<source>Maemo Device</source>
<comment>Qt4 Maemo Device target display name</comment>
<translation>Maemo-Gerät</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="+2"/>
<source>Maemo</source>
<comment>Qt4 Maemo target display name</comment>
<translation>Maemo</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt Simulator</source>
<comment>Qt4 Simulator target display name</comment>
<translation>Qt Simulator</translation>
</message>
<message>
- <location line="+391"/>
<source><b>Device:</b> Not connected</source>
<translation><b>Gerät:</b> Nicht angeschlossen</translation>
</message>
<message>
- <location line="+6"/>
<source><b>Device:</b> %1</source>
<translation><b>Gerät:</b> %1</translation>
</message>
<message>
- <location line="+1"/>
<source><b>Device:</b> %1, %2</source>
<translation><b>Gerät:</b> %1, %2</translation>
</message>
@@ -18549,7 +15263,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlProjectManager::QmlTarget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="+5"/>
<source>QML Viewer</source>
<comment>QML Viewer target display name</comment>
<translation>QML-Betrachter</translation>
@@ -18558,22 +15271,18 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::DesignDocumentController</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp" line="+218"/>
<source>-New Form-</source>
<translation>-Neues Formular-</translation>
</message>
<message>
- <location line="+182"/>
<source>Cannot save to file "%1": permission denied.</source>
<translation>Die Datei "%1" konnte wegen nicht ausreichender Zugriffsrechte nicht geschrieben werden.</translation>
</message>
<message>
- <location line="+6"/>
<source>Parent folder "%1" for file "%2" does not exist.</source>
<translation>Das übergeordnete Verzeichnis "%1" der Datei %2" existiert nicht.</translation>
</message>
<message>
- <location line="+324"/>
<source>Cannot write file: "%1".</source>
<translation>Die Datei "%1" kann nicht geschrieben werden.</translation>
</message>
@@ -18581,17 +15290,18 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::NavigatorTreeModel</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp" line="+303"/>
<source>Invalid Id</source>
<translation>Ungültige Id</translation>
</message>
<message>
- <location line="+195"/>
+ <source>%1 is an invalid id</source>
+ <translation>%1 ist keine gültige Id</translation>
+ </message>
+ <message>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="+0"/>
<source>Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?</source>
<translation>Das Verschieben der Komponente %1 an diese Stelle bewirkt das Löschen der Komponente %2. Möchten Sie den Vorgang fortsetzen?</translation>
</message>
@@ -18599,7 +15309,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::NavigatorWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp" line="+61"/>
<source>Navigator</source>
<comment>Title of navigator view</comment>
<translation>Navigator</translation>
@@ -18608,27 +15317,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>WidgetPluginManager</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp" line="-114"/>
<source>Failed to create instance.</source>
<translation>Es konnte keine Instanz erzeugt werden.</translation>
</message>
<message>
- <location line="+6"/>
<source>Not a QmlDesigner plugin.</source>
<translation>Kein QmlDesigner-Plugin.</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="-133"/>
<source>Failed to create instance of file '%1': %2</source>
<translation>Es konnte keine Instanz der Datei '%1' erzeugt werden: %2</translation>
</message>
<message>
- <location line="+9"/>
<source>Failed to create instance of file '%1'.</source>
<translation>Es konnte keine Instanz der Datei '%1' erzeugt werden.</translation>
</message>
<message>
- <location line="+9"/>
<source>File '%1' is not a QmlDesigner plugin.</source>
<translation>Die Datei '%1' ist kein QmlDesigner-Plugin.</translation>
</message>
@@ -18636,7 +15340,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::AllPropertiesBox</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/allpropertiesbox.cpp" line="+59"/>
<source>Properties</source>
<comment>Title of properties view.</comment>
<translation>Eigenschaften</translation>
@@ -18645,73 +15348,58 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>qdesigner_internal::QtGradientStopsController</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientstopscontroller.cpp" line="+173"/>
<source>H</source>
<translation>H</translation>
</message>
<message>
- <location line="+1"/>
<source>S</source>
<translation>S</translation>
</message>
<message>
- <location line="+1"/>
<source>V</source>
<translation>V</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+4"/>
<source>Hue</source>
<translation>Farbton</translation>
</message>
<message>
- <location line="-3"/>
<source>Sat</source>
<translation>Sättigung</translation>
</message>
<message>
- <location line="+1"/>
<source>Val</source>
<translation>Wert</translation>
</message>
<message>
- <location line="+3"/>
<source>Saturation</source>
<translation>Sättigung</translation>
</message>
<message>
- <location line="+1"/>
<source>Value</source>
<translation>Wert</translation>
</message>
<message>
- <location line="+22"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
- <location line="+1"/>
<source>G</source>
<translation>G</translation>
</message>
<message>
- <location line="+1"/>
<source>B</source>
<translation>B</translation>
</message>
<message>
- <location line="+6"/>
<source>Red</source>
<translation>Rot</translation>
</message>
<message>
- <location line="+1"/>
<source>Green</source>
<translation>Grün</translation>
</message>
<message>
- <location line="+1"/>
<source>Blue</source>
<translation>Blau</translation>
</message>
@@ -18719,37 +15407,30 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QtGradientStopsWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/qtgradienteditor/qtgradientstopswidget.cpp" line="+947"/>
<source>New Stop</source>
<translation>Neuer Bezugspunkt</translation>
</message>
<message>
- <location line="+1"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>Flip All</source>
<translation>Alles umkehren</translation>
</message>
<message>
- <location line="+1"/>
<source>Select All</source>
<translation>Alles auswählen</translation>
</message>
<message>
- <location line="+1"/>
<source>Zoom In</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location line="+1"/>
<source>Zoom Out</source>
<translation>Verkleinern</translation>
</message>
<message>
- <location line="+1"/>
<source>Reset Zoom</source>
<translation>Vergrößerung zurücksetzen</translation>
</message>
@@ -18757,12 +15438,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::Internal::StatesEditorWidgetPrivate</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp" line="+107"/>
<source>base state</source>
<translation>base state</translation>
</message>
<message>
- <location line="+27"/>
<source>State%1</source>
<comment>Default name for newly created states</comment>
<translation>State%1</translation>
@@ -18771,7 +15450,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::StatesEditorWidget</name>
<message>
- <location line="+60"/>
<source>States</source>
<comment>Title of Editor widget</comment>
<translation>Status</translation>
@@ -18780,27 +15458,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::RewriterView</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/model/rewriterview.cpp" line="+79"/>
<source>Error parsing</source>
<translation>Fehler beim Parsen</translation>
</message>
<message>
- <location line="+2"/>
<source>Internal error</source>
<translation>Interner Fehler</translation>
</message>
<message>
- <location line="+6"/>
<source>"%1"</source>
<translation>"%1"</translation>
</message>
<message>
- <location line="+6"/>
<source>line %1</source>
<translation>Zeile %1</translation>
</message>
<message>
- <location line="+7"/>
<source>column %1</source>
<translation>Spalte %1</translation>
</message>
@@ -18808,17 +15481,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::Internal::DocumentWarningWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designmodewidget.cpp" line="+103"/>
<source><a href="goToError">Go to error</a></source>
<translation><a href="goToError">Gehe zu Fehler</a></translation>
</message>
<message>
- <location line="+16"/>
<source>%3 (%1:%2)</source>
<translation>%3 (%1:%2)</translation>
</message>
<message>
- <location line="+3"/>
<source>Internal error (%1)</source>
<translation>Interner Fehler (%1)</translation>
</message>
@@ -18826,97 +15496,78 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlDesigner::Internal::DesignModeWidget</name>
<message>
- <location line="+26"/>
<source>&Undo</source>
<translation>&Rückgängig</translation>
</message>
<message>
- <location line="+2"/>
<source>&Redo</source>
<translation>&Wiederholen</translation>
</message>
<message>
- <location line="+2"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location line="+0"/>
<source>Delete "%1"</source>
<translation>"%1" löschen</translation>
</message>
<message>
- <location line="+2"/>
<source>Cu&t</source>
<translation>&Ausschneiden</translation>
</message>
<message>
- <location line="+0"/>
<source>Cut "%1"</source>
<translation></translation>
</message>
<message>
- <location line="+2"/>
<source>&Copy</source>
<translation>&Kopieren</translation>
</message>
<message>
- <location line="+0"/>
<source>Copy "%1"</source>
<translation>"%1" Kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>&Paste</source>
<translation>&Einfügen</translation>
</message>
<message>
- <location line="+0"/>
<source>Paste "%1"</source>
<translation>"%1" einfügen</translation>
</message>
<message>
- <location line="+2"/>
<source>Select &All</source>
<translation>Alles Aus&wählen</translation>
</message>
<message>
- <location line="+0"/>
<source>Select All "%1"</source>
<translation>Alles auswählen "%1"</translation>
</message>
<message>
- <location line="+2"/>
<source>Toggle Full Screen</source>
<translation>Vollbild umschalten</translation>
</message>
<message>
- <location line="+2"/>
<source>&Restore Default View</source>
<translation>&Vorgabe wiederherstellen</translation>
</message>
<message>
- <location line="+2"/>
<source>Toggle &Left Sidebar</source>
<translation>&Linke Seitenleiste umschalten</translation>
</message>
<message>
- <location line="+2"/>
<source>Toggle &Right Sidebar</source>
<translation>&Rechte Seitenleiste umschalten</translation>
</message>
<message>
- <location line="+430"/>
<source>Projects</source>
<translation>Projekte</translation>
</message>
<message>
- <location line="+4"/>
<source>File System</source>
<translation>Dateisystem</translation>
</message>
<message>
- <location line="+4"/>
<source>Open Documents</source>
<translation>Offene Dokumente</translation>
</message>
@@ -18924,32 +15575,26 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlJSEditor::Internal::QmlJSTextEditor</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditor.cpp" line="+994"/>
<source>Show Qt Quick ToolBar</source>
<translation>Qt-Quick-Werkzeugleiste anzeigen</translation>
</message>
<message>
- <location line="+233"/>
<source>Rename...</source>
<translation>Umbenennen...</translation>
</message>
<message>
- <location line="+1"/>
<source>New id:</source>
<translation>Neue Id:</translation>
</message>
<message>
- <location line="+50"/>
<source>Unused variable</source>
<translation>Unbenutzte Variable</translation>
</message>
<message>
- <location line="+180"/>
<source>Refactoring</source>
<translation>Refaktorisierung</translation>
</message>
<message>
- <location line="+6"/>
<source>Rename id '%1'...</source>
<translation>Id '%1' Umbenennen</translation>
</message>
@@ -18957,42 +15602,50 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlJSEditor::Internal::QmlJSEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditorplugin.cpp" line="+139"/>
<source>Creates a Qt QML file.</source>
- <translation>Erstellt eine Qt-QML-Datei.</translation>
+ <translation type="obsolete">Erstellt eine Qt-QML-Datei.</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt QML File</source>
- <translation>Qt QML-Datei</translation>
+ <translation type="obsolete">Qt QML-Datei</translation>
</message>
<message>
- <location line="+27"/>
<source>Show Qt Quick Toolbar</source>
<translation>Qt Quick-Werkzeugleiste anzeigen</translation>
</message>
<message>
- <location line="-12"/>
- <location line="+74"/>
<source>QML</source>
<extracomment>QML sub-menu in the Tools menu</extracomment>
<translation>QML</translation>
</message>
<message>
- <location line="-69"/>
+ <source>Creates a QML file.</source>
+ <translation>Erstellt eine QML-Datei.</translation>
+ </message>
+ <message>
+ <source>QML File</source>
+ <translation>QML-Datei</translation>
+ </message>
+ <message>
<source>Follow Symbol Under Cursor</source>
<translation>Symbol unter Einfügemarke verfolgen</translation>
</message>
+ <message>
+ <source>Find Usages</source>
+ <translation>Verwendung suchen</translation>
+ </message>
+ <message>
+ <source>Ctrl+Shift+U</source>
+ <translation>Ctrl+Shift+U</translation>
+ </message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlRunControl</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp" line="+87"/>
<source>Starting %1 %2</source>
<translation>Starte %1 %2</translation>
</message>
<message>
- <location line="+33"/>
<source>%1 exited with code %2</source>
<translation>%1 beendet, Rückgabewert %2</translation>
</message>
@@ -19000,15 +15653,33 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlProjectManager::Internal::QmlRunControlFactory</name>
<message>
- <location line="+45"/>
<source>Run</source>
<translation>Ausführen</translation>
</message>
+ <message>
+ <source>Open Qt4 Options</source>
+ <translation>Einstellungen zur Qt4-Bibliothek öffnen</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Abbrechen</translation>
+ </message>
+ <message>
+ <source>QML Observer Missing</source>
+ <translation>QML-Beobachter fehlt</translation>
+ </message>
+ <message>
+ <source>QML Observer could not be found.</source>
+ <translation>Der QML-Betrachter konnte nicht gefunden werden.</translation>
+ </message>
+ <message>
+ <source>QML Observer is used to offer debugging features for QML applications, such as interactive debugging and inspection tools.It must be compiled for each used Qt version separately. On the Qt4 options page, select the current Qt installation and click Rebuild.</source>
+ <translation>Der QML-Beobachter stellt zusätzliche Debugging-Funktionalität für QML-Anwendungen zur Verfügung, wie zum Beispiel interaktive Vorschau von Code-Änderungen und weitere Werkzeuge zur Untersuchung. Er muss für jede verwendete Qt-Version separat übersetzt werden. Gehen Sie auf die Qt4-Einstellungsseite, wählen Sie die betreffende Qt-Installation aus und klicken Sie auf 'Neu Erstellen'.</translation>
+ </message>
</context>
<context>
<name>QmlProjectManager</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectconstants.h" line="+6"/>
<source>Qt Quick Project</source>
<translation>Qt Quick-Projekt</translation>
</message>
@@ -19016,7 +15687,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlProjectManager::Internal::Manager</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectmanager.cpp" line="+73"/>
<source>Failed opening project '%1': Project already open</source>
<translation>Das Projekt %1 konnte nicht geöffnet werden da es bereits geladen ist</translation>
</message>
@@ -19024,18 +15694,15 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::MaemoRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp" line="+183"/>
<source>Run on Maemo device</source>
<extracomment>Maemo run configuration default display name</extracomment>
<translation>Ausführung auf Maemo-Gerät</translation>
</message>
<message>
- <location line="+156"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+2"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
@@ -19043,7 +15710,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::MaemoRunControlFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp" line="+196"/>
<source>Run on device</source>
<translation>Auf Gerät ausführen</translation>
</message>
@@ -19051,98 +15717,78 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::MaemoRunConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp" line="+106"/>
<source><a href="%1">Manage device configurations</a></source>
<translation><a href="%1">Gerätekonfigurationen verwalten</a></translation>
</message>
<message>
- <location line="+5"/>
<source><a href="%1">Set Debugger</a></source>
<translation><a href="%1">Debugger einstellen</a></translation>
</message>
<message>
- <location line="+5"/>
<source>Device configuration:</source>
<translation>Geräte-Konfiguration:</translation>
</message>
<message>
- <location line="+3"/>
<source>Executable on host:</source>
<translation>Ausführbare Datei auf Hostrechner:</translation>
</message>
<message>
- <location line="+2"/>
<source>Executable on device:</source>
<translation>Ausführbare Datei auf Mobilgerät:</translation>
</message>
<message>
- <location line="+5"/>
<source>C++ only</source>
<translation>nur C++</translation>
</message>
<message>
- <location line="+1"/>
<source>QML only</source>
<translation>nur QML</translation>
</message>
<message>
- <location line="+1"/>
<source>C++ and QML</source>
<translation>C++ und QML</translation>
</message>
<message>
- <location line="+4"/>
<source>Debugging type:</source>
<translation> Debuggen:</translation>
</message>
<message>
- <location line="+37"/>
<source>Use remote gdb</source>
<translation>gdb-Kommandozeilenprogramm benutzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Use remote gdbserver</source>
<translation>Gdb-Server benutzen</translation>
</message>
<message>
- <location line="+69"/>
<source>Base environment for this run configuration:</source>
<translation>Basisumgebung für diese Ausführungskonfiguration:</translation>
</message>
<message>
- <location line="+3"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
<message>
- <location line="+1"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+4"/>
<source>Fetch Device Environment</source>
<translation>Umgebung vom Mobilgerät abfragen</translation>
</message>
<message>
- <location line="+90"/>
- <location line="+28"/>
<source>Choose directory to mount</source>
<translation>Ordner für mount-Vorgang auswählen</translation>
</message>
<message>
- <location line="+10"/>
<source><b>Debugging details:</b> Use gdb</source>
<translation><b>Debuggereinstellung:</b> Benutze gdb</translation>
</message>
<message>
- <location line="+1"/>
<source><b>Debugging details:</b> Use gdbserver</source>
<translation><b>Debuggereinstellung:</b> Benutze Gdb-Server</translation>
</message>
<message numerus="yes">
- <location line="+69"/>
<source>%n local directories to be mounted on the device.</source>
<extracomment>Note: Only mountCount>1 will occur here as 0, 1 are handled above.</extracomment>
<translation>
@@ -19151,17 +15797,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</translation>
</message>
<message>
- <location line="-7"/>
<source>No local directories to be mounted on the device.</source>
<translation>Es existieren keine lokalen Ordner, die auf dem Mobilgerät angehängt werden können (mount).</translation>
</message>
<message>
- <location line="+3"/>
<source>One local directory to be mounted on the device.</source>
<translation>Es existiert ein lokaler Ordner, der auf dem Mobilgerät angehängt werden kann (mount).</translation>
</message>
<message numerus="yes">
- <location line="+30"/>
<source>WARNING: You want to mount %1 directories, but your device has only %n free ports.<br>You will not be able to run this configuration.</source>
<translation>
<numerusform>Warnhinweis: Sie möchten %1 Ordner anhängen, aber Ihr Mobilgerät hat nur einen freien Port.<br>Diese Konfiguration kann nicht ausgeführt werden.</numerusform>
@@ -19169,7 +15812,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</translation>
</message>
<message numerus="yes">
- <location line="+8"/>
<source>WARNING: You want to mount %1 directories, but only %n ports on the device will be available in debug mode. <br>You will not be able to debug your application with this configuration.</source>
<translation>
<numerusform>Warnhinweis: Sie möchten %1 Ordner anhängen, aber Ihr Mobilgerät hat im Debug-Modus nur einen freien Port.<br>Diese Konfiguration kann nicht ausgeführt werden.</numerusform>
@@ -19177,7 +15819,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
</translation>
</message>
<message>
- <location line="-356"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
@@ -19185,65 +15826,51 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::MaemoSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp" line="+378"/>
<source>Public Key Files(*.pub);;All Files (*)</source>
<translation>Öffentliche Schlüssel (*.pub);;Alle Dateien (*)</translation>
</message>
<message>
- <location line="+13"/>
<source>Could not read public key file '%1'.</source>
<translation>Die öffentliche Schlüsseldatei '%1' konnte nicht gelesen werden.</translation>
</message>
<message>
- <location line="+53"/>
<source>Deploy Public Key ...</source>
<translation>Öffentlichen Schlüssel senden...</translation>
</message>
<message>
- <location line="-54"/>
- <location line="+20"/>
- <location line="+19"/>
<source>Deployment Failed</source>
<translation>Deployment fehlgeschlagen</translation>
</message>
<message>
- <location line="-269"/>
<source>New Device Configuration %1</source>
<comment>Standard Configuration name with number</comment>
<translation>New Device Configuration %1</translation>
</message>
<message>
- <location line="+217"/>
<source>Choose Public Key File</source>
<translation>Datei mit öffentlichem Schlüssel</translation>
</message>
<message>
- <location line="+53"/>
<source>Key deployment failed: %1.</source>
<translation>Das Versenden des Schlüssels schlug fehl: %1.</translation>
</message>
<message>
- <location line="+55"/>
<source>You will need at least one port.</source>
<translation>Sie benötigen mindestens einen freien Port.</translation>
</message>
<message>
- <location line="-127"/>
<source>Stop Deploying</source>
<translation>Deployement beenden</translation>
</message>
<message>
- <location line="+53"/>
<source>Could not connect to host: %1</source>
<translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
</message>
<message>
- <location line="+16"/>
<source>Key was successfully deployed.</source>
<translation>Der Schlüssel wurde erfolgreich versandt.</translation>
</message>
<message>
- <location line="-1"/>
<source>Deployment Succeeded</source>
<translation>Deployment beendet</translation>
</message>
@@ -19251,27 +15878,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::Qt4BuildConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4buildconfiguration.cpp" line="+654"/>
<source>Using Qt Version "%1"</source>
<translation>Verwende Qt-Version "%1"</translation>
</message>
<message>
- <location line="+54"/>
<source>New Configuration</source>
<translation>Neue Konfiguration</translation>
</message>
<message>
- <location line="+1"/>
<source>New configuration name:</source>
<translation>Name der neuen Konfiguration:</translation>
</message>
<message>
- <location line="+7"/>
<source>%1 Debug</source>
<translation>%1 Debug</translation>
</message>
<message>
- <location line="+5"/>
<source>%1 Release</source>
<translation>%1 Release</translation>
</message>
@@ -19279,17 +15901,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+39"/>
<source>Qt4</source>
<translation>Qt4</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt Versions</source>
<translation>Qt Versionen</translation>
</message>
<message>
- <location line="+5"/>
<source>Qt C++ Project</source>
<translation>Qt-C++-Projekt</translation>
</message>
@@ -19297,27 +15916,22 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QtVersion</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+966"/>
<source>No qmake path set</source>
<translation>Es ist keine qmake-Pfad gesetzt</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt version has no name</source>
<translation>Die Qt-Version hat keinen Namen</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt version is not properly installed, please run make install</source>
<translation>Die Qt-Version ist nicht richtig installiert, führen Sie bitte make install aus</translation>
</message>
<message>
- <location line="+2"/>
<source>Could not determine the path to the binaries of the Qt installation, maybe the qmake path is wrong?</source>
<translation>Der Pfad zu den ausführbaren Dateien der Qt-Installation konnte nicht bestimmt werden, möglicherweise ist der Pfad zu qmake falsch?</translation>
</message>
<message>
- <location line="+128"/>
<source>The Qt Version has no toolchain.</source>
<translation>Dieser Qt-Version ist keine Toolchain zugeordnet.</translation>
</message>
@@ -19325,12 +15939,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::TestWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/testwizard.cpp" line="+51"/>
<source>Qt Unit Test</source>
<translation>Qt-Unit-Test</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a QTestLib-based unit test for a feature or a class. Unit tests allow you to verify that the code is fit for use and that there are no regressions.</source>
<translation>Erstellt einen auf QTestLib basierenden Unit-Test für eine Funktion oder eine Klasse. Unit-Tests dienen zur Überprüfung der Verwendbarkeit des Codes und der Feststellung von Regressionen.</translation>
</message>
@@ -19338,12 +15950,10 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Qt4ProjectManager::Internal::TestWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp" line="+58"/>
<source>This wizard generates a Qt unit test consisting of a single source file with a test class.</source>
<translation>Dieser Wizard erstellt einen Qt-Unit-Test aus einer einzelnen Quelldatei mit einer Testklasse.</translation>
</message>
<message>
- <location line="+8"/>
<source>Details</source>
<translation>Details</translation>
</message>
@@ -19351,7 +15961,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>Subversion::Internal::SubversionEditor</name>
<message>
- <location filename="../../../src/plugins/subversion/subversioneditor.cpp" line="+54"/>
<source>Annotate revision "%1"</source>
<translation>Annotation für Revision "%1"</translation>
</message>
@@ -19359,7 +15968,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>TextEditor</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditorconstants.h" line="+134"/>
<source>Text Editor</source>
<translation>Text Editor</translation>
</message>
@@ -19367,47 +15975,38 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>VCSBase::VCSBasePlugin</name>
<message>
- <location filename="../../../src/plugins/vcsbase/vcsbaseplugin.cpp" line="+545"/>
<source>Version Control</source>
<translation>Versionskontrolle</translation>
</message>
<message>
- <location line="+1"/>
<source>The file '%1' could not be deleted.</source>
<translation>Die Datei %1 konnte nicht gelöscht werden.</translation>
</message>
<message>
- <location line="+22"/>
<source>Choose Repository Directory</source>
<translation>Ordner für Repository wählen</translation>
</message>
<message>
- <location line="+6"/>
<source>The directory '%1' is already managed by a version control system (%2). Would you like to specify another directory?</source>
<translation>Der Ordner '%1' ist bereits unter Verwaltung eines Versionskontrollsystems (%2). Möchten Sie einen anderen Ordner angeben?</translation>
</message>
<message>
- <location line="+3"/>
<source>Repository already under version control</source>
<translation>Das Repository wird bereits von einem Versionskontrollsystem verwaltet</translation>
</message>
<message>
- <location line="+7"/>
<source>Repository Created</source>
<translation>Repository erstellt</translation>
</message>
<message>
- <location line="+4"/>
<source>Repository Creation Failed</source>
<translation>Fehlschlag bei Erstellung des Repositories</translation>
</message>
<message>
- <location line="-3"/>
<source>A version control repository has been created in %1.</source>
<translation>Ein Repository für Versionskontrolle wurde im Ordner %1 erstellt.</translation>
</message>
<message>
- <location line="+4"/>
<source>A version control repository could not be created in %1.</source>
<translation>Im Ordner %1 konnte kein Repository für die Versionskontrolle erstellt werden.</translation>
</message>
@@ -19415,17 +16014,14 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>trk::Launcher</name>
<message>
- <location filename="../../../src/shared/symbianutils/launcher.cpp" line="+579"/>
<source>Cannot open remote file '%1': %2</source>
<translation>Die Datei '%1' auf dem Gerät konnte nicht geöffnet werden: %2</translation>
</message>
<message>
- <location line="+5"/>
<source>Cannot open '%1': %2</source>
<translation>Die Datei '%1' kann nicht geöffnet werden: %2</translation>
</message>
<message>
- <location line="+441"/>
<source>Unable to acquire a device for port '%1'. It appears to be in use.</source>
<translation>Es kann nicht auf das Gerät "%1" zugegriffen werden. Offenbar ist es bereits in Benutzung.</translation>
</message>
@@ -19433,7 +16029,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>AboutDialog</name>
<message>
- <location filename="../../../src/tools/qml/standalone/aboutdialog.cpp" line="+85"/>
<source>About Bauhaus</source>
<comment>AboutDialog</comment>
<translation>Ãœber Bauhaus</translation>
@@ -19442,78 +16037,62 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>QmlJS::Check</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljscheck.cpp" line="+341"/>
<source>'%1' is not a valid property name</source>
<translation>' %1' ist kein eindeutiger Name für Eigenschaften</translation>
</message>
<message>
- <location line="-115"/>
<source>unknown type</source>
<translation>unbekannter Typ</translation>
</message>
<message>
- <location line="-119"/>
<source>unknown value for enum</source>
<translation>Unbekannter Wert für Aufzählung</translation>
</message>
<message>
- <location line="+247"/>
<source>'%1' does not have members</source>
<translation>'%1' hat keine MItglieder</translation>
</message>
<message>
- <location line="+16"/>
<source>'%1' is not a member of '%2'</source>
<translation>'%1' gehört nicht zu '%2'</translation>
</message>
<message>
- <location line="-259"/>
<source>value might be 'undefined'</source>
<translation>Wert kann 'undefined' sein</translation>
</message>
<message>
- <location line="+2"/>
<source>enum value is not a string or number</source>
<translation>Wert der Aufzählung ist weder Zeichenkette noch Zahl</translation>
</message>
<message>
- <location line="+6"/>
<source>numerical value expected</source>
<translation>numerischer Wert erwartet</translation>
</message>
<message>
- <location line="+12"/>
<source>boolean value expected</source>
<translation>boolescher Wert erwartet</translation>
</message>
<message>
- <location line="+12"/>
<source>string value expected</source>
<translation>Zeichenkette erwartet</translation>
</message>
<message>
- <location line="+8"/>
<source>not a valid color</source>
<translation>keine gültige Farbe</translation>
</message>
<message>
- <location line="+9"/>
<source>expected anchor line</source>
<translation>Ankerzeile erwartet</translation>
</message>
<message>
- <location line="+91"/>
- <location line="+11"/>
<source>expected id</source>
<translation>Id erwartet</translation>
</message>
<message>
- <location line="-2"/>
<source>using string literals for ids is discouraged</source>
<translation>Von der Verwendung von Zeichenketten-Literalen als Ids wird abgeraten</translation>
</message>
<message>
- <location line="+7"/>
<source>ids must be lower case</source>
<translation>Ids müssen mit einem Kleinbuchstaben beginnen</translation>
</message>
@@ -19521,7 +16100,6 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio
<context>
<name>BINEditor::BinEditor</name>
<message>
- <location filename="../../../src/plugins/bineditor/bineditor.cpp" line="+1078"/>
<source>Decimal unsigned value (little endian): %1
Decimal unsigned value (big endian): %2
Decimal signed value (little endian): %3
@@ -19532,42 +16110,34 @@ Dezimaler, vorzeichenbehafteter Wert (Little Endian): %3
Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
</message>
<message>
- <location line="+143"/>
<source>Copying Failed</source>
<translation>Das Kopieren schlug fehl</translation>
</message>
<message>
- <location line="+1"/>
<source>You cannot copy more than 4 MB of binary data.</source>
<translation>Sie können nicht mehr als 4 MB binäre Daten kopieren.</translation>
</message>
<message>
- <location line="+110"/>
<source>Copy Selection as ASCII Characters</source>
<translation>Auswahl als ASCII-Zeichen kopieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Copy Selection as Hex Values</source>
<translation>Auswahl als hexadezimale Werte kopieren</translation>
</message>
<message>
- <location line="+21"/>
<source>Jump to Address in This Window</source>
<translation>Gehe zu Adresse in diesem Fenster</translation>
</message>
<message>
- <location line="+1"/>
<source>Jump to Address in New Window</source>
<translation>Gehe zu Adresse in neuem Fenster</translation>
</message>
<message>
- <location line="+25"/>
<source>Jump to Address 0x%1 in This Window</source>
<translation>Gehe zu Adresse 0x%1 in diesem Fenster</translation>
</message>
<message>
- <location line="+2"/>
<source>Jump to Address 0x%1 in New Window</source>
<translation>Gehe zu Adresse 0x%1 in neuem Fenster</translation>
</message>
@@ -19575,7 +16145,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>Core::Internal::SystemEditor</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editormanager/systemeditor.cpp" line="+67"/>
<source>Could not open url %1.</source>
<translation>URL %1 konnte nicht geöffnet werden.</translation>
</message>
@@ -19583,22 +16152,18 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>Debugger::DebuggerUISwitcher</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggeruiswitcher.cpp" line="+361"/>
<source>&Debug Languages</source>
- <translation>&Sprachen</translation>
+ <translation type="obsolete">&Sprachen</translation>
</message>
<message>
- <location line="+3"/>
<source>Memory...</source>
<translation>Speicher...</translation>
</message>
<message>
- <location line="+50"/>
<source>Alt+L</source>
- <translation>Alt+L</translation>
+ <translation type="obsolete">Alt+L</translation>
</message>
<message>
- <location line="+125"/>
<source>Debugger Toolbar</source>
<translation>Debugger-Werkzeugleiste</translation>
</message>
@@ -19606,7 +16171,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>BuildSettingsPanelFactory</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildsettingspropertiespage.cpp" line="-267"/>
<source>Build Settings</source>
<translation>Build-Einstellungen</translation>
</message>
@@ -19614,7 +16178,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>BuildSettingsPanel</name>
<message>
- <location line="+31"/>
<source>Build Settings</source>
<translation>Build-Einstellungen</translation>
</message>
@@ -19622,7 +16185,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>DependenciesPanel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/dependenciespanel.cpp" line="+170"/>
<source>Dependencies</source>
<translation>Abhängigkeiten</translation>
</message>
@@ -19630,7 +16192,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>DependenciesPanelFactory</name>
<message>
- <location line="+29"/>
<source>Dependencies</source>
<translation>Abhängigkeiten</translation>
</message>
@@ -19638,7 +16199,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>EditorSettingsPanelFactory</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+48"/>
<source>Editor Settings</source>
<translation>Editoreinstellungen</translation>
</message>
@@ -19646,7 +16206,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>EditorSettingsPanel</name>
<message>
- <location line="+27"/>
<source>Editor Settings</source>
<translation>Editoreinstellungen</translation>
</message>
@@ -19654,7 +16213,6 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>RunSettingsPanel</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="-278"/>
<source>Run Settings</source>
<translation>Einstellungen zur Ausführung</translation>
</message>
@@ -19662,22 +16220,18 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>QmlDesigner::XUIFileDialog</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/integration/xuifiledialog.cpp" line="+45"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
<message>
- <location line="+22"/>
<source>Save File</source>
<translation>Datei speichern</translation>
</message>
<message>
- <location line="+14"/>
<source>Declarative UI files (*.qml)</source>
<translation>Declarative-UI-Dateien (*.qml)</translation>
</message>
<message>
- <location line="+1"/>
<source>All files (*)</source>
<translation>Alle Dateien (*)</translation>
</message>
@@ -19685,12 +16239,10 @@ Dezimaler, vorzeichenbehafteter Wert (Big Endian): %4</translation>
<context>
<name>QmlJSEditor::Internal::ModelManager</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljsmodelmanager.cpp" line="+147"/>
<source>Indexing</source>
<translation>Indizierung</translation>
</message>
<message>
- <location line="+389"/>
<source>Type dump of QML plugin in %0 failed.
Errors:
%1
@@ -19704,7 +16256,6 @@ Fehler:
<context>
<name>QmlProjectManager::QmlProject</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlproject.cpp" line="+101"/>
<source>Error while loading project file!</source>
<translation>Fehler beim Laden der Projektdatei!</translation>
</message>
@@ -19712,53 +16263,65 @@ Fehler:
<context>
<name>QmlProjectManager::Internal::QmlProjectApplicationWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp" line="+50"/>
<source>New QML Project</source>
- <translation>Neues QML-Projekt</translation>
+ <translation type="obsolete">Neues QML-Projekt</translation>
</message>
<message>
- <location line="+1"/>
<source>This wizard generates a QML application project.</source>
- <translation>Dieser Wizard erstellt ein QML-Anwendungsprojekt.</translation>
+ <translation type="obsolete">Dieser Wizard erstellt ein QML-Anwendungsprojekt.</translation>
+ </message>
+ <message>
+ <source>New Qt Quick UI Project</source>
+ <translation>Neues Qt Quick-UI-Projekt</translation>
+ </message>
+ <message>
+ <source>This wizard generates a Qt Quick UI project.</source>
+ <translation>Dieser Wizard erstellt ein Qt Quick-UI-Projekt.</translation>
</message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlProjectApplicationWizard</name>
<message>
- <location line="+14"/>
<source>Qt QML Application</source>
- <translation>Qt-QML-Anwendung</translation>
+ <translation type="obsolete">Qt-QML-Anwendung</translation>
</message>
<message>
- <location line="+1"/>
<source>QML Application</source>
- <translation>QML-Anwendung</translation>
+ <translation type="obsolete">QML-Anwendung</translation>
</message>
<message>
- <location line="+2"/>
<source>Creates a QML application project with a single QML file containing the main view.
QML application projects are executed by the Qt QML Viewer and do not need to be built.</source>
- <translation>Erstellt eine QML-Anwendung aus einer einzelnen QML-Datei, die die Hauptansicht enthält.
+ <translation type="obsolete">Erstellt eine QML-Anwendung aus einer einzelnen QML-Datei, die die Hauptansicht enthält.
QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen keine Compilierung.</translation>
</message>
<message>
- <location line="+67"/>
+ <source>Qt Quick UI</source>
+ <translation>Qt Quick UI</translation>
+ </message>
+ <message>
+ <source>Creates a Qt Quick UI project with a single QML file that contains the main view.
+
+You can review Qt Quick UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.</source>
+ <translation>Erstellt ein Qt Quick-UI-Projekt aus einer einzelnen QML-Datei, die die Hauptansicht enthält.
+
+Qt Quick-UI-Projekte benötigen keine Übersetzung und können direkt im QML-Betrachter ausgeführt werden. Zur Erstellung und Ausführung dieser Projekte ist keine Entwicklungsumgebung erforderlich.</translation>
+ </message>
+ <message>
<source>File generated by QtCreator</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
<translation>File generated by QtCreator</translation>
</message>
<message>
- <location line="+6"/>
<source>Include .qml, .js, and image files from current directory and subdirectories</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
<translation>Include .qml, .js, and image files from current directory and subdirectories</translation>
</message>
<message>
- <location line="+11"/>
<source>List of plugin directories passed to QML runtime</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
@@ -19768,98 +16331,98 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>QmlProjectManager::Internal::QmlProjectImportWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp" line="+64"/>
<source>Import Existing QML Directory</source>
- <translation>Importiere existierenden QML-Ordner</translation>
+ <translation type="obsolete">Importiere existierenden QML-Ordner</translation>
</message>
<message>
- <location line="+4"/>
<source>Project Name and Location</source>
- <translation>Name und Ordner des Projekts</translation>
+ <translation type="obsolete">Name und Ordner des Projekts</translation>
</message>
<message>
- <location line="+1"/>
<source>Project name:</source>
- <translation>Projektname:</translation>
+ <translation type="obsolete">Projektname:</translation>
</message>
<message>
- <location line="+1"/>
<source>Location:</source>
- <translation>Pfad:</translation>
+ <translation type="obsolete">Pfad:</translation>
</message>
<message>
- <location line="+3"/>
<source>Location</source>
- <translation>Pfad</translation>
+ <translation type="obsolete">Pfad</translation>
</message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlProjectImportWizard</name>
<message>
- <location line="+43"/>
<source>Import Existing QML Directory</source>
- <translation>Importiere existierenden QML-Ordner</translation>
+ <translation type="obsolete">Importiere existierenden QML-Ordner</translation>
</message>
<message>
- <location line="+2"/>
<source>Creates a QML project from an existing directory of QML files.</source>
- <translation>Erstellt ein QML-Projekt von einem Ordner, der QML-Dateien enthält.</translation>
+ <translation type="obsolete">Erstellt ein QML-Projekt von einem Ordner, der QML-Dateien enthält.</translation>
</message>
<message>
- <location line="+39"/>
<source>File generated by QtCreator</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
- <translation>File generated by QtCreator</translation>
+ <translation type="obsolete">File generated by QtCreator</translation>
</message>
<message>
- <location line="+6"/>
<source>Include .qml, .js, and image files from current directory and subdirectories</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
- <translation>Include .qml, .js, and image files from current directory and subdirectories</translation>
+ <translation type="obsolete">Include .qml, .js, and image files from current directory and subdirectories</translation>
</message>
<message>
- <location line="+11"/>
<source>List of plugin directories passed to QML runtime</source>
<comment>qmlproject Template</comment>
<extracomment>Comment added to generated .qmlproject file</extracomment>
- <translation>List of plugin directories passed to QML runtime</translation>
+ <translation type="obsolete">List of plugin directories passed to QML runtime</translation>
</message>
</context>
<context>
<name>QmlProjectManager::QmlProjectRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp" line="+100"/>
<source>QML Viewer</source>
<comment>QMLRunConfiguration display name.</comment>
<translation>QML-Betrachter</translation>
</message>
<message>
- <location line="+76"/>
<source>Custom QML Viewer:</source>
- <translation>Benutzerdefinierter QML-Betrachter:</translation>
+ <translation type="obsolete">Benutzerdefinierter QML-Betrachter:</translation>
+ </message>
+ <message>
+ <source>Arguments:</source>
+ <translation>Argumente:</translation>
</message>
<message>
- <location line="+1"/>
<source>QML Viewer arguments:</source>
- <translation>Kommandozeilenargumente des Betrachters:</translation>
+ <translation type="obsolete">Kommandozeilenargumente des Betrachters:</translation>
+ </message>
+ <message>
+ <source>Manage Qt versions</source>
+ <translation>Qt-Versionen verwalten</translation>
+ </message>
+ <message>
+ <source>Qt version:</source>
+ <translation>Qt-Version:</translation>
</message>
<message>
- <location line="+8"/>
<source>Debugger:</source>
<translation>Debugger:</translation>
</message>
<message>
- <location line="+6"/>
<source>Main QML file:</source>
<translation>QML-Hauptdatei:</translation>
</message>
+ <message>
+ <source>Invalid Qt version</source>
+ <translation>Ungültige Qt-Version</translation>
+ </message>
</context>
<context>
<name>QmlProjectManager::Internal::QmlProjectRunConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp" line="+60"/>
<source>Run QML Script</source>
<translation>QML-Skriptdatei ausführen</translation>
</message>
@@ -19867,12 +16430,10 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Qt4ProjectManager::Internal::Qt4TargetFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4target.cpp" line="-282"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
- <location line="+0"/>
<source>Release</source>
<translation>Release</translation>
</message>
@@ -19880,7 +16441,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>RunSettingsPanelFactory</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runsettingspropertiespage.cpp" line="-31"/>
<source>Run Settings</source>
<translation>Einstellungen zur Ausführung</translation>
</message>
@@ -19888,7 +16448,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>TargetSettingsPanelFactory</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/projectwindow.cpp" line="+305"/>
<source>Targets</source>
<translation>Ziele</translation>
</message>
@@ -19896,7 +16455,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>QmlDesigner::PluginManager</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp" line="+161"/>
<source>About Plugins</source>
<translation>Ãœber Plugins</translation>
</message>
@@ -19904,37 +16462,30 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>QmlDesigner::Internal::BauhausPlugin</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/qmldesignerplugin.cpp" line="+125"/>
<source>Switch Text/Design</source>
<translation>Text/Design umschalten</translation>
</message>
<message>
- <location line="+200"/>
<source>Save %1 As...</source>
<translation>Speichere '%1' unter...</translation>
</message>
<message>
- <location line="+1"/>
<source>&Save %1</source>
<translation>&Speichere %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Revert %1 to Saved</source>
<translation>Stelle %1 wieder her</translation>
</message>
<message>
- <location line="+3"/>
<source>Close %1</source>
<translation>Schließe %1</translation>
</message>
<message>
- <location line="+3"/>
<source>Close All Except %1</source>
<translation>Alle außer %1 schließen</translation>
</message>
<message>
- <location line="+0"/>
<source>Close Others</source>
<translation>Andere schließen</translation>
</message>
@@ -19942,7 +16493,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Core::DesignMode</name>
<message>
- <location filename="../../../src/plugins/coreplugin/designmode.cpp" line="+149"/>
<source>Design</source>
<translation>Design</translation>
</message>
@@ -19950,52 +16500,42 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>CommandMappings</name>
<message>
- <location filename="../../../src/plugins/coreplugin/actionmanager/commandmappings.ui"/>
<source>Command Mappings</source>
<translation>Zuordnung von Kommandos</translation>
</message>
<message>
- <location/>
<source>Command</source>
<translation>Kommando</translation>
</message>
<message>
- <location/>
<source>Label</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location/>
<source>Target</source>
<translation>Ziel</translation>
</message>
<message>
- <location/>
<source>Defaults</source>
<translation>Vorgabe</translation>
</message>
<message>
- <location/>
<source>Import...</source>
<translation>Importieren...</translation>
</message>
<message>
- <location/>
<source>Export...</source>
<translation>Exportieren...</translation>
</message>
<message>
- <location/>
<source>Target Identifier</source>
<translation></translation>
</message>
<message>
- <location/>
<source>Target:</source>
<translation>Ziel:</translation>
</message>
<message>
- <location/>
<source>Reset</source>
<translation>Rücksetzen</translation>
</message>
@@ -20003,7 +16543,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>MaemoConfigTestDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.ui"/>
<source>Device Configuration Test</source>
<translation>Test der Geräte-Konfiguration</translation>
</message>
@@ -20011,132 +16550,106 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>MaemoSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui"/>
<source>Maemo Device Configurations</source>
<translation>Maemo-Geräte-Konfigurationen</translation>
</message>
<message>
- <location/>
<source>Device type:</source>
<translation>Gerätetyp:</translation>
</message>
<message>
- <location/>
<source>Authentication type:</source>
<translation>Art der Authentifizierung:</translation>
</message>
<message>
- <location/>
<source>Password</source>
<translation>Passwort</translation>
</message>
<message>
- <location/>
<source>Key</source>
<translation>Schlüssel</translation>
</message>
<message>
- <location/>
<source>Password:</source>
<translation>Passwort:</translation>
</message>
<message>
- <location/>
<source>Private key file:</source>
<translation>Private Schlüsseldatei:</translation>
</message>
<message>
- <location/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location/>
<source>Test</source>
<translation>Testen</translation>
</message>
<message>
- <location/>
<source>Configuration:</source>
<translation>Konfiguration:</translation>
</message>
<message>
- <location/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location/>
<source>IP or host name of the device</source>
<translation>IP-Adresse oder Hostname des Geräts</translation>
</message>
<message>
- <location/>
<source>Generate SSH Key ...</source>
<translation>Erzeuge SSH-Schlüssel...</translation>
</message>
<message>
- <location/>
<source>s</source>
<translation>s</translation>
</message>
<message>
- <location/>
<source>Deploy Public Key ...</source>
<translation>Öffentlichen Schlüssel senden...</translation>
</message>
<message>
- <location/>
<source>Remote device</source>
<translation>Gerät</translation>
</message>
<message>
- <location/>
<source>Maemo emulator</source>
<translation>Maemo-Emulator</translation>
</message>
<message>
- <location/>
<source>Host name:</source>
<translation>Hostname:</translation>
</message>
<message>
- <location/>
<source>Connection timeout:</source>
<translation>Zeitlimit der Verbindung:</translation>
</message>
<message>
- <location/>
<source>Username:</source>
<translation>Nutzername:</translation>
</message>
<message>
- <location/>
<source>SSH port:</source>
<translation>SSH-Port:</translation>
</message>
<message>
- <location/>
<source>Free ports:</source>
<translation>Freien Ports:</translation>
</message>
<message>
- <location/>
<source>You can enter lists and ranges like this: 1024,1026-1028,1030</source>
<translation>Sie können Listen und Bereiche wie folgt angeben: 1024,1026-1028,1030</translation>
</message>
<message>
- <location/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location/>
<source>Show password</source>
<translation>Passwort anzeigen</translation>
</message>
@@ -20144,90 +16657,77 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStepWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.ui"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation type="obsolete">Form</translation>
</message>
<message>
- <location/>
<source>Self-signed certificate</source>
<translation>Selbstsigniertes Zertifikat</translation>
</message>
<message>
- <location/>
<source>Custom certificate:</source>
<translation>Benutzerdefiniertes Zertifikat:</translation>
</message>
<message>
- <location/>
<source>Choose certificate file (.cer)</source>
<translation>Geben Sie eine Datei mit einem Zertifikat (.cer) an</translation>
</message>
<message>
- <location/>
<source>Key file:</source>
<translation>Datei mit Schlüssel:</translation>
</message>
<message>
- <location/>
<source>Create Smart Installer package</source>
<translation>Smart-Installer-Paket erzeugen</translation>
</message>
<message>
- <location/>
<source>Resets saved passphrases for all used keys</source>
<translation>Setzt die Passphrasen aller verwendeten Schlüssel zurück</translation>
</message>
<message>
- <location/>
<source>Reset Passphrases</source>
<translation>Passphrase zurücksetzen</translation>
</message>
+ <message>
+ <source>Not signed</source>
+ <translation>Unsigniert</translation>
+ </message>
</context>
<context>
<name>VCSBase::CleanDialog</name>
<message>
- <location filename="../../../src/plugins/vcsbase/cleandialog.cpp" line="+68"/>
<source>The directory %1 could not be deleted.</source>
<translation>Das Verzeichnis %1 konnte nicht gelöscht werden.</translation>
</message>
<message>
- <location line="+7"/>
<source>The file %1 could not be deleted.</source>
<translation>Die Datei %1 konnte nicht gelöscht werden.</translation>
</message>
<message>
- <location line="+37"/>
<source>There were errors when cleaning the repository %1:</source>
<translation>Beim Bereinigen des Repositories %1 traten Fehler auf:</translation>
</message>
<message>
- <location line="+31"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
<message>
- <location line="+2"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+18"/>
<source>Repository: %1</source>
<translation>Repository: %1</translation>
</message>
<message>
- <location line="+31"/>
<source>%1 bytes, last modified %2</source>
<translation>%1 bytes, zuletzt geändert %2</translation>
</message>
<message>
- <location line="+36"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message numerus="yes">
- <location line="+1"/>
<source>Do you want to delete %n files?</source>
<translation>
<numerusform>Möchten Sie eine Datei löschen?</numerusform>
@@ -20235,12 +16735,10 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
</translation>
</message>
<message>
- <location line="+11"/>
<source>Cleaning %1</source>
<translation>Bereinige %1</translation>
</message>
<message>
- <location filename="../../../src/plugins/vcsbase/cleandialog.ui"/>
<source>Clean Repository</source>
<translation>Repository bereinigen</translation>
</message>
@@ -20248,7 +16746,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>ExtensionSystem::PluginDetailsView</name>
<message>
- <location filename="../../../src/libs/extensionsystem/plugindetailsview.cpp" line="+81"/>
<source>None</source>
<translation>Keine</translation>
</message>
@@ -20256,14 +16753,10 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>ExtensionSystem::PluginView</name>
<message>
- <location filename="../../../src/libs/extensionsystem/pluginview.cpp" line="+158"/>
- <location line="+19"/>
- <location line="+54"/>
<source>Load on Startup</source>
<translation>Beim Start Laden</translation>
</message>
<message>
- <location line="-66"/>
<source>Utilities</source>
<translation>Hilfsmittel</translation>
</message>
@@ -20271,27 +16764,22 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Utils::fileDeletedPrompt</name>
<message>
- <location filename="../../../src/libs/utils/reloadpromptutils.cpp" line="+32"/>
<source>File has been removed</source>
<translation>Die Datei wurde gelöscht</translation>
</message>
<message>
- <location line="+2"/>
<source>The file %1 has been removed outside Qt Creator. Do you want to save it under a different name, or close the editor?</source>
<translation>Die Datei %1 wurde außerhalb von Qt Creator gelöscht. Möchten Sie sie unter einem anderen Namen speichern oder den Editor schließen?</translation>
</message>
<message>
- <location line="+3"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location line="+1"/>
<source>Save as...</source>
<translation>Speichern als...</translation>
</message>
<message>
- <location line="+1"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
@@ -20299,12 +16787,10 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Core::CommandMappings</name>
<message>
- <location filename="../../../src/plugins/coreplugin/actionmanager/commandmappings.cpp" line="+138"/>
<source>Command</source>
<translation>Kommando</translation>
</message>
<message>
- <location line="+0"/>
<source>Label</source>
<translation>Beschreibung</translation>
</message>
@@ -20312,17 +16798,14 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Core::EditorToolBar</name>
<message>
- <location filename="../../../src/plugins/coreplugin/editortoolbar.cpp" line="+207"/>
<source>Copy Full Path to Clipboard</source>
<translation>Vollständigen Pfad in die Zwischenablage kopieren</translation>
</message>
<message>
- <location line="+59"/>
<source>Make writable</source>
<translation>Schreibbar machen</translation>
</message>
<message>
- <location line="+4"/>
<source>File is writable</source>
<translation>Die Datei ist schreibbar</translation>
</message>
@@ -20330,7 +16813,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Git::Internal::GitCommand</name>
<message>
- <location filename="../../../src/plugins/git/gitcommand.cpp" line="+70"/>
<source>Error: Git timed out after %1s.</source>
<translation>Fehler: Zeitüberschreitung nach %1s.</translation>
</message>
@@ -20338,24 +16820,20 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>ProjectExplorer::BuildConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildconfiguration.cpp" line="+59"/>
<source>Build</source>
<extracomment>Display name of the build build step list. Used as part of the labels in the project window.</extracomment>
<translation>Build</translation>
</message>
<message>
- <location line="+4"/>
<source>Clean</source>
<extracomment>Display name of the clean build step list. Used as part of the labels in the project window.</extracomment>
<translation>Bereinigen</translation>
</message>
<message>
- <location line="+98"/>
<source>System Environment</source>
<translation>Systemumgebung</translation>
</message>
<message>
- <location line="+2"/>
<source>Clean Environment</source>
<translation>Umgebung löschen</translation>
</message>
@@ -20363,12 +16841,10 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>ProjectExplorer::BuildEnvironmentWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildenvironmentwidget.cpp" line="+48"/>
<source>Clear system environment</source>
<translation>Systemumgebung löschen</translation>
</message>
<message>
- <location line="+13"/>
<source>Build Environment</source>
<translation>Build-Umgebung</translation>
</message>
@@ -20376,7 +16852,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>ProjectExplorer::CustomProjectWizard</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customwizard/customwizard.cpp" line="+544"/>
<source>The project %1 could not be opened.</source>
<translation>Das Projekt %1 konnte nicht geöffnet werden.</translation>
</message>
@@ -20384,7 +16859,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>ProjectExplorer::Internal::CustomWizardPage</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customwizard/customwizardpage.cpp" line="+340"/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
@@ -20392,23 +16866,19 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>QmlDesigner::Internal::StatesEditorModel</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp" line="+76"/>
<source>base state</source>
<comment>Implicit default state</comment>
<translation>Grundzustand</translation>
</message>
<message>
- <location line="+45"/>
<source>Invalid state name</source>
<translation>Ungültiger Name des Zustands</translation>
</message>
<message>
- <location line="+2"/>
<source>The empty string as a name is reserved for the base state.</source>
<translation>Eine leere Zeichenkette ist als Name des Basiszustands reserviert.</translation>
</message>
<message>
- <location line="+1"/>
<source>Name already used in another state</source>
<translation>Der Name wird bereits von einem anderen Zustand verwendet</translation>
</message>
@@ -20416,7 +16886,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>QmlDesigner::Internal::SubComponentManagerPrivate</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp" line="+357"/>
<source>QML Components</source>
<translation>QML-Komponenten</translation>
</message>
@@ -20424,7 +16893,6 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>QmlManager</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h" line="+53"/>
<source><Current File></source>
<translation><Aktuelle Datei></translation>
</message>
@@ -20432,81 +16900,66 @@ QML-Anwendungen werden vom Qt QML-Betrachter direkt ausgeführt und benötigen k
<context>
<name>Qt4ProjectManager::Internal::MaemoConfigTestDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoconfigtestdialog.cpp" line="+77"/>
<source>Testing configuration...</source>
<translation>Test der Konfiguration...</translation>
</message>
<message>
- <location line="+1"/>
<source>Stop Test</source>
<translation>Test anhalten</translation>
</message>
<message>
- <location line="+29"/>
<source>Could not connect to host: %1</source>
<translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
</message>
<message>
- <location line="+3"/>
<source>
Did you start Qemu?</source>
<translation>
Haben Sie Qemu gestartet?</translation>
</message>
<message>
- <location line="+19"/>
- <location line="+28"/>
<source>Remote process failed: %1</source>
<translation>Der Prozess konnte nicht auf demMobilgerät gestartet werden: %1</translation>
</message>
<message>
- <location line="-23"/>
<source>Qt version mismatch! Expected Qt on device: 4.6.2 or later.</source>
<translation>Die Überprüfung der Qt-Version schlug fehl! Auf dem Gerät muss Qt-Version 4.6.2 oder neuer installiert sein.</translation>
</message>
<message>
- <location line="+27"/>
<source>Mad Developer is not installed.<br>You will not be able to deploy to this device.</source>
<translation>Mad Developer ist nicht installiert.<br>Ein Deployment auf dieses Mobilgerät ist nicht möglich.</translation>
</message>
<message>
- <location line="+8"/>
<source>Device configuration okay.</source>
<translation>Geräte-Konfiguration in Ordnung.</translation>
</message>
<message>
- <location line="+15"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location line="+16"/>
<source>Device configuration test failed: Unexpected output:
%1</source>
<translation>Der Test der Geräte-Konfiguration schlug fehl (unerwartete Ausgaben):
%1</translation>
</message>
<message>
- <location line="+5"/>
<source>Hardware architecture: %1
</source>
<translation>Architektur der Hardware: %1
</translation>
</message>
<message>
- <location line="+1"/>
<source>Kernel version: %1
</source>
<translation>Kernel-Version: %1
</translation>
</message>
<message>
- <location line="+4"/>
<source>No Qt packages installed.</source>
<translation>Es sind keine Qt-Pakete installiert.</translation>
</message>
<message>
- <location line="+4"/>
<source>List of installed Qt packages:</source>
<translation>Liste der installierten Qt-Pakete:</translation>
</message>
@@ -20514,38 +16967,31 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp" line="+119"/>
<source>Create SIS Package</source>
<extracomment>default create SIS package build step display name</extracomment>
<translation>SIS-Paketdatei erzeugen</translation>
</message>
<message>
- <location line="+51"/>
<source>Could not find make command '%1' in the build environment</source>
<translation>Das 'make'-Kommando '%1' konnte in der Build-Umgebung nicht gefunden werden</translation>
</message>
<message>
- <location line="+156"/>
<source>The process "%1" exited normally.</source>
<translation>Der Prozess "%1" wurde normal beendet.</translation>
</message>
<message>
- <location line="+5"/>
<source>The process "%1" exited with code %2.</source>
<translation>Der Prozess "%1" wurde mit dem Rückgabewert %2 beendet.</translation>
</message>
<message>
- <location line="+4"/>
<source>The process "%1" crashed.</source>
<translation>Der Prozess "%1" ist abgestürzt.</translation>
</message>
<message>
- <location line="+52"/>
<source>Could not start process "%1" in %2</source>
<translation>Der Prozess "%1" konnte in "%2" nicht gestartet werden</translation>
</message>
<message>
- <location line="+6"/>
<source>Starting: "%1" %2 in %3
</source>
<translation>Starte: "%1" %2 in %3
@@ -20555,7 +17001,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStepFactory</name>
<message>
- <location line="+238"/>
<source>Create SIS Package</source>
<translation>SIS-Paketdatei erzeugen</translation>
</message>
@@ -20563,32 +17008,30 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Internal::S60CreatePackageStepConfigWidget</name>
<message>
- <location line="+53"/>
<source>Reset Passphrases</source>
<translation>Passphrase zurücksetzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you want to reset all passphrases saved for keys used?</source>
<translation>Möchten Sie Passwörter aller verwendeten Schlüssel zurücksetzen?</translation>
</message>
<message>
- <location line="+10"/>
+ <source>not signed</source>
+ <translation>Unsigniert</translation>
+ </message>
+ <message>
<source>self-signed</source>
<translation>Selbstsigniert</translation>
</message>
<message>
- <location line="+2"/>
<source>signed with certificate %1 and key file %2</source>
<translation>signiert mit Zertifikat %1 und Schlüssel %2</translation>
</message>
<message>
- <location line="+4"/>
<source><b>Create SIS Package:</b> %1, using Smart Installer</source>
<translation><b>Erzeuge SIS-Paketdatei:</b> %1 einschließlich Smart-Installer</translation>
</message>
<message>
- <location line="+1"/>
<source><b>Create SIS Package:</b> %1</source>
<translation><b>Erzeuge SIS-Paketdatei:</b> %1</translation>
</message>
@@ -20596,7 +17039,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Qt4Project</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+828"/>
<source>Evaluating</source>
<translation>Auswertung</translation>
</message>
@@ -20604,27 +17046,22 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>QmlJS::Interpreter::QmlXmlReader</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljsinterpreter.cpp" line="+355"/>
<source>The file is not module file.</source>
<translation>Die Datei ist keine Moduldatei.</translation>
</message>
<message>
- <location line="+12"/>
<source>Unexpected element <%1> in <%2></source>
<translation>Unerwartetes Element <%1> in <%2></translation>
</message>
<message>
- <location line="+9"/>
<source>invalid value '%1' for attribute %2 in <%3></source>
<translation>Ungültiger Wert '%1' des Attributs %2 in <%3></translation>
</message>
<message>
- <location line="+4"/>
<source><%1> has no valid %2 attribute</source>
<translation><%1> hat kein gültiges Attribut %2</translation>
</message>
<message>
- <location line="+1583"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -20632,27 +17069,22 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Find::FindPlugin</name>
<message>
- <location filename="../../../src/plugins/find/findplugin.cpp" line="+192"/>
<source>&Find/Replace</source>
<translation>&Suchen/Ersetzen</translation>
</message>
<message>
- <location line="+18"/>
<source>Advanced Find</source>
<translation>Erweiterte Suche</translation>
</message>
<message>
- <location line="+2"/>
<source>Open Advanced Find...</source>
<translation>Erweiterte Suche öffnen...</translation>
</message>
<message>
- <location line="+1"/>
<source>Advanced...</source>
<translation>Erweitert...</translation>
</message>
<message>
- <location line="+2"/>
<source>Ctrl+Shift+F</source>
<translation>Ctrl+Shift+F</translation>
</message>
@@ -20660,7 +17092,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>QmlJS::Link</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljslink.cpp" line="+381"/>
<source>package not found</source>
<translation>Package nicht gefunden</translation>
</message>
@@ -20668,7 +17099,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>CodePaster::PasteBinDotComSettings</name>
<message>
- <location filename="../../../src/plugins/cpaster/pastebindotcomsettings.cpp" line="+58"/>
<source>Pastebin.com</source>
<translation>Pastebin.com</translation>
</message>
@@ -20676,7 +17106,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Internal::MaemoSettingsPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp" line="+69"/>
<source>Maemo Device Configurations</source>
<translation>Maemo-Geräte-Konfigurationen</translation>
</message>
@@ -20684,7 +17113,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>ExpressionEditor</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/ExpressionEditor.qml" line="+49"/>
<source>Expression</source>
<translation>Ausdruck</translation>
</message>
@@ -20692,12 +17120,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>ExtendedFunctionButton</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml" line="+64"/>
<source>Reset</source>
<translation>Rücksetzen</translation>
</message>
<message>
- <location line="+11"/>
<source>Set Expression</source>
<translation>Ausdruck setzen</translation>
</message>
@@ -20705,23 +17131,18 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>FontGroupBox</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/FontGroupBox.qml" line="+6"/>
- <location line="+7"/>
<source>Font</source>
<translation>Zeichensatz</translation>
</message>
<message>
- <location line="+25"/>
<source>Size</source>
<translation>Größe</translation>
</message>
<message>
- <location line="+32"/>
<source>Font Style</source>
<translation>Stil</translation>
</message>
<message>
- <location line="+9"/>
<source>Style</source>
<translation>Stil</translation>
</message>
@@ -20729,22 +17150,18 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Geometry</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Geometry.qml" line="+8"/>
<source>Geometry</source>
<translation>Geometrie</translation>
</message>
<message>
- <location line="+9"/>
<source>Position</source>
<translation>Position</translation>
</message>
<message>
- <location line="+40"/>
<source>Size</source>
<translation>Größe</translation>
</message>
<message>
- <location line="+34"/>
<source>Lock aspect ratio</source>
<translation>Festes Seitenverhältnis</translation>
</message>
@@ -20752,37 +17169,30 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>ImageSpecifics</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/ImageSpecifics.qml" line="+15"/>
<source>Image</source>
<translation>Bild</translation>
</message>
<message>
- <location line="+7"/>
<source>Source</source>
<translation>Bildquelle</translation>
</message>
<message>
- <location line="+19"/>
<source>Fill Mode</source>
<translation>Füllmode</translation>
</message>
<message>
- <location line="+18"/>
<source>Aliasing</source>
<translation>Kantenglättung</translation>
</message>
<message>
- <location line="+4"/>
<source>Smooth</source>
<translation>Glatt</translation>
</message>
<message>
- <location line="+12"/>
<source>Source Size</source>
<translation>Größe der Bildquelle</translation>
</message>
<message>
- <location line="+35"/>
<source>Painted Size</source>
<translation>Größe</translation>
</message>
@@ -20790,32 +17200,18 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Layout</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Layout.qml" line="+7"/>
<source>Layout</source>
<translation>Layout</translation>
</message>
<message>
- <location line="+12"/>
<source>Anchors</source>
<translation>Anker</translation>
</message>
<message>
- <location line="+33"/>
- <location line="+50"/>
- <location line="+49"/>
- <location line="+48"/>
- <location line="+48"/>
- <location line="+48"/>
<source>Target</source>
<translation>Ziel</translation>
</message>
<message>
- <location line="-224"/>
- <location line="+49"/>
- <location line="+48"/>
- <location line="+48"/>
- <location line="+48"/>
- <location line="+48"/>
<source>Margin</source>
<translation>Rand</translation>
</message>
@@ -20823,27 +17219,22 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>RectangleColorGroupBox</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml" line="+7"/>
<source>Colors</source>
<translation>Farben</translation>
</message>
<message>
- <location line="+43"/>
<source>Stops</source>
<translation>Bezugspunkte</translation>
</message>
<message>
- <location line="+1"/>
<source>Gradient Stops</source>
<translation>Bezugspunkte des Gradienten</translation>
</message>
<message>
- <location line="+13"/>
<source>Rectangle</source>
<translation>Rechteck</translation>
</message>
<message>
- <location line="+45"/>
<source>Border</source>
<translation>Rahmen</translation>
</message>
@@ -20851,17 +17242,14 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>RectangleSpecifics</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml" line="+21"/>
<source>Rectangle</source>
<translation>Rechteck</translation>
</message>
<message>
- <location line="+21"/>
<source>Radius</source>
<translation>Radius</translation>
</message>
<message>
- <location line="-11"/>
<source>Border</source>
<translation>Rahmen</translation>
</message>
@@ -20869,27 +17257,22 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>StandardTextColorGroupBox</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml" line="+11"/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location line="+4"/>
<source>Text</source>
<translation>Text</translation>
</message>
<message>
- <location line="+7"/>
<source>Style</source>
<translation>Stil</translation>
</message>
<message>
- <location line="+8"/>
<source>Selection</source>
<translation>Auswahl</translation>
</message>
<message>
- <location line="+9"/>
<source>Selected</source>
<translation>Ausgewählt</translation>
</message>
@@ -20897,23 +17280,18 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>StandardTextGroupBox</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml" line="+7"/>
- <location line="+9"/>
<source>Text</source>
<translation>Text</translation>
</message>
<message>
- <location line="+12"/>
<source>Wrap Mode</source>
<translation>Umbruch</translation>
</message>
<message>
- <location line="+36"/>
<source>Aliasing</source>
<translation>Kantenglättung</translation>
</message>
<message>
- <location line="+4"/>
<source>Smooth</source>
<translation>Glatt</translation>
</message>
@@ -20922,7 +17300,6 @@ Haben Sie Qemu gestartet?</translation>
<translation></translation>
</message>
<message>
- <location line="-22"/>
<source>Alignment</source>
<translation>Ausrichtung</translation>
</message>
@@ -20930,27 +17307,30 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Switches</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Switches.qml" line="+21"/>
<source>special properties</source>
<translation>spezielle Eigenschaften</translation>
</message>
<message>
- <location line="+17"/>
<source>layout and geometry</source>
- <translation>Layout und Geometrie</translation>
+ <translation type="obsolete">Layout und Geometrie</translation>
</message>
<message>
- <location line="+1"/>
<source>Geometry</source>
- <translation>Geometrie</translation>
+ <translation type="obsolete">Geometrie</translation>
+ </message>
+ <message>
+ <source>layout</source>
+ <translation>layout</translation>
+ </message>
+ <message>
+ <source>Layout</source>
+ <translation>Layout</translation>
</message>
<message>
- <location line="+13"/>
<source>advanced properties</source>
<translation>weitere Eigenschaften</translation>
</message>
<message>
- <location line="+3"/>
<source>Advanced</source>
<translation>Erweitert</translation>
</message>
@@ -20958,12 +17338,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>TextEditSpecifics</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml" line="+24"/>
<source>Text Edit</source>
<translation>Text bearbeiten</translation>
</message>
<message>
- <location line="+8"/>
<source>Format</source>
<translation>Format</translation>
</message>
@@ -20971,52 +17349,42 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>TextInputGroupBox</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml" line="+7"/>
<source>Text Input</source>
<translation>Texteingabe</translation>
</message>
<message>
- <location line="+9"/>
<source>Input Mask</source>
<translation>Eingabemaske</translation>
</message>
<message>
- <location line="+13"/>
<source>Echo Mode</source>
<translation>Echo-Mode</translation>
</message>
<message>
- <location line="+19"/>
<source>Pass. Char</source>
<translation>Passwort-Zeichen</translation>
</message>
<message>
- <location line="+1"/>
<source>Password Character</source>
<translation>Passwort-Zeichen</translation>
</message>
<message>
- <location line="+12"/>
<source>Flags</source>
<translation>Flags</translation>
</message>
<message>
- <location line="+3"/>
<source>Read Only</source>
<translation>Schreibgeschützt</translation>
</message>
<message>
- <location line="+15"/>
<source>Cursor Visible</source>
<translation>Mauszeiger sichtbar</translation>
</message>
<message>
- <location line="+14"/>
<source>Focus On Press</source>
<translation>Fokussieren durch Betätigen</translation>
</message>
<message>
- <location line="+13"/>
<source>Auto Scroll</source>
<translation>Automatisch rollen</translation>
</message>
@@ -21024,67 +17392,54 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Transformation</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Transformation.qml" line="+6"/>
<source>Transformation</source>
<translation>Transformation</translation>
</message>
<message>
- <location line="+9"/>
<source>Origin</source>
<translation>Ursprung</translation>
</message>
<message>
- <location line="+20"/>
<source>Top Left</source>
<translation>Links oben</translation>
</message>
<message>
- <location line="+1"/>
<source>Top</source>
<translation>Oben</translation>
</message>
<message>
- <location line="+1"/>
<source>Top Right</source>
<translation>Unten rechts</translation>
</message>
<message>
- <location line="+1"/>
<source>Left</source>
<translation>Links</translation>
</message>
<message>
- <location line="+1"/>
<source>Center</source>
<translation>Mittig</translation>
</message>
<message>
- <location line="+1"/>
<source>Right</source>
<translation>Rechts</translation>
</message>
<message>
- <location line="+1"/>
<source>Bottom Left</source>
<translation>Unten links</translation>
</message>
<message>
- <location line="+1"/>
<source>Bottom</source>
<translation>Unten</translation>
</message>
<message>
- <location line="+1"/>
<source>Bottom Right</source>
<translation>Unten rechts</translation>
</message>
<message>
- <location line="+9"/>
<source>Scale</source>
<translation>Skalieren</translation>
</message>
<message>
- <location line="+35"/>
<source>Rotation</source>
<translation>Drehung</translation>
</message>
@@ -21092,13 +17447,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Type</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Type.qml" line="+7"/>
- <location line="+7"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location line="+17"/>
<source>Id</source>
<translation>Id</translation>
</message>
@@ -21106,23 +17458,18 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Visibility</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Visibility.qml" line="+6"/>
- <location line="+9"/>
<source>Visibility</source>
<translation>Sichtbarkeit</translation>
</message>
<message>
- <location line="+4"/>
<source>Is visible</source>
<translation>sichtbar</translation>
</message>
<message>
- <location line="+14"/>
<source>Clip</source>
<translation>Beschneiden</translation>
</message>
<message>
- <location line="+11"/>
<source>Opacity</source>
<translation>Deckkraft</translation>
</message>
@@ -21130,7 +17477,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Utils::LinearProgressWidget</name>
<message>
- <location filename="../../../src/libs/utils/wizard.cpp" line="+126"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -21138,12 +17484,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>CodePaster::PasteView</name>
<message>
- <location filename="../../../src/plugins/cpaster/pasteview.cpp" line="+53"/>
<source><Comment></source>
<translation><Kommentar></translation>
</message>
<message>
- <location line="+5"/>
<source>Paste</source>
<translation>Einfügen</translation>
</message>
@@ -21151,12 +17495,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Designer::Internal::FormEditorFactory</name>
<message>
- <location filename="../../../src/plugins/designer/formeditorfactory.cpp" line="+93"/>
<source>This file can only be edited in <b>Design</b> mode.</source>
<translation>Datei kann nur im <b>Designmodus</b> bearbeitet werden.</translation>
</message>
<message>
- <location line="+1"/>
<source>Switch mode</source>
<translation>Modus umschalten</translation>
</message>
@@ -21164,28 +17506,22 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Help::Internal::HelpViewer</name>
<message>
- <location filename="../../../src/plugins/help/helpviewer_qtb.cpp" line="+343"/>
<source>Open Link</source>
<translation>Verweis öffnen</translation>
</message>
<message>
- <location line="+1"/>
- <location filename="../../../src/plugins/help/helpviewer_qwv.cpp" line="+244"/>
<source>Open Link as New Page</source>
<translation>Verweis in neuer Seite öffnen</translation>
</message>
<message>
- <location line="+3"/>
<source>Copy Link</source>
<translation>Verweis kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Reload</source>
<translation>Neu laden</translation>
</message>
@@ -21193,7 +17529,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Help::Internal::OpenPagesModel</name>
<message>
- <location filename="../../../src/plugins/help/openpagesmodel.cpp" line="+64"/>
<source>(Untitled)</source>
<translation>(Ohne Titel)</translation>
</message>
@@ -21201,12 +17536,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Help::Internal::OpenPagesWidget</name>
<message>
- <location filename="../../../src/plugins/help/openpageswidget.cpp" line="+150"/>
<source>Close %1</source>
<translation>Schließe %1</translation>
</message>
<message>
- <location line="+2"/>
<source>Close All Except %1</source>
<translation>Alle außer %1 schließen</translation>
</message>
@@ -21214,139 +17547,112 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Internal::TargetSetupPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.ui"/>
<source>Qt Creator can set up the following targets:</source>
<translation>Qt Creator kann die folgenden Ziele einrichten:</translation>
</message>
<message>
- <location/>
<source>Qt Version</source>
<translation>Qt-Version</translation>
</message>
<message>
- <location/>
<source>Status</source>
<translation>Status</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="+316"/>
<source>Qt Creator can set up the following targets for<br>project <b>%1</b>:</source>
<comment>%1: Project name</comment>
<translation>Qt Creator kann für das Projekt<br><b>%1</b><br>die folgenden Ziele anlegen:</translation>
</message>
<message>
- <location line="+119"/>
<source>Choose a directory to scan for additional shadow builds</source>
<translation>Zusätzliche Shadow-Builds</translation>
</message>
<message>
- <location line="+13"/>
<source>No builds found</source>
<translation>Keine Builds gefunden</translation>
</message>
<message>
- <location line="+1"/>
<source>No builds for project file "%1" were found in the folder "%2".</source>
<comment>%1: pro-file, %2: directory that was checked.</comment>
<translation>Im Ordner "%2" konnten keine Builds des Projekts "%1" gefunden werden.</translation>
</message>
<message>
- <location line="+29"/>
<source>Check All</source>
<translation>Alle markieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Check all Qt versions</source>
<translation>Alle Qt-Versionen markieren</translation>
</message>
<message>
- <location line="+47"/>
<source>Check only this version</source>
<translation>Nur diese Qt-Version markieren</translation>
</message>
<message>
- <location line="+5"/>
<source>Check all versions</source>
<translation>Alle Qt-Versionen markieren</translation>
</message>
<message>
- <location line="+4"/>
<source>Uncheck all versions</source>
<translation>Alle Markierungen von Qt-Versionen entfernen</translation>
</message>
<message>
- <location line="+39"/>
<source><b>Error:</b> </source>
<comment>Severity is Task::Error</comment>
<translation><b>Fehler:</b> </translation>
</message>
<message>
- <location line="+4"/>
<source><b>Warning:</b> </source>
<comment>Severity is Task::Warning</comment>
<translation><b>Warnung:</b> </translation>
</message>
<message>
- <location line="+26"/>
<source>debug and release</source>
<extracomment>We are going to build debug and release</extracomment>
<translation>debug and release</translation>
</message>
<message>
- <location line="+4"/>
<source>debug</source>
<extracomment>Debug build</extracomment>
<translation>debug</translation>
</message>
<message>
- <location line="+3"/>
<source>release</source>
<extracomment>release build</extracomment>
<translation>release</translation>
</message>
<message>
- <location line="+5"/>
<source><br>using %1 (%2)</source>
<extracomment>%1: qmake used (incl. full path), %2: "debug", "release" or "debug and release"</extracomment>
<translation><br>unter Verwendung von %1 (%2)</translation>
</message>
<message>
- <location line="+16"/>
<source>Import</source>
<extracomment>Is this an import of an existing build or a new one?</extracomment>
<translation>Import</translation>
</message>
<message>
- <location line="+2"/>
<source>New</source>
<extracomment>Is this an import of an existing build or a new one?</extracomment>
<translation>Neu</translation>
</message>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.ui"/>
<source>Setup targets for your project</source>
<translation>Ziele des Projekts einrichten</translation>
</message>
<message>
- <location/>
<source>Build Directory</source>
<translation>Build-Ordner</translation>
</message>
<message>
- <location/>
<source>Import Existing Shadow Build...</source>
<translation>Importiere existierenden Shadow-Build...</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="-155"/>
<source>Uncheck all Qt versions</source>
<translation>Alle Markierungen von Qt-Versionen entfernen</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="-2"/>
<source>Uncheck All</source>
<translation>Alle Markierungen entfernen</translation>
</message>
@@ -21354,48 +17660,38 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>QmlJSEditor::Internal::QmlJSEditorFactory</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljseditorfactory.cpp" line="+154"/>
<source>Qt Creator -> About Plugins...</source>
<translation>Qt Creator ->Plugins...</translation>
</message>
<message>
- <location line="+2"/>
<source>Help -> About Plugins...</source>
<translation>Hilfe -> Plugins...</translation>
</message>
<message>
- <location line="-15"/>
<source>Do you want to enable the experimental Qt Quick Designer?</source>
<translation>Möchten Sie den experimentellen Qt Quick-Designer aktivieren?</translation>
</message>
<message>
- <location line="+1"/>
- <location line="+23"/>
<source>Enable Qt Quick Designer</source>
<translation>Qt Quick-Designer aktivieren</translation>
</message>
<message>
- <location line="-6"/>
<source>Enable experimental Qt Quick Designer?</source>
<translation>Möchten Sie den experimentellen Qt Quick-Designer aktivieren?</translation>
</message>
<message>
- <location line="+1"/>
<source>Do you want to enable the experimental Qt Quick Designer? After enabling it, you can access the visual design capabilities by switching to Design Mode. This can affect the overall stability of Qt Creator. To disable Qt Quick Designer again, visit the menu '%1' and disable 'QmlDesigner'.</source>
<translation>Möchten Sie den experimentellen Qt Quick-Designer aktivieren? Dadurch bekommen Sie Zugriff auf die grafische Designfunktion, wenn Sie in den Designmodus schalten. Dies kann allerdings die Stabilität von Qt Creator beeinträchtigen. Um den Qt-Quick-Designer wieder zu deaktivieren, wählen Sie '%1' und deaktivieren 'QmlDesigner' in dem gezeigten Fenster.</translation>
</message>
<message>
- <location line="+6"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location line="+8"/>
<source>Please restart Qt Creator</source>
<translation>Bitte starten Sie Qt Creator neu</translation>
</message>
<message>
- <location line="+1"/>
<source>Please restart Qt Creator to make the change effective.</source>
<translation>Bitte starten Sie Qt Creator neu, damit die Änderungen wirksam werden.</translation>
</message>
@@ -21403,7 +17699,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Utils::FileWizardDialog</name>
<message>
- <location filename="../../../src/libs/utils/filewizarddialog.cpp" line="+45"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
@@ -21411,7 +17706,6 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Designer::Internal::FormFileWizardDialog</name>
<message>
- <location filename="../../../src/plugins/designer/formwizarddialog.cpp" line="+27"/>
<source>Location</source>
<translation>Pfad</translation>
</message>
@@ -21419,94 +17713,84 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>ProjectExplorer::CustomWizard</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/customwizard/customwizard.cpp" line="-437"/>
<source>Details</source>
<comment>Default short title for custom wizard page to be shown in the progress pane of the wizard.</comment>
<translation>Details</translation>
</message>
<message>
- <location filename="customwizard_tr.h" line="+1"/>
<source>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</source>
<translation>Erstellt ein C++-Plugin für Erweiterungen, die dynamisch von Anwendungen geladen werden können, die die Klasse QDeclarativeEngine verwenden.</translation>
</message>
<message>
- <location line="+1"/>
<source>Custom QML Extension Plugin</source>
<translation>Plugin zur Erweiterung von QML</translation>
</message>
<message>
- <location line="+1"/>
<source>QML Extension Plugin</source>
<translation>Plugin zur Erweiterung von QML</translation>
</message>
<message>
- <location line="+1"/>
<source>Custom QML Extension Plugin Parameters</source>
<oldsource>QML Runtime Plug-in Parameters</oldsource>
<translation>Parameter des Plugins zur Erweiterung von QML</translation>
</message>
<message>
- <location line="+1"/>
<source>Example Object Class-name:</source>
- <translation>Klassenname des Beispiel-Objekts:</translation>
+ <translation type="obsolete">Klassenname des Beispiel-Objekts:</translation>
+ </message>
+ <message>
+ <source>Object Class-name:</source>
+ <translation>Klassenname des Objektes:</translation>
+ </message>
+ <message>
+ <source>The project name and the object class-name cannot be the same.</source>
+ <translation>Der Projektname und der Klassenname des Objektes müssen sich unterscheiden.</translation>
</message>
<message>
- <location line="+1"/>
<source>Creates a custom Qt Creator plugin.</source>
<translation>Erzeugt ein benutzerdefiniertes Qt Creator-Plugin.</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Creator plugin</source>
<translation>Qt Creator-Plugin</translation>
</message>
<message>
- <location line="+1"/>
<source>Other Project</source>
<translation>Anderes Projekt</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin Information</source>
<translation>Plugin-Information:</translation>
</message>
<message>
- <location line="+1"/>
<source>Plugin name:</source>
<translation>Name des Plugins:</translation>
</message>
<message>
- <location line="+1"/>
<source>Vendor name:</source>
<translation>Anbieter:</translation>
</message>
<message>
- <location line="+1"/>
<source>Copyright:</source>
<translation>Copyright:</translation>
</message>
<message>
- <location line="+1"/>
<source>License:</source>
<translation>Lizenz:</translation>
</message>
<message>
- <location line="+1"/>
<source>Description:</source>
<translation>Beschreibung:</translation>
</message>
<message>
- <location line="+1"/>
<source>Url:</source>
<translation>Url:</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Creator sources:</source>
<translation>Qt Creator-Quelldateien:</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Creator build:</source>
<translation>Qt Creator-Build-Ordner:</translation>
</message>
@@ -21514,13 +17798,10 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>Qt4ProjectManager::Internal::BaseQt4ProjectWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qtwizard.cpp" line="+225"/>
- <location line="+4"/>
<source>Modules</source>
<translation>Module</translation>
</message>
<message>
- <location line="+27"/>
<source>Qt Versions</source>
<translation>Qt-Versionen</translation>
</message>
@@ -21528,57 +17809,46 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>MaemoSshConfigDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.ui"/>
<source>SSH Key Configuration</source>
<translation>Konfiguration der SSH-Schlüssel</translation>
</message>
<message>
- <location/>
<source>Options</source>
<translation>Einstellungen</translation>
</message>
<message>
- <location/>
<source>Key size:</source>
<translation>Größe des Schlüssels:</translation>
</message>
<message>
- <location/>
<source>Key algorithm:</source>
<translation>Algorithmus für Schlüssel:</translation>
</message>
<message>
- <location/>
<source>RSA</source>
<translation>RSA</translation>
</message>
<message>
- <location/>
<source>DSA</source>
<translation>DSA</translation>
</message>
<message>
- <location/>
<source>Key</source>
<translation>Schlüssel</translation>
</message>
<message>
- <location/>
<source>Generate SSH Key</source>
<translation>SSH-Schlüssel erzeugen</translation>
</message>
<message>
- <location/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location/>
<source>Save Public Key...</source>
<translation>Öffentlichen Schlüssel speichern...</translation>
</message>
<message>
- <location/>
<source>Save Private Key...</source>
<translation>Privaten Schlüssel speichern...</translation>
</message>
@@ -21586,56 +17856,46 @@ Haben Sie Qemu gestartet?</translation>
<context>
<name>CommonSettingsPage</name>
<message>
- <location filename="../../../src/plugins/vcsbase/commonsettingspage.ui"/>
<source>Wrap submit message at:</source>
<translation>Beschreibung umbrechen bei:</translation>
</message>
<message>
- <location/>
<source> characters</source>
<translation> Zeichen</translation>
</message>
<message>
- <location/>
<source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
<translation>Eine ausführbare Datei, die mit der Beschreibung in einer temporären Datei als erstem Kommandozeilenparameter aufgerufen wird. Bei Fehlschlag sollte sie einen Rückgabewert ungleich Null mit einer entsprechende Nachricht auf der Fehlerausgabe zurückgeben.</translation>
</message>
<message>
- <location/>
<source>Submit message check script:</source>
<translation>Skript zur Überprüfung der Beschreibung:</translation>
</message>
<message>
- <location/>
<source>A file listing user names and email addresses in a 4-column mailmap format:
name <email> alias <email></source>
<translation>Eine Datei, die Nutzernamen und E-Mail-Adressen in einem vierspaltigen Format (mailmap) enthält:
Namen <E-Mail> Alias <E-Mail?</translation>
</message>
<message>
- <location/>
<source>User/alias configuration file:</source>
<translation>Nutzer/Alias-Konfigurationsdatei:</translation>
</message>
<message>
- <location/>
<source>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</source>
<translation>Eine Datei, die Zeilen mit Feldnamen (zum Beispiel "Reviewed-By:") enthält, die im Abgabefenster unter der Beschreibung erscheinen.</translation>
</message>
<message>
- <location/>
<source>User fields configuration file:</source>
<translation>Nutzerfeld-Konfigurationsdatei:</translation>
</message>
<message>
- <location/>
<source>Specifies a command that is executed to graphically prompt for a password,
should a repository require SSH-authentication (see documentation on SSH and the environment variable SSH_ASKPASS).</source>
<translation>Kommando zur graphischen Passwortabfrage bei SSH-Authorisierung eines Repositories
(siehe SSH-Dokumentation zur Umgebungsvariable SSH-ASKPASS).</translation>
</message>
<message>
- <location/>
<source>SSH prompt command:</source>
<translation>Graphische Passwortabfrage:</translation>
</message>
@@ -21643,37 +17903,30 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>BorderImageSpecifics</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml" line="+17"/>
<source>Image</source>
<translation>Bild</translation>
</message>
<message>
- <location line="+7"/>
<source>Source</source>
<translation>Bildquelle</translation>
</message>
<message>
- <location line="+20"/>
<source>Source Size</source>
<translation>Größe der Bildquelle</translation>
</message>
<message>
- <location line="+35"/>
<source>Left</source>
<translation>Links</translation>
</message>
<message>
- <location line="+10"/>
<source>Right</source>
<translation>Rechts</translation>
</message>
<message>
- <location line="+10"/>
<source>Top</source>
<translation>Oben</translation>
</message>
<message>
- <location line="+10"/>
<source>Bottom</source>
<translation>Unten</translation>
</message>
@@ -21681,28 +17934,22 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Extended</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Extended.qml" line="+5"/>
<source>Effect</source>
<translation>Effekt</translation>
</message>
<message>
- <location line="+71"/>
- <location line="+70"/>
<source>Blur Radius:</source>
<translation>Unschärferadius:</translation>
</message>
<message>
- <location line="-18"/>
<source>Pixel Size:</source>
<translation>Pixel-Größe:</translation>
</message>
<message>
- <location line="+41"/>
<source>x Offset: </source>
<translation>x-Versatz: </translation>
</message>
<message>
- <location line="+11"/>
<source>y Offset: </source>
<translation>y-Versatz: </translation>
</message>
@@ -21710,17 +17957,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Modifiers</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/Modifiers.qml" line="+6"/>
<source>Manipulation</source>
<translation>Manipulation</translation>
</message>
<message>
- <location line="+118"/>
<source>Rotation</source>
<translation>Drehung</translation>
</message>
<message>
- <location line="+9"/>
<source>z</source>
<translation>z</translation>
</message>
@@ -21728,17 +17972,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>WebViewSpecifics</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml" line="+18"/>
<source>WebView</source>
<translation>WebView</translation>
</message>
<message>
- <location line="+21"/>
<source>Preferred Width</source>
<translation>Bevorzugte Breite</translation>
</message>
<message>
- <location line="+10"/>
<source>Page Height</source>
<translation>Seitenhöhe</translation>
</message>
@@ -21746,7 +17987,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>CppEditor</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppeditorconstants.h" line="+29"/>
<source>C++</source>
<translation>C++</translation>
</message>
@@ -21754,27 +17994,22 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Debugger::Internal::GdbChooserWidget</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/gdbchooserwidget.cpp" line="+106"/>
<source>Unable to run '%1': %2</source>
<translation>'%1' kann nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+43"/>
<source>Binary</source>
<translation>Ausführbare Datei</translation>
</message>
<message>
- <location line="+0"/>
<source>Toolchains</source>
<translation>Toolchains</translation>
</message>
<message>
- <location line="+186"/>
<source>Duplicate binary</source>
<translation>Ausführbare Datei bereits vorhanden</translation>
</message>
<message>
- <location line="+1"/>
<source>The binary '%1' already exists.</source>
<translation>Die ausführbare Datei '%1' ist bereits vorhanden.</translation>
</message>
@@ -21782,17 +18017,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Debugger::Internal::ToolChainSelectorWidget</name>
<message>
- <location line="+83"/>
<source>Desktop/General</source>
<translation>Desktop/Allgemein</translation>
</message>
<message>
- <location line="+1"/>
<source>Symbian</source>
<translation>Symbian</translation>
</message>
<message>
- <location line="+1"/>
<source>Maemo</source>
<translation>Maemo</translation>
</message>
@@ -21800,17 +18032,14 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Debugger::Internal::BinaryToolChainDialog</name>
<message>
- <location line="+101"/>
<source>Select binary and toolchains</source>
<translation>Wählen Sie ausführbare Datei und Toolchain</translation>
</message>
<message>
- <location line="+3"/>
<source>Gdb binary</source>
<translation>Ausführbare Datei für Gdb</translation>
</message>
<message>
- <location line="+2"/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
@@ -21818,15 +18047,13 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>QApplication</name>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/main.cpp" line="+88"/>
<source>Qt QML Viewer</source>
- <translation>Qt QML-Betrachter</translation>
+ <translation type="obsolete">Qt QML-Betrachter</translation>
</message>
</context>
<context>
<name>QmlDesigner::ComponentView</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/integration/componentview.cpp" line="+75"/>
<source>whole document</source>
<translation>gesamtes Dokument</translation>
</message>
@@ -21834,7 +18061,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>FileWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp" line="+103"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
@@ -21842,7 +18068,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>QmlDesigner::Internal::ModelPrivate</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/model/model.cpp" line="+173"/>
<source>invalid type</source>
<translation>ungültiger Typ</translation>
</message>
@@ -21850,8 +18075,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Qt Quick</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/settingspage.cpp" line="+10"/>
- <location filename="../../../src/plugins/qmljseditor/quicktoolbarsettingspage.cpp" line="+145"/>
<source>Qt Quick</source>
<translation>Qt Quick</translation>
</message>
@@ -21859,85 +18082,66 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>Qt4ProjectManager::Internal::MaemoPackageCreationStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp" line="+157"/>
<source>Creating package file ...</source>
<translation>Erzeuge Paketdatei...</translation>
</message>
<message>
- <location line="+294"/>
<source>Cannot open MADDE config file '%1'.</source>
<translation>Die MADDE-Konfigurationsdatei '%1' kann nicht geöffnet werden.</translation>
</message>
<message>
- <location line="-246"/>
<source>Package created.</source>
<translation>Paketdatei erzeugt.</translation>
</message>
<message>
- <location line="+75"/>
<source>Package Creation: Running command '%1'.</source>
<translation>Paketerstellung: Führe Kommando '%1' aus.</translation>
</message>
<message>
- <location line="-96"/>
- <location line="+14"/>
- <location line="+21"/>
- <location line="+64"/>
<source>Packaging failed.</source>
<translation>Die Paketerstellung schlug fehl.</translation>
</message>
<message>
- <location line="-183"/>
<source>Packaging for Maemo</source>
<translation>Paketerstellung für Maemo</translation>
</message>
<message>
- <location line="+53"/>
<source>Package up to date.</source>
<translation>Paket ist auf aktuellem Stand.</translation>
</message>
<message>
- <location line="+46"/>
<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>
- <location line="+21"/>
<source>Could not remove directory '%1'.</source>
<translation>Der Ordner %1 konnte nicht entfernt werden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Could not create Debian directory '%1'.</source>
<translation>Der Debian-Ordner %1 konnte nicht angelegt werden.</translation>
</message>
<message>
- <location line="+16"/>
<source>Could not copy file '%1' to '%2'</source>
<translation>Die Datei '%1' konnte nicht nach '%2' kopiert werden</translation>
</message>
<message>
- <location line="+43"/>
<source>Packaging error: Could not start command '%1'. Reason: %2</source>
<translation>Fehler bei Paketerstellung: Das Kommando '%1' konnte nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+7"/>
<source>Packaging Error: Command '%1' failed.</source>
<translation>Fehler bei Paketerstellung: Das Kommando '%1' schlug fehl.</translation>
</message>
<message>
- <location line="+3"/>
<source> Reason: %1</source>
<translation>Ursache: %1</translation>
</message>
<message>
- <location line="+2"/>
<source>Exit code: %1</source>
<translation>Rückgabewert: %1</translation>
</message>
<message>
- <location line="+213"/>
<source>Your project name contains characters not allowed in Debian packages.
They must only use lower-case letters, numbers, '-', '+' and '.'.
We will try to work around that, but you may experience problems.</source>
@@ -21949,42 +18153,34 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Qt4ProjectManager::Internal::MaemoPackageCreationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp" line="+124"/>
<source>No Version Available.</source>
<translation>Keine Version verfügbar.</translation>
</message>
<message>
- <location line="+19"/>
<source>Could not read icon</source>
<translation>Die Icon-Datei konnte nicht gelesen werden</translation>
</message>
<message>
- <location line="+7"/>
<source>Images</source>
<translation>Bilddateien</translation>
</message>
<message>
- <location line="+6"/>
<source>Choose Image</source>
<translation>Bilddatei auswählen</translation>
</message>
<message>
- <location line="+5"/>
<source>Could Not Set New Icon</source>
<translation>Icon nicht verwendbar</translation>
</message>
<message>
- <location line="+46"/>
<source>Could Not Set Version Number</source>
<translation>Versionsnummer konnte nicht gesetzt werden</translation>
</message>
<message>
- <location line="-30"/>
<source><b>Create Package:</b> </source>
<translation><b>Erzeuge Paketdatei:</b> </translation>
</message>
<message>
- <location line="+3"/>
<source>(Packaging disabled)</source>
<translation>(Paketerstellung deaktiviert)</translation>
</message>
@@ -21992,22 +18188,18 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Qt4ProjectManager::Internal::MaemoSshConfigDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshconfigdialog.cpp" line="+124"/>
<source>Save Public Key File</source>
<translation>Öffentlichen Schlüssel speichern</translation>
</message>
<message>
- <location line="+0"/>
<source>Save Private Key File</source>
<translation>Privaten Schlüssel speichern</translation>
</message>
<message>
- <location line="+13"/>
<source>Error writing file</source>
<translation>Fehler beim Schreiben der Datei</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not write file '%1':
%2</source>
<translation>Die Datei '%1' konnte nicht geschrieben werden:
@@ -22017,22 +18209,18 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Qt4ProjectManager::Internal::S60DevicesBaseWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp" line="-277"/>
<source>Default</source>
<translation>Vorgabe</translation>
</message>
<message>
- <location line="+1"/>
<source>SDK Location</source>
<translation>SDK-Pfad</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt Location</source>
<translation>Qt-Pfad</translation>
</message>
<message>
- <location line="+157"/>
<source>Choose Qt folder</source>
<translation>Qt-Ordner</translation>
</message>
@@ -22040,7 +18228,6 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Qt4ProjectManager::Internal::S60DevicesModel</name>
<message>
- <location line="-122"/>
<source>No Qt installed</source>
<translation>Qt ist nicht installiert</translation>
</message>
@@ -22048,22 +18235,18 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Qt4ProjectManager::Internal::GnuPocS60DevicesWidget</name>
<message>
- <location line="+198"/>
<source>Step 1 of 2: Choose GnuPoc folder</source>
<translation>Schritt 1 von 2: GnuPoc-Ordner wählen</translation>
</message>
<message>
- <location line="+6"/>
<source>Step 2 of 2: Choose Qt folder</source>
<translation>Schritt 2 von 2: Qt-Ordner wählen</translation>
</message>
<message>
- <location line="+4"/>
<source>Adding GnuPoc</source>
<translation>GnuPoc hinzufügen</translation>
</message>
<message>
- <location line="+1"/>
<source>GnuPoc and Qt folders must not be identical.</source>
<translation>GnuPoc-Ordner und Qt-Ordner müssen sich unterscheiden.</translation>
</message>
@@ -22071,27 +18254,22 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>CodePaster::FileShareProtocolSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/cpaster/fileshareprotocolsettingswidget.ui"/>
<source>Form</source>
<translation>Formular</translation>
</message>
<message>
- <location/>
<source>&Path:</source>
<translation>&Pfad:</translation>
</message>
<message>
- <location/>
<source>&Display:</source>
<translation>&Anzeige:</translation>
</message>
<message>
- <location/>
<source>entries</source>
<translation>Einträge</translation>
</message>
<message>
- <location/>
<source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
<translation>Das dateibasierte Paster-Protokoll dient zum Austausch von Textauschnitten mittels einfacher Dateien auf einem Netzlaufwerk. Die Dateien werden nicht gelöscht.</translation>
</message>
@@ -22099,47 +18277,38 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>MaemoPackageCreationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.ui"/>
<source>Check this if you want the files below to be deployed directly.</source>
<translation>Startet das Deployment der Dateien unmittelbar.</translation>
</message>
<message>
- <location/>
<source>Skip packaging step</source>
<translation>Paketerstellung überspringen</translation>
</message>
<message>
- <location/>
<source>Major:</source>
<translation>Major:</translation>
</message>
<message>
- <location/>
<source>Minor:</source>
<translation>Minor:</translation>
</message>
<message>
- <location/>
<source>Patch:</source>
<translation>Patch:</translation>
</message>
<message>
- <location/>
<source><b>Version number:</b></source>
<translation><b>Versionsnummer:</b></translation>
</message>
<message>
- <location/>
<source><b>Adapt Debian file:</b></source>
<translation><b>Passe Debian-Datei an:</b></translation>
</message>
<message>
- <location/>
<source>Edit</source>
<translation>Bearbeiten</translation>
</message>
<message>
- <location/>
<source><b>Package Manager Icon:</b></source>
<translation><b>Paketverwaltungs-Icon:</b></translation>
</message>
@@ -22147,12 +18316,10 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Utils::FancyMainWindow</name>
<message>
- <location filename="../../../src/libs/utils/fancymainwindow.cpp" line="+65"/>
<source>Locked</source>
<translation>Verankert</translation>
</message>
<message>
- <location line="+2"/>
<source>Reset to Default Layout</source>
<translation>Vorgabe wiederherstellen</translation>
</message>
@@ -22160,7 +18327,6 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>SshKeyGenerator</name>
<message>
- <location filename="../../../src/plugins/coreplugin/ssh/sshkeygenerator.cpp" line="+68"/>
<source>Error generating key: %1</source>
<translation>Es konnte kein Schlüssel erstellt werden: %1</translation>
</message>
@@ -22168,32 +18334,26 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>CodePaster::FileShareProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/fileshareprotocol.cpp" line="+104"/>
<source>Cannot open %1: %2</source>
<translation>Die Datei %1 kann nicht geöffnet werden: %2</translation>
</message>
<message>
- <location line="+9"/>
<source>%1 does not appear to be a paster file.</source>
<translation>Die Datei %1 ist keine Paster-Datei.</translation>
</message>
<message>
- <location line="+15"/>
<source>Error in %1 at %2: %3</source>
<translation>Fehler in %1 bei %2: %3</translation>
</message>
<message>
- <location line="+11"/>
<source>Please configure a path.</source>
<translation>Bitte geben Sie einen Pfad an.</translation>
</message>
<message>
- <location line="+59"/>
<source>Unable to open a file for writing in %1: %2</source>
<translation>Im Ordner %1 konnte keine Datei zum Schreiben geöffnet werden: %2</translation>
</message>
<message>
- <location line="+17"/>
<source>Pasted: %1</source>
<translation>Ausschnitt: %1</translation>
</message>
@@ -22201,7 +18361,6 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>CodePaster::FileShareProtocolSettingsPage</name>
<message>
- <location filename="../../../src/plugins/cpaster/fileshareprotocolsettingspage.cpp" line="+110"/>
<source>Fileshare</source>
<translation>Dateibasiert</translation>
</message>
@@ -22209,12 +18368,10 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>CodePaster::Protocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/protocol.cpp" line="+148"/>
<source>%1 - Configuration Error</source>
<translation>%1 - Konfigurationsfehler</translation>
</message>
<message>
- <location line="+4"/>
<source>Settings...</source>
<translation>Einstellungen...</translation>
</message>
@@ -22222,7 +18379,6 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>ProjectExplorer::Internal::SessionNameInputDialog</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="-150"/>
<source>Enter the name of the session:</source>
<translation>Geben Sie den Namen der Sitzung an:</translation>
</message>
@@ -22230,12 +18386,10 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>QmlJSEditor::Internal::QmlJSPreviewRunner</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljspreviewrunner.cpp" line="+73"/>
<source>Failed to preview Qt Quick file</source>
<translation>Die Qt Quick-Datei konnte nicht angezeigt werden</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not preview Qt Quick (QML) file. Reason:
%1</source>
<translation>Die Qt Quick-Datei (QML) konnte nicht angezeigt werden:
@@ -22245,42 +18399,34 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>TextEditor::Internal::TextEditorPlugin</name>
<message>
- <location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+96"/>
<source>Creates a text file. The default file extension is <tt>.txt</tt>. You can specify a different extension as part of the filename.</source>
<translation>Erstellt eine Textdatei mit der Erweiterung <tt>.txt</tt>. Sie können eine andere Erweiterung als Teil des Dateinamens angeben.</translation>
</message>
<message>
- <location line="+2"/>
<source>Text File</source>
<translation>Textdatei</translation>
</message>
<message>
- <location line="+2"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location line="+23"/>
<source>Triggers a completion in this scope</source>
<translation>Beginnt eine Ergänzung in diesem Bereich</translation>
</message>
<message>
- <location line="+5"/>
<source>Ctrl+Space</source>
<translation>Ctrl+Space</translation>
</message>
<message>
- <location line="+2"/>
<source>Meta+Space</source>
<translation>Meta+Space</translation>
</message>
<message>
- <location line="+6"/>
<source>Triggers a quick fix in this scope</source>
<translation>Führt eine Schnellkorrektur im Bereich durch</translation>
</message>
<message>
- <location line="+4"/>
<source>Alt+Return</source>
<translation>Alt+Return</translation>
</message>
@@ -22288,22 +18434,18 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>ProjectExplorer::Internal::S60ProjectChecker</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp" line="+53"/>
<source>The Symbian SDK and the project sources must reside on the same drive.</source>
<translation>Das Symbian-SDK und das Projekt müssen sich auf demselben Laufwerk befinden.</translation>
</message>
<message>
- <location line="+8"/>
<source>The Symbian SDK was not found for Qt version %1.</source>
<translation>Es konnte kein Symbian-SDK für die Qt-Version %1 gefunden werden.</translation>
</message>
<message>
- <location line="+6"/>
<source>The "Open C/C++ plugin" is not installed in the Symbian SDK or the Symbian SDK path is misconfigured for Qt version %1.</source>
<translation>Das Plugin "Open C/C++" ist im Symbian SDK nicht installiert oder der Pfad des Symbian SDKs ist bei der Qt-Version %1 falsch konfiguriert.</translation>
</message>
<message>
- <location line="+12"/>
<source>The Symbian toolchain does not handle special characters in a project path well.</source>
<translation>Sonderzeichen in der Pfadangabe können bei der Symbian-Toolchain zu Problemen führen.</translation>
</message>
@@ -22311,97 +18453,87 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>Qt4ProjectManager::QtVersion</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="-1065"/>
<source>The Qt version is invalid: %1</source>
<extracomment>%1: Reason for being invalid</extracomment>
<translation>Ungültige Qt-Version: %1</translation>
</message>
<message>
- <location line="+9"/>
<source>The qmake command "%1" was not found or is not executable.</source>
<extracomment>%1: Path to qmake executable</extracomment>
<translation>Das qmake-Kommando "%1" konnte nicht gefunden werden, oder die Datei ist nicht ausführbar.</translation>
</message>
<message>
- <location line="+11"/>
<source>Qmake does not support build directories below the source directory.</source>
<translation>qmake unterstützt keine Build-Vorgänge in Verzeichnissen, die sich unterhalb des Quellverzeichnisses befinden.</translation>
</message>
<message>
- <location line="+5"/>
<source>The build directory needs to be at the same level as the source directory.</source>
<translation>Das Build-Verzeichnis muss sich auf Ebene des Quellverzeichnisses befinden.</translation>
</message>
+ <message>
+ <source>Cannot build QMLObserver; Qt version must be 4.7.1 or higher.</source>
+ <translation>Der QML-Beobachter kann nicht erstellt werden, da er Qt-Version 4.7.1 oder höher erfordert.</translation>
+ </message>
+ <message>
+ <source>Cannot build qmldump; Qt version must be 4.7.1 or higher.</source>
+ <translation>qmldump kann nicht erstellt werden, da es Qt-Version 4.7.1 oder höher erfordert.</translation>
+ </message>
</context>
<context>
<name>Debugger::Internal::PdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/pdb/pdbengine.cpp" line="+211"/>
<source>Running requested...</source>
<translation>Fortsetzung angefordert...</translation>
</message>
<message>
- <location line="-33"/>
<source>Unable to start pdb '%1': %2</source>
<translation>Der pdb-Debugger '%1' kann nicht ausgeführt werden: %2</translation>
</message>
<message>
- <location line="+5"/>
<source>Adapter start failed</source>
<translation>Der Start des Adapters schlug fehl</translation>
</message>
<message>
- <location line="+16"/>
<source>Python Error</source>
<translation>Python-Fehler</translation>
</message>
<message>
- <location line="+302"/>
<source>'%1' contains no identifier</source>
<translation>'%1' enthält keinen Bezeichner</translation>
</message>
<message>
- <location line="+5"/>
<source>String literal %1</source>
<translation>Zeichenketten-Literal %1</translation>
</message>
<message>
- <location line="+15"/>
<source>Cowardly refusing to evaluate expression '%1' with potential side effects</source>
<translation>Werte Ausdruck '%1' mit potentiellen Seiteneffekten nicht aus</translation>
</message>
<message>
- <location line="+58"/>
<source>Pdb I/O Error</source>
<translation>Pdb Eingabe/Ausgabefehler</translation>
</message>
<message>
- <location line="+10"/>
<source>The Pdb process failed to start. Either the invoked program '%1' is missing, or you may have insufficient permissions to invoke the program.</source>
<translation>Der Start des Pdb-Prozesses schlug fehl. Entweder fehlt die ausführbare Datei '%1' oder die Berechtigungen sind nicht ausreichend.</translation>
</message>
<message>
- <location line="+5"/>
<source>The Pdb process crashed some time after starting successfully.</source>
<translation>Der Pdb-Prozess ist einige Zeit nach dem Start abgestürzt.</translation>
</message>
<message>
- <location line="+3"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
<translation>Zeitüberschreitung bei der letzten waitFor...()-Funktion. Der Status des QProcess ist unverändert, und waitFor...() kann noch einmal gerufen.</translation>
</message>
<message>
- <location line="+4"/>
<source>An error occurred when attempting to write to the Pdb process. For example, the process may not be running, or it may have closed its input channel.</source>
<translation>Ein Fehler trat beim Versuch des Schreibens zum Pdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
</message>
<message>
- <location line="+4"/>
<source>An error occurred when attempting to read from the Pdb process. For example, the process may not be running.</source>
<translation>Ein Fehler trat beim Versuch des Lesens vom Pdb-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
- <location line="+3"/>
<source>An unknown error in the Pdb process occurred. </source>
<translation>Im Pdb-Prozess trat ein unbekannter Fehler auf.</translation>
</message>
@@ -22409,12 +18541,10 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>ProjectExplorer::Internal::TargetSelector</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/targetselector.h" line="+28"/>
<source>Run</source>
<translation>Ausführung</translation>
</message>
<message>
- <location line="+1"/>
<source>Build</source>
<translation>Erstellung</translation>
</message>
@@ -22422,15 +18552,17 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>QmlDesigner::PropertyEditor</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp" line="+357"/>
<source>Invalid Id</source>
<translation>Ungültige Id</translation>
</message>
+ <message>
+ <source>%1 is an invalid id</source>
+ <translation>%1 ist keine gültige Id</translation>
+ </message>
</context>
<context>
<name>emptyPane</name>
<message>
- <location filename="../qmldesigner/propertyeditor/Qt/emptyPane.qml" line="+38"/>
<source>none or multiple items selected</source>
<translation>keines oder mehrere Elemente ausgewählt</translation>
</message>
@@ -22438,17 +18570,14 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>QmlDesigner::FormEditorWidget</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp" line="+88"/>
<source>Snap to guides (E)</source>
<translation>An Hilfslinien ausrichten (E)</translation>
</message>
<message>
- <location line="+24"/>
<source>Show bounding rectangles (A)</source>
<translation>Rahmen anzeigen (A)</translation>
</message>
<message>
- <location line="+10"/>
<source>Only select items with content (S)</source>
<translation>Nur Elemente mit Inhalt auswählen (S)</translation>
</message>
@@ -22456,19 +18585,16 @@ Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftrete
<context>
<name>InvalidIdException</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/exceptions/invalididexception.cpp" line="+44"/>
<source>Only alphanumeric characters and underscore allowed.
Ids must begin with a lowercase letter.</source>
<translation>Es sind nur alphanumerische Zeichen und Unterstriche zulässig.
Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
</message>
<message>
- <location line="+2"/>
<source>Ids have to be unique.</source>
<translation>Ids müssen eindeutig sein.</translation>
</message>
<message>
- <location line="+22"/>
<source>Invalid Id: %1
%2</source>
<translation>Ungültige Id: %1
@@ -22478,7 +18604,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlDesigner::InvalidArgumentException</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/exceptions/invalidargumentexception.cpp" line="+60"/>
<source>Failed to create item of type %1</source>
<translation>Es konnte kein Element des Typs %1 erzeugt werden</translation>
</message>
@@ -22486,7 +18611,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlDesigner::QmlModelView</name>
<message>
- <location filename="../../../src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp" line="+219"/>
<source>Invalid Id</source>
<translation>Ungültige Id</translation>
</message>
@@ -22494,94 +18618,74 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>CppTools::QuickFix</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppquickfixes.cpp" line="+149"/>
- <location line="+96"/>
<source>Rewrite Using %1</source>
<translation>Unter Verwendung von %1 umschreiben</translation>
</message>
<message>
- <location line="-2"/>
<source>Swap Operands</source>
<translation>Operanden vertauschen</translation>
</message>
<message>
- <location line="+58"/>
<source>Rewrite Condition Using ||</source>
<translation>Bedingung unter Verwendung des ||-Operators umschreiben</translation>
</message>
<message>
- <location line="+124"/>
<source>Split Declaration</source>
<translation>Deklaration aufspalten</translation>
</message>
<message>
- <location line="+83"/>
<source>Add Curly Braces</source>
<translation>Geschweifte Klammern hinzufügen</translation>
</message>
<message>
- <location line="+68"/>
- <location line="+82"/>
<source>Move Declaration out of Condition</source>
<translation>Deklaration aus Bedingung entfernen</translation>
</message>
<message>
- <location line="+112"/>
<source>Split if Statement</source>
<translation>if-Anweisung aufspalten</translation>
</message>
<message>
- <location line="+136"/>
<source>Enclose in QLatin1Char(...)</source>
<translation>In QLatin1Char(...) einschließen</translation>
</message>
<message>
- <location line="+3"/>
<source>Enclose in QLatin1String(...)</source>
<translation>In QLatin1String(...) einschließen</translation>
</message>
<message>
- <location line="+122"/>
<source>Mark as translatable</source>
<translation>Zur Ãœbersetzung vorsehen</translation>
</message>
<message>
- <location line="+82"/>
<source>Convert to Objective-C String Literal</source>
<translation>In Objective-C-Zeichenkettenliteral wandeln</translation>
</message>
<message>
- <location line="+96"/>
<source>Convert to Hexadecimal</source>
<translation>In Hexadezimal wandeln</translation>
</message>
<message>
- <location line="+18"/>
<source>Convert to Octal</source>
<translation>In Oktal wandeln</translation>
</message>
<message>
- <location line="+19"/>
<source>Convert to Decimal</source>
<translation>In Dezimal wandeln</translation>
</message>
<message>
- <location line="+172"/>
<source>Complete Switch Statement</source>
<translation>Switch-Anweisung vervollständigen</translation>
</message>
<message>
- <location line="+77"/>
<source>#include header file</source>
<translation>#include Header-Datei</translation>
</message>
<message>
- <location line="+116"/>
<source>Add local declaration</source>
<translation>Lokale Deklaration hinzufügen</translation>
</message>
<message>
- <location line="+87"/>
<source>Convert to Camel Case ...</source>
<translation>In Camel-Case wandeln...</translation>
</message>
@@ -22589,7 +18693,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>GenericProjectManager::Internal::Manager</name>
<message>
- <location filename="../../../src/plugins/genericprojectmanager/genericprojectmanager.cpp" line="+71"/>
<source>Failed opening project '%1': Project already open</source>
<translation>Das Projekt %1 konnte nicht geöffnet werden da es bereits geladen ist</translation>
</message>
@@ -22597,7 +18700,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlProjectManager::Internal::QmlRunConfiguration</name>
<message>
- <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h" line="+36"/>
<source>QML Viewer</source>
<translation>QML-Betrachter</translation>
</message>
@@ -22605,37 +18707,26 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>ContextPaneTextWidget</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/contextpanetext.ui"/>
<source>Text</source>
<translation>Text</translation>
</message>
<message>
- <location/>
<source>Style</source>
<translation>Stil</translation>
</message>
<message>
- <location/>
- <source>Normal</source>
- <translation></translation>
- </message>
- <message>
- <location/>
<source>Outline</source>
- <translation>Umriss</translation>
+ <translation type="obsolete">Umriss</translation>
</message>
<message>
- <location/>
<source>Raised</source>
- <translation>Hervorgehoben</translation>
+ <translation type="obsolete">Hervorgehoben</translation>
</message>
<message>
- <location/>
<source>Sunken</source>
- <translation>Abgesenkt</translation>
+ <translation type="obsolete">Abgesenkt</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
@@ -22643,7 +18734,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Core::HelpManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/helpmanager.cpp" line="+398"/>
<source>Unfiltered</source>
<translation>Ungefiltert</translation>
</message>
@@ -22651,12 +18741,10 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>FakeVim::Internal::FakeVimHandler::Private</name>
<message>
- <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="-1147"/>
<source> [New] </source>
<translation> [Neu] </translation>
</message>
<message>
- <location line="+187"/>
<source>Not an editor command: %1</source>
<translation>Kein Editor-Kommando: %1</translation>
</message>
@@ -22664,70 +18752,77 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>ContextPaneWidgetBorderImage</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Scale the image to fit to the available area.</source>
- <translation>Bild auf Größe der verfügbaren Fläche skalieren</translation>
+ <translation type="obsolete">Bild auf Größe der verfügbaren Fläche skalieren</translation>
</message>
<message>
- <location/>
<source>Tile the image until there is no more space. May crop the last image.</source>
- <translation>Bild mehrfach nebeneinander anordnen, bis kein Platz mehr vorhanden ist. Das letzte Bild wird unter Umständen beschnitten.</translation>
+ <translation type="obsolete">Bild mehrfach nebeneinander anordnen, bis kein Platz mehr vorhanden ist. Das letzte Bild wird unter Umständen beschnitten.</translation>
</message>
<message>
- <location/>
<source>Like Repeat, but scales the images down to ensure that the last image is not cropped.</source>
- <translation>Wie 'Nebeneinander' mit zusätzlicher Skalierung zur Vermeidung des Beschneidens des letzten Bildes.</translation>
+ <translation type="obsolete">Wie 'Nebeneinander' mit zusätzlicher Skalierung zur Vermeidung des Beschneidens des letzten Bildes.</translation>
</message>
<message>
- <location/>
<source>10 x 10</source>
<translation>10 x 10</translation>
</message>
+ <message>
+ <source>Stretch vertically. Scales the image to fit to the available area.</source>
+ <translation>Vertikal anpassen. Skaliert das Bild, so dass es die zur Verfügung stehende Fläche ausfüllt.</translation>
+ </message>
+ <message>
+ <source>Repeat vertically. Tiles the image until there is no more space. May crop the last image.</source>
+ <translation>Vertikal mehrfach anordnen. Bild mehrfach untereinander anordnen, bis kein Platz mehr vorhanden ist. Das letzte Bild wird unter Umständen beschnitten.</translation>
+ </message>
+ <message>
+ <source>Round. Like Repeat, but scales the images down to ensure that the last image is not cropped.</source>
+ <translation>Runden. Wie 'Vertikal mehrfach anordnen' mit zusätzlicher Skalierung zur Vermeidung des Beschneidens des letzten Bildes.</translation>
+ </message>
+ <message>
+ <source>Repeat horizontally. Tiles the image until there is no more space. May crop the last image.</source>
+ <translation>Horizontal mehrfach anordnen. Bild mehrfach nebeneinander anordnen, bis kein Platz mehr vorhanden ist. Das letzte Bild wird unter Umständen beschnitten.</translation>
+ </message>
+ <message>
+ <source>Stretch horizontally. Scales the image to fit to the available area.</source>
+ <translation>Horizontal anpassen. Skaliert das Bild, so dass es die zur Verfügung stehende Fläche ausfüllt.</translation>
+ </message>
</context>
<context>
<name>ContextPaneWidgetImage</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/contextpanewidgetimage.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>The image is scaled to fit</source>
<translation>Das Bild ist skaliert, um die Fläche auszufüllen</translation>
</message>
<message>
- <location/>
<source>The image is stretched horizontally and tiled vertically</source>
<translation>Das Bild ist horizontal gestreckt und vertikal mehrfach untereinander angeordnet</translation>
</message>
<message>
- <location/>
<source>The image is stretched vertically and tiled horizontally</source>
<translation>Das Bild ist vertikal gestreckt und horizontal mehrfach nebeneinander angeordnet</translation>
</message>
<message>
- <location/>
<source>The image is duplicated horizontally and vertically</source>
<translation>Das Bild ist horizontal und vertikal mehrfach nebeneinander angeordnet</translation>
</message>
<message>
- <location/>
<source>The image is scaled uniformly to fit without cropping</source>
<translation>Das Bild ist gleichmäßig skaliert, um die Fläche ohne Beschneidung auszufüllen</translation>
</message>
<message>
- <location/>
<source>The image is scaled uniformly to fill, cropping if necessary</source>
<translation>Das Bild ist gleichmäßig skaliert, mit eventueller Beschneidung</translation>
</message>
<message>
- <location/>
<source>10 x 10</source>
<translation></translation>
</message>
@@ -22735,27 +18830,22 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>ContextPaneWidgetRectangle</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/contextpanewidgetrectangle.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Gradient</source>
<translation>Gradient</translation>
</message>
<message>
- <location/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location/>
<source>Border</source>
<translation>Rahmen</translation>
</message>
@@ -22763,198 +18853,136 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>EasingContextPane</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/easingpane/easingcontextpane.ui"/>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<message>
- <location/>
<source>play simulation</source>
- <translation>Simulation abspielen</translation>
+ <translation type="obsolete">Simulation abspielen</translation>
</message>
<message>
- <location/>
<source>Easing</source>
<translation>Easing</translation>
</message>
<message>
- <location/>
<source>easing type</source>
- <translation>Easing-Typ</translation>
+ <translation type="obsolete">Easing-Typ</translation>
</message>
<message>
- <location/>
<source>Linear</source>
- <translation type="unfinished">Linear</translation>
+ <translation type="obsolete">Linear</translation>
</message>
<message>
- <location/>
- <source>Quad</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Cubic</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Quart</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Quint</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Sine</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Expo</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Circ</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Elastic</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Back</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Bounce</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
<source>Subtype</source>
- <translation type="unfinished"></translation>
+ <translation>Subtype</translation>
</message>
<message>
- <location/>
<source>easing subtype</source>
- <translation>Easing-Subtyp</translation>
- </message>
- <message>
- <location/>
- <source>In</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>Out</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>InOut</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location/>
- <source>OutIn</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Easing-Subtyp</translation>
</message>
<message>
- <location/>
<source>Duration</source>
<translation>Dauer</translation>
</message>
<message>
- <location/>
<source>duration</source>
- <translation>Dauer</translation>
+ <translation type="obsolete">Dauer</translation>
</message>
<message>
- <location/>
<source>INVALID</source>
<translation>Ungültig</translation>
</message>
<message>
- <location/>
<source> ms</source>
<translation></translation>
</message>
<message>
- <location/>
<source>Amplitude</source>
<translation>Amplitude</translation>
</message>
<message>
- <location/>
<source>easing amplitude (only for Elastic and Bounce curves)</source>
- <translation>Easing-Amplitude (nur für Kurven des Typs Elastic und Bounce)</translation>
+ <translation type="obsolete">Easing-Amplitude (nur für Kurven des Typs Elastic und Bounce)</translation>
</message>
<message>
- <location/>
<source>Period</source>
<translation>Periode</translation>
</message>
<message>
- <location/>
<source>easing period (only for Elastic curve)</source>
- <translation>Easing-Periode (nur für Kurven des Typs Elastic)</translation>
+ <translation type="obsolete">Easing-Periode (nur für Kurven des Typs Elastic)</translation>
</message>
<message>
- <location/>
<source>Overshoot</source>
- <translation type="unfinished"></translation>
+ <translation>Overshoot</translation>
</message>
<message>
- <location/>
<source>easing overshoot (only for Back curve)</source>
- <translation>Easing-Overshoot (nur für Kurven des Typs Back)</translation>
+ <translation type="obsolete">Easing-Overshoot (nur für Kurven des Typs Back)</translation>
+ </message>
+ <message>
+ <source>Play simulation</source>
+ <translation>Simulation abspielen</translation>
+ </message>
+ <message>
+ <source>Type of easing curve</source>
+ <translation>Typ der Easing-Kurve</translation>
+ </message>
+ <message>
+ <source>Acceleration or deceleration of easing curve</source>
+ <translation>Beschleunigung/Verlangsamung der Easing-Kurve</translation>
+ </message>
+ <message>
+ <source>Duration of animation</source>
+ <translation>Dauer der Animation</translation>
+ </message>
+ <message>
+ <source>Amplitude of elastic and bounce easing curves</source>
+ <translation>Easing-Amplitude für Kurven des Typs Elastic und Bounce</translation>
+ </message>
+ <message>
+ <source>Easing period of an elastic curve</source>
+ <translation>Easing-Periode für Kurven des Typs Elastic</translation>
+ </message>
+ <message>
+ <source>Easing overshoot for a back curve</source>
+ <translation>Easing-Overshoot für Kurven des Typs Back</translation>
</message>
</context>
<context>
<name>ClassView::Internal::NavigationWidget</name>
<message>
- <location filename="../../../src/plugins/classview/classviewnavigationwidget.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location filename="../../../src/plugins/classview/classviewnavigationwidget.cpp" line="+140"/>
<source>Show subprojects</source>
+ <translation type="obsolete">Untergeordnete Projekte anzeigen</translation>
+ </message>
+ <message>
+ <source>Show Subprojects</source>
<translation>Untergeordnete Projekte anzeigen</translation>
</message>
</context>
<context>
<name>AttachTcfDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/attachtcfdialog.ui"/>
<source>Start Debugger</source>
<translation>Debugger starten</translation>
</message>
<message>
- <location/>
<source>Host and port:</source>
<translation>Host und Portnummer:</translation>
</message>
<message>
- <location/>
<source>Architecture:</source>
<translation>Architektur:</translation>
</message>
<message>
- <location/>
<source>Use server start script:</source>
<translation>Server-Startskript benutzen:</translation>
</message>
<message>
- <location/>
<source>Server start script:</source>
<translation>Server-Startskript:</translation>
</message>
@@ -22962,32 +18990,26 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Help::Internal::RemoteFilterOptions</name>
<message>
- <location filename="../../../src/plugins/help/remotehelpfilter.ui"/>
<source>Filter configuration</source>
<translation>Filterkonfiguration</translation>
</message>
<message>
- <location/>
<source>Prefix:</source>
<translation>Präfix:</translation>
</message>
<message>
- <location/>
<source>Limit to prefix</source>
<translation>Auf Präfix beschränken</translation>
</message>
<message>
- <location/>
<source>+</source>
<translation>+</translation>
</message>
<message>
- <location/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../../../src/plugins/help/remotehelpfilter.cpp" line="+56"/>
<source>Double click to edit item.</source>
<translation><Doppelklick zum Bearbeiten></translation>
</message>
@@ -22995,32 +19017,26 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>ImageViewer::Internal::ImageViewerToolbar</name>
<message>
- <location filename="../../../src/plugins/imageviewer/imageviewertoolbar.ui"/>
<source>Show background</source>
<translation>Hintergrund anzeigen</translation>
</message>
<message>
- <location/>
<source>Show outline</source>
<translation>Umriss anzeigen</translation>
</message>
<message>
- <location/>
<source>Fit image in the screen</source>
<translation>Bild an Schirmgröße anpassen</translation>
</message>
<message>
- <location/>
<source>Original size</source>
<translation>Originalgröße</translation>
</message>
<message>
- <location/>
<source>Zoom In</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location/>
<source>Zoom Out</source>
<translation>Verkleinern</translation>
</message>
@@ -23028,32 +19044,26 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlJSEditor::Internal::QuickToolBarSettingsPage</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/quicktoolbarsettingspage.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmljseditor/quicktoolbarsettingspage.cpp" line="-10"/>
<source>Qt Quick ToolBar</source>
<translation>Qt Quick-Werkzeugleiste</translation>
</message>
<message>
- <location filename="../../../src/plugins/qmljseditor/quicktoolbarsettingspage.ui"/>
<source>Qt Quick Toolbars</source>
<translation>Qt Quick-Werkzeugleisten</translation>
</message>
<message>
- <location/>
<source>Always show Qt Quick Toolbar</source>
<translation>Qt Quick-Werkzeugleisten immer anzeigen</translation>
</message>
<message>
- <location/>
<source>If enabled, the toolbar will remain pinned to an absolute position.</source>
<translation>Verankert die Werkzeugleiste an einer festen, absoluten Position.</translation>
</message>
<message>
- <location/>
<source>Pin Qt Quick Toolbar</source>
<translation>Qt Quick-Werkzeugleiste verankern</translation>
</message>
@@ -23061,97 +19071,78 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Qt4ProjectManager::Internal::LibraryDetailsWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/librarydetailswidget.ui"/>
<source>Form</source>
- <translation>Form</translation>
+ <translation type="obsolete">Form</translation>
</message>
<message>
- <location/>
<source>Library:</source>
<translation>Bibliothek:</translation>
</message>
<message>
- <location/>
<source>Library file:</source>
<translation>Bibliotheksdatei:</translation>
</message>
<message>
- <location/>
<source>Include path:</source>
<translation>Include-Pfad:</translation>
</message>
<message>
- <location/>
<source>Platform</source>
<translation>Plattform</translation>
</message>
<message>
- <location/>
<source>Linux</source>
<translation>Linux</translation>
</message>
<message>
- <location/>
<source>Mac</source>
<translation>Mac</translation>
</message>
<message>
- <location/>
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
- <location/>
<source>Symbian</source>
<translation>Symbian</translation>
</message>
<message>
- <location/>
<source>Linkage:</source>
<translation>Linken</translation>
</message>
<message>
- <location/>
<source>Dynamic</source>
<translation>dynamisch</translation>
</message>
<message>
- <location/>
<source>Static</source>
<translation>statisch</translation>
</message>
<message>
- <location/>
<source>Mac:</source>
<translation>Mac:</translation>
</message>
<message>
- <location/>
<source>Library</source>
<translation>Bibliothek</translation>
</message>
<message>
- <location/>
<source>Framework</source>
<translation>Framework</translation>
</message>
<message>
- <location/>
<source>Windows:</source>
<translation>Windows:</translation>
</message>
<message>
- <location/>
<source>Library inside "debug" or "release" subfolder</source>
<translation>Bibliothek innerhalb "debug" oder "release" Unterordner</translation>
</message>
<message>
- <location/>
<source>Add "d" suffix for debug version</source>
<translation>Präfix "d" für Debug-Version anfügen</translation>
</message>
<message>
- <location/>
<source>Remove "d" suffix for release version</source>
<translation>Präfix "d" für Release-Version entfernen</translation>
</message>
@@ -23159,17 +19150,14 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>MaemoDeployableListWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistwidget.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Add File to Package</source>
<translation>Datei zu Paket hinzufügen</translation>
</message>
<message>
- <location/>
<source>Remove File from Package</source>
<translation>Datei aus Paket entfernen</translation>
</message>
@@ -23177,27 +19165,22 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>MaemoDeployStepWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Device configuration:</source>
<translation>Gerätekonfiguration:</translation>
</message>
<message>
- <location/>
<source>Also deploy to sysroot</source>
<translation>Deployment zu sysroot</translation>
</message>
<message>
- <location/>
<source>These show the INSTALLS settings from the project file(s).</source>
<translation>Zeigt die INSTALLS-Einstellungen aus den Projektdateien.</translation>
</message>
<message>
- <location/>
<source><b>Files to install:</b></source>
<translation><b>Zu installierende Dateien:</b></translation>
</message>
@@ -23205,85 +19188,89 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlStandaloneAppWizardSourcesPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location/>
<source>+</source>
- <translation>+</translation>
+ <translation type="obsolete">+</translation>
</message>
<message>
- <location/>
<source>-</source>
- <translation>-</translation>
+ <translation type="obsolete">-</translation>
</message>
<message>
- <location/>
<source>Import Paths</source>
- <translation>Import-Pfade</translation>
+ <translation type="obsolete">Import-Pfade</translation>
</message>
<message>
- <location/>
<source>Error</source>
- <translation>Fehler</translation>
+ <translation type="obsolete">Fehler</translation>
</message>
<message>
- <location/>
<source>Main QML file</source>
- <translation>QML-Hauptdatei</translation>
+ <translation type="obsolete">QML-Hauptdatei</translation>
</message>
<message>
- <location/>
<source>QML Modules</source>
- <translation>QML-Module</translation>
+ <translation type="obsolete">QML-Module</translation>
</message>
<message>
- <location/>
<source>URIs (e.g. 'org.mydomain.MyQmlModule')</source>
- <translation>URIs (zum Beispiel 'org.mydomain.MyQmlModule')</translation>
+ <translation type="obsolete">URIs (zum Beispiel 'org.mydomain.MyQmlModule')</translation>
+ </message>
+ <message>
+ <source>Main QML File</source>
+ <translation>QML-Hauptdatei</translation>
+ </message>
+ <message>
+ <source>New 'main.qml' file, generated by this wizard.</source>
+ <translation>Generiere neue 'main.qml'-Datei.</translation>
+ </message>
+ <message>
+ <source>Import an existing .qml file</source>
+ <translation>Importiere existierende QML-Datei</translation>
+ </message>
+ <message>
+ <source>Note: All files and directories which reside in the same directory as the Main QML File will be deployed. You can anytime modify the contents of that directory before deploying.</source>
+ <translation type="obsolete">Hinweis: Alle Dateien und Ordner, die sich im selben Ordner wie die QML-Hauptdatei befinden, sind zum Deployment vorgesehen. Der Inhalt des Ordners kann vor dem Deployment-Vorgang jederzeit modifiziert werden.</translation>
+ </message>
+ <message>
+ <source>Note: All files and directories which reside in the same directory as the Main QML File will be deployed. You can modify the contents of that directory anytime before deploying.</source>
+ <translation>Hinweis: Alle Dateien und Ordner, die sich im selben Ordner wie die QML-Hauptdatei befinden, sind zum Deployment vorgesehen. Der Inhalt des Ordners kann vor dem Deployment-Vorgang jederzeit modifiziert werden.</translation>
</message>
</context>
<context>
<name>HighlighterSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/generichighlighter/highlightersettingspage.ui"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
- <location/>
<source>Syntax Highlight Definition Files</source>
<translation>Definitionsdateien für die Syntax-Hervorhebung</translation>
</message>
<message>
- <location/>
<source>Location:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location/>
<source>Use fallback location</source>
<translation>Fallback benutzen</translation>
</message>
<message>
- <location/>
<source>Behavior</source>
<translation>Verhalten</translation>
</message>
<message>
- <location/>
<source>Alert when a highlight definition is not found</source>
<translation>Hinweis anzeigen, wenn keine Definitionsdatei gefunden werden konnte</translation>
</message>
<message>
- <location/>
<source>Ignored file patterns:</source>
<translation>Ausgeschlossen Dateien (Suchmuster):</translation>
</message>
<message>
- <location/>
<source><html><head/><body>
<p>Highlight definitions are provided by the <a href="http://kate-editor.org/">Kate Text Editor</a>.</p></body></html></source>
<translation><html><head/><body>
@@ -23293,32 +19280,26 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>ManageDefinitionsDialog</name>
<message>
- <location filename="../../../src/plugins/texteditor/generichighlighter/managedefinitionsdialog.ui"/>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<message>
- <location/>
<source>Download Selected Definitions</source>
<translation>Ausgewählte Definitionsdateien herunterladen</translation>
</message>
<message>
- <location/>
<source>Definitions</source>
<translation>Definitionsdateien</translation>
</message>
<message>
- <location/>
<source>Select All</source>
<translation>Alles auswählen</translation>
</message>
<message>
- <location/>
<source>Clear Selection</source>
<translation>Auswahl rücksetzen</translation>
</message>
<message>
- <location/>
<source>Invert Selection</source>
<translation>Auswahl umkehren</translation>
</message>
@@ -23326,240 +19307,188 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>ProxySettings</name>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/proxysettings.ui"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation type="obsolete">Dialog</translation>
</message>
<message>
- <location/>
<source>Use http proxy</source>
- <translation>HTTP-Proxy verwenden</translation>
+ <translation type="obsolete">HTTP-Proxy verwenden</translation>
</message>
<message>
- <location/>
<source>Server Address:</source>
- <translation>Adresse des Servers:</translation>
+ <translation type="obsolete">Adresse des Servers:</translation>
</message>
<message>
- <location/>
<source>Port:</source>
- <translation>Port:</translation>
+ <translation type="obsolete">Port:</translation>
</message>
<message>
- <location/>
<source>Username:</source>
- <translation>Nutzername:</translation>
+ <translation type="obsolete">Nutzername:</translation>
</message>
<message>
- <location/>
<source>Password:</source>
- <translation>Passwort:</translation>
+ <translation type="obsolete">Passwort:</translation>
</message>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/proxysettings_maemo5.ui"/>
<source>HTTP Proxy</source>
- <translation>HTTP-Proxy</translation>
+ <translation type="obsolete">HTTP-Proxy</translation>
</message>
<message>
- <location/>
<source>Use HTTP Proxy</source>
- <translation>HTTP-Proxy verwenden</translation>
+ <translation type="obsolete">HTTP-Proxy verwenden</translation>
</message>
<message>
- <location/>
<source>Server</source>
- <translation>Server</translation>
+ <translation type="obsolete">Server</translation>
</message>
<message>
- <location/>
<source>Name or IP</source>
- <translation>Name oder IP-Adresse</translation>
+ <translation type="obsolete">Name oder IP-Adresse</translation>
</message>
<message>
- <location/>
<source>Port</source>
- <translation>Port</translation>
+ <translation type="obsolete">Port</translation>
</message>
<message>
- <location/>
<source>8080</source>
- <translation>8080</translation>
+ <translation type="obsolete">8080</translation>
</message>
<message>
- <location/>
<source>Username</source>
- <translation>Nutzername</translation>
+ <translation type="obsolete">Nutzername</translation>
</message>
<message>
- <location/>
<source>Password</source>
- <translation>Passwort</translation>
+ <translation type="obsolete">Passwort</translation>
</message>
</context>
<context>
<name>RecordingOptions</name>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/recopts.ui"/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>Video options</source>
- <translation>Video-Einstellungen</translation>
+ <translation type="obsolete">Video-Einstellungen</translation>
</message>
<message>
- <location/>
<source>File:</source>
- <translation>Datei:</translation>
+ <translation type="obsolete">Datei:</translation>
</message>
<message>
- <location/>
<source>...</source>
- <translation>...</translation>
+ <translation type="obsolete">...</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>Size</source>
- <translation>Größe</translation>
+ <translation type="obsolete">Größe</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>VGA</source>
- <translation>VGA</translation>
+ <translation type="obsolete">VGA</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>720p</source>
- <translation>720p</translation>
+ <translation type="obsolete">720p</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>QVGA</source>
- <translation>QVGA</translation>
+ <translation type="obsolete">QVGA</translation>
</message>
<message>
- <location/>
<source>Width:</source>
- <translation>Breite:</translation>
+ <translation type="obsolete">Breite:</translation>
</message>
<message>
- <location/>
<source>Height:</source>
- <translation>Höhe:</translation>
+ <translation type="obsolete">Höhe:</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>Rate</source>
- <translation>Bildfrequenz</translation>
+ <translation type="obsolete">Bildfrequenz</translation>
</message>
<message>
- <location/>
<source>60Hz</source>
- <translation>60Hz</translation>
+ <translation type="obsolete">60Hz</translation>
</message>
<message>
- <location/>
<source>50Hz</source>
- <translation>50Hz</translation>
+ <translation type="obsolete">50Hz</translation>
</message>
<message>
- <location/>
<source>25Hz</source>
- <translation>25Hz</translation>
+ <translation type="obsolete">25Hz</translation>
</message>
<message>
- <location/>
<source>Hz</source>
- <translation>Hz</translation>
+ <translation type="obsolete">Hz</translation>
</message>
<message>
- <location/>
<source>24Hz</source>
- <translation>24Hz</translation>
+ <translation type="obsolete">24Hz</translation>
</message>
<message>
- <location/>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>Profile</source>
- <translation>Profile</translation>
+ <translation type="obsolete">Profile</translation>
</message>
<message>
- <location/>
<source>Help</source>
- <translation>Hilfe</translation>
+ <translation type="obsolete">Hilfe</translation>
</message>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/recopts_maemo5.ui"/>
<source>60 Hz</source>
- <translation>60 Hz</translation>
+ <translation type="obsolete">60 Hz</translation>
</message>
<message>
- <location/>
<source>50 Hz</source>
- <translation>50 Hz</translation>
+ <translation type="obsolete">50 Hz</translation>
</message>
<message>
- <location/>
<source>25 Hz</source>
- <translation>25 Hz</translation>
+ <translation type="obsolete">25 Hz</translation>
</message>
<message>
- <location/>
<source>24 Hz</source>
- <translation>24 Hz</translation>
+ <translation type="obsolete">24 Hz</translation>
</message>
<message>
- <location/>
<source>20 Hz</source>
- <translation>20 Hz</translation>
+ <translation type="obsolete">20 Hz</translation>
</message>
<message>
- <location/>
<source>15 Hz</source>
- <translation>15 Hz</translation>
+ <translation type="obsolete">15 Hz</translation>
</message>
<message>
- <location/>
<source>10 Hz</source>
- <translation>10 Hz</translation>
+ <translation type="obsolete">10 Hz</translation>
</message>
<message>
- <location/>
<source>File</source>
- <translation>Datei</translation>
+ <translation type="obsolete">Datei</translation>
</message>
<message>
- <location/>
<source>Options</source>
- <translation>Einstellungen</translation>
+ <translation type="obsolete">Einstellungen</translation>
</message>
</context>
<context>
<name>QmlEditorWidgets::ContextPaneWidget</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/contextpanewidget.cpp" line="+181"/>
<source>Hides this toolbar.</source>
<translation>Schließt diese Werkzeugleiste.</translation>
</message>
<message>
- <location line="+20"/>
<source>Pin Toolbar</source>
<translation>Werkzeugleiste verankern</translation>
</message>
<message>
- <location line="+5"/>
<source>Show Always</source>
<translation>Stets anzeigen</translation>
</message>
<message>
- <location line="+273"/>
<source>Unpins the toolbar and moves it to the default position.</source>
<translation>Löst die Verankerung und verschiebt die Werkzeugleiste an die Vorgabeposition.</translation>
</message>
<message>
- <location line="+17"/>
<source>Hides this toolbar. This toolbar can be permanently disabled in the options page or in the context menu.</source>
<translation>Schließt diese Werkzeugleiste. Sie kann in den Einstellung oder durch das Kontextmenü dauerhaft abgeschaltet werden.</translation>
</message>
@@ -23567,8 +19496,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlEditorWidgets::ContextPaneWidgetImage</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/contextpanewidgetimage.cpp" line="+81"/>
- <location line="+19"/>
<source>double click for preview</source>
<translation>Doppelklick zur Vorschau</translation>
</message>
@@ -23576,7 +19503,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>QmlEditorWidgets::FileWidget</name>
<message>
- <location filename="../../../src/libs/qmleditorwidgets/filewidget.cpp" line="+89"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
@@ -23584,17 +19510,14 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Utils::DebuggerLanguageChooser</name>
<message>
- <location filename="../../../src/libs/utils/debuggerlanguagechooser.cpp" line="+13"/>
<source>C++</source>
<translation>C++</translation>
</message>
<message>
- <location line="+1"/>
<source>QML</source>
<translation>QML</translation>
</message>
<message>
- <location line="+7"/>
<source>Debug port:</source>
<translation>Port für Debugger:</translation>
</message>
@@ -23602,55 +19525,49 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Utils::SynchronousProcess</name>
<message>
- <location filename="../../../src/libs/utils/synchronousprocess.cpp" line="+99"/>
<source>The command '%1' finished successfully.</source>
<translation>Das Kommando '%1' wurde beendet.</translation>
</message>
<message>
- <location line="+2"/>
<source>The command '%1' terminated with exit code %2.</source>
<translation>Das Kommando '%1' wurde beendet, Rückgabewert %2.</translation>
</message>
<message>
- <location line="+3"/>
<source>The command '%1' terminated abnormally.</source>
<translation>Das Kommando '%1' wurde in anormaler Weise beendet.</translation>
</message>
<message>
- <location line="+2"/>
<source>The command '%1' could not be started.</source>
<translation>Das Kommando '%1' konnte nicht gestartet.</translation>
</message>
<message>
- <location line="+2"/>
<source>The command '%1' did not respond within the timeout limit (%2 ms).</source>
<translation>Das Kommando '%1' konnte nicht innerhalb des Zeitlimits (%2 ms) beended werden.</translation>
</message>
<message>
- <location line="+255"/>
<source>Process not Responding</source>
<translation>Keine Antwort</translation>
</message>
<message>
- <location line="+2"/>
<source>The process is not responding.</source>
<translation>Der Prozess antwortet nicht.</translation>
</message>
<message>
- <location line="+1"/>
<source>The process '%1' is not responding.</source>
<translation>Der Prozess '%1' antwortet nicht.</translation>
</message>
<message>
- <location line="+2"/>
+ <source>Would you like to terminate it?</source>
+ <translation>Möchten Sie abbrechen?</translation>
+ </message>
+ <message>
<source> Would you like to terminate it?</source>
- <translation>Möchten Sie ihn abbrechen?</translation>
+ <translation type="obsolete">Möchten Sie ihn abbrechen?</translation>
</message>
</context>
<context>
<name>ClassView::Internal::NavigationWidgetFactory</name>
<message>
- <location filename="../../../src/plugins/classview/classviewnavigationwidgetfactory.cpp" line="+87"/>
<source>Class View</source>
<translation>Klassenanzeige</translation>
</message>
@@ -23658,17 +19575,14 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Core::NavigationWidget</name>
<message>
- <location filename="../../../src/plugins/coreplugin/navigationwidget.cpp" line="+192"/>
<source>Activate %1 Pane</source>
<translation>Aktiviere Panel %1</translation>
</message>
<message>
- <location line="+31"/>
<source>Hide Sidebar</source>
<translation>Seitenleiste verbergen</translation>
</message>
<message>
- <location line="+2"/>
<source>Show Sidebar</source>
<translation>Seitenleiste anzeigen</translation>
</message>
@@ -23676,103 +19590,82 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>Core::Internal::SftpChannelPrivate</name>
<message>
- <location filename="../../../src/plugins/coreplugin/ssh/sftpchannel.cpp" line="+230"/>
<source>Server could not start sftp subsystem.</source>
<translation>Der Server konnte das sftp-Subsystem nicht starten.</translation>
</message>
<message>
- <location line="+65"/>
<source>Unexpected packet of type %1.</source>
<translation>Unerwartetes Paket des Typs %1.</translation>
</message>
<message>
- <location line="+17"/>
<source>Protocol version mismatch: Expected %1, got %2</source>
<translation>Die Versionen des Protokolls stimmen nicht überein: Erwartet %1, erhalten %2</translation>
</message>
<message>
- <location line="+116"/>
<source>Unknown error.</source>
<translation>Unbekannter Fehler.</translation>
</message>
<message>
- <location line="+24"/>
<source>Created remote directory '%1'.</source>
<translation>Der entfernter Ordner '%1' wurde angelegt.</translation>
</message>
<message>
- <location line="+3"/>
<source>Remote directory '%1' already exists.</source>
<translation>Der entfernte Ordner '%1' ist bereits vorhanden.</translation>
</message>
<message>
- <location line="+4"/>
<source>Error creating directory '%1': %2</source>
<translation>Fehler beim Anlegen des Ordners '%1': %2</translation>
</message>
<message>
- <location line="+24"/>
<source>Could not open local file '%1': %2</source>
<translation>Die lokale Datei '%1' konnte nicht geöffnet werden: %2</translation>
</message>
<message>
- <location line="+27"/>
<source>Remote directory could not be opened for reading.</source>
<translation>Der entfernte Ordner konnte nicht zum Lesen geöffnet werden.</translation>
</message>
<message>
- <location line="+6"/>
<source>Failed to list remote directory contents.</source>
<translation>Der Inhalt des entfernten Ordners konnte nicht bestimmt werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Failed to close remote directory.</source>
<translation>Der entfernte Ordner konnte nicht geschlossen werden.</translation>
</message>
<message>
- <location line="+19"/>
<source>Failed to open remote file for reading.</source>
<translation>Die entfernte Datei konnte nicht zum Lesen geöffnet werden.</translation>
</message>
<message>
- <location line="+6"/>
<source>Failed retrieve information on the remote file ('stat' failed).</source>
<translation>Es konnte keine Information über die entfernte Datei eingeholt werden ('stat' schlug fehl).</translation>
</message>
<message>
- <location line="+199"/>
<source>Cannot append to remote file: Server does not support the file size attribute.</source>
<translation>Es können keine Daten an die entfernte Datei angehängt werden, da der Server das Dateigrößenattribut nicht unterstützt.</translation>
</message>
<message>
- <location line="-193"/>
<source>Failed to read remote file.</source>
<translation>Die entfernte Datei konnte nicht gelesen werden.</translation>
</message>
<message>
- <location line="+11"/>
- <location line="+69"/>
<source>Failed to close remote file.</source>
<translation>Die entfernte Datei konnte nicht geschlossen werden.</translation>
</message>
<message>
- <location line="-40"/>
<source>Failed to open remote file for writing.</source>
<translation>Die entfernte Datei konnte nicht zum Schreiben geöffnet werden.</translation>
</message>
<message>
- <location line="+18"/>
<source>Failed to write remote file.</source>
<translation>Die entfernte Datei konnte nicht geschrieben werden.</translation>
</message>
<message>
- <location line="+172"/>
<source>Server could not start session.</source>
<translation>Der Server konnte keine Sitzung starten.</translation>
</message>
<message>
- <location line="+52"/>
<source>Error reading local file: %1</source>
<translation>Fehler beim Lesen der lokalen Datei: %1</translation>
</message>
@@ -23780,7 +19673,6 @@ Ids müssen außerdem mit einem Kleinbuchstaben beginnen.</translation>
<context>
<name>SshConnection</name>
<message>
- <location filename="../../../src/plugins/coreplugin/ssh/sshcapabilities.cpp" line="+95"/>
<source>Server and client capabilities don't match. Client list was: %1.
Server list was %2.</source>
<translation>Die Fähigkeiten von Server und Client stimmen nicht überein. Client: %1.
@@ -23790,7 +19682,6 @@ Server: %2.</translation>
<context>
<name>Core::Internal::SshChannelManager</name>
<message>
- <location filename="../../../src/plugins/coreplugin/ssh/sshchannelmanager.cpp" line="+137"/>
<source>Invalid channel id %1</source>
<translation>Ungültiger Kanalbezeichner %1</translation>
</message>
@@ -23798,62 +19689,50 @@ Server: %2.</translation>
<context>
<name>Core::Internal::SshConnectionPrivate</name>
<message>
- <location filename="../../../src/plugins/coreplugin/ssh/sshconnection.cpp" line="+283"/>
<source>SSH Protocol error: %1</source>
<translation>SSH-Protokollfehler: %1</translation>
</message>
<message>
- <location line="+6"/>
<source>Botan library exception: %1</source>
<translation>Ausnahmefehler in der Botan-Bibliothek: %1</translation>
</message>
<message>
- <location line="+16"/>
<source>Invalid protocol version: Expected '2.0', got '%1'.</source>
<translation>Die Versionen des Protokolls stimmen nicht überein: Erwartet '2.0', erhalten %1.</translation>
</message>
<message>
- <location line="+8"/>
<source>Invalid server id '%1'.</source>
<translation>Ungültige Server-Kennzeichnung '%1'.</translation>
</message>
<message>
- <location line="+37"/>
<source>Unexpected packet of type %1.</source>
<translation>Unerwartetes Paket des Typs %1.</translation>
</message>
<message>
- <location line="+45"/>
<source>Could not read private key file: %1</source>
<translation>Die private Schlüsseldatei %1 konnte nicht gelesen werden</translation>
</message>
<message>
- <location line="+18"/>
<source>Password expired.</source>
<translation>Das Passwort ist abgelaufen.</translation>
</message>
<message>
- <location line="+24"/>
<source>Server rejected password.</source>
<translation>Der Server hat das Passwort zurückgewiesen.</translation>
</message>
<message>
- <location line="+0"/>
<source>Server rejected key.</source>
<translation>Der Server hat den Schlüssel zurückgewiesen.</translation>
</message>
<message>
- <location line="+69"/>
<source>Server closed connection: %1</source>
<translation>Der Server hat die Verbindung %1 geschlossen</translation>
</message>
<message>
- <location line="+13"/>
<source>Connection closed unexpectedly.</source>
<translation>Die Verbindung wurde plötzlich geschlossen.</translation>
</message>
<message>
- <location line="+14"/>
<source>Timeout waiting for reply from server.</source>
<translation>Ãœberschreitung des Zeitlimits beim Warten auf Antwort vom Server.</translation>
</message>
@@ -23861,12 +19740,10 @@ Server: %2.</translation>
<context>
<name>CodePaster::NetworkProtocol</name>
<message>
- <location filename="../../../src/plugins/cpaster/protocol.cpp" line="+63"/>
<source>Checking connection</source>
<translation>Prüfe Verbindung</translation>
</message>
<message>
- <location line="+1"/>
<source>Connecting to %1...</source>
<translation>Verbinde zu %1...</translation>
</message>
@@ -23874,7 +19751,6 @@ Server: %2.</translation>
<context>
<name>CheckUndefinedSymbols</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppchecksymbols.cpp" line="+584"/>
<source>Expected a namespace-name</source>
<translation>Angabe eines Namensraums erforderlich</translation>
</message>
@@ -23882,16 +19758,19 @@ Server: %2.</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cppinsertdecldef.cpp" line="+78"/>
<source>Add %1 declaration</source>
<comment>CppEditor::DeclFromDef</comment>
- <translation>Deklaration für %1 hinzufügen</translation>
+ <translation type="obsolete">Deklaration für %1 hinzufügen</translation>
+ </message>
+ <message>
+ <source>Add definition in %1</source>
+ <comment>CppEditor::DefFromDecl</comment>
+ <translation type="obsolete">Definition in %1 hinzufügen</translation>
</message>
</context>
<context>
<name>CppEditor::Internal::CppTypeHierarchyWidget</name>
<message>
- <location filename="../../../src/plugins/cppeditor/cpptypehierarchy.cpp" line="+156"/>
<source>No type hierarchy available</source>
<translation>Keine Klassenhierarchie verfügbar</translation>
</message>
@@ -23899,7 +19778,6 @@ Server: %2.</translation>
<context>
<name>CppEditor::Internal::CppTypeHierarchyFactory</name>
<message>
- <location line="+106"/>
<source>Type Hierarchy</source>
<translation>Klassenhierarchie</translation>
</message>
@@ -23907,12 +19785,10 @@ Server: %2.</translation>
<context>
<name>CppTools::Internal::SymbolsFindFilter</name>
<message>
- <location filename="../../../src/plugins/cpptools/symbolsfindfilter.cpp" line="+126"/>
<source>C++ Symbols</source>
<translation>C++-Symbole</translation>
</message>
<message>
- <location line="+47"/>
<source>Searching</source>
<translation>Suche</translation>
</message>
@@ -23920,37 +19796,30 @@ Server: %2.</translation>
<context>
<name>CppTools::Internal::SymbolsFindFilterConfigWidget</name>
<message>
- <location line="+82"/>
<source>Types:</source>
<translation>Typen:</translation>
</message>
<message>
- <location line="+3"/>
<source>Classes</source>
<translation>Klassen</translation>
</message>
<message>
- <location line="+3"/>
<source>Methods</source>
<translation>Methoden</translation>
</message>
<message>
- <location line="+3"/>
<source>Enums</source>
<translation>Enumerationen</translation>
</message>
<message>
- <location line="+3"/>
<source>Declarations</source>
<translation>Deklarationen</translation>
</message>
<message>
- <location line="+14"/>
<source>Projects Only</source>
<translation>Nur Projekte</translation>
</message>
<message>
- <location line="+3"/>
<source>Global</source>
<translation>Global</translation>
</message>
@@ -23958,211 +19827,173 @@ Server: %2.</translation>
<context>
<name>Debugger::Internal::CdbEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbengine.cpp" line="+122"/>
<source>The function "%1()" failed: %2</source>
<extracomment>Function call failed</extracomment>
<translation>Der Funktionsaufruf "%1()" schlug fehl: %2</translation>
</message>
<message>
- <location line="+213"/>
<source>Version: %1</source>
<translation>Version: %1</translation>
</message>
<message>
- <location line="+2"/>
<source><html>The installed version of the <i>Debugging Tools for Windows</i> (%1) is rather old. Upgrading to version %2 is recommended for the proper display of Qt's data types.</html></source>
<translation><html>Die gegenwärtig installierte Version der <i>Debugging Tools for Windows</i> (%1) ist veraltet. Es wird ein Upgrade auf Version %2 empfohlen, um die Qt-Datentypen richtig anzeigen zu können.</html></translation>
</message>
<message>
- <location line="+4"/>
<source>Debugger</source>
<translation>Debugger</translation>
</message>
<message>
- <location line="+21"/>
<source><html><head/><body><p>The debugger is not configured to use the public <a href="%1">Microsoft Symbol Server</a>. This is recommended for retrieval of the symbols of the operating system libraries.</p><p><i>Note:</i> A fast internet connection is required for this to work smoothly. Also, a delay might occur when connecting for the first time.</p><p>Would you like to set it up?</p></br></body></html></source>
<translation></translation>
</message>
<message>
- <location line="+8"/>
<source>Symbol Server</source>
<translation></translation>
</message>
<message>
- <location line="+1"/>
<source>Do not ask again</source>
<translation></translation>
</message>
<message>
- <location line="+54"/>
<source>The dumper library was not found at %1.</source>
<translation>Es konnte keine Ausgabe-Hilfsbibliothek unter %1 gefunden werden.</translation>
</message>
<message>
- <location line="+47"/>
<source>The console stub process was unable to start '%1'.</source>
<translation>Der Konsolenprozess konnte '%1' nicht ausführen.</translation>
</message>
<message>
- <location line="+12"/>
<source>Attaching to core files is not supported!</source>
- <translation>Das Debuggen von Core-Dateien wird nicht unterstützt!</translation>
+ <translation type="obsolete">Das Debuggen von Core-Dateien wird nicht unterstützt!</translation>
+ </message>
+ <message>
+ <source>Attaching to core files is not supported.</source>
+ <translation>Das Debuggen von Core-Dateien wird nicht unterstützt.</translation>
</message>
<message>
- <location line="+73"/>
<source>The process exited with exit code %1.</source>
<translation>Der Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
- <location line="+181"/>
<source>Continuing with '%1'...</source>
<translation>Setze mit '%1' fort...</translation>
</message>
<message>
- <location line="+10"/>
<source>Unable to continue: %1</source>
<translation>Die Ausführung des Prozesses kann nicht fortgesetzt werden: %1</translation>
</message>
<message>
- <location line="+31"/>
<source>Reverse stepping is not implemented.</source>
<translation>Die Funktionalität für 'Einzelschritt rückwärts' ist nicht implementiert.</translation>
</message>
<message>
- <location line="+6"/>
<source>Thread %1 cannot be stepped.</source>
<translation>Für den Thread %1 ist kein Einzelschritt möglich.</translation>
</message>
<message>
- <location line="+38"/>
<source>Stepping %1</source>
<translation>Führe Schritt aus (%1)</translation>
</message>
<message>
- <location line="+94"/>
<source>Running requested...</source>
<translation>Fortsetzung angefordert...</translation>
</message>
<message>
- <location line="+68"/>
<source>Running up to %1:%2...</source>
<translation>Ausführung bis %1:%2...</translation>
</message>
<message>
- <location line="+14"/>
<source>Running up to function '%1()'...</source>
<translation>Ausführung bis zu Funktion '%1()'...</translation>
</message>
<message>
- <location line="+13"/>
<source>Jump to line is not implemented</source>
<translation>Die Funktionalität für 'Springe zu Zeile' ist nicht implementiert</translation>
</message>
<message>
- <location line="+15"/>
<source>Assigning '%1' to '%2' (%3)...</source>
<extracomment>Arguments: New value, name, (type)</extracomment>
- <translation>Weise '%' an '%2' (%3) zu...</translation>
+ <translation>Weise '%1' an '%2' (%3) zu...</translation>
</message>
<message>
- <location line="+7"/>
<source>Can assign only scalar values.</source>
<translation>Es können nur skalare Werte zugewiesen werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Cannot assign values of type '%1'. Only POD-types can be assigned.</source>
<translation>Werte des Typs '%1' können nicht zugewiesen werden. Es sind nur POD-Typen zulässig.</translation>
</message>
<message>
- <location line="+29"/>
<source>Unable to assign the value '%1' to '%2' (%3): %4</source>
<extracomment>Arguments: New value, name, (type): Error</extracomment>
<translation>Der Wert '%1' konnte nicht an '%2' (%3) zugewiesen werden: %4</translation>
</message>
<message>
- <location line="+165"/>
<source>Unable to retrieve %1 bytes of memory at 0x%2: %3</source>
<translation>Die Abfrage des Speichers (%1 bytes ab 0x%2) schlug fehl: %3</translation>
</message>
<message>
- <location line="+32"/>
<source>Cannot retrieve symbols while the debuggee is running.</source>
<translation>Die Symbole können nicht bestimmt werden, solange die zu debuggende Anwendung läuft.</translation>
</message>
<message>
- <location line="+39"/>
- <location line="+6"/>
<source>Debugger Error</source>
<translation>Debugger-Fehler</translation>
</message>
<message>
- <location line="+27"/>
<source>Ignoring initial breakpoint...</source>
<translation>Anfänglicher Haltepunkt wurde übergangen...</translation>
</message>
<message>
- <location line="+47"/>
<source><interrupt thread></source>
<translation><interrupt thread></translation>
</message>
<message>
- <location line="+1"/>
<source>Breakpoint</source>
<translation>Breakpoint</translation>
</message>
<message>
- <location line="+20"/>
<source>Interrupted in thread %1, current thread: %2</source>
<translation>Angehalten im Thread: %1, aktueller Thread: %2</translation>
</message>
<message>
- <location line="+1"/>
<source>Stopped, current thread: %1</source>
<translation>Angehalten, Thread: %1</translation>
</message>
<message>
- <location line="+55"/>
<source>Changing threads: %1 -> %2</source>
<translation>Wechsel von Thread %1 zu %2</translation>
</message>
<message>
- <location line="+23"/>
<source>stopped</source>
<translation></translation>
</message>
<message>
- <location line="+49"/>
<source>Stopped at %1:%2 in thread %3.</source>
<translation>Bei %1:%2 im Thread %3 angehalten.</translation>
</message>
<message>
- <location line="+5"/>
<source>Stopped at %1 in thread %2 (missing debug information).</source>
<translation>Bei %1 im Thread %2 angehalten (keine Debuginformation).</translation>
</message>
<message>
- <location line="+3"/>
<source>Stopped at %1 (%2) in thread %3 (missing debug information).</source>
<translation>Bei %1 (%2) im Thread %3 angehalten (keine Debuginformation).</translation>
</message>
<message>
- <location line="+5"/>
<source>Stopped in thread %1 (missing debug information).</source>
<translation>Im Thread %1 angehalten (keine Debuginformation).</translation>
</message>
<message>
- <location line="+113"/>
<source>Breakpoint: %1</source>
<translation>Haltepunkt: %1</translation>
</message>
<message>
- <location line="+1"/>
<source>Watchpoint: %1</source>
<translation></translation>
</message>
<message>
- <location line="+60"/>
<source>The CDB debug engine does not support the '%1</source>
<translation></translation>
</message>
@@ -24170,32 +20001,26 @@ Server: %2.</translation>
<context>
<name>Debugger::Internal::CacheDirectoryDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp" line="-62"/>
<source>Select Local Cache Folder</source>
<translation>Wählen Sie ein lokales Cache-Verzeichnis aus</translation>
</message>
<message>
- <location line="+7"/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location line="+36"/>
<source>Already Exists</source>
<translation>Datei existiert bereits</translation>
</message>
<message>
- <location line="+1"/>
<source>A file named '%1' already exists.</source>
<translation>Eine Datei des Namens '%1' existiert bereits.</translation>
</message>
<message>
- <location line="+6"/>
<source>Cannot Create</source>
<translation>Ordner kann nicht angelegt werden</translation>
</message>
<message>
- <location line="+1"/>
<source>The folder '%1' could not be created.</source>
<translation>Der Ordner %1 konnte nicht angelegt werden.</translation>
</message>
@@ -24203,7 +20028,6 @@ Server: %2.</translation>
<context>
<name>Debugger::Internal::AttachTcfDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerdialogs.cpp" line="-166"/>
<source>Select Executable</source>
<translation>Ausführbare Datei auswählen</translation>
</message>
@@ -24211,22 +20035,18 @@ Server: %2.</translation>
<context>
<name>Debugger::DebuggerPlugin</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+31"/>
<source>Option '%1' is missing the parameter.</source>
<translation>Das Kommandozeilenargument '%1' erfordert einen Parameter.</translation>
</message>
<message>
- <location line="+5"/>
<source>The parameter '%1' of option '%2' is not a number.</source>
<translation>Der Parameter '%1' des Kommandozeilenarguments '%2' ist keine Zahl.</translation>
</message>
<message>
- <location line="+62"/>
<source>Invalid debugger option: %1</source>
<translation>Ungültiger Debugger-Kommandozeilenparameter: %1</translation>
</message>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+117"/>
<source>The application requires the debugger engine '%1', which is disabled.</source>
<translation>Diese Anwendung erfordert den Debugger '%1', der gegenwärtig deaktiviert ist.</translation>
</message>
@@ -24234,211 +20054,166 @@ Server: %2.</translation>
<context>
<name>Debugger::DebuggerPluginPrivate</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerplugin.cpp" line="+355"/>
<source>QML Script Console</source>
<translation>QML Skript-Konsole</translation>
</message>
<message>
- <location line="+19"/>
<source>Continue</source>
<translation>Fortsetzen</translation>
</message>
<message>
- <location line="+6"/>
- <location line="+263"/>
<source>Stop Debugger</source>
<translation>Debugger anhalten</translation>
</message>
<message>
- <location line="-259"/>
<source>Interrupt</source>
<translation>Anhalten</translation>
</message>
<message>
- <location line="+4"/>
<source>Abort Debugging</source>
<translation>Debuggen abbrechen</translation>
</message>
<message>
- <location line="+2"/>
<source>Aborts debugging and resets the debugger to the initial state.</source>
<translation>Bricht das Debuggen ab und setzt den Debugger in den Ausgangszustand.</translation>
</message>
<message>
- <location line="+3"/>
<source>Step Over</source>
<translation>Einzelschritt über</translation>
</message>
<message>
- <location line="+5"/>
<source>Step Into</source>
<translation>Einzelschritt herein</translation>
</message>
<message>
- <location line="+5"/>
<source>Step Out</source>
<translation>Einzelschritt heraus</translation>
</message>
<message>
- <location line="+5"/>
- <location line="+2"/>
<source>Run to Line</source>
<translation>Ausführen bis Zeile</translation>
</message>
<message>
- <location line="+4"/>
<source>Run to Outermost Function</source>
<translation>Ausführen bis zu äußerster Funktion</translation>
</message>
<message>
- <location line="+4"/>
<source>Immediately Return From Inner Function</source>
<translation>Sofortiges Herausspringen aus innerer Funktion</translation>
</message>
<message>
- <location line="+3"/>
- <location line="+2"/>
<source>Jump to Line</source>
<translation>Zeile anspringen</translation>
</message>
<message>
- <location line="+3"/>
<source>Toggle Breakpoint</source>
<translation>Haltepunkt umschalten</translation>
</message>
<message>
- <location line="+2"/>
- <location line="+2"/>
<source>Add to Watch Window</source>
<translation>Zu Überwachten Ausdrücken hinzufügen</translation>
</message>
<message>
- <location line="+3"/>
<source>Create Snapshot</source>
<translation>Snapshot erzeugen</translation>
</message>
<message>
- <location line="+6"/>
<source>Reverse Direction</source>
<translation>Umgekehrte Richtung</translation>
</message>
<message>
- <location line="+8"/>
<source>Move to Called Frame</source>
<translation>Gehe zum aufgerufenen Stackframe</translation>
</message>
<message>
- <location line="+3"/>
<source>Move to Calling Frame</source>
<translation>Gehe zumaufrufenden Stackframe</translation>
</message>
<message>
- <location line="+38"/>
<source>C++</source>
- <translation>C++</translation>
+ <translation type="obsolete">C++</translation>
</message>
<message>
- <location line="+1"/>
<source>QML/JavaScript</source>
- <translation>QML/JavaScript</translation>
+ <translation type="obsolete">QML/JavaScript</translation>
</message>
<message>
- <location line="+62"/>
<source>Error evaluating command line arguments: %1</source>
<translation>Fehler beim Auswerten der Kommandozeilenargumente: %1</translation>
</message>
<message>
- <location line="+18"/>
<source>Start and Debug External Application...</source>
<translation>Debugge externe Anwendung...</translation>
</message>
<message>
- <location line="+5"/>
<source>Attach to Running External Application...</source>
<translation>Debugge externe, laufende Anwendung...</translation>
</message>
<message>
- <location line="+5"/>
<source>Attach to Core...</source>
<translation>Debugge core-Datei</translation>
</message>
<message>
- <location line="+4"/>
<source>Attach to Running Tcf Agent...</source>
<translation>Verbinde zu Tcf-Agent...</translation>
</message>
<message>
- <location line="+1"/>
<source>This attaches to a running 'Target Communication Framework' agent.</source>
<translation>Verbindet zu einem laufenden Agenten, der das 'Target Communication Framework'-Protokoll verwendet.</translation>
</message>
<message>
- <location line="+5"/>
<source>Start and Attach to Remote Application...</source>
<translation>An entfernte Anwendung anhängen...</translation>
</message>
<message>
- <location line="+5"/>
<source>Detach Debugger</source>
<translation>Debugger abhängen</translation>
</message>
<message>
- <location line="+57"/>
<source>Interrupt Debugger</source>
<translation>Debugger unterbrechen</translation>
</message>
<message>
- <location line="+6"/>
<source>Reset Debugger</source>
<translation>Debugger zurücksetzen</translation>
</message>
<message>
- <location line="+206"/>
<source>Threads:</source>
<translation>Threads:</translation>
</message>
<message>
- <location line="+131"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="+1"/>
<source>Cannot attach to PID 0</source>
<translation>Der Debugger kann nicht an die Prozess-Id 0 angehängt werden</translation>
</message>
<message>
- <location line="+5"/>
<source>Process %1</source>
<translation>Prozess %1</translation>
</message>
<message>
- <location line="+25"/>
<source>Core file "%1"</source>
<translation>Core-Datei "%1"</translation>
</message>
<message>
- <location line="+13"/>
<source>Remote: "%1"</source>
<translation>Verbindung: "%1"</translation>
</message>
<message>
- <location line="+92"/>
<source>Attaching to PID %1.</source>
<translation>An Prozess %1 angehängt.</translation>
</message>
<message>
- <location line="+11"/>
<source>Attaching to remote server %1.</source>
<translation>Verbinde zu Server %1.</translation>
</message>
<message>
- <location line="+3"/>
<source>Attaching to core %1.</source>
<translation>Debugge core-Datei %1.</translation>
</message>
<message>
- <location line="+484"/>
<source>Save Debugger Log</source>
<translation>Debugger Log speichern</translation>
</message>
@@ -24446,7 +20221,6 @@ Server: %2.</translation>
<context>
<name>Debugger::DebuggerRunControlFactory</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerrunner.cpp" line="+21"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
@@ -24454,47 +20228,42 @@ Server: %2.</translation>
<context>
<name>Debugger::DebuggerRunControl</name>
<message>
- <location line="+313"/>
<source>Cannot debug '%1' (tool chain: '%2'): %3</source>
<translation>Der Debugger kann nicht mit '%1' (Toolchain '%2') gestartet werden: %3</translation>
</message>
<message>
- <location line="+2"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="+88"/>
<source>Debugger</source>
<translation>Debugger</translation>
</message>
<message>
- <location line="+8"/>
<source>Starting debugger '%1' for tool chain '%2'...</source>
<translation>Starte Debugger '%1' für Toolchain '%2'...</translation>
</message>
<message>
- <location line="+8"/>
<source>Debugging starts</source>
<translation>Debuggen beginnt</translation>
</message>
<message>
- <location line="+7"/>
<source>Debugging has failed</source>
<translation>Debuggen schlug fehl</translation>
</message>
<message>
- <location line="+8"/>
<source>Debugging has finished</source>
<translation>Debuggen beendet</translation>
</message>
<message>
- <location line="+24"/>
- <source>A debugging session are still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it?</source>
+ <source>A debugging session is still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it?</source>
<translation>Der Debugger läuft noch. Das Beenden im gegenwärtigen Zustand könnte zu einem inkonsistenten Zustand des untersuchten Prozesses führen. Möchten Sie ihn trotzdem beenden?</translation>
</message>
<message>
- <location line="+7"/>
+ <source>A debugging session are still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it?</source>
+ <translation type="obsolete">Der Debugger läuft noch. Das Beenden im gegenwärtigen Zustand könnte zu einem inkonsistenten Zustand des untersuchten Prozesses führen. Möchten Sie ihn trotzdem beenden?</translation>
+ </message>
+ <message>
<source>Close Debugging Session</source>
<translation>Debuggen beenden</translation>
</message>
@@ -24502,12 +20271,10 @@ Server: %2.</translation>
<context>
<name>Debugger::Internal::LocalPlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/localplaingdbadapter.cpp" line="+77"/>
<source>Cannot set up communication with child process: %1</source>
<translation>Die Kommunikation mit dem untergeordneten Prozess konnte nicht hergestellt werden: %1</translation>
</message>
<message>
- <location line="+67"/>
<source>This does not seem to be a "Debug" build.
Setting breakpoints by file name and line number may fail.</source>
<translation>Es liegt offenbar kein "Debug"-Build vor.
@@ -24517,27 +20284,22 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<context>
<name>Debugger::Internal::RemoteGdbProcess</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbprocess.cpp" line="+85"/>
<source>Connection could not be established.</source>
<translation>Es konnte keine Verbindung hergestellt werden.</translation>
</message>
<message>
- <location line="+6"/>
<source>Could not create FIFO.</source>
<translation>Es konnte keine FiFo erstellt werden.</translation>
</message>
<message>
- <location line="+35"/>
<source>Application output reader unexpectedly finished.</source>
<translation>Das Lesen der Ausgabe der Anwendung wurde plötzlich abgebrochen.</translation>
</message>
<message>
- <location line="+12"/>
<source>Remote gdb failed to start.</source>
<translation>Der entfernte gdb-Prozess konnte nicht gestartet werden.</translation>
</message>
<message>
- <location line="+3"/>
<source>Remote gdb crashed.</source>
<translation>Der entfernte gdb-Prozess ist abgestürzt.</translation>
</message>
@@ -24545,17 +20307,14 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<context>
<name>Debugger::Internal::TcfTrkGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/tcftrkgdbadapter.cpp" line="+86"/>
<source>Process started, PID: 0x%1, thread id: 0x%2, code segment: 0x%3, data segment: 0x%4.</source>
<translation>Der Prozess wurde gestartet, PID: 0x%1, Thread-Id: 0x%2, Code-Segment: 0x%3, Datensegment: 0x%4.</translation>
</message>
<message>
- <location line="+151"/>
<source>The reported code segment address (0x%1) might be invalid. Symbol resolution or setting breakoints may not work.</source>
<translation>Die erhaltene Startadresse des Codesegments (%0x1) ist eventuell ungültig. Bei Auflösen von Symbolen oder beim Setzen von Haltpunkten könnten Probleme auftreten.</translation>
</message>
<message>
- <location line="+37"/>
<source>Connecting to TRK server adapter failed:
</source>
<translation>Die Verbindung zum TRK-Server-Adapter schlug fehl:
@@ -24565,17 +20324,14 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<context>
<name>Debugger::Internal::ScriptConsole</name>
<message>
- <location filename="../../../src/plugins/debugger/qml/scriptconsole.cpp" line="+68"/>
<source><Type expression to evaluate></source>
<translation><Geben Sie einen Ausdruck ein></translation>
</message>
<message>
- <location line="+1"/>
<source>Write and evaluate QtScript expressions.</source>
<translation>QtScript-Ausdrücke schreiben und auswerten.</translation>
</message>
<message>
- <location line="+57"/>
<source>Script Console
</source>
<translation>Skript-Konsole
@@ -24585,12 +20341,10 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<context>
<name>Debugger::Internal::SourceFilesHandler</name>
<message>
- <location filename="../../../src/plugins/debugger/sourcefileshandler.cpp" line="+65"/>
<source>Internal name</source>
<translation>Interner Name</translation>
</message>
<message>
- <location line="+1"/>
<source>Full name</source>
<translation>Vollständiger Name</translation>
</message>
@@ -24598,17 +20352,14 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<context>
<name>Debugger::Internal::TcfEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/tcf/tcfengine.cpp" line="+169"/>
<source>%1.</source>
<translation>%1.</translation>
</message>
<message>
- <location line="+24"/>
<source>Running requested...</source>
<translation>Fortsetzung angefordert...</translation>
</message>
<message>
- <location line="+366"/>
<source>Stopped.</source>
<translation>Angehalten.</translation>
</message>
@@ -24616,7 +20367,6 @@ Das Setzen von Haltepunkten nach Dateinamen und Zeilennummern könnte nicht funk
<context>
<name>Git::Internal::SettingsPageWidget</name>
<message>
- <location filename="../../../src/plugins/git/settingspage.cpp" line="-97"/>
<source>Set the environment variable HOME to '%1'
(%2).
This causes msysgit to look for the SSH-keys in that location
@@ -24627,12 +20377,10 @@ msysgit wird diese Angabe an Stelle des Installationsordners zum Lokalisieren de
wenn es außerhalb von git bash aufgerufen wird.</translation>
</message>
<message>
- <location line="+4"/>
<source>not currently set</source>
<translation>momentan nicht gesetzt</translation>
</message>
<message>
- <location line="+1"/>
<source>currently set to '%1'</source>
<translation>momentaner Wert '%1'</translation>
</message>
@@ -24640,12 +20388,10 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>Help::Internal::ExternalHelpWindow</name>
<message>
- <location filename="../../../src/plugins/help/externalhelpwindow.cpp" line="+142"/>
<source>Show Sidebar</source>
<translation>Seitenleiste anzeigen</translation>
</message>
<message>
- <location line="+29"/>
<source>Qt Creator Offline Help</source>
<translation>Qt Creator-Offline-Hilfe</translation>
</message>
@@ -24653,12 +20399,10 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>EditorManager</name>
<message>
- <location filename="../../../src/plugins/help/helpplugin.cpp" line="-619"/>
<source>Next Open Document in History</source>
<translation>Nächstes geöffnetes Dokument im Verlauf</translation>
</message>
<message>
- <location line="+8"/>
<source>Previous Open Document in History</source>
<translation>Vorhergehendes geöffnetes Dokument im Verlauf</translation>
</message>
@@ -24666,7 +20410,6 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>Help::Internal::OpenPagesManager</name>
<message>
- <location filename="../../../src/plugins/help/openpagesmanager.cpp" line="+332"/>
<source>Copy Full Path to Clipboard</source>
<translation>Vollständigen Pfad in die Zwischenablage kopieren</translation>
</message>
@@ -24674,7 +20417,6 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>Help::Internal::RemoteHelpFilter</name>
<message>
- <location filename="../../../src/plugins/help/remotehelpfilter.cpp" line="+34"/>
<source>Online Documentation</source>
<translation>Online-Dokumentation</translation>
</message>
@@ -24682,62 +20424,50 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ImageViewer::Internal::ImageViewerActionHandler</name>
<message>
- <location filename="../../../src/plugins/imageviewer/imagevieweractionhandler.cpp" line="+115"/>
<source>Zoom In</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl++</source>
<translation>Ctrl++</translation>
</message>
<message>
- <location line="+1"/>
<source>Zoom Out</source>
<translation>Verkleinern</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+-</source>
<translation>Ctrl+-</translation>
</message>
<message>
- <location line="+1"/>
<source>Original Size</source>
<translation>Originalgröße</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+0</source>
<translation>Ctrl+0</translation>
</message>
<message>
- <location line="+1"/>
<source>Fit To Screen</source>
<translation>An Bildschirm anpassen</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+=</source>
<translation>Ctrl+=</translation>
</message>
<message>
- <location line="+1"/>
<source>Switch background</source>
<translation>Hintergrund umschalten</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+[</source>
<translation>Ctrl+[</translation>
</message>
<message>
- <location line="+1"/>
<source>Switch outline</source>
<translation>Umriss umschalten</translation>
</message>
<message>
- <location line="+1"/>
<source>Ctrl+]</source>
<translation>Ctrl+]</translation>
</message>
@@ -24745,48 +20475,39 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::Internal::BuildStepListWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/buildstepspage.cpp" line="-250"/>
<source>%1 Steps</source>
<extracomment>%1 is the name returned by BuildStepList::displayName</extracomment>
<translation>Schritte für %1</translation>
</message>
<message>
- <location line="+6"/>
<source>No %1 Steps</source>
<translation>Keine Schritte für %1</translation>
</message>
<message>
- <location line="+2"/>
<source>Add %1 Step</source>
<translation>Schritt für %1 hinzufügen</translation>
</message>
<message>
- <location line="+62"/>
<source>Move Up</source>
<translation>Nach oben</translation>
</message>
<message>
- <location line="+6"/>
<source>Move Down</source>
<translation>Nach unten</translation>
</message>
<message>
- <location line="+6"/>
<source>Remove Item</source>
<translation>Element löschen</translation>
</message>
<message>
- <location line="+79"/>
<source>Removing Step failed</source>
<translation>Das Entfernen des Build-Schritts schlug fehl</translation>
</message>
<message>
- <location line="+1"/>
<source>Cannot remove build step while building</source>
<translation>Während des Build-Vorgangs ist das Entfernen eines Build-Schritts nicht möglich</translation>
</message>
<message>
- <location line="+24"/>
<source>No Build Steps</source>
<translation>Keine Build-Schritte</translation>
</message>
@@ -24794,25 +20515,21 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::Internal::CopyTaskHandler</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/copytaskhandler.cpp" line="+51"/>
<source>error: </source>
<comment>Task is of type error</comment>
<translation>Fehler:</translation>
</message>
<message>
- <location line="+3"/>
<source>warning: </source>
<comment>Task is of type warning</comment>
<translation>Warnung:</translation>
</message>
<message>
- <location line="+13"/>
<source>&Copy</source>
<comment>Name of the action triggering the copytaskhandler</comment>
<translation>&Kopieren</translation>
</message>
<message>
- <location line="+1"/>
<source>Copy task to clipboard</source>
<translation>Inhalt in Zwischenablage kopieren</translation>
</message>
@@ -24820,14 +20537,11 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::DeployConfiguration</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/deployconfiguration.cpp" line="+55"/>
- <location line="+54"/>
<source>Deploy</source>
<extracomment>Display name of the deploy build step list. Used as part of the labels in the project window.</extracomment>
<translation>Deployment</translation>
</message>
<message>
- <location line="-52"/>
<source>No deployment</source>
<extracomment>Default DeployConfiguration display name</extracomment>
<translation>Kein Deployment</translation>
@@ -24836,7 +20550,6 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::DeployConfigurationFactory</name>
<message>
- <location line="+99"/>
<source>Deploy Configuration</source>
<extracomment>Display name of the default deploy configuration</extracomment>
<translation>Deployment-Konfiguration</translation>
@@ -24845,7 +20558,6 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::Internal::EditorSettingsWidget</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/editorsettingspropertiespage.cpp" line="+20"/>
<source>Default</source>
<translation>Vorgabe</translation>
</message>
@@ -24853,27 +20565,22 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::RunControl</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/runconfiguration.cpp" line="+324"/>
<source>Application Still Running</source>
<translation>Anwendung läuft noch</translation>
</message>
<message>
- <location line="+1"/>
<source>%1 is still running.</source>
<translation>%1 läuft noch.</translation>
</message>
<message>
- <location line="+3"/>
<source>Force it to quit?</source>
<translation>Soll sie beendet werden?</translation>
</message>
<message>
- <location line="+2"/>
<source>Force Quit</source>
<translation>Beenden</translation>
</message>
<message>
- <location line="+1"/>
<source>Keep Running</source>
<translation>Fortsetzen</translation>
</message>
@@ -24881,12 +20588,10 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::Internal::ShowInEditorTaskHandler</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/showineditortaskhandler.cpp" line="+63"/>
<source>&Show in editor</source>
<translation>In &Editor anzeigen</translation>
</message>
<message>
- <location line="+1"/>
<source>Show task location in an editor</source>
<translation>Fundstelle in Editor anzeigen</translation>
</message>
@@ -24894,12 +20599,10 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::Internal::ShowOutputTaskHandler</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/showoutputtaskhandler.cpp" line="+62"/>
<source>Show &Output</source>
<translation>&Ausgabe anzeigen</translation>
</message>
<message>
- <location line="+1"/>
<source>Show output generating this issue.</source>
<translation>Zum Problem gehörende Ausgabe anzeigen</translation>
</message>
@@ -24907,18 +20610,14 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::Internal::TaskWindow</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="-478"/>
- <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+64"/>
<source>Build Issues</source>
<translation>Build-Probleme</translation>
</message>
<message>
- <location line="+31"/>
<source>Show Warnings</source>
<translation>Warnungen anzeigen</translation>
</message>
<message>
- <location line="+5"/>
<source>Filter by categories</source>
<translation>Nach Kategorie filtern</translation>
</message>
@@ -24926,12 +20625,10 @@ wenn es außerhalb von git bash aufgerufen wird.</translation>
<context>
<name>ProjectExplorer::UserFileAccessor</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/userfileaccessor.cpp" line="-576"/>
<source>Project Settings File from a different Environment?</source>
<translation>Projektdatei aus anderer Umgebung?</translation>
</message>
<message>
- <location line="+2"/>
<source>Qt Creator has found a .user settings file which was created for another development setup, maybe originating from another machine.
The .user settings files contain environment specific settings. They should not be copied to a different environment.
@@ -24947,17 +20644,14 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>ProjectExplorer::UserFileHandler</name>
<message>
- <location line="+924"/>
<source>No deployment</source>
<translation>Kein Deployment</translation>
</message>
<message>
- <location line="+9"/>
<source>Deploy to Maemo device</source>
<translation>Deployment auf Maemo-Gerät</translation>
</message>
<message>
- <location line="+2"/>
<source>Deploy to Symbian device</source>
<translation>Deployment auf Symbian-Gerät</translation>
</message>
@@ -24965,7 +20659,6 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>ProjectExplorer::Internal::VcsAnnotateTaskHandler</name>
<message>
- <location filename="../../../src/plugins/projectexplorer/vcsannotatetaskhandler.cpp" line="+71"/>
<source>&Annotate</source>
<translation>&Annotation</translation>
</message>
@@ -24973,12 +20666,10 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSEditor::ComponentFromObjectDef</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp" line="+101"/>
<source>Move Component into separate file</source>
<translation>Verschiebe Komponente in separate Datei</translation>
</message>
<message>
- <location line="+4"/>
<source>Move Component into '%1.qml'</source>
<translation>Verschiebe Komponente in '%1.qml'</translation>
</message>
@@ -24986,15 +20677,17 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSEditor::Internal::QmlJSOutlineWidget</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljsoutline.cpp" line="+86"/>
<source>Show all bindings</source>
+ <translation type="obsolete">Alle Bindings anzeigen</translation>
+ </message>
+ <message>
+ <source>Show All Bindings</source>
<translation>Alle Bindings anzeigen</translation>
</message>
</context>
<context>
<name>QmlJSEditor::QuickFix</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljsquickfixes.cpp" line="+87"/>
<source>Split initializer</source>
<translation>Initialisierung aufspalten</translation>
</message>
@@ -25002,77 +20695,62 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSInspector::Internal::QmlInspectorToolbar</name>
<message>
- <location filename="../../../src/plugins/qmljsinspector/qmlinspectortoolbar.cpp" line="+181"/>
<source>Apply Changes to Document</source>
<translation>Änderungen auf Dokument anwenden</translation>
</message>
<message>
- <location line="+1"/>
<source>Observer Mode</source>
<translation>Beobachter-Modus</translation>
</message>
<message>
- <location line="+2"/>
<source>Reload</source>
<translation>Neu laden</translation>
</message>
<message>
- <location line="+1"/>
<source>Play/Pause Animations</source>
<translation>Animationen pausieren/fortsetzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Select</source>
<translation>Auswählen</translation>
</message>
<message>
- <location line="+1"/>
<source>Zoom</source>
<translation>Vergrößern</translation>
</message>
<message>
- <location line="+1"/>
<source>Color Picker</source>
<translation>Farbauswahl</translation>
</message>
<message>
- <location line="+1"/>
<source>Live Preview Changes in QML Viewer</source>
<translation>Änderungen im QML-Betrachter unmittelbar anzeigen</translation>
</message>
<message>
- <location line="+31"/>
<source>Animation Speed</source>
<translation>Animationsgeschwindigkeit</translation>
</message>
<message>
- <location line="+2"/>
<source>1x</source>
<translation>1x</translation>
</message>
<message>
- <location line="+5"/>
<source>0.5x</source>
<translation>0.5x</translation>
</message>
<message>
- <location line="+4"/>
<source>0.25x</source>
<translation>0.25x</translation>
</message>
<message>
- <location line="+4"/>
<source>0.125x</source>
<translation>0.125x</translation>
</message>
<message>
- <location line="+4"/>
<source>0.1x</source>
<translation>0.1x</translation>
</message>
<message>
- <location line="+4"/>
<source>Pause</source>
<translation>Pause</translation>
</message>
@@ -25080,7 +20758,6 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSInspector::Internal::ContextCrumblePath</name>
<message>
- <location filename="../../../src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp" line="+58"/>
<source>[no context]</source>
<translation>[kein context]</translation>
</message>
@@ -25088,12 +20765,10 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSInspector::Internal::InspectorUi</name>
<message>
- <location filename="../../../src/plugins/qmljsinspector/qmljsinspector.cpp" line="+577"/>
<source>Context Path</source>
<translation>Kontextpfad</translation>
</message>
<message>
- <location line="+6"/>
<source>QML Observer</source>
<translation>QML-Beobachter</translation>
</message>
@@ -25101,32 +20776,26 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSInspector::Internal::QmlJSLiveTextPreview</name>
<message>
- <location filename="../../../src/plugins/qmljsinspector/qmljslivetextpreview.cpp" line="+565"/>
<source>You changed a QML file in Live Preview mode, which modifies the running QML application. In case of unexpected behavior, please reload the QML application. </source>
<translation>Sie haben eine QML-Datei im Live-Vorschaumodus geändert, was in die laufende QML-Anwendung eingreift. Im Falle des Auftretens von unerwartetem Verhalten laden Sie die bitte die Anwendung neu.</translation>
</message>
<message>
- <location line="+3"/>
<source>Disable Live Preview</source>
<translation>Live-Vorschaumodus deaktivieren</translation>
</message>
<message>
- <location line="+11"/>
<source>The %1 attribute at line %2, column %3 cannot be changed without reloading the QML application. </source>
<translation>Das Attribut %1 bei Zeile %2, Spalte %3 kann nicht ohne Neuladen der QML-Anwendung geändert werden.</translation>
</message>
<message>
- <location line="+4"/>
<source>The %1 element at line %2, column %3 cannot be changed without reloading the QML application. </source>
<translation>Das Element %1 bei Zeile %2, Spalte %3 kann nicht ohne Neuladen der QML-Anwendung geändert werden.</translation>
</message>
<message>
- <location line="+8"/>
<source>You can continue debugging, but behavior can be unexpected.</source>
<translation>Sie können das Debuggen fortsetzen. es kann allerdings unerwartetes Verhalten auftreten.</translation>
</message>
<message>
- <location line="+2"/>
<source>Reload</source>
<translation>Neu laden</translation>
</message>
@@ -25134,12 +20803,10 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSInspector::Internal::QmlJSObjectTree</name>
<message>
- <location filename="../../../src/plugins/qmljsinspector/qmljsobjecttree.cpp" line="+106"/>
<source>Go to file</source>
<translation>Gehe zu Datei</translation>
</message>
<message>
- <location line="+70"/>
<source>Url: </source>
<translation>Url: </translation>
</message>
@@ -25147,7 +20814,6 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>QmlJSInspector::ToolBarColorBox</name>
<message>
- <location filename="../../../src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp" line="+53"/>
<source>Copy Color</source>
<translation>Farbe kopieren</translation>
</message>
@@ -25155,22 +20821,18 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>Qt4ProjectManager::Internal::AddLibraryWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/addlibrarywizard.cpp" line="+60"/>
<source>Add Library</source>
<translation>Bibliothek hinzufügen</translation>
</message>
<message>
- <location line="+11"/>
<source>Type</source>
<translation>Typ</translation>
</message>
<message>
- <location line="+2"/>
<source>Details</source>
<translation>Details</translation>
</message>
<message>
- <location line="+1"/>
<source>Summary</source>
<translation>Zusammenfassung</translation>
</message>
@@ -25178,46 +20840,38 @@ Möchten Sie sie trotzdem laden?</translation>
<context>
<name>Qt4ProjectManager::Internal::LibraryTypePage</name>
<message>
- <location line="+36"/>
<source>Library Type</source>
<translation>Typ der Bibliothek</translation>
</message>
<message>
- <location line="+1"/>
<source>Choose the type of the library to link to</source>
<translation>Wählen Sie den Typ der Bibliothek, gegen die Sie Ihr Projekt linken möchten</translation>
</message>
<message>
- <location line="+4"/>
<source>System library</source>
<translation>Systembibliothek</translation>
</message>
<message>
- <location line="+4"/>
<source>Links to a system library.
Neither the path to the library nor the path to its includes is added to the .pro file.</source>
<translation>Linken gegen eine Systembibliothek.
Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-Datei hinzugefügt.</translation>
</message>
<message>
- <location line="+9"/>
<source>External library</source>
<translation>Externe Bibliothek</translation>
</message>
<message>
- <location line="+3"/>
<source>Links to a library that is not located in your build tree.
Adds the library and include paths to the .pro file.</source>
<translation>Linken gegen eine Systembibliothek.
Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-Datei hinzugefügt.</translation>
</message>
<message>
- <location line="+9"/>
<source>Internal library</source>
<translation>Interne Bibliothek</translation>
</message>
<message>
- <location line="+3"/>
<source>Links to a library that is located in your build tree.
Adds the library and include paths to the .pro file.</source>
<translation>Linken gegen eine Systembibliothek.
@@ -25227,32 +20881,26 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::DetailsPage</name>
<message>
- <location line="+62"/>
<source>System Library</source>
<translation>Systembibliothek</translation>
</message>
<message>
- <location line="+1"/>
<source>Specify the library to link to</source>
<translation>Wählen Sie den Typ der zu verwendenden Bibliothek</translation>
</message>
<message>
- <location line="+6"/>
<source>Specify the library to link to and the includes path</source>
<translation>Geben Sie den Pfad und die Include-Pfade der Bibliothek an</translation>
</message>
<message>
- <location line="+6"/>
<source>Choose the project file of the library to link to</source>
<translation>Geben Sie die Projektdatei der zu verwendenden Bibliothek an</translation>
</message>
<message>
- <location line="-7"/>
<source>External Library</source>
<translation>Externe Bibliothek</translation>
</message>
<message>
- <location line="+6"/>
<source>Internal Library</source>
<translation>Interne Bibliothek</translation>
</message>
@@ -25260,12 +20908,10 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::SummaryPage</name>
<message>
- <location line="+21"/>
<source>Summary</source>
<translation>Zusammenfassung</translation>
</message>
<message>
- <location line="+18"/>
<source>The following snippet will be added to the<br><b>%1</b> file:</source>
<translation>Die folgende Angabe wird in die Datei <br><b>%1</b> eingefügt:</translation>
</message>
@@ -25273,32 +20919,26 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::LibraryDetailsController</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/librarydetailscontroller.cpp" line="+190"/>
<source>Linkage:</source>
<translation>Linken:</translation>
</message>
<message>
- <location line="+5"/>
<source>%1 Dynamic</source>
<translation>%1 dynamisch</translation>
</message>
<message>
- <location line="+4"/>
<source>%1 Static</source>
<translation>%1 statisch</translation>
</message>
<message>
- <location line="+14"/>
<source>Mac:</source>
<translation>Mac:</translation>
</message>
<message>
- <location line="+5"/>
<source>%1 Framework</source>
<translation>%1 Framework</translation>
</message>
<message>
- <location line="+4"/>
<source>%1 Library</source>
<translation>%1 Bibliothek</translation>
</message>
@@ -25306,37 +20946,30 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDebugSupport</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp" line="+132"/>
<source>No device configuration set for run configuration.</source>
<translation>Für Ausführungskonfiguration ist keine Gerätekonfiguration eingestellt.</translation>
</message>
<message>
- <location line="+5"/>
<source>Preparing remote side ...</source>
<translation>Bereite Gegenseite vor...</translation>
</message>
<message>
- <location line="+50"/>
<source>Upload failed: Could not open file '%1'</source>
<translation>Fehlschlag beim Hochladen: Die Datei '%1' konnte nicht geöffnet werden</translation>
</message>
<message>
- <location line="+3"/>
<source>Started uploading debugging helpers ('%1').</source>
<translation>Hochladen der Debugger-Ausgabe-Hilfsbibliothek ('%1') begonnen.</translation>
</message>
<message>
- <location line="+25"/>
<source>Could not upload debugging helpers: %1.</source>
<translation>Die Debugger-Ausgabe-Hilfsbibliothek ('%1') konnte nicht hochgeladen werden.</translation>
</message>
<message>
- <location line="+5"/>
<source>Finished uploading debugging helpers.</source>
<translation>Hochladen der Debugger-Ausgabe-Hilfsbibliothek ('%1') beendet.</translation>
</message>
<message>
- <location line="+69"/>
<source>Initial setup failed: %1</source>
<translation>Initialisierung fehlgeschlagen: %1</translation>
</message>
@@ -25344,27 +20977,22 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDeployableListModel</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp" line="+109"/>
<source>File already in list.</source>
<translation>Die Datei ist bereits in der Liste enthalten.</translation>
</message>
<message>
- <location line="+6"/>
<source>Failed to update .pro file.</source>
<translation>Die .pro-Datei konnte nicht geändert werden.</translation>
</message>
<message>
- <location line="+17"/>
<source>Could not update .pro file.</source>
<translation>Die .pro-Datei konnte nicht geändert werden.</translation>
</message>
<message>
- <location line="+66"/>
<source>Local File Path</source>
<translation>Lokaler Pfad</translation>
</message>
<message>
- <location line="+0"/>
<source>Remote Directory</source>
<translation>Entfernter Ordner</translation>
</message>
@@ -25372,17 +21000,14 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDeployableListWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistwidget.cpp" line="+86"/>
<source>Choose a local file</source>
<translation>Lokale Datei</translation>
</message>
<message>
- <location line="+9"/>
<source>Error adding file</source>
<translation>Fehler beim Hinzufügen der Datei</translation>
</message>
<message>
- <location line="+20"/>
<source>Error removing file</source>
<translation>Fehler beim Entfernen der Datei</translation>
</message>
@@ -25390,124 +21015,99 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDeployStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp" line="+89"/>
<source>Deploy to Maemo device</source>
<extracomment>MaemoDeployStep default display name</extracomment>
<translation>Deployment auf Maemo-Gerät</translation>
</message>
<message>
- <location line="+192"/>
<source>Cannot start deployment, as the clean-up from the last time has not finished yet.</source>
<translation>Das Deployment kann nicht gestartet werden, da die Bereinigung vom letzten Mal noch nicht abgeschlossen wurde.</translation>
</message>
<message>
- <location line="+7"/>
<source>Deployment failed: No valid device set.</source>
<translation>Fehlschlag beim Deployment: Es ist kein gültiges Gerät eingestellt.</translation>
</message>
<message>
- <location line="+28"/>
<source>All files up to date, no installation necessary.</source>
<translation>Alle Dateien sind auf dem aktuellen Stand, es ist keine Installation erforderlich.</translation>
</message>
<message>
- <location line="+12"/>
<source>Could not connect to host: %1</source>
<translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
</message>
<message>
- <location line="+18"/>
<source>Upload failed: Could not open file '%1'</source>
<translation>Fehlschlag beim Hochladen: Die Datei '%1' konnte nicht geöffnet werden</translation>
</message>
<message>
- <location line="+3"/>
<source>Started uploading file '%1'.</source>
<translation>Hochladen der Datei '%1' begonnen.</translation>
</message>
<message>
- <location line="+10"/>
<source>Could not set up SFTP connection: %1</source>
<translation>Die SFTP-Verbindung konnte nicht hergestellt werden: %1</translation>
</message>
<message>
- <location line="+14"/>
<source>Failed to upload file %1: %2</source>
<translation>Das Hochladen der Datei %1 schlug fehl: %2</translation>
</message>
<message>
- <location line="+5"/>
<source>Successfully uploaded file '%1'.</source>
<translation>Die Datei '%1' wurde hochgeladen.</translation>
</message>
<message>
- <location line="+42"/>
<source>Deployment finished.</source>
<translation>Deployment beendet.</translation>
</message>
<message>
- <location line="+82"/>
<source>Installing package to sysroot ...</source>
<translation>Installiere Paket auf sysroot...</translation>
</message>
<message>
- <location line="+7"/>
- <location line="+40"/>
<source>Installation to sysroot failed, continuing anyway.</source>
<translation>Die Installation des Paketes auf sysroot schlug fehl, setze fort.</translation>
</message>
<message>
- <location line="-35"/>
<source>Copying files to sysroot ...</source>
<translation>Kopiere Dateien auf sysroot...</translation>
</message>
<message>
- <location line="+10"/>
<source>Sysroot installation failed: Could not copy '%1' to '%2'. Continuing anyway.</source>
<translation>Die Installation auf sysroot schlug fehl: '%1' konnte nicht nach '%2' kopiert werden, setze fort.</translation>
</message>
<message>
- <location line="+46"/>
<source>Connecting to device...</source>
<translation>Verbinde zu Mobilgerät...</translation>
</message>
<message>
- <location line="+25"/>
<source>Installing package to device...</source>
<translation>Installiere Paket auf Mobilgerät...</translation>
</message>
<message>
- <location line="+43"/>
<source>Copying file '%1' to path '%2' on the device...</source>
<translation>Kopiere Datei '%1' in den Pfad '%2' auf dem Mobilgerät...</translation>
</message>
<message>
- <location line="+8"/>
<source>Device has not enough free ports for deployment.</source>
<translation>Das Mobilgerät verfügt nicht über eine ausreichende Anzahl freier Ports für das Deployment.</translation>
</message>
<message>
- <location line="+17"/>
<source>Copying file '%1' failed.</source>
<translation>Das Kopieren der Datei '%1' schlug fehl.</translation>
</message>
<message>
- <location line="+4"/>
<source>Successfully copied file '%1'.</source>
<translation>Die Datei '%1' wurde kopiert.</translation>
</message>
<message>
- <location line="+5"/>
<source>All files copied.</source>
<translation>Alle Dateien kopiert.</translation>
</message>
<message>
- <location line="+62"/>
<source>Installing package failed.</source>
<translation>Die Installation des Pakets schlug fehl.</translation>
</message>
<message>
- <location line="+5"/>
<source>Package installed.</source>
<translation>Paket installiert.</translation>
</message>
@@ -25515,7 +21115,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDeployStepFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp" line="+35"/>
<source>Deploy to device</source>
<translation>Deployment auf Mobilgerät</translation>
</message>
@@ -25523,7 +21122,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDeployStepWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp" line="+72"/>
<source><b>Deploy to device</b>: %1</source>
<translation><b>Deployment auf Mobilgerät</b>: %1</translation>
</message>
@@ -25531,7 +21129,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>MaemoDeviceConfig</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp" line="+212"/>
<source>(Invalid device)</source>
<translation>(Ungültiges Mobilgerät)</translation>
</message>
@@ -25539,12 +21136,10 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoDeviceEnvReader</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp" line="+121"/>
<source>Could not connect to host: %1</source>
<translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
</message>
<message>
- <location line="+17"/>
<source>Error running remote process: %1</source>
<translation>Fehler bei Ausführung des Prozesses auf dem Gerät: %1</translation>
</message>
@@ -25552,7 +21147,6 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoPackageCreationFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp" line="+78"/>
<source>Create Debian Package</source>
<translation>Debian-Paketdatei erzeugen</translation>
</message>
@@ -25560,38 +21154,30 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoQemuManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp" line="+86"/>
- <location line="+461"/>
<source>Start Maemo Emulator</source>
<translation>Maemo-Emulator starten</translation>
</message>
<message>
- <location line="-367"/>
<source>Qemu has been shut down, because you removed the corresponding Qt version.</source>
<translation>Qemu wurde beendet, da die entsprechende Qt-Version entfernt wurde.</translation>
</message>
<message>
- <location line="+249"/>
<source>Qemu finished with error: Exit code was %1.</source>
<translation>Qemu wurde mit einem Fehler beendet, Rückgabewert %1.</translation>
</message>
<message>
- <location line="+25"/>
<source>Qemu failed to start: %1</source>
<translation>Qemu konnte nicht gestartet werden: %1</translation>
</message>
<message>
- <location line="+3"/>
<source>Qemu crashed</source>
<translation>Qemu ist abgestürzt</translation>
</message>
<message>
- <location line="+13"/>
<source>Qemu error</source>
<translation>Qemu-Fehler</translation>
</message>
<message>
- <location line="+74"/>
<source>Stop Maemo Emulator</source>
<translation>Maemo-Emulator stoppen</translation>
</message>
@@ -25599,87 +21185,82 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
<context>
<name>Qt4ProjectManager::Internal::MaemoRemoteMounter</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp" line="+104"/>
+ <source>No directories to mount</source>
+ <translation>Es sind keine Ordner zum Anhängen vorhanden</translation>
+ </message>
+ <message>
+ <source>No directories to unmount</source>
+ <translation>Es sind keine Ordner zum Abhängen vorhanden</translation>
+ </message>
+ <message>
<source>Unmounting remote mount points...</source>
<translation>Hänge entfernte Dateisysteme ab...</translation>
</message>
<message>
- <location line="+18"/>
<source>Could not execute unmount request.</source>
<translation>Unmount-Anforderung konnte nicht ausgeführt werden.</translation>
</message>
<message>
- <location line="+3"/>
<source>Failure unmounting: %1</source>
<translation>Fehlschlag beim Abhängen: %1</translation>
</message>
<message>
- <location line="+13"/>
<source>Finished unmounting.</source>
<translation>Abhängen beendet.</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+137"/>
<source>
stderr was: '%1'</source>
<translation>
Fehlerausgabe: '%1'</translation>
</message>
<message>
- <location line="-111"/>
<source>Setting up SFTP connection...</source>
<translation>Stelle SFTP-Verbindung her...</translation>
</message>
<message>
- <location line="+14"/>
<source>Failed to establish SFTP connection: %1</source>
<translation>Es konnte keine SFTP-Verbindung hergestellt werden: %1</translation>
</message>
<message>
- <location line="+8"/>
<source>Uploading UTFS client...</source>
<translation>Hochladen des UTFS-CLients begonnen...</translation>
</message>
<message>
- <location line="+9"/>
<source>Could not upload UTFS client (%1).</source>
<translation>Fehlschlag beim Hochladen des UTFS-Clients ('%1)</translation>
</message>
<message>
- <location line="+16"/>
<source>Could not upload UTFS client: %1</source>
<translation>Fehlschlag beim Hochladen des UTFS-Clients: %1</translation>
</message>
<message>
- <location line="+33"/>
<source>Starting remote UTFS clients...</source>
<translation>Starte entfernte UTFS-Clients...</translation>
</message>
<message>
- <location line="+28"/>
+ <source>Mount operation succeeded.</source>
+ <translation>Anhängen erfolgreich ausgeführt.</translation>
+ </message>
+ <message>
<source>Failure running UTFS client: %1</source>
<translation>Fehlschlag beim Ausführen des UTFS-Clients: %1</translation>
</message>
<message>
- <location line="+14"/>
<source>Starting UTFS servers...</source>
<translation>Starte UTFS-Server...</translation>
</message>
<message>
- <location line="+43"/>
<source>
stderr was: %1</source>
<translation>
Fehlerausgabe: %1</translation>
</message>
<message>
- <location line="+5"/>
<source>Error running UTFS server: %1</source>
<translation>Fehler bei der Ausführung des UTFS-Servers: %1</translation>
</message>
<message>
- <location line="+52"/>
<source>Timeout waiting for UTFS servers to connect.</source>
<translation>Ãœberschreitung des Zeitlimits beim Warten auf die Verbindung des UTFS-Servers.</translation>
</message>
@@ -25687,12 +21268,10 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::MaemoRemoteMountsModel</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoremotemountsmodel.cpp" line="+130"/>
<source>Local directory</source>
<translation>Lokaler Ordner</translation>
</message>
<message>
- <location line="+1"/>
<source>Remote mount point</source>
<translation>Mount-Punkt</translation>
</message>
@@ -25700,22 +21279,18 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::MaemoRunControl</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp" line="+73"/>
<source>No device configuration set for run configuration.</source>
<translation>Für Ausführungskonfiguration ist keine Gerätekonfiguration eingestellt.</translation>
</message>
<message>
- <location line="+39"/>
<source>Starting remote process ...</source>
<translation>Starte entfernten Prozess...</translation>
</message>
<message>
- <location line="+12"/>
<source>Finished running remote process. Exit code was %1.</source>
<translation>Der entfernte Prozess wurde beendet, Rückgabewert %1.</translation>
</message>
<message>
- <location line="+34"/>
<source>Remote Execution Failure</source>
<translation>Fehler bei Ausführung auf dem Gerät</translation>
</message>
@@ -25723,42 +21298,38 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::MaemoSshRunner</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp" line="+87"/>
<source>Cannot start deployment, as the clean-up from the last time has not finished yet.</source>
- <translation>Das Deployment kann nicht gestartet werden, da die Bereinigung vom letzten Mal noch nicht abgeschlossen wurde.</translation>
+ <translation type="obsolete">Das Deployment kann nicht gestartet werden, da die Bereinigung vom letzten Mal noch nicht abgeschlossen wurde.</translation>
</message>
<message>
- <location line="+21"/>
<source>Connecting to device...</source>
<translation>Verbinde zu Mobilgerät...</translation>
</message>
<message>
- <location line="+27"/>
<source>Could not connect to host: %1</source>
<translation>Es konnte keine Verbindung zum Host %1 hergestellt werden</translation>
</message>
<message>
- <location line="+9"/>
+ <source>Connection failed: %1</source>
+ <translation>Fehler bei Herstellen der Verbindung: %1</translation>
+ </message>
+ <message>
<source>Killing remote process(es)...</source>
<translation>Stoppe entfernte Prozesse...</translation>
</message>
<message>
- <location line="+33"/>
<source>Initial cleanup failed: %1</source>
<translation>Die zu Anfang durchzuführende Bereinigung schlug fehl: %1</translation>
</message>
<message>
- <location line="+55"/>
<source>Error running remote process: %1</source>
<translation>Fehler bei Ausführung des Prozesses auf dem Mobilgerät: %1</translation>
</message>
<message>
- <location line="+24"/>
<source>Cannot run: No remote executable set.</source>
<translation>Keine Ausführung möglich: Es wurde keine ausführbaren Datei gesetzt.</translation>
</message>
<message>
- <location line="+29"/>
<source>The device does not have enough free ports for this run configuration.</source>
<translation>Für diese Ausführungskonfiguration sind nicht ausreichend freie Ports auf dem Mobilgerät verfügbar.</translation>
</message>
@@ -25766,70 +21337,54 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::MaemoTemplatesManager</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp" line="+162"/>
<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>
- <location line="+8"/>
<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>
- <location line="+29"/>
- <location line="+35"/>
<source>Packaging Error: Cannot open file '%1'.</source>
<translation>Fehler bei Paketerstellung: Die Datei '%1' kann nicht geöffnet werden.</translation>
</message>
<message>
- <location line="-11"/>
- <location line="+38"/>
<source>Packaging Error: Cannot write file '%1'.</source>
<translation>Fehler bei Paketerstellung: Die Datei '%1' kann nicht geschrieben werden.</translation>
</message>
<message>
- <location line="+154"/>
- <location line="+6"/>
<source>Debian changelog file '%1' has unexpected format.</source>
<translation>Die Debian-Changelog-Datei '%1' ist in einem unbekannten Format.</translation>
</message>
<message>
- <location line="+23"/>
<source>Error writing Debian changelog file '%1': %2</source>
<translation>Fehler beim Schreiben der Debian-Changelog-Datei '%1': %2</translation>
</message>
<message>
- <location line="+43"/>
<source>Invalid icon data in Debian control file.</source>
<translation>Die Debian-Kontrolldatei enthält ungültige Icon-Daten.</translation>
</message>
<message>
- <location line="+15"/>
<source>Could not read image file '%1'.</source>
<translation>Die Bilddatei '%1' konnte nicht gelesen werden.</translation>
</message>
<message>
- <location line="+9"/>
<source>Could not export image file '%1'.</source>
<translation>Die Bilddatei '%1' konnte nicht exportiert werden.</translation>
</message>
<message>
- <location line="+30"/>
<source>Error writing file '%1': %2</source>
<translation>Fehler beim Schreiben der Datei %1: %2</translation>
</message>
<message>
- <location line="+32"/>
<source>Error creating Maemo templates</source>
<translation>Fehlschlag beim Erstellen der Maemo-Vorlagendateien</translation>
</message>
<message>
- <location line="+29"/>
<source>File '%1' does not exist</source>
<translation>Die Datei '%1' existiert nicht</translation>
</message>
<message>
- <location line="+2"/>
<source>Cannot open file '%1': %2</source>
<translation>Die Datei '%1' kann nicht geöffnet werden: %2</translation>
</message>
@@ -25837,22 +21392,18 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::PassphraseForKeyDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.cpp" line="+47"/>
<source>Passphrase:</source>
<translation>Passphrase:</translation>
</message>
<message>
- <location line="+14"/>
<source>Save passphrase</source>
<translation>Passphrase speichern</translation>
</message>
<message>
- <location line="+2"/>
<source>This is an insecure option. The password will be saved as a plain text.</source>
<translation>Diese Option stellt ein Sicherheitsrisiko dar, da das Passwort als Text gespeichert wird.</translation>
</message>
<message>
- <location line="+12"/>
<source>Passphrase for %1</source>
<translation>Passphrase für %1</translation>
</message>
@@ -25860,12 +21411,10 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::S60DeployConfiguration</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp" line="+292"/>
<source>Deploy %1 to Symbian device</source>
<translation>Deployment von %1 auf Symbian-Gerät</translation>
</message>
<message>
- <location line="+2"/>
<source>Deploy to Symbian device</source>
<translation>Deployment auf Symbian-Gerät</translation>
</message>
@@ -25873,7 +21422,6 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::S60DeployConfigurationFactory</name>
<message>
- <location line="+78"/>
<source>%1 on Symbian Device</source>
<translation>%1 auf Symbian-Gerät</translation>
</message>
@@ -25881,42 +21429,34 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::S60DeployConfigurationWidget</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp" line="+73"/>
<source>Device:</source>
<translation>Gerät:</translation>
</message>
<message>
- <location line="+3"/>
<source>Silent installation</source>
<translation>Stille Installation</translation>
</message>
<message>
- <location line="+28"/>
<source>Installation file:</source>
<translation>Installationspaket:</translation>
</message>
<message>
- <location line="+14"/>
<source>Silent installation is an installation mode that does not require user's intervention. In case it fails the non silent installation is launched.</source>
<translation>Im Modus 'Stille Installation' ist keine Interaktion mit dem Nutzer auf dem Mobilgerät erforderlich. Bei Fehlschlag wird eine Standardinstallation gestartet.</translation>
</message>
<message>
- <location line="+6"/>
<source>Installation drive:</source>
<translation>Installationslaufwerk:</translation>
</message>
<message>
- <location line="+21"/>
<source>Device on serial port:</source>
<translation>Gerät auf serieller Schnittstelle:</translation>
</message>
<message>
- <location line="+9"/>
<source>Queries the device for information</source>
<translation>Fragt Informationen vom Gerät ab</translation>
</message>
<message>
- <location line="+136"/>
<source>Connecting...</source>
<translation>Verbinde...</translation>
</message>
@@ -25924,106 +21464,85 @@ Fehlerausgabe: %1</translation>
<context>
<name>Qt4ProjectManager::Internal::S60DeployStep</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp" line="+65"/>
<source>Unable to remove existing file '%1': %2</source>
<translation>Die existierende Datei '%1' konnte nicht entfernt werden: %2</translation>
</message>
<message>
- <location line="+15"/>
<source>Unable to rename file '%1' to '%2': %3</source>
<translation>Die Datei '%1' konnte nicht in '%2' umbenannt werden: %3</translation>
</message>
<message>
- <location line="+30"/>
<source>Deploy</source>
<extracomment>Qt4 Deploystep display name</extracomment>
<translation>Deployment</translation>
</message>
<message>
- <location line="+82"/>
<source>Renaming new package '%1' to '%2'</source>
<translation>Die Paketdatei wird von '%1' zu '%2' umbenannt</translation>
</message>
<message>
- <location line="+6"/>
<source>Removing old package '%1'</source>
<translation>Entferne Paketdatei '%1'</translation>
</message>
<message>
- <location line="+7"/>
<source>'%1': Package file not found</source>
<translation>'%1': Paketdatei nicht gefunden</translation>
</message>
<message>
- <location line="+10"/>
<source>There is no device plugged in.</source>
<translation>Es ist kein Gerät angeschlossen.</translation>
</message>
<message>
- <location line="+11"/>
<source>Failed to find package %1</source>
<translation>Die Paketdatei'%1 konnte nicht gefunden werden</translation>
</message>
<message>
- <location line="+49"/>
<source>Deploying application to '%2'...</source>
<translation>Deployment der Anwendung auf '%2'...</translation>
</message>
<message>
- <location line="+4"/>
<source>Could not connect to phone on port '%1': %2
Check if the phone is connected and App TRK is running.</source>
<translation>Es konnte keine Verbindung zum Gerät über den Port '%1' hergestellt werden: %2
Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK' läuft.</translation>
</message>
<message>
- <location line="+53"/>
- <location line="+56"/>
<source>Canceled.</source>
<translation>Abgebrochen.</translation>
</message>
<message>
- <location line="-49"/>
<source>Could not create file %1 on device: %2</source>
<translation>Die Datei %1 konnte nicht auf dem Gerät erzeugt werden: %2</translation>
</message>
<message>
- <location line="+6"/>
<source>Could not write to file %1 on device: %2</source>
<translation>Die Datei %1 konnte nicht auf dem Gerät geschrieben werden: %2</translation>
</message>
<message>
- <location line="+6"/>
<source>Could not close file %1 on device: %2. It will be closed when App TRK is closed.</source>
<translation>Die Datei %1 konnte nicht auf dem Gerät geschlossen werden: %2. Sie wird beim Beenden der Trk-Anwendung geschlossen.</translation>
</message>
<message>
- <location line="+7"/>
<source>Could not connect to App TRK on device: %1. Restarting App TRK might help.</source>
<translation>Es konnte keine Verbindung zu App TRK über den Port '%1' hergestellt werden. Bitte versuchen Sie, App TRK neu zu starten.</translation>
</message>
<message>
- <location line="+6"/>
<source>Copying "%1"...</source>
<translation>Kopieren "%1"...</translation>
</message>
<message>
- <location line="+5"/>
<source>Installing package "%1" on drive %2:...</source>
<translation>Installiere Paket "%1" auf Laufwerk %2:...</translation>
</message>
<message>
- <location line="+5"/>
<source>Installation has finished</source>
<translation>Installation beendet</translation>
</message>
<message>
- <location line="+5"/>
<source>Could not install from package %1 on device: %2</source>
<translation>Das Installation des Pakets %1 auf dem Gerät schlug fehl: %2</translation>
</message>
<message>
- <location line="+30"/>
<source>The device '%1' has been disconnected</source>
<translation>Die Verbindung zum Gerät '%1' wurde getrennt</translation>
</message>
@@ -26031,7 +21550,6 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60DeployStepWidget</name>
<message>
- <location line="+23"/>
<source>Deploy SIS Package</source>
<translation>Deployment der SIS-Paketdatei</translation>
</message>
@@ -26039,7 +21557,6 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::S60DeployStepFactory</name>
<message>
- <location line="+74"/>
<source>Deploy SIS Package</source>
<translation>Deployment der SIS-Paketdatei</translation>
</message>
@@ -26047,24 +21564,20 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::SbsV2Parser</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp" line="+70"/>
<source>SBSv2 build log</source>
<translation>Build-Log von SBSv2</translation>
</message>
<message>
- <location line="+42"/>
<source>The file '%1' is not a SBSv2 log file.</source>
<translation>Die Datei '%1; ist kein Build-Log von SBSv2.</translation>
</message>
<message>
- <location line="+67"/>
<source>Running command: %1
</source>
<translation>Führe Kommando '%1' aus
</translation>
</message>
<message>
- <location line="+11"/>
<source>Recipe %1 failed with exit code %2.</source>
<extracomment>%1 is the SBSv2 build recipe name, %2 the return code of the failed command</extracomment>
<translation>Recipe %1 schlug mit demRückgabewert %2 fehl</translation>
@@ -26073,12 +21586,10 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::Qt4DeployConfigurationFactory</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/qt4deployconfiguration.cpp" line="+63"/>
<source>Deploy to Symbian device</source>
<translation>Deployment auf Symbian-Gerät</translation>
</message>
<message>
- <location line="+4"/>
<source>Deploy to Maemo device</source>
<translation>Deployment auf Maemo-Gerät</translation>
</message>
@@ -26086,27 +21597,22 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::QmlStandaloneApp</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp" line="+127"/>
<source>The QML import path '%1' cannot be found.</source>
<translation>Der QML-Importpfad '%1' konnte nicht gefunden werden.</translation>
</message>
<message>
- <location line="+24"/>
<source>The QML module '%1' cannot be found.</source>
<translation>Der QML-Modul '%1' konnte nicht gefunden werden.</translation>
</message>
<message>
- <location line="+129"/>
<source>Invalid '%1' entry in '%2' of module '%3'.</source>
<translation>Ungültiger Eintrag '%1' in '%2' des Moduls '%3'.</translation>
</message>
<message>
- <location line="+29"/>
<source>No .pro file for plugin '%1' cannot be found.</source>
<translation>Für das Plugin '%1' konnte keine .pro-Datei gefunden werden.</translation>
</message>
<message>
- <location line="+158"/>
<source>Could not write file '%1'.</source>
<translation>Die Datei '%1' konnte nicht geschrieben werden.</translation>
</message>
@@ -26114,27 +21620,30 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp" line="+70"/>
<source>New QML Project</source>
- <translation>Neues QML-Projekt</translation>
+ <translation type="obsolete">Neues QML-Projekt</translation>
</message>
<message>
- <location line="+1"/>
<source>QML Project from existing, QML Viewer-based Project</source>
- <translation>QML-Projekt aus bereits existierendem, auf dem QML-Betrachter basierendem Projekt erstellen</translation>
+ <translation type="obsolete">QML-Projekt aus bereits existierendem, auf dem QML-Betrachter basierendem Projekt erstellen</translation>
</message>
<message>
- <location line="+2"/>
<source>This wizard generates a QML application project.</source>
- <translation>Dieser Wizard erstellt ein QML-Anwendungsprojekt.</translation>
+ <translation type="obsolete">Dieser Wizard erstellt ein QML-Anwendungsprojekt.</translation>
</message>
<message>
- <location line="+1"/>
<source>This wizard imports an existing, QML Viewer-based application and creates a standalone version of it.</source>
- <translation>Dieser Wizard importiert eine existierende, auf dem QML-Betrachter basierende Anwendung und erstellt daraus eine eigenständig lauffähige Anwendung.</translation>
+ <translation type="obsolete">Dieser Wizard importiert eine existierende, auf dem QML-Betrachter basierende Anwendung und erstellt daraus eine eigenständig lauffähige Anwendung.</translation>
+ </message>
+ <message>
+ <source>New Qt Quick Application</source>
+ <translation>Neue Qt Quick-Anwendung</translation>
+ </message>
+ <message>
+ <source>This wizard generates a Qt Quick application project.</source>
+ <translation>Dieser Wizard erstellt ein Qt Quick-Anwendungsprojekt.</translation>
</message>
<message>
- <location line="+6"/>
<source>QML Sources</source>
<translation>QML-Quellen</translation>
</message>
@@ -26142,25 +21651,25 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>Qt4ProjectManager::Internal::QmlStandaloneAppWizardSourcesPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardpages.cpp" line="+56"/>
<source>Select the main QML file of the application.</source>
- <translation>Wählen Sie die Haupt-QML-Datei der Anwendung aus.</translation>
+ <translation type="obsolete">Wählen Sie die Haupt-QML-Datei der Anwendung aus.</translation>
</message>
<message>
- <location line="+67"/>
<source>Select an import path for QML modules.</source>
- <translation>Wählen Sie einen Importpfad für die QML-Module.</translation>
+ <translation type="obsolete">Wählen Sie einen Importpfad für die QML-Module.</translation>
+ </message>
+ <message>
+ <source>Select QML File</source>
+ <translation>QML-Datei auswählen</translation>
</message>
</context>
<context>
<name>TaskList::Internal::StopMonitoringHandler</name>
<message>
- <location filename="../../../src/plugins/tasklist/stopmonitoringhandler.cpp" line="+68"/>
<source>Stop monitoring</source>
<translation>Ãœberwachung beenden</translation>
</message>
<message>
- <location line="+3"/>
<source>Stop monitoring task files.</source>
<translation>Ãœberwache Task-Dateien.</translation>
</message>
@@ -26168,7 +21677,6 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>TaskList::Internal::TaskFileFactory</name>
<message>
- <location filename="../../../src/plugins/tasklist/taskfilefactory.cpp" line="+64"/>
<source>Task file reader</source>
<translation>Task-Datei</translation>
</message>
@@ -26176,37 +21684,30 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>TextEditor::HighlighterSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp" line="+62"/>
<source>Generic Highlighter</source>
<translation>Generische Syntaxhervorhebung</translation>
</message>
<message>
- <location line="+33"/>
<source>Download Definitions</source>
<translation>Definitionen herunterladen</translation>
</message>
<message>
- <location line="+3"/>
<source>Autodetect</source>
<translation>Automatisch bestimmen</translation>
</message>
<message>
- <location line="+78"/>
<source>Autodetect Definitions</source>
<translation>Definitionsdateien automatisch bestimmen</translation>
</message>
<message>
- <location line="+1"/>
<source>No pre-installed definitions could be found.</source>
<translation>Es konnten vorinstallierten Definitionsdateien gefunden werden.</translation>
</message>
<message>
- <location line="+42"/>
<source>Error connecting to server.</source>
<translation>Fehler beim Herstellen der Verbindung zum Server.</translation>
</message>
<message>
- <location line="+1"/>
<source>Not possible to retrieve data.</source>
<translation>Es konnten keine Daten erhalten werden.</translation>
</message>
@@ -26214,32 +21715,26 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>TextEditor::Internal::ManageDefinitionsDialog</name>
<message>
- <location filename="../../../src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp" line="+59"/>
<source>Installed</source>
<translation>Installiert</translation>
</message>
<message>
- <location line="+0"/>
<source>Available</source>
<translation>Verfügbar</translation>
</message>
<message>
- <location line="+0"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location line="+3"/>
<source>Download Definitions</source>
<translation>Definitionen herunterladen</translation>
</message>
<message>
- <location line="+49"/>
<source>Download Information</source>
<translation>Download</translation>
</message>
<message>
- <location line="+1"/>
<source>There is already one download in progress. Please wait until it is finished.</source>
<translation>Es läuft bereits ein Download-Vorgang. Bitte warten Sie, bis er beendet wird.</translation>
</message>
@@ -26247,34 +21742,28 @@ Bitte prüfen Sie, ob das Gerät verbunden ist und die Anwendung 'TRK'
<context>
<name>TextEditor::Internal::Manager</name>
<message>
- <location filename="../../../src/plugins/texteditor/generichighlighter/manager.cpp" line="+153"/>
<source>Registering definitions</source>
<translation>Registriere Definitionen</translation>
</message>
<message>
- <location line="+223"/>
<source>Downloading definitions</source>
<translation>Lade Definitionen herunter</translation>
</message>
<message>
- <location line="+21"/>
<source>Error downloading selected definition(s).</source>
<translation>Fehler beim Herunterladen der ausgewählten Definitionen.</translation>
</message>
<message>
- <location line="+2"/>
<source>Error downloading one or more definitions.</source>
<translation>Fehler beim Herunterladen einer oder mehrerer Definitionen.</translation>
</message>
<message>
- <location line="+2"/>
<source>
Please check the directory's access rights.</source>
<translation>
Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
</message>
<message>
- <location line="+1"/>
<source>Download Error</source>
<translation>Fehler beim Herunterladen</translation>
</message>
@@ -26282,17 +21771,14 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>TextEditor::Internal::OutlineWidgetStack</name>
<message>
- <location filename="../../../src/plugins/texteditor/outlinefactory.cpp" line="+21"/>
<source>No outline available</source>
<translation>Überblick nicht verfügbar</translation>
</message>
<message>
- <location line="+13"/>
<source>Synchronize with Editor</source>
<translation>Mit Editor synchronisieren</translation>
</message>
<message>
- <location line="+5"/>
<source>Filter tree</source>
<translation>Baum filtern</translation>
</message>
@@ -26300,7 +21786,6 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>TextEditor::Internal::OutlineFactory</name>
<message>
- <location line="+125"/>
<source>Outline</source>
<translation>Ãœberblick</translation>
</message>
@@ -26308,12 +21793,10 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>TextEditor::Internal::PlainTextEditorFactory</name>
<message>
- <location filename="../../../src/plugins/texteditor/plaintexteditorfactory.cpp" line="+100"/>
<source>A highlight definition was not found for this file. Would you like to try to find one?</source>
<translation>Für diese Datei konnte ist keine Definition der Syntaxhervorhebung vorhanden. Möchten Sie nach einer Definition suchen?</translation>
</message>
<message>
- <location line="+2"/>
<source>Show highlighter options</source>
<translation>Einstellungen der Syntaxhervorhebung anzeigen</translation>
</message>
@@ -26321,375 +21804,322 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>LoggerWidget</name>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/loggerwidget.cpp" line="+63"/>
- <location line="+102"/>
<source>Warnings</source>
- <translation>Warnungen</translation>
+ <translation type="obsolete">Warnungen</translation>
</message>
<message>
- <location line="+6"/>
<source>Show by default</source>
- <translation>Per Vorgabe anzeigen</translation>
+ <translation type="obsolete">Per Vorgabe anzeigen</translation>
</message>
<message>
- <location line="+6"/>
<source>Hide by default</source>
- <translation>Per Vorgabe nicht anzeigen</translation>
+ <translation type="obsolete">Per Vorgabe nicht anzeigen</translation>
</message>
<message>
- <location line="+6"/>
<source>Show for first warning</source>
- <translation>Bei der ersten Warnung anzeigen</translation>
+ <translation type="obsolete">Bei der ersten Warnung anzeigen</translation>
</message>
</context>
<context>
<name>RecordingDialog</name>
<message>
- <location filename="../../../src/tools/qml/qmlobserver/qmlruntime.cpp" line="+254"/>
<source>Original (%1x%2)</source>
- <translation>Originalgröße (%1x%2)</translation>
+ <translation type="obsolete">Originalgröße (%1x%2)</translation>
</message>
</context>
<context>
<name>QDeclarativeViewer</name>
<message>
- <location line="+307"/>
<source>Save Video File</source>
- <translation>Video-Datei speichern</translation>
+ <translation type="obsolete">Video-Datei speichern</translation>
</message>
<message>
- <location line="+0"/>
<source>Save PNG Frames</source>
- <translation>PNG-Bilder speichern</translation>
+ <translation type="obsolete">PNG-Bilder speichern</translation>
</message>
<message>
- <location line="+2"/>
<source>Common Video files</source>
- <translation>Gebräuchliche Videodateien</translation>
+ <translation type="obsolete">Gebräuchliche Videodateien</translation>
</message>
<message>
- <location line="+1"/>
<source>GIF Animation</source>
- <translation>GIF-Animation</translation>
+ <translation type="obsolete">GIF-Animation</translation>
</message>
<message>
- <location line="+1"/>
<source>Individual PNG frames</source>
- <translation>Einzelne PNG-Bilder</translation>
+ <translation type="obsolete">Einzelne PNG-Bilder</translation>
</message>
<message>
- <location line="+1"/>
<source>All ffmpeg formats (*.*)</source>
- <translation>Alle ffmpeg Formate (*.*)</translation>
+ <translation type="obsolete">Alle ffmpeg Formate (*.*)</translation>
</message>
<message>
- <location line="+19"/>
<source>Qt QML Viewer</source>
- <translation>Qt QML-Betrachter</translation>
+ <translation type="obsolete">Qt QML-Betrachter</translation>
</message>
<message>
- <location line="+23"/>
<source>ffmpeg and ImageMagick not available - no video output</source>
- <translation>ffmpeg und ImageMagick nicht verfügbar - keine Video-Ausgabe</translation>
+ <translation type="obsolete">ffmpeg und ImageMagick nicht verfügbar - keine Video-Ausgabe</translation>
</message>
<message>
- <location line="+2"/>
<source>ffmpeg not available - GIF and PNG outputs only</source>
- <translation>ffmpeg nicht verfügbar - nur GIF- und PNG-Ausgabe möglich</translation>
+ <translation type="obsolete">ffmpeg nicht verfügbar - nur GIF- und PNG-Ausgabe möglich</translation>
</message>
<message>
- <location line="+115"/>
<source>&Open...</source>
- <translation>&Öffnen...</translation>
+ <translation type="obsolete">&Öffnen...</translation>
</message>
<message>
- <location line="+4"/>
<source>&Reload</source>
- <translation>Neu &laden</translation>
+ <translation type="obsolete">Neu &laden</translation>
</message>
<message>
- <location line="+4"/>
<source>&Take Snapshot</source>
- <translation>&Momentaufnahme erstellen</translation>
+ <translation type="obsolete">&Momentaufnahme erstellen</translation>
</message>
<message>
- <location line="+4"/>
<source>Start Recording &Video</source>
- <translation>&Video-Aufzeichnung beginnen</translation>
+ <translation type="obsolete">&Video-Aufzeichnung beginnen</translation>
</message>
<message>
- <location line="+4"/>
<source>Video &Options...</source>
- <translation>Video-&Einstellungen</translation>
+ <translation type="obsolete">Video-&Einstellungen</translation>
</message>
<message>
- <location line="+3"/>
<source>Animation Speed</source>
- <translation>Animationsgeschwindigkeit</translation>
+ <translation type="obsolete">Animationsgeschwindigkeit</translation>
</message>
<message>
- <location line="+4"/>
<source>1x</source>
- <translation>1x</translation>
+ <translation type="obsolete">1x</translation>
</message>
<message>
- <location line="+7"/>
<source>0.5x</source>
- <translation>0.5x</translation>
+ <translation type="obsolete">0.5x</translation>
</message>
<message>
- <location line="+5"/>
<source>0.25x</source>
- <translation>0.25x</translation>
+ <translation type="obsolete">0.25x</translation>
</message>
<message>
- <location line="+5"/>
<source>0.125x</source>
- <translation>0.125x</translation>
+ <translation type="obsolete">0.125x</translation>
</message>
<message>
- <location line="+5"/>
<source>0.1x</source>
- <translation>0.1x</translation>
+ <translation type="obsolete">0.1x</translation>
</message>
<message>
- <location line="+5"/>
<source>Pause</source>
- <translation>Pause</translation>
+ <translation type="obsolete">Pause</translation>
</message>
<message>
- <location line="+4"/>
<source>Pause and step</source>
- <translation>Pause und Einzelschritt</translation>
+ <translation type="obsolete">Pause und Einzelschritt</translation>
</message>
<message>
- <location line="+3"/>
<source>Set step</source>
- <translation>Schrittweite setzen</translation>
+ <translation type="obsolete">Schrittweite setzen</translation>
</message>
<message>
- <location line="+3"/>
<source>Animations</source>
- <translation>Animationen</translation>
+ <translation type="obsolete">Animationen</translation>
</message>
<message>
- <location line="+3"/>
<source>Show Warnings</source>
- <translation>Warnungen anzeigen</translation>
+ <translation type="obsolete">Warnungen anzeigen</translation>
</message>
<message>
- <location line="+5"/>
<source>&Observer Mode</source>
- <translation>&Beobachter-Modus</translation>
+ <translation type="obsolete">&Beobachter-Modus</translation>
</message>
<message>
- <location line="+9"/>
<source>HTTP &Proxy...</source>
- <translation>HTTP-&Proxy...</translation>
+ <translation type="obsolete">HTTP-&Proxy...</translation>
</message>
<message>
- <location line="+3"/>
<source>Full Screen</source>
- <translation>Vollbild</translation>
+ <translation type="obsolete">Vollbild</translation>
</message>
<message>
- <location line="+4"/>
<source>Rotate orientation</source>
- <translation>Ausrichtung umschalten</translation>
+ <translation type="obsolete">Ausrichtung umschalten</translation>
</message>
<message>
- <location line="+8"/>
<source>Portrait</source>
- <translation>Hochformat</translation>
+ <translation type="obsolete">Hochformat</translation>
</message>
<message>
- <location line="+2"/>
<source>Landscape</source>
- <translation>Querformat</translation>
+ <translation type="obsolete">Querformat</translation>
</message>
<message>
- <location line="+2"/>
<source>Portrait (inverted)</source>
- <translation>Umgedrehtes Hochformat</translation>
+ <translation type="obsolete">Umgedrehtes Hochformat</translation>
</message>
<message>
- <location line="+2"/>
<source>Landscape (inverted)</source>
- <translation>Umgedrehtes Querformat</translation>
+ <translation type="obsolete">Umgedrehtes Querformat</translation>
</message>
<message>
- <location line="+3"/>
<source>&About Qt...</source>
- <translation>&Ãœber Qt...</translation>
+ <translation type="obsolete">&Ãœber Qt...</translation>
</message>
<message>
- <location line="+3"/>
<source>&Quit</source>
- <translation>&Beenden</translation>
+ <translation type="obsolete">&Beenden</translation>
</message>
<message>
- <location line="+23"/>
<source>Set orientation</source>
- <translation>Ausrichtung festlegen</translation>
+ <translation type="obsolete">Ausrichtung festlegen</translation>
</message>
<message>
- <location line="+5"/>
<source>&File</source>
- <translation>&Datei</translation>
+ <translation type="obsolete">&Datei</translation>
</message>
<message>
- <location line="+7"/>
<source>&Recording</source>
- <translation>&Aufzeichnung</translation>
+ <translation type="obsolete">&Aufzeichnung</translation>
</message>
<message>
- <location line="+4"/>
<source>&Debugging</source>
- <translation>&Debuggen</translation>
+ <translation type="obsolete">&Debuggen</translation>
</message>
<message>
- <location line="+6"/>
<source>S&ettings</source>
- <translation>&Einstellungen</translation>
+ <translation type="obsolete">&Einstellungen</translation>
</message>
<message>
- <location line="+10"/>
<source>Properties</source>
- <translation>Eigenschaften</translation>
+ <translation type="obsolete">Eigenschaften</translation>
</message>
<message>
- <location line="+8"/>
<source>&Help</source>
- <translation>&Hilfe</translation>
+ <translation type="obsolete">&Hilfe</translation>
</message>
<message>
- <location line="+117"/>
<source>&Stop Recording Video F9</source>
- <translation>&Video-Aufzeichnung beenden F9</translation>
+ <translation type="obsolete">&Video-Aufzeichnung beenden F9</translation>
</message>
<message>
- <location line="+0"/>
<source>&Start Recording Video F9</source>
- <translation>&Video-Aufzeichnung beginnen F9</translation>
+ <translation type="obsolete">&Video-Aufzeichnung beginnen F9</translation>
</message>
<message>
- <location line="+27"/>
<source>Set animation step duration</source>
- <translation>Animationsschrittweite festlegen</translation>
+ <translation type="obsolete">Animationsschrittweite festlegen</translation>
</message>
<message>
- <location line="+1"/>
<source>Step duration (ms):</source>
- <translation>Animationsschrittweite (ms):</translation>
+ <translation type="obsolete">Animationsschrittweite (ms):</translation>
</message>
<message>
- <location line="+37"/>
<source>Open QML file</source>
- <translation>QML-Datei öffnen</translation>
+ <translation type="obsolete">QML-Datei öffnen</translation>
</message>
<message>
- <location line="+0"/>
<source>QML Files (*.qml)</source>
- <translation>QML-Dateien (*.qml)</translation>
+ <translation type="obsolete">QML-Dateien (*.qml)</translation>
</message>
<message>
- <location line="+74"/>
<source>%1 - Qt QML Viewer</source>
- <translation>%1 - Qt QML-Betrachter</translation>
+ <translation type="obsolete">%1 - Qt QML-Betrachter</translation>
</message>
<message>
- <location line="+129"/>
<source>Video recording uses ffmpeg:</source>
- <translation>Video-Aufzeichnung unter Verwendung von ffmpeg:</translation>
+ <translation type="obsolete">Video-Aufzeichnung unter Verwendung von ffmpeg:</translation>
</message>
<message>
- <location line="+63"/>
<source>Saving frames...</source>
- <translation>Speichere Bilder...</translation>
+ <translation type="obsolete">Speichere Bilder...</translation>
</message>
<message>
- <location line="+0"/>
<source>Cancel</source>
- <translation>Abbrechen</translation>
+ <translation type="obsolete">Abbrechen</translation>
</message>
<message>
- <location line="+46"/>
<source>Converting frames to GIF file...</source>
- <translation>Wandele Bilder in GIF-Datei...</translation>
+ <translation type="obsolete">Wandele Bilder in GIF-Datei...</translation>
</message>
</context>
<context>
<name>MobileAppWizardOptionPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/mobileappwizardoptionspage.ui"/>
<source>WizardPage</source>
<translation>WizardPage</translation>
</message>
<message>
- <location/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location/>
<source>Orientation Behavior:</source>
- <translation>Ausrichtung:</translation>
+ <translation type="obsolete">Ausrichtung:</translation>
</message>
<message>
- <location/>
<source>Symbian specific</source>
- <translation>Symbian-spezifisch</translation>
+ <translation type="obsolete">Symbian-spezifisch</translation>
</message>
<message>
- <location/>
<source>Application Icon (.svg):</source>
- <translation>Icon der Anwendung (.svg):</translation>
+ <translation type="obsolete">Icon der Anwendung (.svg):</translation>
</message>
<message>
- <location/>
<source>Target UID3:</source>
<translation>Ziel-UID3:</translation>
</message>
<message>
- <location/>
<source>Enable network access</source>
<translation>Netzwerkzugriff gestatten</translation>
</message>
<message>
- <location/>
<source>Maemo specific</source>
- <translation>Maemo-spezifisch</translation>
+ <translation type="obsolete">Maemo-spezifisch</translation>
</message>
<message>
- <location/>
<source>Application Icon (64x64):</source>
+ <translation type="obsolete">Icon der Anwendung (64x64):</translation>
+ </message>
+ <message>
+ <source>Orientation behavior:</source>
+ <translation>Ausrichtung:</translation>
+ </message>
+ <message>
+ <source>Symbian Specific</source>
+ <translation>Symbian-spezifisch</translation>
+ </message>
+ <message>
+ <source>Application icon (.svg):</source>
+ <translation>Icon der Anwendung (.svg):</translation>
+ </message>
+ <message>
+ <source>Maemo Specific</source>
+ <translation>Maemo-spezifisch</translation>
+ </message>
+ <message>
+ <source>Application icon (64x64):</source>
<translation>Icon der Anwendung (64x64):</translation>
</message>
</context>
<context>
<name>Debugger::DebuggerEnginePrivate</name>
<message>
- <location filename="../../../src/plugins/debugger/debuggerengine.cpp" line="+379"/>
<source>Remove Breakpoint %1</source>
<translation>Haltepunkt %1 löschen</translation>
</message>
<message>
- <location line="+8"/>
<source>Disable Breakpoint %1</source>
<translation>Haltepunkt %1 deaktivieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Enable Breakpoint %1</source>
<translation>Haltepunkt %1 aktivieren</translation>
</message>
<message>
- <location line="+8"/>
<source>Set Breakpoint at 0x%1</source>
<translation>Haltepunkt bei 0x%1 setzen</translation>
</message>
<message>
- <location line="+1"/>
<source>Set Breakpoint at line %1</source>
<translation>Haltepunkt bei Zeile %1 setzen</translation>
</message>
@@ -26697,67 +22127,54 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>Debugger::DebuggerEngine</name>
<message>
- <location line="+182"/>
<source>Symbol</source>
<translation>Symbol</translation>
</message>
<message>
- <location line="+0"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
<message>
- <location line="+0"/>
<source>Code</source>
<translation>Code</translation>
</message>
<message>
- <location line="+1"/>
<source>Symbols in "%1"</source>
<translation>Symbole in "%1"</translation>
</message>
<message>
- <location line="+174"/>
<source>Launching</source>
<translation>Starte</translation>
</message>
<message>
- <location line="+263"/>
<source>%1 (explicitly set in the Debugger Options)</source>
<translation>%1 (explizit in den Debugger-Einstellungen gesetzt)</translation>
</message>
<message>
- <location line="+10"/>
<source>Open Qt4 Options</source>
<translation>Einstellungen zur Qt4-Bibliothek öffnen</translation>
</message>
<message>
- <location line="+2"/>
<source>Turn off Helper Usage</source>
<translation>Ausgabe-Hilfsbibliothek deaktivieren</translation>
</message>
<message>
- <location line="+2"/>
<source>Continue Anyway</source>
<translation>Trotzdem fortsetzen</translation>
</message>
<message>
- <location line="+3"/>
<source>Debugging Helper Missing</source>
<translation>Ausgabe-Hilfsbibliothek nicht gefunden</translation>
</message>
<message>
- <location line="+2"/>
<source>The debugging helper is used to nicely format the values of some Qt and Standard Library data types. It must be compiled for each used Qt version separately. On the Qt4 options page, select a Qt installation and click Rebuild.</source>
<translation>Die Ausgabe-Hilfsbibliothek dient zur Ausgabe der Werte einiger Datentypen aus Qt- und den Standardbibliotheken. Sie muss mit jeder benutzten Qt-Version compiliert werden. Das geschieht in der Seite 'Qt-Einstellungen' durch Auswahl der Qt-Installation und Klicken auf 'Erstellen' für die Ausgabe-Hilfsbibliothek.</translation>
</message>
<message>
- <location line="-1"/>
<source>The debugger could not load the debugging helper library.</source>
<translation>Der Debugger konnte die Ausgabe-Hilfsbibliothek nicht finden.</translation>
</message>
<message>
- <location line="+465"/>
<source>Taking notice of pid %1</source>
<translation>PID %1 gemeldet</translation>
</message>
@@ -26765,18 +22182,15 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>Debugger::QmlAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/qml/qmladapter.cpp" line="+124"/>
<source>Connect to debug server %1:%2</source>
<translation>Verbinde zum Debug-Server %1: %2</translation>
</message>
<message>
- <location line="+14"/>
<source>Error: (%1) %2</source>
<comment>%1=error code, %2=error message</comment>
<translation>Fehler: (%1) %2</translation>
</message>
<message>
- <location line="+13"/>
<source>disconnected.
</source>
@@ -26785,32 +22199,39 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
</translation>
</message>
<message>
- <location line="+6"/>
<source>resolving host...</source>
<translation>Hostname wird aufgelöst...</translation>
</message>
<message>
- <location line="+3"/>
<source>connecting to debug server...</source>
<translation>Verbinde zum Debug-Server...</translation>
</message>
<message>
- <location line="+4"/>
<source>connected.
</source>
<translation>verbunden.
</translation>
</message>
<message>
- <location line="+12"/>
<source>closing...</source>
<translation>schließe Verbindung...</translation>
</message>
+ <message>
+ <source>Error: Cannot connect to debug service '%1'. Debugging functionality will be limited.</source>
+ <translation>Fehler: Es kann keine Verbindung zum Debug-Dienst '%1' hergestellt werden. Es steht nur eine eingeschränkte Debug-Funktionalität zur Verfügung.</translation>
+ </message>
+ <message>
+ <source>Connected to debug service '%1'.</source>
+ <translation>Verbindung zum Debug-Dienst '%1' hergestellt.</translation>
+ </message>
+ <message>
+ <source>Not connected to debug service '%1'.</source>
+ <translation>Es konnte keine Verbindung zum Debug-Dienst '%1' hergestellt werden.</translation>
+ </message>
</context>
<context>
<name>Debugger::QmlCppEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/qml/qmlcppengine.cpp" line="+111"/>
<source>%1 debugger activated</source>
<translation>Debugger %1 aktiviert</translation>
</message>
@@ -26818,62 +22239,54 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>Debugger::QmlEngine</name>
<message>
- <location filename="../../../src/plugins/debugger/qml/qmlengine.cpp" line="+199"/>
<source>QML Debugger connected.</source>
<translation>QML-Debugger verbunden.</translation>
</message>
<message>
- <location line="+8"/>
<source>Failed to connect to debugger</source>
<translation>Keine Verbindung zum Debugger</translation>
</message>
<message>
- <location line="+1"/>
<source>Could not connect to QML debugger server at %1:%2.</source>
<translation>Es konnte keine Verbindung zum QML-Debugger-Server %1 hergestellt werden: %2</translation>
</message>
<message>
- <location line="+9"/>
<source>QML Debugger: Remote host closed connection.</source>
<translation>QML-Debugger: Der Host hat die Verbindung gechlossen.</translation>
</message>
<message>
- <location line="+14"/>
+ <source>QML Debugger: Could not connect to service '%1'.</source>
+ <translation>QML-Debugger: Es konnte keine Verbindung zum Debug-Dienst '%1' hergestellt werden.</translation>
+ </message>
+ <message>
<source>QML Debugger connecting...</source>
<translation>Stelle QML-Debugger-Verbindung her...</translation>
</message>
<message>
- <location line="+10"/>
<source>Failed to start application</source>
<translation>Anwendung konnte nicht gestartet werden</translation>
</message>
<message>
- <location line="+1"/>
<source>Application startup failed: %1</source>
<translation>Die Anwendung konnte nicht gestartet werden: %1</translation>
</message>
<message>
- <location line="+55"/>
<source>Trying to stop while process is no longer running.</source>
<translation>Versuche zu beenden, da der Prozess nicht mehr läuft.</translation>
</message>
<message>
- <location line="+216"/>
<source>Stopped.</source>
<translation>Angehalten.</translation>
</message>
<message>
- <location line="+133"/>
<source><p>An Uncaught Exception occured in <i>%1</i>:</p><p>%2</p></source>
<translation><p>In <i>%1</i> ist eine unbehandelte Ausnahme ist aufgetreten :</p><p>%2</p></translation>
</message>
<message>
- <location line="+2"/>
<source>Uncaught Exception</source>
<translation>Unbehandelter Ausnahmefehler</translation>
</message>
<message>
- <location line="+64"/>
<source>QML Debugger disconnected.</source>
<translation>QML-Debugger getrennt.</translation>
</message>
@@ -26881,12 +22294,10 @@ Bitte prüfen Sie die Zugriffsrechte des Ordners.</translation>
<context>
<name>MobileAppWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp" line="+49"/>
<source>Mobile Qt Application</source>
<translation>Mobile Qt-Anwendung</translation>
</message>
<message>
- <location line="+2"/>
<source>Creates a Qt application optimized for mobile devices with a Qt Designer-based main window.
Preselects Qt for Simulator and mobile targets if available.</source>
@@ -26898,32 +22309,38 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Qt4ProjectManager::Internal::MobileAppWizardOptionsPage</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp" line="+62"/>
<source>Auto rotate orientation</source>
- <translation>Ausrichtung automatisch ändern</translation>
+ <translation type="obsolete">Ausrichtung automatisch ändern</translation>
</message>
<message>
- <location line="+2"/>
<source>Lock to landscape orientation</source>
- <translation>Querformat festlegen</translation>
+ <translation type="obsolete">Querformat festlegen</translation>
</message>
<message>
- <location line="+2"/>
<source>Lock to portrait orientation</source>
+ <translation type="obsolete">Hochformat festlegen</translation>
+ </message>
+ <message>
+ <source>Automatically Rotate Orientation</source>
+ <translation>Ausrichtung automatisch ändern</translation>
+ </message>
+ <message>
+ <source>Lock to Landscape Orientation</source>
+ <translation>Querformat festlegen</translation>
+ </message>
+ <message>
+ <source>Lock to Portrait Orientation</source>
<translation>Hochformat festlegen</translation>
</message>
<message>
- <location line="+52"/>
<source>The file is not a valid image.</source>
<translation>Keine gültige Bilddatei.</translation>
</message>
<message>
- <location line="+2"/>
<source>The icon has an invalid size.</source>
<translation>Das Icon hat keine gültige Größe.</translation>
</message>
<message>
- <location line="+2"/>
<source>Icon unusable</source>
<translation>Das Icon kann nicht verwendet werden</translation>
</message>
@@ -26931,7 +22348,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>TaskList::TaskListPlugin</name>
<message>
- <location filename="../../../src/plugins/tasklist/tasklistplugin.cpp" line="+194"/>
<source>My Tasks</source>
<extracomment>Category under which tasklist tasks are listed in build issues view</extracomment>
<translation>Meine Tasks</translation>
@@ -26940,35 +22356,29 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Utils::FileNameValidatingLineEdit</name>
<message>
- <location filename="../../../src/libs/utils/filenamevalidatinglineedit.cpp" line="+95"/>
<source>Name is empty.</source>
<translation>Der Dateiname ist leer.</translation>
</message>
<message>
- <location line="+9"/>
<source>Name contains white space.</source>
<translation>Der Name enthält Leerzeichen.</translation>
</message>
<message>
- <location line="+2"/>
<source>Invalid character '%1'.</source>
<translation>Ungültiges Zeichen '%1'.</translation>
</message>
<message>
- <location line="+11"/>
<source>Invalid characters '%1'.</source>
<translation>Ungültige Zeichen '%1'.</translation>
</message>
<message>
- <location line="+10"/>
<source>Name matches MS Windows device. (%1).</source>
- <translation>Der Name entspricht dem eines Standardgerätes unter MS Windows. (1%)</translation>
+ <translation>Der Name entspricht dem eines Standardgerätes unter MS Windows. (%1)</translation>
</message>
</context>
<context>
<name>Debugger::Internal::AbstractPlainGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/abstractplaingdbadapter.cpp" line="+78"/>
<source>Starting executable failed:
</source>
<translation>Das Starten der ausführbaren Datei schlug fehl:
@@ -26978,7 +22388,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::AttachGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/attachgdbadapter.cpp" line="+82"/>
<source>Attached to process %1.</source>
<translation>An Prozess %1 angehängt.</translation>
</message>
@@ -26986,38 +22395,30 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::CoreGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/coregdbadapter.cpp" line="+81"/>
<source>Error Loading Symbols</source>
<translation>Fehler beim Laden der Symbole</translation>
</message>
<message>
- <location line="+1"/>
<source>No executable to load symbols from specified.</source>
<translation>Es wurde keine ausführbare Datei zum Laden der Symbole angegeben.</translation>
</message>
<message>
- <location line="+18"/>
- <location line="+9"/>
<source>Attach to core failed.</source>
<translation>Das Debuggen der core-Datei schlug fehl.</translation>
</message>
<message>
- <location line="+17"/>
<source>Attached to core temporarily.</source>
<translation>Debugge core-Datei temporär.</translation>
</message>
<message>
- <location line="+27"/>
<source>Symbols found.</source>
<translation>Die Symbole wurden gefunden.</translation>
</message>
<message>
- <location line="+14"/>
<source>Attached to core.</source>
<translation>Debugge core-Datei.</translation>
</message>
<message>
- <location line="+4"/>
<source>Attach to core "%1" failed:
</source>
<translation>Das Debuggen der core-Datei "%1" schlug fehl:
@@ -27027,47 +22428,38 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::RemoteGdbServerAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/remotegdbserveradapter.cpp" line="+109"/>
<source>The upload process failed to start. Shell missing?</source>
<translation>Das Hochladen schlug fehl. Eine mögliche Ursache könnte ein fehlendes Shell-Programm sein.</translation>
</message>
<message>
- <location line="+3"/>
<source>The upload process crashed some time after starting successfully.</source>
<translation>Das Hochladen ist nach dem Starten abgestürzt.</translation>
</message>
<message>
- <location line="+4"/>
<source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
<translation>Zeitüberschreitung bei der letzten waitFor...()-Funktion. Der Status des QProcess ist unverändert, und waitFor...() kann noch einmal gerufen.</translation>
</message>
<message>
- <location line="+5"/>
<source>An error occurred when attempting to write to the upload process. For example, the process may not be running, or it may have closed its input channel.</source>
<translation>Ein Fehler trat beim Versuch des Schreibens zum Hochlade-Prozess auf. Wahrscheinlich läuft der Prozess nicht, oder hat seinen Eingabekanal geschlossen.</translation>
</message>
<message>
- <location line="+5"/>
<source>An error occurred when attempting to read from the upload process. For example, the process may not be running.</source>
<translation>Ein Fehler trat beim Versuch des Lesens vom Hochlade-Prozess auf. Wahrscheinlich läuft der Prozess nicht.</translation>
</message>
<message>
- <location line="+4"/>
<source>An unknown error in the upload process occurred. This is the default return value of error().</source>
<translation>Es trat ein unbekannter Fehler im Hochlade-Prozess auf.</translation>
</message>
<message>
- <location line="+5"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location line="+69"/>
<source>No symbol file given.</source>
<translation>Es wurde keine Symboldatei angegeben.</translation>
</message>
<message>
- <location line="+23"/>
<source>Reading debug information failed:
</source>
<translation>Das Lesen der Debug-Information schlug fehl:
@@ -27077,7 +22469,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::TermGdbAdapter</name>
<message>
- <location filename="../../../src/plugins/debugger/gdb/termgdbadapter.cpp" line="+202"/>
<source>Debugger Error</source>
<translation>Debugger-Fehler</translation>
</message>
@@ -27085,93 +22476,92 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Qt4ProjectManager::Internal::QmlStandaloneAppWizard</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp" line="+32"/>
<source>Qt QML Application</source>
- <translation>Qt-QML-Anwendung</translation>
+ <translation type="obsolete">Qt-QML-Anwendung</translation>
</message>
<message>
- <location line="+1"/>
<source>Qt QML Imported Application</source>
- <translation>Qt QML Neue Anwendung (Import)</translation>
+ <translation type="obsolete">Qt QML Neue Anwendung (Import)</translation>
</message>
<message>
- <location line="+5"/>
<source>Creates a mobile-deployable Qt QML application project. A lightweight Qt/C++ application with a QDeclarativeView and a single QML file will be created.</source>
- <translation>Erstellt ein auf einem Mobilgeräte installierbares Qt QML-Anwendungsprojekt. Es wird eine leichtgewichtige Qt-C++-Anwendung mit einer einzelnen QML-Datei unter Verwendung von QDeclarativeViewer erstellt.</translation>
+ <translation type="obsolete">Erstellt ein auf einem Mobilgeräte installierbares Qt QML-Anwendungsprojekt. Es wird eine leichtgewichtige Qt-C++-Anwendung mit einer einzelnen QML-Datei unter Verwendung von QDeclarativeViewer erstellt.</translation>
</message>
<message>
- <location line="+3"/>
<source>Creates a mobile-deployable Qt QML application project. An existing, QML Viewer-based project will be imported and a lightweight Qt/C++ application with a QDeclarativeView will be created for it.</source>
- <translation>Erstellt ein auf einem Mobilgeräte installierbares Qt QML-Anwendungsprojekt. Eine auf dem QML-Betrachter basierende Anwendung wird importiert und daraus eine leichtgewichtige Qt-C++-Anwendung mit einer einzelnen QML-Datei unter Verwendung von QDeclarativeViewer erstellt.</translation>
+ <translation type="obsolete">Erstellt ein auf einem Mobilgeräte installierbares Qt QML-Anwendungsprojekt. Eine auf dem QML-Betrachter basierende Anwendung wird importiert und daraus eine leichtgewichtige Qt-C++-Anwendung mit einer einzelnen QML-Datei unter Verwendung von QDeclarativeViewer erstellt.</translation>
+ </message>
+ <message>
+ <source>Qt Quick Application</source>
+ <translation>Neue Qt Quick-Anwendung</translation>
+ </message>
+ <message>
+ <source>Creates a Qt Quick application that you can deploy to mobile devices.</source>
+ <translation>Erstellt eine Qt Quick-Anwendung, die auf mobilen Geräten installiert werden kann.</translation>
</message>
</context>
<context>
<name>BreakpointDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/breakpoint.ui"/>
<source>Dialog</source>
- <translation>Dialog</translation>
+ <translation type="obsolete">Dialog</translation>
</message>
<message>
- <location/>
<source>Breakpoint type:</source>
<translation>Typ des Haltepunkts:</translation>
</message>
<message>
- <location/>
<source>File name:</source>
<translation>Dateiname:</translation>
</message>
<message>
- <location/>
<source>Line number:</source>
<translation>Zeilennummer:</translation>
</message>
<message>
- <location/>
<source>Function:</source>
<translation>Funktion:</translation>
</message>
<message>
- <location/>
<source>Condition:</source>
<translation>Bedingung:</translation>
</message>
<message>
- <location/>
<source>Ignore count:</source>
<translation>Anhalten erst nach:</translation>
</message>
<message>
- <location/>
<source>Thread specification:</source>
<translation>Thread:</translation>
</message>
<message>
- <location/>
<source>Address:</source>
<translation>Adresse:</translation>
</message>
+ <message>
+ <source>Edit Breakpoint Properties</source>
+ <translation>Haltepunkte bearbeiten</translation>
+ </message>
+ <message>
+ <source>Use full path:</source>
+ <translation>Vollständigen Pfad verwenden:</translation>
+ </message>
</context>
<context>
<name>ComponentNameDialog</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljscomponentnamedialog.ui"/>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<message>
- <location/>
<source>Component name:</source>
<translation>Komponentenname:</translation>
</message>
<message>
- <location/>
<source>Path:</source>
<translation>Pfad:</translation>
</message>
<message>
- <location/>
<source>Choose...</source>
<translation>Auswählen...</translation>
</message>
@@ -27179,17 +22569,14 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>QmlJS::Bind</name>
<message>
- <location filename="../../../src/libs/qmljs/qmljsbind.cpp" line="+202"/>
<source>expected two numbers separated by a dot</source>
<translation>es werden zwei durch Komma getrennte Zahlen erwartet</translation>
</message>
<message>
- <location line="+10"/>
<source>package import requires a version number</source>
<translation>Package-Import erfordert eine Versionsnummer</translation>
</message>
<message>
- <location line="+11"/>
<source>file or directory not found</source>
<translation>Datei oder Ordner nicht gefunden</translation>
</message>
@@ -27197,7 +22584,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Core::Internal::CommandComboBox</name>
<message>
- <location filename="../../../src/plugins/coreplugin/navigationsubwidget.cpp" line="+123"/>
<source>Activate %1</source>
<translation>Aktiviere %1</translation>
</message>
@@ -27205,22 +22591,18 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::BreakpointDialog</name>
<message>
- <location filename="../../../src/plugins/debugger/breakwindow.cpp" line="-358"/>
<source>File and Line Number</source>
<translation>Datei und Zeilennummer</translation>
</message>
<message>
- <location line="+1"/>
<source>Function Name</source>
<translation>Funktionsname:</translation>
</message>
<message>
- <location line="+1"/>
<source>Function "main()"</source>
<translation>Funktion "main()"</translation>
</message>
<message>
- <location line="+1"/>
<source>Address</source>
<translation>Adresse</translation>
</message>
@@ -27228,27 +22610,22 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::Console</name>
<message>
- <location filename="../../../src/plugins/debugger/consolewindow.cpp" line="+190"/>
<source>Clear Contents</source>
<translation>Inhalt löschen</translation>
</message>
<message>
- <location line="+6"/>
<source>Save Contents</source>
<translation>Inhalt speichern</translation>
</message>
<message>
- <location line="+78"/>
<source>Log File</source>
<translation>Datei für Log-Inhalt</translation>
</message>
<message>
- <location line="+9"/>
<source>Write Failure</source>
<translation>Fehler beim Schreiben</translation>
</message>
<message>
- <location line="+1"/>
<source>Unable to write log contents to '%1': %2</source>
<translation>Das Log konnte nicht in die Datei '%1' geschrieben werden: %2</translation>
</message>
@@ -27256,7 +22633,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::ConsoleWindow</name>
<message>
- <location line="+17"/>
<source>Console</source>
<translation>Konsole</translation>
</message>
@@ -27264,27 +22640,22 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::DebuggerPane</name>
<message>
- <location filename="../../../src/plugins/debugger/logwindow.cpp" line="+189"/>
<source>Clear Contents</source>
<translation>Inhalt löschen</translation>
</message>
<message>
- <location line="+6"/>
<source>Save Contents</source>
<translation>Inhalt speichern</translation>
</message>
<message>
- <location line="+34"/>
<source>Log File</source>
<translation>Log für Datei</translation>
</message>
<message>
- <location line="+9"/>
<source>Write Failure</source>
<translation>Fehler beim Schreiben</translation>
</message>
<message>
- <location line="+1"/>
<source>Unable to write log contents to '%1': %2</source>
<translation>Das Log konnte nicht in die Datei '%1' geschrieben werden: %2</translation>
</message>
@@ -27292,7 +22663,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::InputPane</name>
<message>
- <location line="+65"/>
<source>Type Ctrl-<Return> to execute a line.</source>
<translation>Sie können eine Zeile mittels <Strg+Return> ausführen.</translation>
</message>
@@ -27300,7 +22670,6 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Debugger::Internal::LogWindow</name>
<message>
- <location line="+61"/>
<source>Log</source>
<translation>Log</translation>
</message>
@@ -27308,17 +22677,14 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>QmlJSEditor::Internal::ComponentNameDialog</name>
<message>
- <location filename="../../../src/plugins/qmljseditor/qmljscomponentnamedialog.cpp" line="+76"/>
<source>Choose a path</source>
<translation>Pfad auswählen</translation>
</message>
<message>
- <location line="+17"/>
<source>Invalid component name</source>
<translation>Der Name Komponente ist ungültig</translation>
</message>
<message>
- <location line="+4"/>
<source>Invalid path</source>
<translation>Ungültiger Pfad</translation>
</message>
@@ -27326,22 +22692,18 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Qt4ProjectManager::AbstractMobileApp</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp" line="+185"/>
<source>Could not open desktop file template</source>
<translation>Die Vorlagendatei der Desktop-Datei konnte nicht geöffnet werden</translation>
</message>
<message>
- <location line="+12"/>
<source>Could not open main.cpp template '%1'.</source>
<translation>Die Vorlagendatei der main.cpp-Datei '%1' konnte nicht geöffnet werden.</translation>
</message>
<message>
- <location line="+47"/>
<source>Could not open project file template '%1'.</source>
<translation>Die Vorlagendatei der Projektdatei '%1' konnte nicht geöffnet werden.</translation>
</message>
<message>
- <location line="+93"/>
<source>Could not open template file '%1'.</source>
<translation>Die Vorlagendatei '%1' konnte nicht geöffnet werden.</translation>
</message>
@@ -27349,14 +22711,162 @@ Wählt Qt-Versionen für Simulator und mobile Ziele aus, sofern sie verfügbar s
<context>
<name>Qt4ProjectManager::Internal::AbstractMobileAppWizardDialog</name>
<message>
- <location filename="../../../src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp" line="+51"/>
<source>Qt versions</source>
- <translation>Qt Versionen</translation>
+ <translation type="obsolete">Qt Versionen</translation>
</message>
<message>
- <location line="+3"/>
<source>Application options</source>
+ <translation type="obsolete">Einstellungen der Anwendung</translation>
+ </message>
+ <message>
+ <source>Qt Versions</source>
+ <translation>Qt-Versionen</translation>
+ </message>
+ <message>
+ <source>Application Options</source>
<translation>Einstellungen der Anwendung</translation>
</message>
</context>
+<context>
+ <name>MobileLibraryWizardOptionPage</name>
+ <message>
+ <source>WizardPage</source>
+ <translation>WizardPage</translation>
+ </message>
+ <message>
+ <source>Enable network access</source>
+ <translation>Netzwerkzugriff gestatten</translation>
+ </message>
+ <message>
+ <source>Target UID3:</source>
+ <translation>Ziel-UID3:</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::BuildableHelperLibrary</name>
+ <message>
+ <source>Building helper library '%1' in %2
+</source>
+ <translation>Erstelle Ausgabe-Hilfsbibliothek '%1' in %2
+</translation>
+ </message>
+ <message>
+ <source>Running %1 %2...
+</source>
+ <translation>Führe %1 %2 aus...
+</translation>
+ </message>
+ <message>
+ <source>Running %1 ...
+</source>
+ <translation>Führe %1 aus...
+</translation>
+ </message>
+ <message>
+ <source>%1 not found in PATH
+</source>
+ <translation>%1 konnte im Pfad (PATH) nicht gefunden werden
+</translation>
+ </message>
+</context>
+<context>
+ <name>QmlJsEditor</name>
+ <message>
+ <source>QML</source>
+ <translation>QML</translation>
+ </message>
+</context>
+<context>
+ <name>QmlJSEditor::FindReferences</name>
+ <message>
+ <source>Searching</source>
+ <translation>Suche</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::QmlDumpTool</name>
+ <message>
+ <source>qmldump could not be built in any of the directories:
+- %1
+
+Reason: %2</source>
+ <translation>qmldump konnte in keinem der folgenden Ordner erstellt werden:
+- %1
+
+Fehler: %2</translation>
+ </message>
+</context>
+<context>
+ <name>QmlDumpBuildTask</name>
+ <message>
+ <source>Building helper</source>
+ <translation>Ausgabe-Hilfsbibliothek</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::QmlObserverTool</name>
+ <message>
+ <source>The target directory %1 could not be created.</source>
+ <translation>Der Zielordner %1 konnte nicht erstellt werden.</translation>
+ </message>
+ <message>
+ <source>QMLObserver could not be built in any of the directories:
+- %1
+
+Reason: %2</source>
+ <translation>Der QML-Beobachter konnte in keinem der folgenden Ordner erstellt werden:
+- %1
+
+Fehler: %2</translation>
+ </message>
+</context>
+<context>
+ <name>QmlDesigner::TextToModelMerger</name>
+ <message>
+ <source>Deprecated import: import Qt 4.7</source>
+ <translation>Veraltete Import-Spezifikation: import Qt 4.7</translation>
+ </message>
+ <message>
+ <source>Deprecated import: import Qt 4.7
+use import QtQuick 1.0 instead.
+
+Do you want to automatically fix the import?</source>
+ <translation>Veraltete Import-Spezifikation: import Qt 4.7
+Es sollte import QtQuick 1.0 verwendet werden.
+
+Soll sie automatisch korrigiert werden?</translation>
+ </message>
+ <message>
+ <source>Deprecated import: import Qt 4.7 use import QtQuick 1.0 instead</source>
+ <translation>Veraltete Import-Spezifikation: import QtQuick 1.0 sollte an Stelle von import Qt 4.7 verwendet werden</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::InsertDefOperation</name>
+ <message>
+ <source>Add definition in %1</source>
+ <translation>Definition in %1 hinzufügen</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::QmlDumpTool</name>
+ <message>
+ <source>qmldump</source>
+ <translation>qmldump</translation>
+ </message>
+</context>
+<context>
+ <name>Qt4ProjectManager::QmlObserverTool</name>
+ <message>
+ <source>QMLObserver</source>
+ <translation>QML-Beobachter</translation>
+ </message>
+</context>
+<context>
+ <name>CppEditor::InsertDeclOperation</name>
+ <message>
+ <source>Add %1 declaration</source>
+ <translation>Deklaration für %1 hinzufügen</translation>
+ </message>
+</context>
</TS>
diff --git a/src/libs/3rdparty/botan/src/src.pro b/src/libs/3rdparty/botan/src/src.pro
index f5bbad2d575c59d3c296383a9ef3ac2bb41ec0a9..37b9f01df9cd2ed17e28b0f8c8dd35cff5bc46ce 100644
--- a/src/libs/3rdparty/botan/src/src.pro
+++ b/src/libs/3rdparty/botan/src/src.pro
@@ -7,6 +7,7 @@ include(../../../../qtcreatorlibrary.pri)
DEPENDPATH += .
INCLUDEPATH += $$PWD $$PWD/../build $$PWD/../build/botan
+unix:QMAKE_CXXFLAGS_DEBUG += -O2
win32 {
win32-msvc* {
diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp
index d91f175a2a51233002c4848592d2b50fb4646bff..da87e756aed6e5464b5988838f73d31505bbe3e1 100644
--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -132,6 +132,8 @@ public:
{
Function *funTy = control()->newFunction(0, 0);
funTy->copy(type);
+ funTy->setConst(type->isConst());
+ funTy->setVolatile(type->isVolatile());
funTy->setName(rewrite->rewriteName(type->name()));
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 813a50bb8a0496cb82c351ad63c80df130992f58..8619502e51bae86faf11af048943d645b7a6257d 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -238,8 +238,21 @@ ClassOrNamespace *LookupContext::globalNamespace() const
ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope) const
{
- if (ClassOrNamespace *b = bindings()->lookupType(scope))
+ if (! scope) {
+ return 0;
+ } else if (Block *block = scope->asBlock()) {
+ for (unsigned i = 0; i < block->memberCount(); ++i) {
+ if (UsingNamespaceDirective *u = block->memberAt(i)->asUsingNamespaceDirective()) {
+ if (ClassOrNamespace *uu = lookupType(u->name(), scope->enclosingNamespace())) {
+ if (ClassOrNamespace *r = uu->lookupType(name))
+ return r;
+ }
+ }
+ }
+ return lookupType(name, scope->enclosingScope());
+ } else if (ClassOrNamespace *b = bindings()->lookupType(scope)) {
return b->lookupType(name);
+ }
return 0;
}
@@ -257,25 +270,19 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const
return candidates;
for (; scope; scope = scope->enclosingScope()) {
- if ((name->isNameId() || name->isTemplateNameId()) && scope->isBlock()) {
+ if (name->identifier() != 0 && scope->isBlock()) {
bindings()->lookupInScope(name, scope, &candidates, /*templateId = */ 0, /*binding=*/ 0);
if (! candidates.isEmpty())
break; // it's a local.
- for (unsigned index = 0; index < scope->memberCount(); ++index) {
- Symbol *member = scope->memberAt(index);
+ for (unsigned i = 0; i < scope->memberCount(); ++i) {
+ if (UsingNamespaceDirective *u = scope->memberAt(i)->asUsingNamespaceDirective()) {
+ if (ClassOrNamespace *uu = lookupType(u->name(), scope->enclosingNamespace())) {
+ candidates = uu->find(name);
- if (UsingNamespaceDirective *u = member->asUsingNamespaceDirective()) {
- if (Namespace *enclosingNamespace = u->enclosingNamespace()->asNamespace()) {
- if (ClassOrNamespace *b = bindings()->lookupType(enclosingNamespace)) {
- if (ClassOrNamespace *uu = b->lookupType(u->name())) {
- candidates = uu->find(name);
-
- if (! candidates.isEmpty())
- return candidates;
- }
- }
+ if (! candidates.isEmpty())
+ return candidates;
}
}
}
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index d98f1943eee825dba2becbfedd1e5d79efbdd7ea..b043931142b595d123d1b118e9d864e7fb80633d 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -315,7 +315,9 @@ bool ContextPaneWidget::setType(const QStringList &types)
m_rectangleWidget->hide();
m_easingWidget->hide();
- if (types.contains("Text")) {
+ if (types.contains("Text") ||
+ types.contains("TextEdit") ||
+ types.contains("TextInput")) {
m_currentWidget = m_textWidget;
m_textWidget->show();
m_textWidget->setStyleVisible(true);
@@ -361,7 +363,7 @@ bool ContextPaneWidget::setType(const QStringList &types)
bool ContextPaneWidget::acceptsType(const QStringList &types)
{
- return types.contains("Text") || m_easingWidget->acceptsType(types) ||
+ return types.contains("Text") || types.contains("TextEdit") || types.contains("TextInput") || m_easingWidget->acceptsType(types) ||
types.contains("Rectangle") || types.contains("Image") || types.contains("BorderImage");
}
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
index 595b7d442e62e9b73a30094fe0a2b9b1322958cc..fc849a02b28de4f9d1dc709ef22b87c93c355610 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
+++ b/src/libs/qmleditorwidgets/contextpanewidgetborderimage.ui
@@ -238,7 +238,7 @@
<item row="0" column="0">
<widget class="QRadioButton" name="verticalStretchRadioButton">
<property name="toolTip">
- <string>Strech horizontally. Scales the image to fit to the available area.</string>
+ <string>Stretch horizontally. Scales the image to fit to the available area.</string>
</property>
<property name="text">
<string/>
diff --git a/src/libs/qmleditorwidgets/filewidget.cpp b/src/libs/qmleditorwidgets/filewidget.cpp
index 47a0020a871b7f592ac2811f90adcafa483f1cd0..5a405d64b4cd1f1b9e5edd35789bc4b66172aa63 100644
--- a/src/libs/qmleditorwidgets/filewidget.cpp
+++ b/src/libs/qmleditorwidgets/filewidget.cpp
@@ -53,9 +53,8 @@ FileWidget::FileWidget(QWidget *parent) : QWidget(parent), m_filter("(*.*)"), m_
layout->addWidget(m_pushButton);
m_pushButton->setText("...");
connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(lineEditChanged()));
- connect(m_pushButton, SIGNAL(pressed()), this, SLOT(buttonPressed()));
+ connect(m_pushButton, SIGNAL(released()), this, SLOT(onButtonReleased()));
connect(m_comboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(comboBoxChanged()));
- m_currentPath = QDir::currentPath();
}
FileWidget::~FileWidget()
@@ -83,14 +82,11 @@ void FileWidget::comboBoxChanged()
setFileNameStr(m_comboBox->currentText());
}
-void FileWidget::buttonPressed()
+void FileWidget::onButtonReleased()
{
- QString path = m_currentPath;
- QString newFile = QFileDialog::getOpenFileName(0, tr("Open File"), path, m_filter);
+ QString newFile = QFileDialog::getOpenFileName(0, tr("Open File"), m_path.toLocalFile(), m_filter);
if (!newFile.isEmpty())
setFileNameStr(newFile);
-
- m_currentPath = QFileInfo(newFile).absolutePath();
}
void FileWidget::setFileNameStr(const QString &fileName)
diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h
index a1c1e37bec2deec941f9b9ab923f120e0ee0e96d..971a28f5c768c79a2788ee782e276b88d23eaf6a 100644
--- a/src/libs/qmleditorwidgets/filewidget.h
+++ b/src/libs/qmleditorwidgets/filewidget.h
@@ -91,7 +91,7 @@ public:
public slots:
void setFileName(const QUrl &fileName);
void setFileNameStr(const QString &fileName);
- void buttonPressed();
+ void onButtonReleased();
void lineEditChanged();
void comboBoxChanged();
@@ -113,7 +113,6 @@ private:
QString m_filter;
bool m_showComboBox;
bool m_lock;
- QString m_currentPath;
};
diff --git a/src/libs/qmljs/qmljsdelta.cpp b/src/libs/qmljs/qmljsdelta.cpp
index da0022a419dbb81f9c4643b551c87aa64ea45ca9..6c4499626443fd713057c93d3b1583e53e8e9e1e 100644
--- a/src/libs/qmljs/qmljsdelta.cpp
+++ b/src/libs/qmljs/qmljsdelta.cpp
@@ -42,6 +42,10 @@ using namespace QmlJS::AST;
namespace {
using namespace QmlJS;
+enum {
+ debug = false
+};
+
/*!
Build a hash of the parents
*/
@@ -359,7 +363,8 @@ void Delta::insert(UiObjectMember *member, UiObjectMember *parentMember, const Q
importList << doc->source().mid(importBegin, importEnd - importBegin);
}
- QString filename = doc->fileName() + QLatin1Char('_') + QString::number(doc->editorRevision())
+ // encode editorRevision, lineNumber in URL. See ClientProxy::buildDebugIdHashRecursive
+ QString filename = QLatin1String("file://") + doc->fileName() + QLatin1Char('_') + QString::number(doc->editorRevision())
+ QLatin1Char(':') + QString::number(uiObjectDef->firstSourceLocation().startLine-importList.count());
foreach(DebugId debugId, debugReferences) {
if (debugId != -1) {
@@ -475,7 +480,8 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P
UiObjectMember* parent = parents2.parent.value(y);
if (!M.way2.contains(parent))
continue;
- qDebug () << "Delta::operator(): insert " << label(y, doc2) << " to " << label(parent, doc2);
+ if (debug)
+ qDebug () << "Delta::operator(): insert " << label(y, doc2) << " to " << label(parent, doc2);
insert(y, parent, newDebuggIds.value(parent), doc2);
continue;
}
@@ -494,7 +500,8 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P
// << " to "<< label(y, doc2) << "with parent " << label(parents2.parent.value(y), doc2);
if (!M.contains(parents1.parent.value(x),parents2.parent.value(y))) {
- qDebug () << "Delta::operator(): move " << label(y, doc2) << " from " << label(parents1.parent.value(x), doc1)
+ if (debug)
+ qDebug () << "Delta::operator(): move " << label(y, doc2) << " from " << label(parents1.parent.value(x), doc1)
<< " to " << label(parents2.parent.value(y), doc2);
reparent(newDebuggIds.value(y), newDebuggIds.value(parents2.parent.value(y)));
continue;
@@ -508,7 +515,8 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P
if (!cast<UiObjectDefinition *>(x))
continue;
if (!M.way1.contains(x)) {
- qDebug () << "Delta::operator(): remove " << label(x, doc1);
+ if (debug)
+ qDebug () << "Delta::operator(): remove " << label(x, doc1);
QList<DebugId> ids = debugIds.value(x);
if (!ids.isEmpty())
remove(ids);
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index e9fcdbce71d1978ffb72e19570e0b76d356fb995..3fa6ca97cfb50c9747495b2bddc5df7e016c2530 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -171,12 +171,79 @@ bool BuildableHelperLibrary::copyFiles(const QString &sourcePath,
return true;
}
-QString BuildableHelperLibrary::buildHelper(const QString &helperName, const QString &proFilename,
- const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode)
+// Helper: Run a build process with merged stdout/stderr
+static inline bool runBuildProcessI(QProcess &proc,
+ const QString &binary,
+ const QStringList &args,
+ int timeoutMS,
+ bool ignoreNonNullExitCode,
+ QString *output, QString *errorMessage)
+{
+ proc.start(binary, args);
+ if (!proc.waitForStarted()) {
+ *errorMessage = QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "Cannot start process: %1").
+ arg(proc.errorString());
+ return false;
+ }
+ // Read stdout/err and check for timeouts
+ QByteArray stdOut;
+ QByteArray stdErr;
+ if (!SynchronousProcess::readDataFromProcess(proc, timeoutMS, &stdOut, &stdErr, false)) {
+ *errorMessage = QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "Timeout after %1s.").
+ arg(timeoutMS / 1000);
+ SynchronousProcess::stopProcess(proc);
+ return false;
+ }
+ if (proc.exitStatus() != QProcess::NormalExit) {
+ *errorMessage = QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "The process crashed.");
+ return false;
+ }
+ const QString stdOutS = QString::fromLocal8Bit(stdOut);
+ if (!ignoreNonNullExitCode && proc.exitCode() != 0) {
+ *errorMessage = QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "The process returned exit code %1:\n%2").
+ arg(proc.exitCode()).arg(stdOutS);
+ return false;
+ }
+ output->append(stdOutS);
+ return true;
+}
+
+// Run a build process with merged stdout/stderr and qWarn about errors.
+static bool runBuildProcess(QProcess &proc,
+ const QString &binary,
+ const QStringList &args,
+ int timeoutMS,
+ bool ignoreNonNullExitCode,
+ QString *output, QString *errorMessage)
+{
+ const bool rc = runBuildProcessI(proc, binary, args, timeoutMS, ignoreNonNullExitCode, output, errorMessage);
+ if (!rc) {
+ // Fail - reformat error.
+ QString cmd = binary;
+ if (!args.isEmpty()) {
+ cmd += QLatin1Char(' ');
+ cmd += args.join(QString(QLatin1Char(' ')));
+ }
+ *errorMessage =
+ QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "Error running '%1' in %2: %3").
+ arg(cmd, proc.workingDirectory(), *errorMessage);
+ qWarning("%s", qPrintable(*errorMessage));
+ }
+ return rc;
+}
+
+
+bool BuildableHelperLibrary::buildHelper(const QString &helperName, const QString &proFilename,
+ const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage)
{
- QString output;
const QChar newline = QLatin1Char('\n');
// Setup process
QProcess proc;
@@ -184,45 +251,43 @@ QString BuildableHelperLibrary::buildHelper(const QString &helperName, const QSt
proc.setWorkingDirectory(directory);
proc.setProcessChannelMode(QProcess::MergedChannels);
- output += QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
- "Building helper library '%1' in %2\n").arg(helperName, directory);
- output += newline;
+ output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "Building helper library '%1' in %2\n").arg(helperName, directory));
+ output->append(newline);
const QString makeFullPath = env.searchInPath(makeCommand);
if (QFileInfo(directory + QLatin1String("/Makefile")).exists()) {
- if (!makeFullPath.isEmpty()) {
- const QString cleanTarget = QLatin1String("distclean");
- output += QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
- "Running %1 %2...\n").arg(makeFullPath, cleanTarget);
- proc.start(makeFullPath, QStringList(cleanTarget));
- proc.waitForFinished();
- output += QString::fromLocal8Bit(proc.readAll());
- } else {
- output += QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary",
- "%1 not found in PATH\n").arg(makeCommand);
- return output;
+ if (makeFullPath.isEmpty()) {
+ *errorMessage = QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary",
+ "%1 not found in PATH\n").arg(makeCommand);
+ return false;
}
+ const QString cleanTarget = QLatin1String("distclean");
+ output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
+ "Running %1 %2...\n").arg(makeFullPath, cleanTarget));
+ if (!runBuildProcess(proc, makeFullPath, QStringList(cleanTarget), 30000, true, output, errorMessage))
+ return false;
}
- output += newline;
- output += QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 ...\n").arg(qmakeCommand);
+ output->append(newline);
+ output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 ...\n").arg(qmakeCommand));
- QStringList makeArgs;
- makeArgs << targetMode << QLatin1String("-spec") << (mkspec.isEmpty() ? QString(QLatin1String("default")) : mkspec) << proFilename;
- proc.start(qmakeCommand, makeArgs);
- proc.waitForFinished();
-
- output += proc.readAll();
-
- output += newline;;
- if (!makeFullPath.isEmpty()) {
- output += QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 ...\n").arg(makeFullPath);
- proc.start(makeFullPath, QStringList());
- proc.waitForFinished();
- output += proc.readAll();
- } else {
- output += QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "%1 not found in PATH\n").arg(makeCommand);
+ QStringList qMakeArgs;
+ if (!targetMode.isEmpty())
+ qMakeArgs << targetMode;
+ if (!mkspec.isEmpty())
+ qMakeArgs << QLatin1String("-spec") << mkspec;
+ qMakeArgs << proFilename;
+ if (!runBuildProcess(proc, qmakeCommand, qMakeArgs, 30000, false, output, errorMessage))
+ return false;
+ output->append(newline);
+ if (makeFullPath.isEmpty()) {
+ *errorMessage = QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "%1 not found in PATH\n").arg(makeCommand);
+ return false;
}
- return output;
+ output->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 ...\n").arg(makeFullPath));
+ if (!runBuildProcess(proc, makeFullPath, QStringList(), 120000, false, output, errorMessage))
+ return false;
+ return true;
}
bool BuildableHelperLibrary::getHelperFileInfoFor(const QStringList &validBinaryFilenames,
diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h
index fa8a85648c643ff564ba9dd9c1180aef6a020d44..09615ce06af8f6bb1ba35f3de6dd472d1d484635 100644
--- a/src/libs/utils/buildablehelperlibrary.h
+++ b/src/libs/utils/buildablehelperlibrary.h
@@ -33,10 +33,11 @@ public:
static bool copyFiles(const QString &sourcePath, const QStringList &files,
const QString &targetDirectory, QString *errorMessage);
- static QString buildHelper(const QString &helperName, const QString &proFilename,
- const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode);
+ static bool buildHelper(const QString &helperName, const QString &proFilename,
+ const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage);
static bool getHelperFileInfoFor(const QStringList &validBinaryFilenames,
const QString &directory, QFileInfo* info);
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index 7ec417030fa9c22afdbe9f5ce8cbc2dc5efcb9f8..b21fcf9ab63af0a0fac3d85b26c3d93d5410488f 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -373,20 +373,15 @@ QString Environment::joinArgumentList(const QStringList &arguments)
return result;
}
-enum State { BASE, VARIABLE, OPTIONALVARIABLEBRACE, STRING, STRING_ESCAPE, ESCAPE };
+enum State { BASE, VARIABLE, OPTIONALVARIABLEBRACE, STRING };
/** Expand environment variables in a string.
*
* Environment variables are accepted in the following forms:
* $SOMEVAR, ${SOMEVAR} and %SOMEVAR%.
*
- * The following escape sequences are supported:
- * "\$", "\\" and "\"" which will be replaced by '$', '\' and '%'
- * respectively.
- *
* Strings enclosed in '"' characters do not get varaibles
- * substituted. Escape codes are processed though.
- *
+ * substituted.
*/
QString Environment::expandVariables(const QString &input) const
{
@@ -399,9 +394,7 @@ QString Environment::expandVariables(const QString &input) const
for (int i = 0; i < length; ++i) {
QChar c = input.at(i);
if (state == BASE) {
- if (c == '\\') {
- state = ESCAPE;
- } else if (c == '$') {
+ if (c == '$') {
state = OPTIONALVARIABLEBRACE;
variable.clear();
endVariable = QChar(0);
@@ -433,20 +426,12 @@ QString Environment::expandVariables(const QString &input) const
variable = c;
state = VARIABLE;
} else if (state == STRING) {
- if (c == '\\') {
- state = STRING_ESCAPE;
- } else if (c == '\"') {
+ if (c == '\"') {
state = BASE;
result += c;
} else {
result += c;
}
- } else if (state == STRING_ESCAPE) {
- result += c;
- state = STRING;
- } else if (state == ESCAPE){
- result += c;
- state = BASE;
}
}
if (state == VARIABLE)
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index ed2cd20f1f80d8a6518467294ed9837b4c9eaff2..e0e31c5db42dbc3ad1bfa18cefe16bf5d4c8b07c 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -172,7 +172,7 @@ void runFileSearch(QFutureInterface<FileSearchResultList> &future,
int n = 0;
while (startOfLastLine[i] != '\n' && startOfLastLine[i] != '\r' && i < textLength && n++ < 256)
res.append(startOfLastLine[i++]);
- results << FileSearchResult(s, lineNr, QString(res),
+ results << FileSearchResult(s, lineNr, QString::fromUtf8(res),
regionPtr - startOfLastLine, sa.length(),
QStringList());
++numMatches;
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 331e51ddfa8f865151242359551e2fdea2e46b9d..844353fddf51d1ae76d74ff04e921fa133d2a82f 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -110,9 +110,7 @@ QString PathChooserPrivate::expandedPath(const QString &input) const
{
if (input.isEmpty())
return input;
- // Environment does \-expansion, too.
- const QString nativeInput = QDir::fromNativeSeparators(input);
- const QString path = QDir::fromNativeSeparators(m_environment.expandVariables(nativeInput));
+ const QString path = QDir::fromNativeSeparators(m_environment.expandVariables(input));
if (path.isEmpty())
return path;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index cad242bbffe0e89e7a51775db5880977f62c7703..566d372f224a79e8ae874165e6e00537d3749889 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1685,6 +1685,7 @@ void EditorManager::showPopupOrSelectDocument() const
}
}
+// Save state of all non-teporary editors.
QByteArray EditorManager::saveState() const
{
QByteArray bytes;
@@ -1694,7 +1695,8 @@ QByteArray EditorManager::saveState() const
QList<IEditor *> editors = openedEditors();
foreach (IEditor *editor, editors) {
- if (!editor->file()->fileName().isEmpty()) {
+ if (!editor->file()->fileName().isEmpty()
+ && !editor->isTemporary()) {
QByteArray state = editor->saveState();
if (!state.isEmpty())
m_d->m_editorStates.insert(editor->file()->fileName(), QVariant(state));
@@ -1704,10 +1706,18 @@ QByteArray EditorManager::saveState() const
stream << m_d->m_editorStates;
QList<OpenEditorsModel::Entry> entries = m_d->m_editorModel->entries();
- stream << entries.count();
+ int entriesCount = 0;
+ foreach (const OpenEditorsModel::Entry &entry, entries) {
+ // The editor may be 0 if it was not loaded yet: In that case it is not temporary
+ if (!entry.editor || !entry.editor->isTemporary())
+ ++entriesCount;
+ }
+
+ stream << entriesCount;
foreach (const OpenEditorsModel::Entry &entry, entries) {
- stream << entry.fileName() << entry.displayName() << entry.id().toUtf8();
+ if (!entry.editor || !entry.editor->isTemporary())
+ stream << entry.fileName() << entry.displayName() << entry.id().toUtf8();
}
stream << m_d->m_splitter->saveState();
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index bb5bf60825ff4568fb616d41458716d08afec40a..127c969c7dfc5243751bac0a9acb50180c05de6c 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -980,7 +980,8 @@ void FileManager::syncWithEditor(Core::IContext *context)
return;
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
- if (editor && (editor->widget() == context->widget()))
+ if (editor && (editor->widget() == context->widget()) &&
+ !editor->isTemporary())
setCurrentFile(editor->file()->fileName());
}
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index f32b3b2a18b0efad22729960b87911c060db9f74..487976bb0c908ccd6b71e75deece5dbab4c50d46 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -325,16 +325,14 @@ bool MainWindow::init(QString *errorMessage)
void MainWindow::extensionsInitialized()
{
m_editorManager->init();
-
m_statusBarManager->extensionsInitalized();
-
OutputPaneManager::instance()->init();
-
- m_actionManager->initialize();
m_vcsManager->extensionsInitialized();
-
m_navigationWidget->setFactories(ExtensionSystem::PluginManager::instance()->getObjects<INavigationWidgetFactory>());
+ // reading the shortcut settings must be done after all shortcuts have been registered
+ m_actionManager->initialize();
+
readSettings();
updateContext();
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index 85376a342114697ff1d5ebddeebf319cc27c7855..538972b083ed70bbdb481df1d14d0bfef32c66a3 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -209,7 +209,7 @@ bool CommandComboBox::event(QEvent *e)
if (e->type() == QEvent::ToolTip) {
const QString text = currentText();
if (const Core::Command *cmd = command(text)) {
- const QString tooltip = tr("Activate %1").arg(text);
+ const QString tooltip = tr("Activate %1 Pane").arg(text);
setToolTip(cmd->stringWithAppendedShortcut(tooltip));
} else {
setToolTip(text);
diff --git a/src/plugins/coreplugin/ssh/sshconnection.cpp b/src/plugins/coreplugin/ssh/sshconnection.cpp
index 0c47b88680e5514f6a5c9893beb41745b58c9f87..3d8258da4bc605de3bdae3aa31e8c359482027a2 100644
--- a/src/plugins/coreplugin/ssh/sshconnection.cpp
+++ b/src/plugins/coreplugin/ssh/sshconnection.cpp
@@ -59,7 +59,7 @@ namespace {
staticInitMutex.lock();
if (!staticInitializationsDone) {
Botan::LibraryInitializer::initialize("thread_safe=true");
- qRegisterMetaType<SshError>("SshError");
+ qRegisterMetaType<Core::SshError>("Core::SshError");
qRegisterMetaType<Core::SftpJobId>("Core::SftpJobId");
staticInitializationsDone = true;
}
@@ -109,8 +109,8 @@ SshConnection::SshConnection() : d(new Internal::SshConnectionPrivate(this))
SIGNAL(dataAvailable(QString)), Qt::QueuedConnection);
connect(d, SIGNAL(disconnected()), this, SIGNAL(disconnected()),
Qt::QueuedConnection);
- connect(d, SIGNAL(error(SshError)), this, SIGNAL(error(SshError)),
- Qt::QueuedConnection);
+ connect(d, SIGNAL(error(Core::SshError)), this,
+ SIGNAL(error(Core::SshError)), Qt::QueuedConnection);
}
void SshConnection::connectToHost(const SshConnectionParameters &serverInfo)
@@ -160,12 +160,16 @@ SshConnection::~SshConnection()
QSharedPointer<SshRemoteProcess> SshConnection::createRemoteProcess(const QByteArray &command)
{
+ // TODO: Is this conditonal return value really a good idea?
+ // Get rid of this IF we can prove that no harm is done by returning
+ // a non-working (but non-null) process pointer.
return state() == Connected
? d->createRemoteProcess(command) : QSharedPointer<SshRemoteProcess>();
}
QSharedPointer<SftpChannel> SshConnection::createSftpChannel()
{
+ // TODO: See above
return state() == Connected
? d->createSftpChannel() : QSharedPointer<SftpChannel>();
}
diff --git a/src/plugins/coreplugin/ssh/sshconnection.h b/src/plugins/coreplugin/ssh/sshconnection.h
index 73987ba594156f08062fdf20e3016caa408ada9f..b262b3e21d6edaec15d6e8389a3593db6d413572 100644
--- a/src/plugins/coreplugin/ssh/sshconnection.h
+++ b/src/plugins/coreplugin/ssh/sshconnection.h
@@ -95,7 +95,7 @@ signals:
void connected();
void disconnected();
void dataAvailable(const QString &message);
- void error(SshError);
+ void error(Core::SshError);
private:
SshConnection();
diff --git a/src/plugins/coreplugin/ssh/sshconnection_p.h b/src/plugins/coreplugin/ssh/sshconnection_p.h
index 2dd3c5c335272c5770e2300ac29247678f3a3233..95339cdafc6809c5bdd9cdc334a2e06be9627a8f 100644
--- a/src/plugins/coreplugin/ssh/sshconnection_p.h
+++ b/src/plugins/coreplugin/ssh/sshconnection_p.h
@@ -90,7 +90,7 @@ signals:
void connected();
void disconnected();
void dataAvailable(const QString &message);
- void error(SshError);
+ void error(Core::SshError);
private:
Q_SLOT void handleSocketConnected();
diff --git a/src/plugins/coreplugin/ssh/sshkeygenerator.cpp b/src/plugins/coreplugin/ssh/sshkeygenerator.cpp
index 976d0094c7886865278a776e13e69e0b34a46d81..985a6e256f11459d0c9f0effa75a17e3c28f768c 100644
--- a/src/plugins/coreplugin/ssh/sshkeygenerator.cpp
+++ b/src/plugins/coreplugin/ssh/sshkeygenerator.cpp
@@ -49,21 +49,28 @@ namespace Core {
using namespace Botan;
using namespace Internal;
-SshKeyGenerator::SshKeyGenerator() { }
+SshKeyGenerator::SshKeyGenerator()
+ : m_type(Rsa)
+ , m_format(OpenSsl)
+{
+}
bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format,
int keySize)
{
+ m_type = type;
+ m_format = format;
+
try {
AutoSeeded_RNG rng;
KeyPtr key;
- if (type == Rsa)
+ if (m_type == Rsa)
key = KeyPtr(new RSA_PrivateKey(rng, keySize));
else
key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::Strong,
keySize)));
- return format == Pkcs8
- ? generatePkcs8Keys(key) : generateOpenSslKeys(key, type);
+ return m_format == Pkcs8
+ ? generatePkcs8Keys(key) : generateOpenSslKeys(key);
} catch (Botan::Exception &e) {
m_error = tr("Error generating key: %1").arg(e.what());
return false;
@@ -95,12 +102,12 @@ void SshKeyGenerator::generatePkcs8Key(const KeyPtr &key, bool privateKey)
pipe.message_count() - 1);
}
-bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key, KeyType type)
+bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key)
{
QList<BigInt> publicParams;
QList<BigInt> allParams;
QByteArray keyId;
- if (type == Rsa) {
+ if (m_type == Rsa) {
const QSharedPointer<RSA_PrivateKey> rsaKey
= key.dynamicCast<RSA_PrivateKey>();
publicParams << rsaKey->get_e() << rsaKey->get_n();
@@ -130,7 +137,7 @@ bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key, KeyType type)
encoder.encode(b);
encoder.end_cons();
const char * const label
- = type == Rsa ? "RSA PRIVATE KEY" : "DSA PRIVATE KEY";
+ = m_type == Rsa ? "RSA PRIVATE KEY" : "DSA PRIVATE KEY";
m_privateKey
= QByteArray(PEM_Code::encode (encoder.get_contents(), label).c_str());
return true;
diff --git a/src/plugins/coreplugin/ssh/sshkeygenerator.h b/src/plugins/coreplugin/ssh/sshkeygenerator.h
index ada06150a04808f59764f4ec55ddc4b575ad98b8..12fb1aa8d1bfc691bf2730ab1ba1aae949abd020 100644
--- a/src/plugins/coreplugin/ssh/sshkeygenerator.h
+++ b/src/plugins/coreplugin/ssh/sshkeygenerator.h
@@ -61,7 +61,7 @@ private:
bool generatePkcs8Keys(const KeyPtr &key);
void generatePkcs8Key(const KeyPtr &key, bool privateKey);
- bool generateOpenSslKeys(const KeyPtr &key, KeyType type);
+ bool generateOpenSslKeys(const KeyPtr &key);
QString m_error;
QByteArray m_publicKey;
diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp
index 66bbdfd6919a33c0f8f62ab9840d01907222a26f..c0becdf2a4631a1ec6b61c66725ac7c0f007ed73 100644
--- a/src/plugins/cppeditor/cppinsertdecldef.cpp
+++ b/src/plugins/cppeditor/cppinsertdecldef.cpp
@@ -29,12 +29,7 @@
#include "cppinsertdecldef.h"
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <CoreTypes.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <TranslationUnit.h>
+#include <CPlusPlus.h>
#include <cplusplus/ASTPath.h>
#include <cplusplus/CppRewriter.h>
#include <cplusplus/LookupContext.h>
@@ -42,6 +37,7 @@
#include <cpptools/insertionpointlocator.h>
#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
using namespace CPlusPlus;
using namespace CppEditor;
@@ -74,8 +70,8 @@ public:
default: break;
}
- setDescription(QCoreApplication::tr("Add %1 declaration",
- "CppEditor::DeclFromDef").arg(type));
+ setDescription(QCoreApplication::translate("CppEditor::InsertDeclOperation",
+ "Add %1 Declaration").arg(type));
}
void performChanges(CppRefactoringFile *, CppRefactoringChanges *refactoring)
@@ -142,46 +138,49 @@ QList<CppQuickFixOperation::Ptr> DeclFromDef::match(const CppQuickFixState &stat
Function *method = funDef->symbol;
- if (ClassOrNamespace *targetBinding = state.context().lookupParent(method)) {
- foreach (Symbol *s, targetBinding->symbols()) {
- if (Class *clazz = s->asClass()) {
- QList<CppQuickFixOperation::Ptr> results;
- const QLatin1String fn(clazz->fileName());
+ Scope *enclosingScope = method->enclosingScope();
+ while (! (enclosingScope->isNamespace() || enclosingScope->isClass()))
+ enclosingScope = enclosingScope->enclosingScope();
+ Q_ASSERT(enclosingScope != 0);
+
+ const Name *functionName = method->name();
+ if (! functionName)
+ return noResult(); // warn, anonymous function names are not valid c++
+
+ if (! functionName->isQualifiedNameId())
+ return noResult(); // warn, trying to add a declaration for a global function
+
+ const QualifiedNameId *q = functionName->asQualifiedNameId();
+ if (!q->base())
+ return noResult();
+
+ if (ClassOrNamespace *binding = state.context().lookupType(q->base(), enclosingScope)) {
+ foreach (Symbol *s, binding->symbols()) {
+ if (Class *matchingClass = s->asClass()) {
+ for (Symbol *s = matchingClass->find(q->identifier()); s; s = s->next()) {
+ if (! s->name())
+ continue;
+ else if (! q->identifier()->isEqualTo(s->identifier()))
+ continue;
+ else if (! s->type()->isFunctionType())
+ continue;
+
+ if (s->type().isEqualTo(method->type()))
+ return noResult();
+ }
+
+ // a good candidate
+
+ const QString fn = QString::fromUtf8(matchingClass->fileName(),
+ matchingClass->fileNameLength());
const QString decl = generateDeclaration(state,
method,
- targetBinding);
- results.append(
- singleResult(
- new InsertDeclOperation(state, idx, fn, clazz,
- InsertionPointLocator::Public,
- decl)));
- results.append(
- singleResult(
- new InsertDeclOperation(state, idx, fn, clazz,
- InsertionPointLocator::Protected,
- decl)));
- results.append(
- singleResult(
- new InsertDeclOperation(state, idx, fn, clazz,
- InsertionPointLocator::Private,
- decl)));
- results.append(
- singleResult(
- new InsertDeclOperation(state, idx, fn, clazz,
- InsertionPointLocator::PublicSlot,
- decl)));
- results.append(
- singleResult(
- new InsertDeclOperation(state, idx, fn, clazz,
- InsertionPointLocator::ProtectedSlot,
- decl)));
- results.append(
- singleResult(
- new InsertDeclOperation(state, idx, fn, clazz,
- InsertionPointLocator::PrivateSlot,
- decl)));
- return results;
- } //! \todo support insertion of non-methods into namespaces
+ binding);
+ return singleResult(
+ new InsertDeclOperation(state, idx, fn, matchingClass,
+ InsertionPointLocator::Public,
+ decl));
+ }
}
}
@@ -217,9 +216,11 @@ public:
, m_decl(decl)
, m_loc(loc)
{
- setDescription(QCoreApplication::tr("Add definition in %1",
- "CppEditor::DefFromDecl")
- .arg(m_loc.fileName()));
+ const QString declFile = QString::fromUtf8(decl->fileName(), decl->fileNameLength());
+ const QDir dir = QFileInfo(declFile).dir();
+ setDescription(QCoreApplication::translate("CppEditor::InsertDefOperation",
+ "Add Definition in %1")
+ .arg(dir.relativeFilePath(m_loc.fileName())));
}
void performChanges(CppRefactoringFile *,
@@ -281,14 +282,19 @@ QList<CppQuickFixOperation::Ptr> DefFromDecl::match(const CppQuickFixState &stat
if (simpleDecl->symbols && ! simpleDecl->symbols->next) {
if (Symbol *symbol = simpleDecl->symbols->value) {
if (Declaration *decl = symbol->asDeclaration()) {
- if (decl->type()->isFunctionType() && decl->enclosingScope() && decl->enclosingScope()->isClass()) {
+ if (decl->type()->isFunctionType()
+ && !decl->type()->asFunctionType()->isPureVirtual()
+ && decl->enclosingScope()
+ && decl->enclosingScope()->isClass()) {
DeclaratorAST *declarator = simpleDecl->declarator_list->value;
if (file.isCursorOn(declarator->core_declarator)) {
CppRefactoringChanges refactoring(state.snapshot());
InsertionPointLocator locator(&refactoring);
QList<CppQuickFixOperation::Ptr> results;
- foreach (const InsertionLocation &loc, locator.methodDefinition(decl))
- results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(state, idx, decl, loc)));
+ foreach (const InsertionLocation &loc, locator.methodDefinition(decl)) {
+ if (loc.isValid())
+ results.append(CppQuickFixOperation::Ptr(new InsertDefOperation(state, idx, decl, loc)));
+ }
return results;
}
}
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 509fb1caa0887c8c2f8e71facec465b3b5b703f1..c86cacf6dc932ed2ebb55da9388997ad2f52bb32 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -1029,7 +1029,7 @@ private:
, m_option(option)
, m_context(context)
{
- setDescription(QApplication::translate("CppTools::QuickFix", "Mark as translatable"));
+ setDescription(QApplication::translate("CppTools::QuickFix", "Mark as Translatable"));
}
virtual void performChanges(CppRefactoringFile *currentFile, CppRefactoringChanges *)
@@ -1501,7 +1501,7 @@ private:
, fwdClass(fwdClass)
{
setDescription(QApplication::translate("CppTools::QuickFix",
- "#include header file"));
+ "#include Header File"));
}
virtual void performChanges(CppRefactoringFile *currentFile, CppRefactoringChanges *)
@@ -1616,7 +1616,7 @@ private:
: CppQuickFixOperation(state, priority)
, binaryAST(binaryAST)
{
- setDescription(QApplication::translate("CppTools::QuickFix", "Add local declaration"));
+ setDescription(QApplication::translate("CppTools::QuickFix", "Add local Declaration"));
}
virtual void performChanges(CppRefactoringFile *currentFile, CppRefactoringChanges *)
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index 838e0c1191db5c2323d3ab7f0d7d2a66efac51c1..c8bcf7ff602d6466aaad45811a3ce3d19c4f4215 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -109,7 +109,8 @@ QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInterfac
void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
- TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line);
+ TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column,
+ QString(), Core::EditorManager::ModeSwitch);
}
void CppCurrentDocumentFilter::refresh(QFutureInterface<void> &future)
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 4dcc85599a88e038afbd2de323af9ac32a8052d1..1041ca68aeffc6b7ebe877733985bbe197b341ae 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -127,7 +127,8 @@ QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(QFutureInterface<Locato
void CppLocatorFilter::accept(Locator::FilterEntry selection) const
{
ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData);
- TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column);
+ TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column,
+ QString(), Core::EditorManager::ModeSwitch);
}
void CppLocatorFilter::reset()
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index b320b578b5200f47f1d3ef2ddf0c273e43e48b95..68b63f167de9d59225fc3d1cd0d5d1e5eda728e6 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -104,7 +104,8 @@ CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditor *editor, CPlus
Document::Ptr CppRefactoringFile::cppDocument() const
{
- if (!m_cppDocument) {
+ if (!m_cppDocument || !m_cppDocument->translationUnit() ||
+ !m_cppDocument->translationUnit()->ast()) {
const QString source = document()->toPlainText();
const QString name = fileName();
const Snapshot &snapshot = refactoringChanges()->snapshot();
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 90d234560b629d390c7b235d343259d31560eb7d..c3c00c1705fc72ecf9d37296911cb81c053a69d4 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -264,7 +264,6 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
const QString privateHeaderSuffix = QLatin1String("_p");
const QChar dot = QLatin1Char('.');
- QStringList candidates;
// Check base matches 'source.h'-> 'source.cpp' and vice versa
const QStringList::const_iterator scend = suffixes.constEnd();
for (QStringList::const_iterator it = suffixes.constBegin(); it != scend; ++it) {
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index f1594b9860453b2761ad2b2fc6a264a29148cf20..fbf2bb3c6ad7093ce4321a397d07d2f83d381767 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -35,6 +35,9 @@
#include <ASTVisitor.h>
#include <TranslationUnit.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/mimedatabase.h>
+
using namespace CPlusPlus;
using namespace CppTools;
@@ -298,7 +301,21 @@ InsertionLocation InsertionPointLocator::methodDeclarationInClass(
}
}
+static bool isSourceFile(const QString &fileName)
+{
+ const Core::MimeDatabase *mimeDb = Core::ICore::instance()->mimeDatabase();
+ Core::MimeType cSourceTy = mimeDb->findByType(QLatin1String("text/x-csrc"));
+ Core::MimeType cppSourceTy = mimeDb->findByType(QLatin1String("text/x-c++src"));
+ Core::MimeType mSourceTy = mimeDb->findByType(QLatin1String("text/x-objcsrc"));
+ QStringList suffixes = cSourceTy.suffixes();
+ suffixes += cppSourceTy.suffixes();
+ suffixes += mSourceTy.suffixes();
+ QFileInfo fileInfo(fileName);
+ return suffixes.contains(fileInfo.suffix());
+}
+
/// Currently, we return the end of fileName.cpp
+/// \todo take the definitions of the surrounding declarations into account
QList<InsertionLocation> InsertionPointLocator::methodDefinition(
Declaration *declaration) const
{
@@ -306,14 +323,29 @@ QList<InsertionLocation> InsertionPointLocator::methodDefinition(
if (!declaration)
return result;
- Internal::CppToolsPlugin *cpptools = Internal::CppToolsPlugin::instance();
+ const QString declFileName = QString::fromUtf8(declaration->fileName(),
+ declaration->fileNameLength());
+ QString target = declFileName;
+ if (!isSourceFile(declFileName)) {
+ Internal::CppToolsPlugin *cpptools = Internal::CppToolsPlugin::instance();
+ QString candidate = cpptools->correspondingHeaderOrSource(declFileName);
+ if (!candidate.isEmpty())
+ target = candidate;
+ }
- const QString declFileName = QLatin1String(declaration->fileName());
- QString target = cpptools->correspondingHeaderOrSource(declFileName);
Document::Ptr doc = m_refactoringChanges->file(target).cppDocument();
if (doc.isNull())
return result;
+ Snapshot simplified = m_refactoringChanges->snapshot().simplified(doc);
+ if (Symbol *s = simplified.findMatchingDefinition(declaration)) {
+ if (Function *f = s->asFunction()) {
+ if (f->isConst() == declaration->type().isConst()
+ && f->isVolatile() == declaration->type().isVolatile())
+ return result;
+ }
+ }
+
TranslationUnit *xUnit = doc->translationUnit();
unsigned tokenCount = xUnit->tokenCount();
if (tokenCount < 2) // no tokens available
diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp
index a6934a6688540ef17b62ae9859227ae96ef16df2..6c0c22c917bd9251198ba38104e92297f75567b5 100644
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -278,10 +278,10 @@ SymbolsFindFilterConfigWidget::SymbolsFindFilterConfigWidget(SymbolsFindFilter *
connect(m_typeEnums, SIGNAL(clicked(bool)), this, SLOT(setState()));
connect(m_typeDeclarations, SIGNAL(clicked(bool)), this, SLOT(setState()));
- m_searchProjectsOnly = new QRadioButton(tr("Projects Only"));
+ m_searchProjectsOnly = new QRadioButton(tr("Projects only"));
layout->addWidget(m_searchProjectsOnly, 2, 1);
- m_searchGlobal = new QRadioButton(tr("Global"));
+ m_searchGlobal = new QRadioButton(tr("All files"));
layout->addWidget(m_searchGlobal, 2, 2);
m_searchGroup = new QButtonGroup(this);
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index c904002cd8e6cddca330155ab79e9520b23b563b..018e458b0c8c5836af33c221ef54ec504fa395e9 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -629,7 +629,7 @@ void CVSPlugin::revertAll()
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
const QString title = tr("Revert repository");
- if (!messageBoxQuestion(title, tr("Would you like to revert all changes to the repository?")))
+ if (!messageBoxQuestion(title, tr("Revert all pending changes to the repository?")))
return;
QStringList args;
args << QLatin1String("update") << QLatin1String("-C") << state.topLevel();
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 32df0b3eb5438549b7956a71e19c8d930dae96a4..3a68ad24ca3bfc48b673efc8dbc203ff6974a156 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -121,7 +121,6 @@ void BreakHandler::clear()
m_enabled.clear();
m_disabled.clear();
m_removed.clear();
- m_inserted.clear();
}
BreakpointData *BreakHandler::findSimilarBreakpoint(const BreakpointData *needle) const
@@ -524,20 +523,9 @@ void BreakHandler::reinsertBreakpoint(BreakpointData *data)
void BreakHandler::append(BreakpointData *data)
{
- QTC_ASSERT(m_bp,/**/);
+ QTC_ASSERT(m_bp, return);
data->m_handler = this;
m_bp->append(data);
- m_inserted.append(data);
-}
-
-Breakpoints BreakHandler::insertedBreakpoints() const
-{
- return m_inserted;
-}
-
-void BreakHandler::takeInsertedBreakPoint(BreakpointData *d)
-{
- m_inserted.removeAll(d);
}
Breakpoints BreakHandler::takeRemovedBreakpoints()
@@ -563,7 +551,7 @@ Breakpoints BreakHandler::takeDisabledBreakpoints()
void BreakHandler::removeBreakpointHelper(int index)
{
- QTC_ASSERT(m_bp,/**/);
+ QTC_ASSERT(m_bp, return);
BreakpointData *data = m_bp->at(index);
m_bp->removeAt(index);
data->removeMarker();
@@ -580,7 +568,7 @@ void BreakHandler::removeBreakpoint(int index)
void BreakHandler::removeBreakpoint(BreakpointData *data)
{
- QTC_ASSERT(m_bp,/**/);
+ QTC_ASSERT(m_bp, return);
removeBreakpointHelper(m_bp->indexOf(data));
emit layoutChanged();
}
@@ -596,6 +584,7 @@ void BreakHandler::toggleBreakpointEnabled(BreakpointData *data)
m_enabled.removeAll(data);
m_disabled.append(data);
}
+ data->removeMarker(); // Force icon update.
data->updateMarker();
emit layoutChanged();
m_engine->attemptBreakpointSynchronization();
@@ -625,7 +614,7 @@ void BreakHandler::removeAllBreakpoints()
BreakpointData *BreakHandler::findBreakpoint(quint64 address) const
{
- QTC_ASSERT(m_bp,/**/);
+ QTC_ASSERT(m_bp, return 0);
foreach (BreakpointData *data, *m_bp)
if (data->address == address)
return data;
@@ -635,7 +624,7 @@ BreakpointData *BreakHandler::findBreakpoint(quint64 address) const
BreakpointData *BreakHandler::findBreakpoint(const QString &fileName,
int lineNumber, bool useMarkerPosition)
{
- QTC_ASSERT(m_bp,/**/);
+ QTC_ASSERT(m_bp, return 0);
foreach (BreakpointData *data, *m_bp)
if (data->isLocatedAt(fileName, lineNumber, useMarkerPosition))
return data;
@@ -726,23 +715,26 @@ bool BreakHandler::isMasterList() const
void BreakHandler::initializeFromTemplate(BreakHandler *other)
{
- QTC_ASSERT(other->isMasterList(), /**/);
- QTC_ASSERT(!isMasterList(), /**/);
- QTC_ASSERT(other->m_bp,/**/);
+ QTC_ASSERT(other->isMasterList(), return);
+ QTC_ASSERT(!isMasterList(), return);
+ QTC_ASSERT(other->m_bp, return);
m_bp = other->m_bp;
+ m_inserted.clear();
foreach(BreakpointData *data, *m_bp) {
- if (m_engine->acceptsBreakpoint(data))
+ if (m_engine->acceptsBreakpoint(data)) {
data->m_handler = this;
+ m_inserted.append(data);
+ }
}
-
}
void BreakHandler::storeToTemplate(BreakHandler *other)
{
- QTC_ASSERT(m_bp,/**/);
+ QTC_ASSERT(m_bp, return);
foreach (BreakpointData *data, *m_bp) {
- data->m_handler = other;
+ data->m_handler = other;
+ data->clear();
}
m_bp = 0;
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 26e4e0eea6e478fb17bcfa7ba4c6fd77dca10444..f14d674f98f7c0663375c5a1f04c790874382670 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -78,8 +78,6 @@ public:
bool isActive() const;
bool isMasterList() const;
- Breakpoints insertedBreakpoints() const;
- void takeInsertedBreakPoint(BreakpointData *);
Breakpoints takeRemovedBreakpoints(); // Owned.
Breakpoints takeEnabledBreakpoints(); // Not owned.
Breakpoints takeDisabledBreakpoints(); // Not owned.
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index 0c9fc2341bd473ef558ff25bb1f73a4a158391b6..11175b010c7010e6c82d4fb5aa9c316049c853c2 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -74,7 +74,6 @@ public:
{
m_data = data;
m_pending = true;
- m_enabled = true;
//qDebug() << "CREATE MARKER " << fileName << lineNumber;
}
@@ -87,19 +86,18 @@ public:
QIcon icon() const
{
const BreakHandler *handler = m_data->handler();
+ if (!m_data->enabled)
+ return handler->disabledBreakpointIcon();
if (!handler->isActive())
return handler->emptyIcon();
- if (!m_enabled)
- return handler->disabledBreakpointIcon();
return m_pending ? handler->pendingBreakPointIcon() : handler->breakpointIcon();
}
- void setPending(bool pending, bool enabled)
+ void setPending(bool pending)
{
- if (pending == m_pending && enabled == m_enabled)
+ if (pending == m_pending)
return;
m_pending = pending;
- m_enabled = enabled;
updateMarker();
}
@@ -149,7 +147,6 @@ public:
private:
BreakpointData *m_data;
bool m_pending;
- bool m_enabled;
};
@@ -205,6 +202,27 @@ BreakpointData::~BreakpointData()
removeMarker();
}
+void BreakpointData::clear()
+{
+ pending = true;
+ bpNumber.clear();
+ bpCondition.clear();
+ bpIgnoreCount = 0;
+ bpFileName.clear();
+ bpFullName.clear();
+ bpLineNumber = 0;
+ bpCorrectedLineNumber = 0;
+ bpThreadSpec.clear();
+ bpFuncName.clear();
+ bpAddress = 0;
+ bpMultiple = false;
+ bpEnabled = true;
+ bpState.clear();
+ m_markerFileName = fileName;
+ m_markerLineNumber = lineNumber;
+ updateMarker();
+}
+
void BreakpointData::removeMarker()
{
BreakpointMarker *m = marker;
@@ -222,7 +240,7 @@ void BreakpointData::updateMarker()
marker = new BreakpointMarker(this, m_markerFileName, m_markerLineNumber);
if (marker)
- marker->setPending(pending, enabled);
+ marker->setPending(pending);
}
void BreakpointData::setMarkerFileName(const QString &fileName)
diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index e96a58bc83fd614c86a5971d87fa40fe57d6eb2f..9589fb8dc9693c0b4f60a20c92982a793de03a84 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -57,6 +57,7 @@ public:
QString toToolTip() const;
BreakHandler *handler() { return m_handler; }
void reinsertBreakpoint();
+ void clear(); // Delete all generated data.
bool isLocatedAt(const QString &fileName, int lineNumber,
bool useMarkerPosition) const;
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index e564a745121406663dd81ea386ef6852ebb4b1c0..4c26e0c3c6f6cc8c0e277ef6d2dfa2950d7cc39b 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -104,14 +104,29 @@ bool BreakpointDialog::showDialog(BreakpointData *data)
if (exec() != QDialog::Accepted)
return false;
- data->lineNumber = lineEditLineNumber->text().toInt();
- data->useFullPath = checkBoxUseFullPath->isChecked();
- data->address = lineEditAddress->text().toULongLong(0, 0);
- data->funcName = lineEditFunction->text();
- data->fileName = pathChooserFileName->path();
- data->condition = lineEditCondition->text().toUtf8();
- data->ignoreCount = lineEditIgnoreCount->text().toInt();
- data->threadSpec = lineEditThreadSpec->text().toUtf8();
+ // Check if changed.
+ const int newLineNumber = lineEditLineNumber->text().toInt();
+ const bool newUseFullPath = checkBoxUseFullPath->isChecked();
+ const quint64 newAddress = lineEditAddress->text().toULongLong(0, 0);
+ const QString newFunc = lineEditFunction->text();
+ const QString newFileName = pathChooserFileName->path();
+ const QByteArray newCondition = lineEditCondition->text().toUtf8();
+ const int newIgnoreCount = lineEditIgnoreCount->text().toInt();
+ const QByteArray newThreadSpec = lineEditThreadSpec->text().toUtf8();
+ if (newLineNumber == data->lineNumber && newUseFullPath == data->useFullPath
+ && newAddress == data->address && newFunc == data->funcName
+ && newFileName == data->fileName && newCondition == data->condition
+ && newIgnoreCount == data->ignoreCount && newThreadSpec == data->threadSpec)
+ return false; // Unchanged -> Cancel.
+
+ data->address = newAddress;
+ data->funcName = newFunc;
+ data->useFullPath = newUseFullPath;
+ data->fileName = newFileName;
+ data->lineNumber = newLineNumber;
+ data->condition = newCondition;
+ data->ignoreCount = newIgnoreCount;
+ data->threadSpec = newThreadSpec;
return true;
}
@@ -389,16 +404,16 @@ void BreakWindow::deleteBreakpoints(QList<int> list)
setModelData(RequestSynchronizeBreakpointsRole);
}
-bool BreakWindow::editBreakpoint(BreakpointData *data)
+bool BreakWindow::editBreakpoint(BreakpointData *data, QWidget *parent)
{
- BreakpointDialog dialog(this);
+ BreakpointDialog dialog(parent);
return dialog.showDialog(data);
}
void BreakWindow::addBreakpoint()
{
BreakpointData *data = new BreakpointData();
- if (editBreakpoint(data))
+ if (editBreakpoint(data, this))
setModelData(RequestBreakpointRole, QVariant::fromValue(data));
else
delete data;
@@ -406,11 +421,12 @@ void BreakWindow::addBreakpoint()
void BreakWindow::editBreakpoints(const QModelIndexList &list)
{
+ QTC_ASSERT(!list.isEmpty(), return);
if (list.size() == 1) {
const QVariant dataV = model()->data(list.at(0), BreakpointRole);
QTC_ASSERT(qVariantCanConvert<BreakpointData *>(dataV), return );
BreakpointData *data = qvariant_cast<BreakpointData *>(dataV);
- if (editBreakpoint(data))
+ if (editBreakpoint(data, this))
data->reinsertBreakpoint();
return;
}
@@ -419,30 +435,36 @@ void BreakWindow::editBreakpoints(const QModelIndexList &list)
QDialog dlg(this);
Ui::BreakCondition ui;
ui.setupUi(&dlg);
-
- QTC_ASSERT(!list.isEmpty(), return);
- QModelIndex idx = list.front();
dlg.setWindowTitle(tr("Edit Breakpoint Properties"));
+ ui.lineEditIgnoreCount->setValidator(new QIntValidator(0, 2147483647, ui.lineEditIgnoreCount));
+
+ const QModelIndex idx = list.front();
QAbstractItemModel *m = model();
- ui.lineEditCondition->setText(
- m->data(idx, BreakpointConditionRole).toString());
- ui.lineEditIgnoreCount->setValidator(
- new QIntValidator(0, 2147483647, ui.lineEditIgnoreCount));
- ui.lineEditIgnoreCount->setText(
- m->data(idx, BreakpointIgnoreCountRole).toString());
- ui.lineEditThreadSpec->setText(
- m->data(idx, BreakpointThreadSpecRole).toString());
+
+ const QString oldCondition = m->data(idx, BreakpointConditionRole).toString();
+ const QString oldIgnoreCount = m->data(idx, BreakpointIgnoreCountRole).toString();
+ const QString oldThreadSpec = m->data(idx, BreakpointThreadSpecRole).toString();
+
+ ui.lineEditCondition->setText(oldCondition);
+ ui.lineEditIgnoreCount->setText(oldIgnoreCount);
+ ui.lineEditThreadSpec->setText(oldThreadSpec);
if (dlg.exec() == QDialog::Rejected)
return;
+ const QString newCondition = ui.lineEditCondition->text();
+ const QString newIgnoreCount = ui.lineEditIgnoreCount->text();
+ const QString newThreadSpec = ui.lineEditThreadSpec->text();
+
+ // Unchanged -> cancel
+ if (newCondition == oldCondition && newIgnoreCount == oldIgnoreCount
+ && newThreadSpec == oldThreadSpec)
+ return;
+
foreach (const QModelIndex &idx, list) {
- //m->setData(idx.sibling(idx.row(), 1), ui.lineEditFunction->text());
- //m->setData(idx.sibling(idx.row(), 2), ui.pathChooserFileName->text());
- //m->setData(idx.sibling(idx.row(), 3), ui.lineEditLineNumber->text());
- m->setData(idx, ui.lineEditCondition->text(), BreakpointConditionRole);
- m->setData(idx, ui.lineEditIgnoreCount->text(), BreakpointIgnoreCountRole);
- m->setData(idx, ui.lineEditThreadSpec->text(), BreakpointThreadSpecRole);
+ m->setData(idx, newCondition, BreakpointConditionRole);
+ m->setData(idx, newIgnoreCount, BreakpointIgnoreCountRole);
+ m->setData(idx, newThreadSpec, BreakpointThreadSpecRole);
}
setModelData(RequestSynchronizeBreakpointsRole);
}
diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h
index 5b6b1cb969b2d72e8a48ff921c0093a3be42a06b..84fbd28fc12edfd2070625004dfdd16713ba1104 100644
--- a/src/plugins/debugger/breakwindow.h
+++ b/src/plugins/debugger/breakwindow.h
@@ -45,6 +45,8 @@ public:
explicit BreakWindow(QWidget *parent = 0);
~BreakWindow();
+ static bool editBreakpoint(BreakpointData *data, QWidget *parent = 0);
+
private slots:
void resizeColumnsToContents();
void setAlwaysResizeColumnsToContents(bool on);
@@ -62,7 +64,6 @@ private:
void deleteBreakpoints(const QModelIndexList &list);
void deleteBreakpoints(QList<int> rows);
void addBreakpoint();
- bool editBreakpoint(BreakpointData *data); // Returns 'Accept'.
void editBreakpoints(const QModelIndexList &list);
void associateBreakpoint(const QModelIndexList &list, int thread);
void setBreakpointsEnabled(const QModelIndexList &list, bool enabled);
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.cpp b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
index 6115b60053539c6a479cc12f8a8a0a4915606aba..f9eaca6bcb4fe0d5567a33df6978dc976f03a69d 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.cpp
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
@@ -67,6 +67,47 @@ static inline QString msgCannotSetBreakAtFunction(const QString &func, const QSt
return QString::fromLatin1("Cannot set a breakpoint at '%1': %2").arg(func, why);
}
+static bool addBreakpoint(CIDebugControl* debugControl,
+ CIDebugSymbols *syms,
+ BreakpointData *nbd,
+ QString *warning)
+{
+ warning->clear();
+ // Function breakpoints: Are the module names specified?
+ if (!nbd->funcName.isEmpty()) {
+ nbd->bpFuncName = nbd->funcName;
+ switch (resolveSymbol(syms, &nbd->bpFuncName, warning)) {
+ case ResolveSymbolOk:
+ break;
+ case ResolveSymbolAmbiguous:
+ *warning = msgCannotSetBreakAtFunction(nbd->funcName, *warning);
+ break;
+ case ResolveSymbolNotFound:
+ case ResolveSymbolError:
+ *warning = msgCannotSetBreakAtFunction(nbd->funcName, *warning);
+ return false;
+ };
+ } // function breakpoint
+ // Now add...
+ quint64 address;
+ unsigned long id;
+ const CdbCore::BreakPoint ncdbbp = breakPointFromBreakPointData(*nbd);
+ if (!ncdbbp.add(debugControl, warning, &id, &address))
+ return false;
+ if (debugBP)
+ qDebug("Added %lu at 0x%lx %s", id, address, qPrintable(ncdbbp.toString()));
+ nbd->pending = false;
+ nbd->bpNumber = QByteArray::number(uint(id));
+ nbd->bpAddress = address;
+ // Take over rest as is
+ nbd->bpCondition = nbd->condition;
+ nbd->bpIgnoreCount = nbd->ignoreCount;
+ nbd->bpThreadSpec = nbd->threadSpec;
+ nbd->bpFileName = nbd->fileName;
+ nbd->bpLineNumber = nbd->lineNumber;
+ return true;
+}
+
// Synchronize (halted) engine breakpoints with those of the BreakHandler.
bool synchronizeBreakPoints(CIDebugControl* debugControl,
CIDebugSymbols *syms,
@@ -83,82 +124,35 @@ bool synchronizeBreakPoints(CIDebugControl* debugControl,
*errorMessage = QString::fromLatin1("Cannot modify breakpoints: %1").arg(*errorMessage);
return false;
}
+ // Delete all breakpoints and re-insert all enabled breakpoints. This is the simplest
+ // way to apply changes since CDB ids shift when removing breakpoints and there is no
+ // easy way to re-match them.
+ if (engineCount) {
+ for (int b = engineCount - 1; b >= 0 ; b--)
+ if (!CdbCore::BreakPoint::removeBreakPointById(debugControl, b, errorMessage))
+ return false;
+ }
+ qDeleteAll(handler->takeRemovedBreakpoints());
+ // Mark disabled ones
+ foreach(BreakpointData *dbd, handler->takeDisabledBreakpoints())
+ dbd->bpEnabled = false;
+
+ // Insert all enabled ones as new
QString warning;
- // Insert new ones
bool updateMarkers = false;
- foreach (BreakpointData *nbd, handler->insertedBreakpoints()) {
- warning.clear();
- // Function breakpoints: Are the module names specified?
- bool breakPointOk = false;
- if (nbd->funcName.isEmpty()) {
- breakPointOk = true;
- } else {
- nbd->bpFuncName = nbd->funcName;
- switch (resolveSymbol(syms, &nbd->bpFuncName, &warning)) {
- case ResolveSymbolOk:
- breakPointOk = true;
- break;
- case ResolveSymbolAmbiguous:
- warnings->push_back(msgCannotSetBreakAtFunction(nbd->funcName, warning));
- warning.clear();
- breakPointOk = true;
- break;
- case ResolveSymbolNotFound:
- case ResolveSymbolError:
- warnings->push_back(msgCannotSetBreakAtFunction(nbd->funcName, warning));
- warning.clear();
- break;
- };
- } // function breakpoint
- // Now add...
- if (breakPointOk) {
- quint64 address;
- unsigned long id;
- const CdbCore::BreakPoint ncdbbp = breakPointFromBreakPointData(*nbd);
- breakPointOk = ncdbbp.add(debugControl, &warning, &id, &address);
- if (breakPointOk) {
- if (debugBP)
- qDebug("Added %lu at 0x%lx %s", id, address, qPrintable(ncdbbp.toString()));
- handler->takeInsertedBreakPoint(nbd);
+ const int size = handler->size();
+ for (int i = 0; i < size; i++) {
+ BreakpointData *breakpoint = handler->at(i);
+ if (breakpoint->enabled)
+ if (addBreakpoint(debugControl, syms, breakpoint, &warning)) {
updateMarkers = true;
- nbd->pending = false;
- nbd->bpNumber = QByteArray::number(uint(id));
- nbd->bpAddress = address;
- // Take over rest as is
- nbd->bpCondition = nbd->condition;
- nbd->bpIgnoreCount = nbd->ignoreCount;
- nbd->bpThreadSpec = nbd->threadSpec;
- nbd->bpFileName = nbd->fileName;
- nbd->bpLineNumber = nbd->lineNumber;
- }
- } // had symbol
- if (!breakPointOk && !warning.isEmpty())
- warnings->push_back(warning); }
- // Delete
- foreach (BreakpointData *rbd, handler->takeRemovedBreakpoints()) {
- if (!CdbCore::BreakPoint::removeBreakPointById(debugControl, rbd->bpNumber.toUInt(), &warning))
- warnings->push_back(warning);
- delete rbd;
- }
- // Enable/Disable
- foreach (BreakpointData *ebd, handler->takeEnabledBreakpoints())
- if (!CdbCore::BreakPoint::setBreakPointEnabledById(debugControl, ebd->bpNumber.toUInt(), true, &warning))
- warnings->push_back(warning);
- foreach (BreakpointData *dbd, handler->takeDisabledBreakpoints())
- if (!CdbCore::BreakPoint::setBreakPointEnabledById(debugControl, dbd->bpNumber.toUInt(), false, &warning))
- warnings->push_back(warning);
- // Check for modified thread ids.
- for (int i = handler->size() - 1; i >= 0; i--) {
- BreakpointData *bpd = handler->at(i);
- if (bpd->threadSpec != bpd->bpThreadSpec) {
- const int newThreadSpec = bpd->threadSpec.isEmpty() ? -1 : bpd->threadSpec.toInt();
- if (CdbCore::BreakPoint::setBreakPointThreadById(debugControl, bpd->bpNumber.toUInt(), newThreadSpec, errorMessage)) {
- bpd->bpThreadSpec = bpd->threadSpec;
} else {
- qWarning("%s", qPrintable(*errorMessage));
+ warnings->push_back(warning);
}
- }
}
+ // Mark enabled ones
+ foreach(BreakpointData *ebd, handler->takeEnabledBreakpoints())
+ ebd->bpEnabled = true;
if (updateMarkers)
handler->updateMarkers();
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 8fff78742c636f43d5a8383ec3851aeaa605da74..520bc5110fb213c8cb80e2965b0290e14b760279 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -705,7 +705,7 @@ void CdbEngine::updateWatchData(const WatchData &incomplete, const WatchUpdateFl
if (incomplete.iname.startsWith("watch.")) {
WatchData watchData = incomplete;
- evaluateWatcher(&watchData);
+ watchData.setError(tr("<not supported>"));
watchHandler()->insertData(watchData);
return;
}
@@ -1171,6 +1171,11 @@ bool CdbEnginePrivate::attemptBreakpointSynchronization(QString *errorMessage)
*errorMessage = QLatin1String("attemptBreakpointSynchronization() called while debugger is not running");
return false;
}
+ // Might be called nested while attempting to stop.
+ if (m_breakEventMode == BreakEventSyncBreakPoints) {
+ *errorMessage = QLatin1String("Nested invocation of attemptBreakpointSynchronization.");
+ return false;
+ }
// This is called from
// 1) CreateProcessEvent with the halted engine
// 2) from the break handler, potentially while the debuggee is running
@@ -1690,16 +1695,21 @@ unsigned CdbEngine::debuggerCapabilities() const
}
// Accessed by RunControlFactory
-DebuggerEngine *createCdbEngine(const DebuggerStartParameters &sp)
+bool isCdbEngineEnabled()
+{
+ return theOptionsPage && theOptionsPage->options()->enabled;
+}
+
+// Accessed by RunControlFactory
+DebuggerEngine *createCdbEngine(const DebuggerStartParameters &sp, QString *errorMessage)
{
// Create engine
- QString errorMessage;
- DebuggerEngine *engine = CdbEngine::create(sp, &errorMessage);
+ DebuggerEngine *engine = CdbEngine::create(sp, errorMessage);
if (engine) {
QObject::connect(theOptionsPage, SIGNAL(debuggerPathsChanged()), engine, SLOT(syncDebuggerPaths()));
} else {
- theOptionsPage->setFailureMessage(errorMessage);
- qWarning("%s\n" ,qPrintable(errorMessage));
+ theOptionsPage->setFailureMessage(*errorMessage);
+ qWarning("%s\n" ,qPrintable(*errorMessage));
}
return engine;
}
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index fae1a5642440327e1034d5d9bc94c7afd33ed69f..9cd8f6903cf4aacb25b77cfb8d88c77d92117f38 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -187,15 +187,15 @@ static inline void fixDumperResult(const WatchData &source,
// If the model queries the expanding item by pretending childrenNeeded=1,
// refuse the request as the children are already known
returned.source |= CdbSymbolGroupContext::ChildrenKnownBit;
- // Fix the children: If the address is missing, we cannot query any further.
- const QList<WatchData>::iterator wend = result->end();
- QList<WatchData>::iterator it = result->begin();
- for (++it; it != wend; ++it) {
- WatchData &wd = *it;
+ // Fix the children: Assign sort id , if the address is missing, we cannot query any further.
+ const int resultSize = result->size();
+ for (int i = 1; i < resultSize; i++) {
+ WatchData &wd = (*result)[i];
+ wd.sortId = i;
// Indicate owner and known children
- it->source = OwnerDumper;
- if (it->isChildrenKnown() && it->isHasChildrenKnown() && it->hasChildren)
- it->source |= CdbSymbolGroupContext::ChildrenKnownBit;
+ wd.source = OwnerDumper;
+ if (wd.isChildrenKnown() && wd.isHasChildrenKnown() && wd.hasChildren)
+ wd.source |= CdbSymbolGroupContext::ChildrenKnownBit;
// Cannot dump items with missing addresses or missing types
const bool typeFixed = fixDumperType(&wd); // Order of evaluation!
if ((wd.address == 0 && wd.isSomethingNeeded()) || typeFixed) {
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h b/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h
index 9cc79b3eecf6ceeee685b0dcd1dac092d068ff36..fcaf098bb76cb282b2aef65710428588bb02d4cd 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext_tpl.h
@@ -52,6 +52,7 @@ bool CdbSymbolGroupContext::getDumpChildSymbols(const QString &prefix,
// children, so, re-evaluate size in end condition.
// Note the that the internal dumpers might expand children,
// so the size might change.
+ int sortId = 0;
for (int s = start; s < size(); ++s) {
const DEBUG_SYMBOL_PARAMETERS &p = symbolParameterAt(s);
if (p.ParentSymbol == parentId && isSymbolDisplayable(p)) {
@@ -59,6 +60,7 @@ bool CdbSymbolGroupContext::getDumpChildSymbols(const QString &prefix,
const unsigned rc = watchDataAt(s, &wd);
if (rc & InternalDumperMask)
wd.source = dumpedOwner;
+ wd.sortId = sortId++;
*it = wd;
++it;
}
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui
index 6d55c88a9efa72dd328336e1af3ba70159dbd438..7440d0bbdf60834aaf4e470cfbf9f10f4db1b46b 100644
--- a/src/plugins/debugger/commonoptionspage.ui
+++ b/src/plugins/debugger/commonoptionspage.ui
@@ -51,7 +51,27 @@
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="4" column="0" colspan="2">
+ <widget class="QCheckBox" name="checkBoxCloseBuffersOnExit">
+ <property name="toolTip">
+ <string>Close temporary buffers on debugger exit.</string>
+ </property>
+ <property name="text">
+ <string>Close temporary buffers on debugger exit</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="2">
+ <widget class="QCheckBox" name="checkBoxSwitchModeOnExit">
+ <property name="toolTip">
+ <string>Switch to previous mode on debugger exit.</string>
+ </property>
+ <property name="text">
+ <string>Switch to previous mode on debugger exit.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
<widget class="QLabel" name="labelMaximalStackDepth">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -64,7 +84,7 @@
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="6" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSpinBox" name="spinBoxMaximalStackDepth">
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 5d4b8d1a6dcf6fa96d43ec13374e07c9f15242e2..3774c37793fd25bf00a55307c486b5314b92bb06 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -306,14 +306,6 @@ DebuggerSettings *DebuggerSettings::instance()
item->setValue(false);
instance->insertItem(DebugDebuggingHelpers, item);
- item = new SavedAction(instance);
- item->setSettingsKey(debugModeGroup, QLatin1String("UseQmlObserver"));
- item->setText(tr("Use QML Observer"));
- item->setCheckable(true);
- item->setDefaultValue(true);
- item->setValue(true);
- instance->insertItem(UseQmlObserver, item);
-
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("UseCodeModel"));
item->setText(tr("Use Code Model"));
@@ -377,6 +369,18 @@ DebuggerSettings *DebuggerSettings::instance()
item->setDefaultValue(QString());
instance->insertItem(GdbScriptFile, item);
+ item = new SavedAction(instance);
+ item->setSettingsKey(debugModeGroup, QLatin1String("CloseBuffersOnExit"));
+ item->setCheckable(true);
+ item->setDefaultValue(false);
+ instance->insertItem(CloseBuffersOnExit, item);
+
+ item = new SavedAction(instance);
+ item->setSettingsKey(debugModeGroup, QLatin1String("SwitchModeOnExit"));
+ item->setCheckable(true);
+ item->setDefaultValue(false);
+ instance->insertItem(SwitchModeOnExit, item);
+
item = new SavedAction(instance);
item->setSettingsKey(debugModeGroup, QLatin1String("AutoQuit"));
item->setText(tr("Automatically Quit Debugger"));
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index aa59ee4bf20d07f2d19f90bf191f5db80e3f473d..72845ec2db1a39f4b67584eb6e618fb7569bccd1 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -92,15 +92,14 @@ enum DebuggerActionCode
LogTimeStamps,
VerboseLog,
OperateByInstruction,
- AutoDerefPointers,
+ CloseBuffersOnExit,
+ SwitchModeOnExit,
UseDebuggingHelpers,
UseCustomDebuggingHelperLocation,
CustomDebuggingHelperLocation,
DebugDebuggingHelpers,
- UseQmlObserver,
-
UseCodeModel,
UseToolTipsInMainEditor,
@@ -127,6 +126,7 @@ enum DebuggerActionCode
ShowStdNamespace,
ShowQtNamespace,
SortStructMembers,
+ AutoDerefPointers,
// Source List
ListSourceFiles,
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index cbb287f1099412b3088bd252f62bdad4caea31a1..149aaf3e153ceeac350b7a84b065af9471b4ea80 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -46,6 +46,7 @@
#include "threadshandler.h"
#include "watchhandler.h"
#include "watchutils.h"
+#include "breakwindow.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
@@ -80,7 +81,7 @@
#include <QtGui/QTextCursor>
#include <QtGui/QTextDocument>
#include <QtGui/QTreeWidget>
-
+#include <QtGui/QMainWindow>
using namespace Core;
using namespace Debugger;
@@ -282,6 +283,8 @@ public slots:
m_runControl->bringApplicationToForeground(m_inferiorPid);
}
+private slots:
+ void slotEditBreakpoint();
public:
DebuggerState state() const { return m_state; }
@@ -329,6 +332,17 @@ void DebuggerEnginePrivate::breakpointSetRemoveMarginActionTriggered()
m_breakHandler.toggleBreakpoint(fileName, lineNumber, address);
}
+void DebuggerEnginePrivate::slotEditBreakpoint()
+{
+ const QAction *act = qobject_cast<QAction *>(sender());
+ QTC_ASSERT(act, return);
+ const QVariant data = act->data();
+ QTC_ASSERT(qVariantCanConvert<BreakpointData *>(data), return);
+ BreakpointData *breakPointData = qvariant_cast<BreakpointData *>(data);
+ if (BreakWindow::editBreakpoint(breakPointData, ICore::instance()->mainWindow()))
+ breakPointData->reinsertBreakpoint();
+}
+
void DebuggerEnginePrivate::breakpointEnableDisableMarginActionTriggered()
{
QAction *act = qobject_cast<QAction *>(sender());
@@ -388,6 +402,10 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant ¶meters)
connect(act2, SIGNAL(triggered()),
this, SLOT(breakpointEnableDisableMarginActionTriggered()));
menu->addAction(act2);
+ QAction *editAction = new QAction(tr("Edit Breakpoint %1...").arg(number), menu);
+ connect(editAction, SIGNAL(triggered()), this, SLOT(slotEditBreakpoint()));
+ editAction->setData(qVariantFromValue(data));
+ menu->addAction(editAction);
} else {
// non-existing
const QString text = address ?
@@ -1049,35 +1067,6 @@ void DebuggerEngine::showQtDumperLibraryWarning(const QString &details)
}
}
-void DebuggerEngine::showQmlObserverToolWarning()
-{
- QMessageBox dialog(plugin()->mainWindow());
- QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
- QMessageBox::ActionRole);
- QPushButton *helperOff = dialog.addButton(tr("Turn off QML Observer Usage"),
- QMessageBox::ActionRole);
- QPushButton *justContinue = dialog.addButton(tr("Continue Anyway"),
- QMessageBox::AcceptRole);
- dialog.setDefaultButton(justContinue);
- dialog.setWindowTitle(tr("QML Observer Missing"));
- dialog.setText(tr("QML Observer could not be found."));
- dialog.setInformativeText(tr(
- "QML Observer is used to offer additional debugging features for "
- "QML applications, such as interactive debugging and inspection tools."
- "It must be compiled for each used Qt version separately. "
- "On the Qt4 options page, select a Qt installation "
- "and click Rebuild."));
- dialog.exec();
- if (dialog.clickedButton() == qtPref) {
- Core::ICore::instance()->showOptionsDialog(
- _(Qt4ProjectManager::Constants::QT_SETTINGS_CATEGORY),
- _(Qt4ProjectManager::Constants::QTVERSION_SETTINGS_PAGE_ID));
- } else if (dialog.clickedButton() == helperOff) {
- theDebuggerAction(UseQmlObserver)
- ->setValue(qVariantFromValue(false), false);
- }
-}
-
QString DebuggerEngine::qtDumperLibraryName() const
{
if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool())
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 199d7c6626060fde3456a0879b6c4ce42c423d10..fd7109d59313811000f7a6796aaa3a16f3c1d9b1 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -84,7 +84,6 @@ public:
quint16 qmlServerPort;
QString projectBuildDir;
QString projectDir;
- bool qmlObserverAvailable;
// for cpp+qml debugging
DebuggerEngineType cppEngineType;
@@ -267,7 +266,6 @@ public:
QString qtDumperLibraryName() const;
QStringList qtDumperLibraryLocations() const;
void showQtDumperLibraryWarning(const QString &details);
- void showQmlObserverToolWarning();
static const char *stateName(int s);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 161546f031d33c616a58bb2f815f28b9e83540b8..f00f908a79cc1da17e35fd10c94c86dd757c1700 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -383,6 +383,7 @@ const char * const ADD_TO_WATCH2 = "Debugger.AddToWatch2";
const char * const OPERATE_BY_INSTRUCTION = "Debugger.OperateByInstruction";
const char * const FRAME_UP = "Debugger.FrameUp";
const char * const FRAME_DOWN = "Debugger.FrameDown";
+const char * const DEBUG_KEY = "F5";
#ifdef Q_WS_MAC
const char * const STOP_KEY = "Shift+F5";
@@ -560,6 +561,10 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
m_ui.checkBoxUseAlternatingRowColors);
m_group.insert(theDebuggerAction(UseToolTipsInMainEditor),
m_ui.checkBoxUseToolTipsInMainEditor);
+ m_group.insert(theDebuggerAction(CloseBuffersOnExit),
+ m_ui.checkBoxCloseBuffersOnExit);
+ m_group.insert(theDebuggerAction(SwitchModeOnExit),
+ m_ui.checkBoxSwitchModeOnExit);
m_group.insert(theDebuggerAction(AutoDerefPointers), 0);
m_group.insert(theDebuggerAction(UseToolTipsInLocalsView), 0);
m_group.insert(theDebuggerAction(UseToolTipsInBreakpointsView), 0);
@@ -668,9 +673,6 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
m_group.insert(theDebuggerAction(UseCodeModel),
m_ui.checkBoxUseCodeModel);
- m_group.insert(theDebuggerAction(UseQmlObserver),
- m_ui.checkBoxUseQmlObserver);
-
#ifdef QT_DEBUG
m_group.insert(theDebuggerAction(DebugDebuggingHelpers),
m_ui.checkBoxDebugDebuggingHelpers);
@@ -694,8 +696,7 @@ QWidget *DebuggingHelperOptionPage::createPage(QWidget *parent)
<< ' ' << m_ui.customLocationGroupBox->title()
<< ' ' << m_ui.dumperLocationLabel->text()
<< ' ' << m_ui.checkBoxUseCodeModel->text()
- << ' ' << m_ui.checkBoxDebugDebuggingHelpers->text()
- << ' ' << m_ui.checkBoxUseQmlObserver->text();
+ << ' ' << m_ui.checkBoxDebugDebuggingHelpers->text();
m_searchKeywords.remove(QLatin1Char('&'));
}
return w;
@@ -839,8 +840,9 @@ static TextEditor::ITextEditor *currentTextEditor()
struct DebuggerActions
{
QAction *continueAction;
- QAction *stopAction;
- QAction *interruptAction; // on the fat debug button
+ QAction *stopAction; // on the application output button if "Stop" is possible
+ QAction *interruptAction; // on the fat debug button if "Pause" is possible
+ QAction *undisturbableAction; // on the fat debug button if nothing can be done
QAction *resetAction; // FIXME: Should not be needed in a stable release
QAction *stepAction;
QAction *stepOutAction;
@@ -923,9 +925,6 @@ public slots:
void attachRemote(const QString &spec);
void attachRemoteTcf();
- void interruptDebuggingRequest();
- void exitDebugger();
-
void enableReverseDebuggingTriggered(const QVariant &value);
void languagesChanged(const Debugger::DebuggerLanguages &languages);
void showStatusMessage(const QString &msg, int timeout = -1);
@@ -967,7 +966,6 @@ public slots:
public:
DebuggerState m_state;
- uint m_capabilities;
DebuggerUISwitcher *m_uiSwitcher;
DebuggerPlugin *m_manager;
DebugMode *m_debugMode;
@@ -977,6 +975,9 @@ public:
TextEditor::BaseTextMark *m_locationMark;
Core::Context m_continuableContext;
Core::Context m_interruptibleContext;
+ Core::Context m_undisturbableContext;
+ Core::Context m_finishedContext;
+ Core::Context m_anyContext;
AttachRemoteParameters m_attachRemoteParameters;
QAction *m_startExternalAction;
@@ -988,7 +989,9 @@ public:
QComboBox *m_langBox;
QToolButton *m_reverseToolButton;
+ QIcon m_startIcon;
QIcon m_stopIcon;
+ QIcon m_continueIcon;
QIcon m_interruptIcon;
QIcon m_locationMarkIcon;
@@ -1073,6 +1076,9 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
m_continuableContext = Core::Context(0);
m_interruptibleContext = Core::Context(0);
+ m_undisturbableContext = Core::Context(0);
+ m_finishedContext = Core::Context(0);
+ m_anyContext = Core::Context(0);
m_debugMode = 0;
m_uiSwitcher = 0;
@@ -1084,6 +1090,12 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
{
m_continuableContext = Core::Context("Gdb.Continuable");
m_interruptibleContext = Core::Context("Gdb.Interruptible");
+ m_undisturbableContext = Core::Context("Gdb.Undisturbable");
+ m_finishedContext = Core::Context("Gdb.Finished");
+ m_anyContext.add(m_continuableContext);
+ m_anyContext.add(m_interruptibleContext);
+ m_anyContext.add(m_undisturbableContext);
+ m_anyContext.add(m_finishedContext);
// FIXME: Move part of this to extensionsInitialized()?
ICore *core = ICore::instance();
@@ -1097,8 +1109,12 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
const Core::Context qmlDebuggerContext(C_QMLDEBUGGER);
const Core::Context cppeditorcontext(CppEditor::Constants::C_CPPEDITOR);
+ m_startIcon = QIcon(_(":/debugger/images/debugger_start_small.png"));
+ m_startIcon.addFile(__(":/debugger/images/debugger_start.png"));
m_stopIcon = QIcon(_(":/debugger/images/debugger_stop_small.png"));
m_stopIcon.addFile(__(":/debugger/images/debugger_stop.png"));
+ m_continueIcon = QIcon(__(":/debugger/images/debugger_continue_small.png"));
+ m_continueIcon.addFile(__(":/debugger/images/debugger_continue.png"));
m_interruptIcon = QIcon(_(":/debugger/images/debugger_interrupt_small.png"));
m_interruptIcon.addFile(__(":/debugger/images/debugger_interrupt.png"));
m_locationMarkIcon = QIcon(_(":/debugger/images/location_16.png"));
@@ -1155,10 +1171,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
this, SLOT(updateWatchersHeader(int,int,int)), Qt::QueuedConnection);
m_actions.continueAction = new QAction(tr("Continue"), this);
- QIcon continueIcon = QIcon(__(":/debugger/images/debugger_continue_small.png"));
- continueIcon.addFile(__(":/debugger/images/debugger_continue.png"));
- m_actions.continueAction->setIcon(continueIcon);
m_actions.continueAction->setProperty(Role, RequestExecContinueRole);
+ m_actions.continueAction->setIcon(m_continueIcon);
m_actions.stopAction = new QAction(tr("Stop Debugger"), this);
m_actions.stopAction->setProperty(Role, RequestExecExitRole);
@@ -1168,6 +1182,11 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
m_actions.interruptAction->setIcon(m_interruptIcon);
m_actions.interruptAction->setProperty(Role, RequestExecInterruptRole);
+ m_actions.undisturbableAction = new QAction(tr("Debugger is Busy"), this);
+ // A "disabled pause" seems to be a good choice.
+ m_actions.undisturbableAction->setIcon(m_interruptIcon);
+ m_actions.undisturbableAction->setEnabled(false);
+
m_actions.resetAction = new QAction(tr("Abort Debugging"), this);
m_actions.resetAction->setProperty(Role, RequestExecResetRole);
m_actions.resetAction->setToolTip(tr("Aborts debugging and "
@@ -1253,7 +1272,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
connect(m_actions.frameDownAction, SIGNAL(triggered()), SLOT(onAction()));
connect(m_actions.frameUpAction, SIGNAL(triggered()), SLOT(onAction()));
connect(m_actions.stopAction, SIGNAL(triggered()), SLOT(onAction()));
- connect(m_actions.interruptAction, SIGNAL(triggered()), SLOT(interruptDebuggingRequest()));
+ connect(m_actions.interruptAction, SIGNAL(triggered()), SLOT(onAction()));
connect(m_actions.resetAction, SIGNAL(triggered()), SLOT(onAction()));
connect(&m_statusTimer, SIGNAL(timeout()), SLOT(clearStatusMessage()));
@@ -1420,22 +1439,21 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
cmd = am->registerAction(m_actions.stopAction,
Constants::STOP, globalcontext);
- cmd->setAttribute(Command::CA_UpdateText);
- cmd->setAttribute(Command::CA_UpdateIcon);
//cmd->setDefaultKeySequence(QKeySequence(Constants::STOP_KEY));
cmd->setDefaultText(tr("Stop Debugger"));
m_uiSwitcher->addMenuAction(cmd, AnyLanguage, CC::G_DEFAULT_ONE);
cmd = am->registerAction(m_actions.interruptAction,
PE::DEBUG, m_interruptibleContext);
- cmd->setAttribute(Command::CA_UpdateText);
- cmd->setAttribute(Command::CA_UpdateIcon);
cmd->setDefaultKeySequence(QKeySequence(Constants::STOP_KEY));
cmd->setDefaultText(tr("Interrupt Debugger"));
+ cmd = am->registerAction(m_actions.undisturbableAction,
+ PE::DEBUG, m_undisturbableContext);
+ cmd->setDefaultText(tr("Debugger is Busy"));
+
cmd = am->registerAction(m_actions.resetAction,
Constants::RESET, globalcontext);
- cmd->setAttribute(Core::Command::CA_UpdateText);
//cmd->setDefaultKeySequence(QKeySequence(Constants::RESET_KEY));
cmd->setDefaultText(tr("Reset Debugger"));
m_uiSwitcher->addMenuAction(cmd, AnyLanguage, CC::G_DEFAULT_ONE);
@@ -1714,8 +1732,7 @@ void DebuggerPluginPrivate::onCurrentProjectChanged(Project *project)
}
// No corresponding debugger found. So we are ready to start one.
ICore *core = ICore::instance();
- core->updateAdditionalContexts(m_continuableContext, Core::Context());
- core->updateAdditionalContexts(m_interruptibleContext, Core::Context());
+ core->updateAdditionalContexts(m_anyContext, Context());
}
void DebuggerPluginPrivate::onAction()
@@ -2027,9 +2044,8 @@ void DebuggerPluginPrivate::showToolTip(ITextEditor *editor, const QPoint &point
notifyCurrentEngine(RequestToolTipByExpressionRole, list);
}
-DebuggerRunControl *
-DebuggerPluginPrivate::createDebugger(const DebuggerStartParameters &sp,
- RunConfiguration *rc)
+DebuggerRunControl *DebuggerPluginPrivate::createDebugger
+ (const DebuggerStartParameters &sp, RunConfiguration *rc)
{
return m_debuggerRunControlFactory->create(sp, rc);
}
@@ -2076,7 +2092,6 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine, bool notify)
m_threadBox->setModel(engine->threadsModel());
m_threadBox->setModelColumn(ThreadData::NameColumn);
m_watchersWindow->setModel(engine->watchersModel());
- m_capabilities = engine->debuggerCapabilities();
if (notify)
notifyCurrentEngine(RequestActivationRole, true);
}
@@ -2116,12 +2131,14 @@ void DebuggerPluginPrivate::cleanupViews()
//if (d->m_engine)
// d->m_engine->cleanup();
- if (EditorManager *editorManager = EditorManager::instance()) {
- QList<IEditor *> toClose;
- foreach (IEditor *editor, editorManager->openedEditors())
- if (editor->property("OpenedByDebugger").toBool())
- toClose.append(editor);
- editorManager->closeEditors(toClose);
+ if (theDebuggerBoolSetting(CloseBuffersOnExit)) {
+ if (EditorManager *editorManager = EditorManager::instance()) {
+ QList<IEditor *> toClose;
+ foreach (IEditor *editor, editorManager->openedEditors())
+ if (editor->property("OpenedByDebugger").toBool())
+ toClose.append(editor);
+ editorManager->closeEditors(toClose);
+ }
}
}
@@ -2263,26 +2280,63 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_state = engine->state();
bool actionsEnabled = DebuggerEngine::debuggerActionsEnabled(m_state);
- //if (m_state == InferiorStopOk)
- // resetLocation();
//qDebug() << "PLUGIN SET STATE: " << m_state;
- if (m_state == DebuggerFinished) {
+ ICore *core = ICore::instance();
+ ActionManager *am = core->actionManager();
+ if (m_state == DebuggerNotReady) {
+ QTC_ASSERT(false, /* We use the Core m_debugAction here */);
+ // F5 starts debugging. It is "startable".
+ m_actions.interruptAction->setEnabled(false);
+ m_actions.continueAction->setEnabled(false);
+ m_actions.stopAction->setEnabled(false);
+ am->command(Constants::STOP)->setKeySequence(QKeySequence());
+ am->command(PE::DEBUG)->setKeySequence(QKeySequence(DEBUG_KEY));
+ core->updateAdditionalContexts(m_anyContext, Context());
+ } else if (m_state == InferiorStopOk) {
+ // F5 continues, Shift-F5 kills. It is "continuable".
+ m_actions.interruptAction->setEnabled(false);
+ m_actions.continueAction->setEnabled(true);
+ m_actions.stopAction->setEnabled(true);
+ am->command(Constants::STOP)->setKeySequence(QKeySequence(STOP_KEY));
+ am->command(PE::DEBUG)->setKeySequence(QKeySequence(DEBUG_KEY));
+ core->updateAdditionalContexts(m_anyContext, m_continuableContext);
+ } else if (m_state == InferiorRunOk) {
+ // Shift-F5 interrupts. It is also "interruptible".
+ m_actions.interruptAction->setEnabled(true);
+ m_actions.continueAction->setEnabled(false);
+ m_actions.stopAction->setEnabled(false);
+ am->command(Constants::STOP)->setKeySequence(QKeySequence());
+ am->command(PE::DEBUG)->setKeySequence(QKeySequence(STOP_KEY));
+ core->updateAdditionalContexts(m_anyContext, m_interruptibleContext);
+ } else if (m_state == DebuggerFinished) {
+ // We don't want to do anything anymore.
+ m_actions.interruptAction->setEnabled(false);
+ m_actions.continueAction->setEnabled(false);
+ m_actions.stopAction->setEnabled(false);
+ am->command(Constants::STOP)->setKeySequence(QKeySequence());
+ am->command(PE::DEBUG)->setKeySequence(QKeySequence(DEBUG_KEY));
+ //core->updateAdditionalContexts(m_anyContext, m_finishedContext);
+ m_codeModelSnapshot = CPlusPlus::Snapshot();
+ core->updateAdditionalContexts(m_anyContext, Context());
setBusyCursor(false);
cleanupViews();
- }
-
- const bool isContinuable = (engine->state() == InferiorStopOk);
- const bool isInterruptible = (engine->state() == InferiorRunOk);
- ICore *core = ICore::instance();
-
- if (isContinuable) {
- core->updateAdditionalContexts(m_interruptibleContext, m_continuableContext);
- } else if (isInterruptible) {
- core->updateAdditionalContexts(m_continuableContext, m_interruptibleContext);
+ } else if (m_state == InferiorUnrunnable) {
+ // We don't want to do anything anymore.
+ m_actions.interruptAction->setEnabled(false);
+ m_actions.continueAction->setEnabled(false);
+ m_actions.stopAction->setEnabled(true);
+ am->command(Constants::STOP)->setKeySequence(QKeySequence(STOP_KEY));
+ am->command(PE::DEBUG)->setKeySequence(QKeySequence(STOP_KEY));
+ core->updateAdditionalContexts(m_anyContext, m_finishedContext);
} else {
- core->updateAdditionalContexts(m_continuableContext, Core::Context());
- core->updateAdditionalContexts(m_interruptibleContext, Core::Context());
+ // Everything else is "undisturbable".
+ m_actions.interruptAction->setEnabled(false);
+ m_actions.continueAction->setEnabled(false);
+ m_actions.stopAction->setEnabled(false);
+ am->command(Constants::STOP)->setKeySequence(QKeySequence());
+ am->command(PE::DEBUG)->setKeySequence(QKeySequence());
+ core->updateAdditionalContexts(m_anyContext, m_undisturbableContext);
}
m_startExternalAction->setEnabled(true);
@@ -2295,62 +2349,43 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_startRemoteAction->setEnabled(true);
const bool stopped = m_state == InferiorStopOk;
- const bool detachable = m_state == InferiorStopOk
+ const bool detachable = stopped
&& engine->startParameters().startMode != AttachCore;
m_detachAction->setEnabled(detachable);
- const bool stoppable = m_state == InferiorRunOk
- || m_state == InferiorStopOk
- || m_state == InferiorUnrunnable;
-
if (stopped)
QApplication::alert(mainWindow(), 3000);
+ const uint caps = engine->debuggerCapabilities();
+ const bool canReverse = (caps & ReverseSteppingCapability)
+ && theDebuggerBoolSetting(EnableReverseDebugging);
+ m_actions.reverseDirectionAction->setEnabled(canReverse);
+
m_actions.watchAction1->setEnabled(true);
m_actions.watchAction2->setEnabled(true);
m_actions.breakAction->setEnabled(true);
- m_actions.snapshotAction->
- setEnabled(stopped && (m_capabilities & SnapshotCapability));
+ m_actions.snapshotAction->setEnabled(stopped && (caps & SnapshotCapability));
- theDebuggerAction(OperateByInstruction)->setEnabled(m_state == InferiorStopOk);
+ theDebuggerAction(OperateByInstruction)->setEnabled(stopped);
- m_actions.stopAction->setEnabled(stopped);
- m_actions.interruptAction->setEnabled(stoppable);
m_actions.resetAction->setEnabled(m_state != DebuggerNotReady
&& m_state != DebuggerFinished);
-#if 1
- // This is only needed when we insist on using Shift-F5 for Interrupt.
- // Removing the block makes F5 interrupt when running and continue when stopped.
- Core::ActionManager *am = core->actionManager();
- bool stopIsKill = m_state == InferiorStopOk
- || m_state == InferiorUnrunnable
- || m_state == DebuggerFinished;
- if (stopIsKill) {
- am->command(Constants::STOP)->setKeySequence(QKeySequence(STOP_KEY));
- am->command(PE::DEBUG)->setKeySequence(QKeySequence("F5"));
- } else {
- am->command(Constants::STOP)->setKeySequence(QKeySequence());
- am->command(PE::DEBUG)->setKeySequence(QKeySequence(STOP_KEY));
- }
-#endif
-
m_actions.stepAction->setEnabled(stopped);
m_actions.stepOutAction->setEnabled(stopped);
m_actions.runToLineAction1->setEnabled(stopped);
m_actions.runToLineAction2->setEnabled(stopped);
m_actions.runToFunctionAction->setEnabled(stopped);
m_actions.returnFromFunctionAction->
- setEnabled(stopped && (m_capabilities & ReturnFromFunctionCapability));
+ setEnabled(stopped && (caps & ReturnFromFunctionCapability));
- const bool canJump = stopped && (m_capabilities & JumpToLineCapability);
+ const bool canJump = stopped && (caps & JumpToLineCapability);
m_actions.jumpToLineAction1->setEnabled(canJump);
m_actions.jumpToLineAction2->setEnabled(canJump);
m_actions.nextAction->setEnabled(stopped);
- const bool canDeref = actionsEnabled
- && (m_capabilities & AutoDerefPointersCapability);
+ const bool canDeref = actionsEnabled && (caps & AutoDerefPointersCapability);
theDebuggerAction(AutoDerefPointers)->setEnabled(canDeref);
theDebuggerAction(AutoDerefPointers)->setEnabled(true);
theDebuggerAction(ExpandStack)->setEnabled(actionsEnabled);
@@ -2444,10 +2479,7 @@ void DebuggerPluginPrivate::activatePreviousMode()
void DebuggerPluginPrivate::activateDebugMode()
{
- const bool canReverse = (m_capabilities & ReverseSteppingCapability)
- && theDebuggerBoolSetting(EnableReverseDebugging);
m_actions.reverseDirectionAction->setChecked(false);
- m_actions.reverseDirectionAction->setEnabled(canReverse);
m_actions.reverseDirectionAction->setEnabled(false);
ModeManager *modeManager = ModeManager::instance();
m_previousMode = modeManager->currentMode()->id();
@@ -2475,22 +2507,6 @@ void DebuggerPluginPrivate::aboutToSaveSession()
m_sessionEngine->saveSessionData();
}
-void DebuggerPluginPrivate::interruptDebuggingRequest()
-{
- if (state() == InferiorRunOk)
- notifyCurrentEngine(RequestExecInterruptRole);
- else
- exitDebugger();
-}
-
-void DebuggerPluginPrivate::exitDebugger()
-{
- // The engine will finally call setState(DebuggerFinished) which
- // in turn will handle the cleanup.
- notifyCurrentEngine(RequestExecExitRole);
- m_codeModelSnapshot = CPlusPlus::Snapshot();
-}
-
void DebuggerPluginPrivate::executeDebuggerCommand()
{
if (QAction *action = qobject_cast<QAction *>(sender()))
@@ -2767,9 +2783,8 @@ QWidget *DebuggerPlugin::mainWindow() const
return d->m_uiSwitcher->mainWindow();
}
-DebuggerRunControl *
-DebuggerPlugin::createDebugger(const DebuggerStartParameters &sp,
- RunConfiguration *rc)
+DebuggerRunControl *DebuggerPlugin::createDebugger
+ (const DebuggerStartParameters &sp, RunConfiguration *rc)
{
return instance()->d->createDebugger(sp, rc);
}
@@ -2825,8 +2840,9 @@ void DebuggerPlugin::runControlFinished(DebuggerRunControl *runControl)
Q_UNUSED(runControl);
d->m_snapshotHandler->removeSnapshot(runControl);
d->disconnectEngine();
- if (d->m_snapshotHandler->size() == 0)
- d->activatePreviousMode();
+ if (theDebuggerBoolSetting(SwitchModeOnExit))
+ if (d->m_snapshotHandler->size() == 0)
+ d->activatePreviousMode();
}
DebuggerLanguages DebuggerPlugin::activeLanguages() const
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 8c016620bbc4c75167f386dc153b60203d8647fb..990b154eb691bce625da36c2b3c7cb4c0904bfae 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -92,10 +92,11 @@ bool checkGdbConfiguration(int toolChain, QString *errorMsg, QString *settingsPa
// unnecessarily.
#ifdef CDB_ENABLED
-DebuggerEngine *createCdbEngine(const DebuggerStartParameters &);
+DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *errorMessage);
bool checkCdbConfiguration(int toolChain, QString *errorMsg, QString *settingsPage);
+bool isCdbEngineEnabled(); // Check the configuration page
#else
-DebuggerEngine *createCdbEngine(const DebuggerStartParameters &) { return 0; }
+DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *) { return 0; }
bool checkCdbConfiguration(int, QString *, QString *) { return false; }
#endif
@@ -123,7 +124,7 @@ static DebuggerPlugin *plugin() { return DebuggerPlugin::instance(); }
// A factory to create DebuggerRunControls
DebuggerRunControlFactory::DebuggerRunControlFactory(QObject *parent,
- DebuggerEngineType enabledEngines)
+ unsigned enabledEngines)
: IRunControlFactory(parent), m_enabledEngines(enabledEngines)
{}
@@ -251,26 +252,38 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget
struct DebuggerRunnerPrivate {
explicit DebuggerRunnerPrivate(RunConfiguration *runConfiguration,
- DebuggerEngineType enabledEngines);
+ unsigned enabledEngines);
+
+ unsigned enabledEngines() const;
DebuggerEngine *m_engine;
const QWeakPointer<RunConfiguration> m_myRunConfiguration;
bool m_running;
- const DebuggerEngineType m_enabledEngines;
+ const unsigned m_cmdLineEnabledEngines;
QString m_errorMessage;
QString m_settingsIdHint;
};
+unsigned DebuggerRunnerPrivate::enabledEngines() const
+{
+ unsigned rc = m_cmdLineEnabledEngines;
+#ifdef CDB_ENABLED
+ if (!Internal::isCdbEngineEnabled())
+ rc &= ~CdbEngineType;
+#endif
+ return rc;
+}
+
DebuggerRunnerPrivate::DebuggerRunnerPrivate(RunConfiguration *runConfiguration,
- DebuggerEngineType enabledEngines) :
+ unsigned enabledEngines) :
m_myRunConfiguration(runConfiguration)
, m_running(false)
- , m_enabledEngines(enabledEngines)
+ , m_cmdLineEnabledEngines(enabledEngines)
{
}
DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
- DebuggerEngineType enabledEngines, const DebuggerStartParameters &sp)
+ unsigned enabledEngines, const DebuggerStartParameters &sp)
: RunControl(runConfiguration, ProjectExplorer::Constants::DEBUGMODE),
d(new DebuggerRunnerPrivate(runConfiguration, enabledEngines))
{
@@ -282,10 +295,11 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
DebuggerRunControl::~DebuggerRunControl()
{
disconnect();
- DebuggerEngine *engine = d->m_engine;
- d->m_engine = 0;
- engine->disconnect();
- delete engine;
+ if (DebuggerEngine *engine = d->m_engine) {
+ d->m_engine = 0;
+ engine->disconnect();
+ delete engine;
+ }
}
const DebuggerStartParameters &DebuggerRunControl::startParameters() const
@@ -325,22 +339,22 @@ static DebuggerEngineType engineForToolChain(int toolChainType)
// Figure out the debugger type of an executable. Analyze executable
// unless the toolchain provides a hint.
-DebuggerEngineType DebuggerRunControl::engineForExecutable(const QString &executable)
+DebuggerEngineType DebuggerRunControl::engineForExecutable(unsigned enabledEngineTypes, const QString &executable)
{
/*if (executable.endsWith(_("qmlviewer"))) {
- if (d->m_enabledEngines & QmlEngineType)
+ if (enabledEngineTypes & QmlEngineType)
return QmlEngineType;
d->m_errorMessage = msgEngineNotAvailable("Qml Engine");
}*/
if (executable.endsWith(_(".js"))) {
- if (d->m_enabledEngines & ScriptEngineType)
+ if (enabledEngineTypes & ScriptEngineType)
return ScriptEngineType;
d->m_errorMessage = msgEngineNotAvailable("Script Engine");
}
if (executable.endsWith(_(".py"))) {
- if (d->m_enabledEngines & PdbEngineType)
+ if (enabledEngineTypes & PdbEngineType)
return PdbEngineType;
d->m_errorMessage = msgEngineNotAvailable("Pdb Engine");
}
@@ -362,10 +376,14 @@ DebuggerEngineType DebuggerRunControl::engineForExecutable(const QString &execut
// We need the CDB debugger in order to be able to debug VS
// executables
- if (checkDebugConfiguration(ToolChain::MSVC, &d->m_errorMessage, 0, &d->m_settingsIdHint))
- return CdbEngineType;
+ if (checkDebugConfiguration(ToolChain::MSVC, &d->m_errorMessage, 0, &d->m_settingsIdHint)) {
+ if (enabledEngineTypes & CdbEngineType)
+ return CdbEngineType;
+ d->m_errorMessage = msgEngineNotAvailable("Cdb Engine");
+ return NoEngineType;
+ }
#else
- if (d->m_enabledEngines & GdbEngineType)
+ if (enabledEngineTypes & GdbEngineType)
return GdbEngineType;
d->m_errorMessage = msgEngineNotAvailable("Gdb Engine");
#endif
@@ -374,20 +392,19 @@ DebuggerEngineType DebuggerRunControl::engineForExecutable(const QString &execut
}
// Debugger type for mode.
-DebuggerEngineType DebuggerRunControl::engineForMode(DebuggerStartMode startMode)
+DebuggerEngineType DebuggerRunControl::engineForMode(unsigned enabledEngineTypes, DebuggerStartMode startMode)
{
if (startMode == AttachTcf)
return TcfEngineType;
#ifdef Q_OS_WIN
// Preferably Windows debugger for attaching locally.
- if (startMode != AttachToRemote)
+ if (startMode != AttachToRemote && (enabledEngineTypes & CdbEngineType))
return CdbEngineType;
return GdbEngineType;
- d->m_errorMessage = msgEngineNotAvailable("Gdb Engine");
- return NoEngineType;
#else
Q_UNUSED(startMode)
+ Q_UNUSED(enabledEngineTypes)
// d->m_errorMessage = msgEngineNotAvailable("Gdb Engine");
return GdbEngineType;
#endif
@@ -400,12 +417,18 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
// Figure out engine according to toolchain, executable, attach or default.
DebuggerEngineType engineType = NoEngineType;
DebuggerLanguages activeLangs = DebuggerPlugin::instance()->activeLanguages();
+ const unsigned enabledEngineTypes = d->enabledEngines();
if (sp.executable.endsWith(_(".js")))
engineType = ScriptEngineType;
else if (sp.executable.endsWith(_(".py")))
engineType = PdbEngineType;
- else
+ else {
engineType = engineForToolChain(sp.toolChainType);
+ if (engineType == CdbEngineType && !(enabledEngineTypes & CdbEngineType)) {
+ d->m_errorMessage = msgEngineNotAvailable("Cdb Engine");
+ engineType = NoEngineType;
+ }
+ }
// Fixme: 1 of 3 testing hacks.
if (sp.processArgs.size() >= 5 && sp.processArgs.at(0) == _("@tcf@"))
@@ -414,10 +437,10 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
if (engineType == NoEngineType
&& sp.startMode != AttachToRemote
&& !sp.executable.isEmpty())
- engineType = engineForExecutable(sp.executable);
+ engineType = engineForExecutable(enabledEngineTypes, sp.executable);
if (!engineType)
- engineType = engineForMode(sp.startMode);
+ engineType = engineForMode(enabledEngineTypes, sp.startMode);
if (engineType != QmlEngineType && (activeLangs & QmlLanguage)) {
if (activeLangs & CppLanguage) {
@@ -439,7 +462,7 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
d->m_engine = Internal::createScriptEngine(sp);
break;
case CdbEngineType:
- d->m_engine = Internal::createCdbEngine(sp);
+ d->m_engine = Internal::createCdbEngine(sp, &d->m_errorMessage);
break;
case PdbEngineType:
d->m_engine = Internal::createPdbEngine(sp);
@@ -458,17 +481,20 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
if (Internal::GdbEngine *embeddedGdbEngine = gdbEngine())
initGdbEngine(embeddedGdbEngine);
break;
- default: {
- // Could not find anything suitable.
- debuggingFinished();
- // Create Message box with possibility to go to settings
- const QString msg = tr("Cannot debug '%1' (tool chain: '%2'): %3")
- .arg(sp.executable, toolChainName(sp.toolChainType), d->m_errorMessage);
- Core::ICore::instance()->showWarningWithOptions(tr("Warning"),
- msg, QString(), QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY),
- d->m_settingsIdHint);
+ case NoEngineType:
+ case AllEngineTypes:
break;
- }
+ }
+
+ if (!d->m_engine) {
+ // Could not find anything suitable.
+ debuggingFinished();
+ // Create Message box with possibility to go to settings
+ const QString msg = tr("Cannot debug '%1' (tool chain: '%2'): %3")
+ .arg(sp.executable, toolChainName(sp.toolChainType), d->m_errorMessage);
+ Core::ICore::instance()->showWarningWithOptions(tr("Warning"),
+ msg, QString(), QLatin1String(Constants::DEBUGGER_SETTINGS_CATEGORY),
+ d->m_settingsIdHint);
}
}
@@ -590,7 +616,8 @@ void DebuggerRunControl::startFailed()
void DebuggerRunControl::handleFinished()
{
emit addToOutputWindowInline(this, tr("Debugging has finished"), false);
- engine()->handleFinished();
+ if (engine())
+ engine()->handleFinished();
plugin()->runControlFinished(this);
}
diff --git a/src/plugins/debugger/debuggerrunner.h b/src/plugins/debugger/debuggerrunner.h
index 3c7aaf1dd3d92bc130611af6fb5c85d7b50e955a..ad49bf433460e5c44489630a888b8836b9a5e895 100644
--- a/src/plugins/debugger/debuggerrunner.h
+++ b/src/plugins/debugger/debuggerrunner.h
@@ -61,7 +61,7 @@ class DEBUGGER_EXPORT DebuggerRunControlFactory
Q_OBJECT
public:
- DebuggerRunControlFactory(QObject *parent, DebuggerEngineType enabledEngines);
+ DebuggerRunControlFactory(QObject *parent, unsigned enabledEngines);
// This is used by the "Non-Standard" scenarios, e.g. Attach to Core.
// FIXME: What to do in case of a 0 runConfiguration?
@@ -78,7 +78,7 @@ private:
QString displayName() const;
QWidget *createConfigurationWidget(RunConfiguration *runConfiguration);
- DebuggerEngineType m_enabledEngines;
+ unsigned m_enabledEngines;
};
@@ -92,7 +92,7 @@ class DEBUGGER_EXPORT DebuggerRunControl
public:
typedef ProjectExplorer::RunConfiguration RunConfiguration;
explicit DebuggerRunControl(RunConfiguration *runConfiguration,
- DebuggerEngineType enabledEngines, const DebuggerStartParameters &sp);
+ unsigned enabledEngines, const DebuggerStartParameters &sp);
~DebuggerRunControl();
// ProjectExplorer::RunControl
@@ -105,7 +105,6 @@ public:
void createEngine(const DebuggerStartParameters &startParameters);
void setCustomEnvironment(Utils::Environment env);
- void setEnabledEngines(DebuggerEngineType enabledEngines);
void startFailed();
void debuggingFinished();
@@ -138,8 +137,8 @@ protected:
const DebuggerStartParameters &startParameters() const;
private:
- DebuggerEngineType engineForExecutable(const QString &executable);
- DebuggerEngineType engineForMode(DebuggerStartMode mode);
+ DebuggerEngineType engineForExecutable(unsigned enabledEngineTypes, const QString &executable);
+ DebuggerEngineType engineForMode(unsigned enabledEngineTypes, DebuggerStartMode mode);
void initGdbEngine(Internal::GdbEngine *engine);
Internal::GdbEngine *gdbEngine() const;
Internal::AbstractGdbAdapter *gdbAdapter() const;
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index 8d64f355abe4672d220efadeccb2e0eb5ddb590c..59ff2d96036ced934699e8afe4d2792f60052f6d 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>529</width>
- <height>411</height>
+ <height>303</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -83,25 +83,6 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>QML Observer is used to offer additional debugging facilities to QML applications, such as interactive preview of code changes and inspection tools.
-
-It is not strictly necessary for debugging with Qt Creator.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBoxUseQmlObserver">
- <property name="text">
- <string>Use QML Observer</string>
- </property>
- </widget>
- </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@@ -123,6 +104,10 @@ It is not strictly necessary for debugging with Qt Creator.</string>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
+ <slots>
+ <signal>editingFinished()</signal>
+ <signal>browsingFinished()</signal>
+ </slots>
</customwidget>
</customwidgets>
<resources/>
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 6918f23c20ffda506e9e16e069b80de1ab6cb544..090c4cbd953806be2186c883422c7161dea95caa 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -425,10 +425,7 @@ void GdbEngine::handleDebuggingHelperValue2Classic(const GdbResponse &response)
setWatchDataType(data, response.data.findChild("type"));
setWatchDataDisplayedType(data, response.data.findChild("displaytype"));
QList<WatchData> list;
- parseWatchData(watchHandler()->expandedINames(),
- data, contents,
- theDebuggerBoolSetting(SortStructMembers),
- &list);
+ parseWatchData(watchHandler()->expandedINames(), data, contents, &list);
//for (int i = 0; i != list.size(); ++i)
// qDebug() << "READ: " << list.at(i).toString();
watchHandler()->insertBulkData(list);
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 20e068869855b9bc8f09cbd270e10677fa246ad0..b55c5e5d25a454384f99f9bb4d8b457839fbfecb 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -133,14 +133,12 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
GdbMi data = all.findChild("data");
QList<WatchData> list;
- const bool sortMembers = theDebuggerBoolSetting(SortStructMembers);
foreach (const GdbMi &child, data.children()) {
WatchData dummy;
dummy.iname = child.findChild("iname").data();
dummy.name = _(child.findChild("name").data());
//qDebug() << "CHILD: " << child.toString();
- parseWatchData(watchHandler()->expandedINames(), dummy, child,
- sortMembers, &list);
+ parseWatchData(watchHandler()->expandedINames(), dummy, child, &list);
}
watchHandler()->insertBulkData(list);
//for (int i = 0; i != list.size(); ++i)
diff --git a/src/plugins/debugger/gdb/remotegdbprocess.cpp b/src/plugins/debugger/gdb/remotegdbprocess.cpp
index 7288f44c7b813d52409d4509852ac489397d0232..0b84a5b4a02497f6f311ad981b7e432652c9ecfa 100644
--- a/src/plugins/debugger/gdb/remotegdbprocess.cpp
+++ b/src/plugins/debugger/gdb/remotegdbprocess.cpp
@@ -31,6 +31,8 @@
#include "remoteplaingdbadapter.h"
+#include <utils/qtcassert.h>
+
#include <ctype.h>
using namespace Core;
@@ -59,6 +61,13 @@ QByteArray RemoteGdbProcess::readAllStandardError()
}
void RemoteGdbProcess::start(const QString &cmd, const QStringList &args)
+{
+ Q_UNUSED(cmd);
+ Q_UNUSED(args);
+ QTC_ASSERT(m_gdbStarted, return);
+}
+
+void RemoteGdbProcess::realStart(const QString &cmd, const QStringList &args)
{
m_command = cmd;
m_cmdArgs = args;
@@ -66,7 +75,7 @@ void RemoteGdbProcess::start(const QString &cmd, const QStringList &args)
m_error.clear();
m_conn = SshConnection::create();
connect(m_conn.data(), SIGNAL(connected()), this, SLOT(handleConnected()));
- connect(m_conn.data(), SIGNAL(error(SshError)), this,
+ connect(m_conn.data(), SIGNAL(error(Core::SshError)), this,
SLOT(handleConnectionError()));
m_conn->connectToHost(m_connParams);
}
@@ -129,13 +138,15 @@ void RemoteGdbProcess::handleAppOutputReaderFinished(int exitStatus)
void RemoteGdbProcess::handleGdbStarted()
{
m_gdbStarted = true;
+ emit started();
}
void RemoteGdbProcess::handleGdbFinished(int exitStatus)
{
switch (exitStatus) {
case SshRemoteProcess::FailedToStart:
- emitErrorExit(tr("Remote gdb failed to start."));
+ m_error = tr("Remote gdb failed to start.");
+ emit startFailed();
break;
case SshRemoteProcess::KilledBySignal:
emitErrorExit(tr("Remote gdb crashed."));
diff --git a/src/plugins/debugger/gdb/remotegdbprocess.h b/src/plugins/debugger/gdb/remotegdbprocess.h
index 9a9679b6952b7c156fd0059820bc45245e1bc9a4..e47a4a22841e7318799e4700eff07a7a4dfe9753 100644
--- a/src/plugins/debugger/gdb/remotegdbprocess.h
+++ b/src/plugins/debugger/gdb/remotegdbprocess.h
@@ -67,9 +67,14 @@ public:
virtual void setWorkingDirectory(const QString &dir);
void interruptInferior();
+ void realStart(const QString &cmd, const QStringList &args);
static const QByteArray CtrlC;
+signals:
+ void started();
+ void startFailed();
+
private slots:
void handleConnected();
void handleConnectionError();
diff --git a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
index 2d06ff3175426976fdb59a5c6e7ef1c3d2e23285..9ade0265e685711a3c628f36fae6a1f39bc4ffe9 100644
--- a/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remoteplaingdbadapter.cpp
@@ -41,6 +41,9 @@ RemotePlainGdbAdapter::RemotePlainGdbAdapter(GdbEngine *engine, QObject *parent)
: AbstractPlainGdbAdapter(engine, parent),
m_gdbProc(engine->startParameters().connParams, this)
{
+ connect(&m_gdbProc, SIGNAL(started()), this, SLOT(handleGdbStarted()));
+ connect(&m_gdbProc, SIGNAL(startFailed()), this,
+ SLOT(handleGdbStartFailed()));
}
void RemotePlainGdbAdapter::startAdapter()
@@ -106,11 +109,22 @@ void RemotePlainGdbAdapter::handleSetupDone()
m_gdbProc.setWorkingDirectory(startParameters().workingDirectory);
if (!startParameters().environment.isEmpty())
m_gdbProc.setEnvironment(startParameters().environment);
+ m_gdbProc.realStart(m_engine->startParameters().debuggerCommand,
+ QStringList() << QLatin1String("-i") << QLatin1String("mi"));
+}
- if (m_engine->startGdb(QStringList(), m_engine->startParameters().debuggerCommand))
+void RemotePlainGdbAdapter::handleGdbStarted()
+{
+ if (m_engine->startGdb(QStringList(),
+ m_engine->startParameters().debuggerCommand))
m_engine->handleAdapterStarted();
}
+void RemotePlainGdbAdapter::handleGdbStartFailed()
+{
+ m_engine->handleAdapterStartFailed(m_gdbProc.errorString());
+}
+
void RemotePlainGdbAdapter::handleSetupFailed(const QString &reason)
{
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
diff --git a/src/plugins/debugger/gdb/remoteplaingdbadapter.h b/src/plugins/debugger/gdb/remoteplaingdbadapter.h
index 68a2651b06c7d74f1f5ecc5c17ecbdcb965ec80c..6275e8a7d9ff22c59d25fb5a8e8b8bc7b61522c4 100644
--- a/src/plugins/debugger/gdb/remoteplaingdbadapter.h
+++ b/src/plugins/debugger/gdb/remoteplaingdbadapter.h
@@ -49,6 +49,10 @@ public:
signals:
void requestSetup();
+private slots:
+ void handleGdbStarted();
+ void handleGdbStartFailed();
+
private:
void startAdapter();
void setupInferior();
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index 31cfa4b00b9ab31fe947dde5b112f8594c95eac8..ce5ad9fc74f3c430edea35bc1413e0e762ead725 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -362,7 +362,7 @@ public slots:
LogWindow::LogWindow(QWidget *parent)
: QWidget(parent)
{
- setWindowTitle(tr("Log"));
+ setWindowTitle(tr("Debugger Log"));
setObjectName("Log");
QSplitter *m_splitter = new Core::MiniSplitter(Qt::Horizontal);
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index dd55400e008e9797ce86cb5e4bf4e341f0ea78a8..3c857fbf461d89ce0108eeefa2c4a93193e3d342 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -826,13 +826,12 @@ void PdbEngine::handleListLocals(const PdbResponse &response)
//GdbMi data = all.findChild("data");
QList<WatchData> list;
WatchHandler *handler = watchHandler();
- bool sortMembers = theDebuggerBoolSetting(SortStructMembers);
foreach (const GdbMi &child, all.children()) {
WatchData dummy;
dummy.iname = child.findChild("iname").data();
dummy.name = _(child.findChild("name").data());
//qDebug() << "CHILD: " << child.toString();
- parseWatchData(handler->expandedINames(), dummy, child, sortMembers, &list);
+ parseWatchData(handler->expandedINames(), dummy, child, &list);
}
handler->insertBulkData(list);
}
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 6b232a69e57b20c201bef26686c3af64d47c10d6..7869dd7897adfa3180510930adfcac69e5225c32 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -14,13 +14,19 @@ namespace Debugger {
const int ConnectionWaitTimeMs = 5000;
namespace Internal {
-DebuggerEngine *createCdbEngine(const DebuggerStartParameters &);
+DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *);
DebuggerEngine *createGdbEngine(const DebuggerStartParameters &);
DebuggerEngine *createQmlEngine(const DebuggerStartParameters &);
DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp)
{
- return new QmlCppEngine(sp);
+ QmlCppEngine *newEngine = new QmlCppEngine(sp);
+ if (newEngine->cppEngine()) {
+ return newEngine;
+ } else {
+ delete newEngine;
+ return 0;
+ }
}
} // namespace Internal
@@ -56,7 +62,12 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp)
if (startParameters().cppEngineType == GdbEngineType) {
d->m_cppEngine = Internal::createGdbEngine(sp);
} else {
- d->m_cppEngine = Internal::createCdbEngine(sp);
+ QString errorMessage;
+ d->m_cppEngine = Internal::createCdbEngine(sp, &errorMessage);
+ if (!d->m_cppEngine) {
+ qWarning("%s", qPrintable(errorMessage));
+ return;
+ }
}
d->m_cppEngine->setRunInWrapperEngine(true);
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 9e1599aedc1931efc62bd8ed0087295110e4f833..3a03e0da8d069808d7a2603dfbec1c4b67cb70e4 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -221,7 +221,7 @@ void QmlEngine::connectionError(QAbstractSocket::SocketError socketError)
void QmlEngine::serviceConnectionError(const QString &serviceName)
{
- plugin()->showMessage(tr("QML Debugger: Couldn't connect to service '%1'.").arg(serviceName), StatusBar);
+ plugin()->showMessage(tr("QML Debugger: Could not connect to service '%1'.").arg(serviceName), StatusBar);
}
void QmlEngine::runEngine()
@@ -322,13 +322,6 @@ void QmlEngine::shutdownEngine()
void QmlEngine::setupEngine()
{
- if (!d->m_attachToRunningExternalApp
- && !startParameters().qmlObserverAvailable
- && Internal::theDebuggerBoolSetting(Internal::UseQmlObserver))
- {
- showQmlObserverToolWarning();
- }
-
d->m_adapter->setMaxConnectionAttempts(MaxConnectionAttempts);
d->m_adapter->setConnectionAttemptInterval(ConnectionAttemptDefaultInterval);
connect(d->m_adapter, SIGNAL(connectionError(QAbstractSocket::SocketError)),
diff --git a/src/plugins/debugger/sessionengine.cpp b/src/plugins/debugger/sessionengine.cpp
index 9914ff33ed87c3dc15171573c7d1974c888fab0a..a822df35229341bdedd5741e52d5ded782d90413 100644
--- a/src/plugins/debugger/sessionengine.cpp
+++ b/src/plugins/debugger/sessionengine.cpp
@@ -30,6 +30,7 @@
#include "sessionengine.h"
#include "breakhandler.h"
#include "watchhandler.h"
+#include "debuggerconstants.h"
#include <utils/qtcassert.h>
@@ -64,6 +65,12 @@ void SessionEngine::saveSessionData()
breakHandler()->saveSessionData();
}
+unsigned SessionEngine::debuggerCapabilities() const
+{
+ return DebuggerEngine::debuggerCapabilities()
+ | AddWatcherCapability | WatchpointCapability;
+}
+
} // namespace Internal
} // namespace Debugger
diff --git a/src/plugins/debugger/sessionengine.h b/src/plugins/debugger/sessionengine.h
index 9bdc833bc1dc4bed0bb6699a179603b874717d9c..c00d6f52c9027dbe18fa01dd2f6b8d45700c2ee2 100644
--- a/src/plugins/debugger/sessionengine.h
+++ b/src/plugins/debugger/sessionengine.h
@@ -51,6 +51,7 @@ public:
virtual void shutdownEngine() {}
virtual void shutdownInferior() {}
virtual void executeDebuggerCommand(const QString &command);
+ virtual unsigned debuggerCapabilities() const;
virtual bool isSessionEngine() const { return true; }
diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp
index 74171d0d0b809ef15046a41321c080962ec4282d..b21d1609f6a460c6c05856852d41f433f20127d4 100644
--- a/src/plugins/debugger/watchdata.cpp
+++ b/src/plugins/debugger/watchdata.cpp
@@ -28,7 +28,8 @@ WatchData::WatchData() :
source(0),
objectId(0),
state(InitialState),
- changed(false)
+ changed(false),
+ sortId(0)
{
}
@@ -172,6 +173,7 @@ QString WatchData::toString() const
str << QLatin1Char('{');
if (!iname.isEmpty())
str << "iname=\"" << iname << doubleQuoteComma;
+ str << "sortId=\"" << sortId << doubleQuoteComma;
if (!name.isEmpty() && name != iname)
str << "name=\"" << name << doubleQuoteComma;
if (error)
diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h
index c64473767ae19ea0df7175d818c540dd82d15c63..f36fce1fe6502227234279e8d6ed3b27a49ed643 100644
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -136,6 +136,7 @@ public:
quint64 objectId; // Object id used for the QMLEngine
int state;
bool changed;
+ int sortId;
};
} // namespace Internal
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index fd428f211ef126be9373053ad8007e838a223d66..00dd7c3a4b7c6697b21d1444381e7d9a05b2dce8 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -704,6 +704,9 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
case EngineActionsEnabledRole:
return engine()->debuggerActionsEnabled();
+
+ case EngineStateRole:
+ return QVariant(int(engine()->state()));
}
const WatchItem *item = watchItem(idx);
@@ -960,40 +963,62 @@ QVariant WatchModel::headerData(int section, Qt::Orientation orientation, int ro
return QVariant();
}
-struct IName : public QByteArray
-{
- IName(const QByteArray &iname) : QByteArray(iname) {}
-};
+// Determine sort order of watch items by sort order or alphabetical inames
+// according to setting 'SortStructMembers'. We need a map key for bulkInsert
+// and a predicate for finding the insertion position of a single item.
-bool iNameLess(const QString &iname1, const QString &iname2)
+// Set this before using any of the below according to action
+static bool sortWatchDataAlphabetically = true;
+
+static bool watchDataLessThan(const QByteArray &iname1, int sortId1, const QByteArray &iname2, int sortId2)
{
- QString name1 = iname1.section('.', -1);
- QString name2 = iname2.section('.', -1);
- if (!name1.isEmpty() && !name2.isEmpty()) {
- if (name1.at(0).isDigit() && name2.at(0).isDigit()) {
- bool ok1 = false, ok2 = false;
- int i1 = name1.toInt(&ok1), i2 = name2.toInt(&ok2);
- if (ok1 && ok2)
- return i1 < i2;
- }
+ if (!sortWatchDataAlphabetically)
+ return sortId1 < sortId2;
+ // Get positions of last part of iname 'local.this.i1" -> "i1"
+ int cmpPos1 = iname1.lastIndexOf('.');
+ if (cmpPos1 == -1) {
+ cmpPos1 = 0;
+ } else {
+ cmpPos1++;
}
- return name1 < name2;
-}
+ int cmpPos2 = iname2.lastIndexOf('.');
+ if (cmpPos2 == -1) {
+ cmpPos2 = 0;
+ } else {
+ cmpPos2++;
+ }
+ // Are we looking at an array with numerical inames 'local.this.i1.0" ->
+ // Go by sort id.
+ if (cmpPos1 < iname1.size() && cmpPos2 < iname2.size()
+ && isdigit(iname1.at(cmpPos1)) && isdigit(iname2.at(cmpPos2)))
+ return sortId1 < sortId2;
+ // Alphabetically
+ return qstrcmp(iname1.constData() + cmpPos1, iname2.constData() + cmpPos2) < 0;
+}
+
+// Sort key for watch data consisting of iname and numerical sort id.
+struct WatchDataSortKey {
+ explicit WatchDataSortKey(const WatchData &wd) :
+ iname(wd.iname), sortId(wd.sortId) {}
+ QByteArray iname;
+ int sortId;
+};
-bool operator<(const IName &iname1, const IName &iname2)
+inline bool operator<(const WatchDataSortKey &k1, const WatchDataSortKey &k2)
{
- return iNameLess(iname1, iname2);
+ return watchDataLessThan(k1.iname, k1.sortId, k2.iname, k2.sortId);
}
-static bool iNameSorter(const WatchItem *item1, const WatchItem *item2)
+bool watchItemSorter(const WatchItem *item1, const WatchItem *item2)
{
- return iNameLess(item1->iname, item2->iname);
+ return watchDataLessThan(item1->iname, item1->sortId, item2->iname, item2->sortId);
}
static int findInsertPosition(const QList<WatchItem *> &list, const WatchItem *item)
{
- QList<WatchItem *>::const_iterator it =
- qLowerBound(list.begin(), list.end(), item, iNameSorter);
+ sortWatchDataAlphabetically = theDebuggerBoolSetting(SortStructMembers);
+ const QList<WatchItem *>::const_iterator it =
+ qLowerBound(list.begin(), list.end(), item, watchItemSorter);
return it - list.begin();
}
@@ -1045,7 +1070,7 @@ void WatchModel::insertData(const WatchData &data)
item->parent = parent;
item->generation = generationCounter;
item->changed = true;
- int n = findInsertPosition(parent->children, item);
+ const int n = findInsertPosition(parent->children, item);
beginInsertRows(index, n, n);
parent->children.insert(n, item);
endInsertRows();
@@ -1078,10 +1103,11 @@ void WatchModel::insertBulkData(const QList<WatchData> &list)
}
QModelIndex index = watchIndex(parent);
- QMap<IName, WatchData> newList;
- typedef QMap<IName, WatchData>::iterator Iterator;
+ sortWatchDataAlphabetically = theDebuggerBoolSetting(SortStructMembers);
+ QMap<WatchDataSortKey, WatchData> newList;
+ typedef QMap<WatchDataSortKey, WatchData>::iterator Iterator;
foreach (const WatchItem &data, list)
- newList[data.iname] = data;
+ newList.insert(WatchDataSortKey(data), data);
if (newList.size() != list.size()) {
qDebug() << "LIST: ";
foreach (const WatchItem &data, list)
@@ -1100,11 +1126,12 @@ void WatchModel::insertBulkData(const QList<WatchData> &list)
QTC_ASSERT(newList.size() == list.size(), return);
foreach (WatchItem *oldItem, parent->children) {
- Iterator it = newList.find(oldItem->iname);
+ const WatchDataSortKey oldSortKey(*oldItem);
+ Iterator it = newList.find(oldSortKey);
if (it == newList.end()) {
WatchData data = *oldItem;
data.generation = generationCounter;
- newList[oldItem->iname] = data;
+ newList.insert(oldSortKey, data);
} else {
bool changed = !it->value.isEmpty()
&& it->value != oldItem->value
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 73016f696101a38f4de88301792dce0a95c8b009..2c1982041432d54db4432a57ddd5ac6666f00a77 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -1666,7 +1666,7 @@ void setWatchDataDisplayedType(WatchData &data, const GdbMi &item)
void parseWatchData(const QSet<QByteArray> &expandedINames,
const WatchData &data0, const GdbMi &item,
- bool sortMembers, QList<WatchData> *list)
+ QList<WatchData> *list)
{
//qDebug() << "HANDLE CHILDREN: " << data0.toString() << item.toString();
WatchData data = data0;
@@ -1711,6 +1711,7 @@ void parseWatchData(const QSet<QByteArray> &expandedINames,
int i = 0;
foreach (const GdbMi &child, children.children()) {
WatchData data1 = childtemplate;
+ data1.sortId = i++;
GdbMi name = child.findChild("name");
if (name.isValid())
data1.name = _(name.data());
@@ -1722,11 +1723,6 @@ void parseWatchData(const QSet<QByteArray> &expandedINames,
} else {
data1.iname = data.iname;
data1.iname += '.';
- if (!sortMembers) {
- char buf[10];
- qsnprintf(buf, sizeof(buf) - 1, "%04d", i);
- data1.iname += buf;
- }
data1.iname += data1.name.toLatin1();
}
if (!data1.name.isEmpty() && data1.name.at(0).isDigit())
@@ -1747,8 +1743,7 @@ void parseWatchData(const QSet<QByteArray> &expandedINames,
//data1.name += " (" + skey + ")";
data1.name = skey;
}
- parseWatchData(expandedINames, data1, child, sortMembers, list);
- ++i;
+ parseWatchData(expandedINames, data1, child, list);
}
}
diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h
index 61d3aa4c7fc19e5c0316ed26472391298a62720d..e1da61a37ab109796aae844402e9a86dfb329177 100644
--- a/src/plugins/debugger/watchutils.h
+++ b/src/plugins/debugger/watchutils.h
@@ -257,7 +257,7 @@ void setWatchDataType(WatchData &data, const GdbMi &mi);
void setWatchDataDisplayedType(WatchData &data, const GdbMi &mi);
void parseWatchData(const QSet<QByteArray> &expandedINames,
- const WatchData &parent, const GdbMi &child, bool sortMembers,
+ const WatchData &parent, const GdbMi &child,
QList<WatchData> *insertions);
} // namespace Internal
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 878b0a11db404dceeb1e947ea7091c4fb197f1f4..253f41e912db74913b82193d5d3feeb472eadea4 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -296,6 +296,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
const unsigned engineCapabilities = modelData(EngineCapabilitiesRole).toUInt();
const bool canHandleWatches =
actionsEnabled && (engineCapabilities & AddWatcherCapability);
+ const DebuggerState state = static_cast<DebuggerState>(modelData(EngineStateRole).toInt());
QMenu menu;
QAction *actInsertNewWatchItem = menu.addAction(tr("Insert New Watch Item"));
@@ -352,10 +353,12 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
QAction *actWatchExpression = new QAction(actionName, &menu);
actWatchExpression->setEnabled(canHandleWatches && !exp.isEmpty());
+ // Can remove watch if engine can handle it or session engine.
actionName = exp.isEmpty() ? tr("Remove Watch Expression")
: tr("Remove Watch Expression \"%1\"").arg(exp);
QAction *actRemoveWatchExpression = new QAction(actionName, &menu);
- actRemoveWatchExpression->setEnabled(canHandleWatches && !exp.isEmpty());
+ actRemoveWatchExpression->setEnabled((canHandleWatches || state == DebuggerNotReady)
+ && !exp.isEmpty());
if (m_type == LocalsType)
menu.addAction(actWatchExpression);
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 326b66e3bde478a555c8002f2b4fd0b3a061258f..b91326d6e78524e1dc2c447c5b8a1e432f857849 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2743,6 +2743,7 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
}
endEditBlock();
} else if (input.isKey(Key_Delete)) {
+ setAnchor();
cursor().deleteChar();
m_lastInsertion.clear();
} else if (input.isKey(Key_PageDown) || input.isControl('f')) {
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 2024be56a47429aa0fb6d887bd5209f689b03c09..8aacac7c708e4c004f369087355e6a0a67e9612b 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -942,7 +942,7 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
QTC_ASSERT(editorManager(), return);
*handled = true;
- if (cmd.matches("w", "write")) {
+ if (cmd.matches("w", "write") || cmd.cmd == "wq") {
// :w[rite]
Core::IEditor *editor = m_editorToHandler.key(handler);
const QString fileName = handler->currentFileName();
@@ -959,6 +959,8 @@ void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
handler->showBlackMessage(FakeVimHandler::tr("\"%1\" %2 %3L, %4C written")
.arg(fileName).arg(" ")
.arg(ba.count('\n')).arg(ba.size()));
+ if (cmd.cmd == "wq")
+ delayedQuitRequested(cmd.hasBang, m_editorToHandler.key(handler));
} else {
handler->showRedMessage(tr("File not saved"));
}
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index b762369b4fdcd54e629cfdb70955ecb8432e1d3e..654ac5dcf84425d4f01ae970563b4ed74efea2a4 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -55,7 +55,7 @@ QString ChangeSelectionDialog::repository() const
void ChangeSelectionDialog::setRepository(const QString &s)
{
- m_ui.repositoryEdit->setText(s);
+ m_ui.repositoryEdit->setText(QDir::toNativeSeparators(s));
}
void ChangeSelectionDialog::selectWorkingDirectory()
diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp
index 504c60e283ac83ab14eb3b90f8601e2c6fa0a73c..db4dd17e2a0903f7dcb266ddd533b1affbf280b0 100644
--- a/src/plugins/git/clonewizardpage.cpp
+++ b/src/plugins/git/clonewizardpage.cpp
@@ -41,10 +41,13 @@ namespace Git {
struct CloneWizardPagePrivate {
CloneWizardPagePrivate();
+ bool urlIsLocal(const QString &url);
+
const QString mainLinePostfix;
const QString gitPostFix;
const QString protocolDelimiter;
QCheckBox *deleteMasterCheckBox;
+ QString headBranch;
};
CloneWizardPagePrivate::CloneWizardPagePrivate() :
@@ -55,6 +58,15 @@ CloneWizardPagePrivate::CloneWizardPagePrivate() :
{
}
+bool CloneWizardPagePrivate::urlIsLocal(const QString &url)
+{
+ if (url.startsWith(QLatin1String("file://"))
+ || url.startsWith(QLatin1Char('/'))
+ || url.at(0).isLetter() && url.at(1) == QChar(':') && url.at(2) == QChar('\\'))
+ return true;
+ return false;
+}
+
CloneWizardPage::CloneWizardPage(QWidget *parent) :
VCSBase::BaseCheckoutWizardPage(parent),
d(new CloneWizardPagePrivate)
@@ -63,7 +75,8 @@ CloneWizardPage::CloneWizardPage(QWidget *parent) :
setSubTitle(tr("Specify repository URL, checkout directory and path."));
setRepositoryLabel(tr("Clone URL:"));
d->deleteMasterCheckBox = new QCheckBox(tr("Delete master branch"));
- addControl(d->deleteMasterCheckBox);
+ d->deleteMasterCheckBox->setToolTip(tr("Delete the master branch after checking out the repository."));
+ addLocalControl(d->deleteMasterCheckBox);
setDeleteMasterBranch(true);
}
@@ -88,7 +101,8 @@ QString CloneWizardPage::directoryFromRepository(const QString &urlIn) const
* 'user@host:qt/qt.git', 'http://host/qt/qt.git' 'local repo'
* ------> 'qt' . */
- QString url = urlIn.trimmed();
+ QString url = urlIn.trimmed().replace(QChar('\\'), QChar('/'));
+
const QChar slash = QLatin1Char('/');
// remove host
const int protocolDelimiterPos = url.indexOf(d->protocolDelimiter); // "://"
@@ -114,8 +128,9 @@ QString CloneWizardPage::directoryFromRepository(const QString &urlIn) const
}
// fix invalid characters
const QChar dash = QLatin1Char('-');
- url.replace(slash, dash);
- url.replace(QLatin1Char('.'), dash);
+ url.replace(QRegExp(QLatin1String("[^0-9a-zA-Z_-]")), dash);
+ // trim leading dashes (they are annoying and get created when using local pathes)
+ url.replace(QRegExp(QLatin1String("^-+")), QString());
return url;
}
@@ -128,33 +143,34 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
const QString binary = client->binary();
- QStringList args;
- args << QLatin1String("clone") << repository() << checkoutDir;
-
VCSBase::ProcessCheckoutJob *job = new VCSBase::ProcessCheckoutJob;
const QProcessEnvironment env = client->processEnvironment();
+
// 1) Basic checkout step
+ QStringList args;
+ args << QLatin1String("clone") << repository() << checkoutDir;
job->addStep(binary, args, workingDirectory, env);
const QString checkoutBranch = branch();
// 2) Checkout branch, change to checkoutDir
- const QString masterBranch = QLatin1String("master");
- if (!checkoutBranch.isEmpty() && checkoutBranch != masterBranch) {
+ if (!checkoutBranch.isEmpty() && checkoutBranch != d->headBranch) {
// Create branch
- args.clear();
- args << QLatin1String("branch") << QLatin1String("--track")
- << checkoutBranch << (QLatin1String("origin/") + checkoutBranch);
- job->addStep(binary, args, *checkoutPath, env);
+ if (!d->urlIsLocal(repository())) {
+ args.clear();
+ args << QLatin1String("branch") << QLatin1String("--track")
+ << checkoutBranch << (QLatin1String("origin/") + checkoutBranch);
+ job->addStep(binary, args, *checkoutPath, env);
+ }
// Checkout branch
args.clear();
args << QLatin1String("checkout") << checkoutBranch;
job->addStep(binary, args, *checkoutPath, env);
- // Delete master if desired
- if (deleteMasterBranch()) {
+ if (deleteMasterBranch() && d->headBranch != QLatin1String("<detached HEAD>")) {
+ // Make sure we only have the requested branch:
args.clear();
- args << QLatin1String("branch") << QLatin1String("-D") << masterBranch;
- job->addStep(binary, args, *checkoutPath, env);
+ args << QLatin1String("branch") << QLatin1String("-D") << d->headBranch;
}
+ job->addStep(binary, args, *checkoutPath, env);
}
return QSharedPointer<VCSBase::AbstractCheckoutJob>(job);
@@ -163,11 +179,16 @@ QSharedPointer<VCSBase::AbstractCheckoutJob> CloneWizardPage::createCheckoutJob(
QStringList CloneWizardPage::branches(const QString &repository, int *current)
{
// Run git on remote repository if an URL was specified.
- *current = 0;
+ *current = -1;
+ d->headBranch.clear();
+
if (repository.isEmpty())
return QStringList();
const QStringList branches = Internal::GitPlugin::instance()->gitClient()->synchronousRepositoryBranches(repository);
- *current = branches.indexOf(QLatin1String("master"));
+ if (!branches.isEmpty()) {
+ *current = 0; // default branch is always returned first!
+ d->headBranch = branches.at(0);
+ }
return branches;
}
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 9837b7c35a7ad42aab10f499a5ba9d0273e9e122..1e9adeb5142c79662cc1e69bf11fed11880cdee8 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -216,6 +216,8 @@ void GitClient::diff(const QString &workingDirectory,
commonDiffArgs << QLatin1String("diff") << QLatin1String(noColorOption);
if (m_settings.diffPatience)
commonDiffArgs << QLatin1String("--patience");
+ if (m_settings.ignoreSpaceChanges)
+ commonDiffArgs << QLatin1String("--ignore-space-change");
if (unstagedFileNames.empty() && stagedFileNames.empty()) {
QStringList arguments(commonDiffArgs);
arguments << diffArgs;
@@ -396,7 +398,7 @@ void GitClient::blame(const QString &workingDirectory,
qDebug() << "blame" << workingDirectory << fileName << lineNumber;
QStringList arguments(QLatin1String("blame"));
arguments << QLatin1String("--root");
- if (m_plugin->settings().spaceIgnorantBlame)
+ if (m_plugin->settings().ignoreSpaceChanges)
arguments << QLatin1String("-w");
arguments << QLatin1String("--") << fileName;
if (!revision.isEmpty())
@@ -1272,29 +1274,45 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory,
return StatusFailed;
}
// Unchanged (output text depending on whether -u was passed)
- if (outputText.contains("nothing to commit")
- || outputText.contains("nothing added to commit but untracked files present"))
+ if (outputText.contains("nothing to commit"))
return StatusUnchanged;
+ if (outputText.contains("nothing added to commit but untracked files present"))
+ return untracked ? StatusChanged : StatusUnchanged;
return StatusChanged;
}
// Quietly retrieve branch list of remote repository URL
+//
+// The branch HEAD is pointing to is always returned first.
QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryURL)
{
QStringList arguments(QLatin1String("ls-remote"));
- arguments << QLatin1String("--heads") << repositoryURL;
+ arguments << repositoryURL << QLatin1String("HEAD") << QLatin1String("refs/heads/*");
const unsigned flags =
VCSBase::VCSBasePlugin::SshPasswordPrompt|
VCSBase::VCSBasePlugin::SuppressStdErrInLogWindow|
VCSBase::VCSBasePlugin::SuppressFailMessageInLogWindow;
const Utils::SynchronousProcessResponse resp = synchronousGit(QString(), arguments, flags);
QStringList branches;
+ branches << "<detached HEAD>";
+ QString headSha;
if (resp.result == Utils::SynchronousProcessResponse::Finished) {
// split "82bfad2f51d34e98b18982211c82220b8db049b<tab>refs/heads/master"
foreach(const QString &line, resp.stdOut.split(QLatin1Char('\n'))) {
+ if (line.endsWith("\tHEAD")) {
+ Q_ASSERT(headSha.isNull());
+ headSha = line.left(line.indexOf(QChar('\t')));
+ continue;
+ }
+
const int slashPos = line.lastIndexOf(QLatin1Char('/'));
- if (slashPos != -1)
- branches.push_back(line.mid(slashPos + 1));
+ const QString branchName = line.mid(slashPos + 1);
+ if (slashPos != -1) {
+ if (line.startsWith(headSha))
+ branches[0] = branchName;
+ else
+ branches.push_back(branchName);
+ }
}
}
return branches;
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index eee8c5236cbd07aacdd1b213a9f1f4e940469a48..b608c35bd41b834f549f0b842ed2a2886d4edc20 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -313,19 +313,6 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
m_menuAction = gitContainer->menu()->menuAction();
ParameterActionCommandPair parameterActionCommand
- = createFileAction(actionManager, gitContainer,
- tr("Diff Current File"), tr("Diff \"%1\""),
- QLatin1String("Git.Diff"), globalcontext, true,
- SLOT(diffCurrentFile()));
- parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
-
- parameterActionCommand
- = createFileAction(actionManager, gitContainer,
- tr("Log File"), tr("Log of \"%1\""),
- QLatin1String("Git.Log"), globalcontext, true, SLOT(logFile()));
- parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
-
- parameterActionCommand
= createFileAction(actionManager, gitContainer,
tr("Blame"), tr("Blame for \"%1\""),
QLatin1String("Git.Blame"),
@@ -334,16 +321,20 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand
= createFileAction(actionManager, gitContainer,
- tr("Undo Unstaged Changes"), tr("Undo Unstaged Changes for \"%1\""),
- QLatin1String("Git.UndoUnstaged"), globalcontext,
- true, SLOT(undoUnstagedFileChanges()));
+ tr("Diff Current File"), tr("Diff of \"%1\""),
+ QLatin1String("Git.Diff"), globalcontext, true,
+ SLOT(diffCurrentFile()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
parameterActionCommand
- = createFileAction(actionManager, gitContainer,
- tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""),
- QLatin1String("Git.Undo"), globalcontext,
- true, SLOT(undoFileChanges()));
- parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
+ = createFileAction(actionManager, gitContainer,
+ tr("Log Current File"), tr("Log of \"%1\""),
+ QLatin1String("Git.Log"), globalcontext, true, SLOT(logFile()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
+
+
+ // ------
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.File"), this));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
@@ -356,6 +347,21 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"),
QLatin1String("Git.Unstage"), globalcontext, true, SLOT(unstageFile()));
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Undo Unstaged Changes"), tr("Undo Unstaged Changes for \"%1\""),
+ QLatin1String("Git.UndoUnstaged"), globalcontext,
+ true, SLOT(undoUnstagedFileChanges()));
+
+ parameterActionCommand
+ = createFileAction(actionManager, gitContainer,
+ tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""),
+ QLatin1String("Git.Undo"), globalcontext,
+ true, SLOT(undoFileChanges()));
+ parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
+
+
+ // ------------
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Project"), this));
parameterActionCommand
@@ -379,63 +385,117 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
QLatin1String("Git.CleanProject"), globalcontext,
true, SLOT(cleanProject()));
+
+ // --------------
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Repository"), this));
createRepositoryAction(actionManager, gitContainer,
- tr("Diff Repository"), QLatin1String("Git.DiffRepository"),
+ tr("Diff"), QLatin1String("Git.DiffRepository"),
globalcontext, true, SLOT(diffRepository()));
createRepositoryAction(actionManager, gitContainer,
- tr("Repository Status"), QLatin1String("Git.StatusRepository"),
- globalcontext, true, &GitClient::status);
-
- createRepositoryAction(actionManager, gitContainer,
- tr("Log Repository"), QLatin1String("Git.LogRepository"),
+ tr("Log"), QLatin1String("Git.LogRepository"),
globalcontext, true, &GitClient::graphLog);
- // Apply current file as patch is handled specially.
- parameterActionCommand =
- createParameterAction(actionManager, gitContainer,
- tr("Apply Patch"), tr("Apply \"%1\""),
- QLatin1String("Git.ApplyCurrentFilePatch"),
- globalcontext, true);
- m_applyCurrentFilePatchAction = parameterActionCommand.first;
- connect(m_applyCurrentFilePatchAction, SIGNAL(triggered()), this,
- SLOT(applyCurrentFilePatch()));
-
createRepositoryAction(actionManager, gitContainer,
- tr("Apply Patch..."), QLatin1String("Git.ApplyPatch"),
- globalcontext, true, SLOT(promptApplyPatch()));
+ tr("Status"), QLatin1String("Git.StatusRepository"),
+ globalcontext, true, &GitClient::status);
createRepositoryAction(actionManager, gitContainer,
- tr("Undo Repository Changes"), QLatin1String("Git.UndoRepository"),
+ tr("Reset..."), QLatin1String("Git.UndoRepository"),
globalcontext, false, SLOT(undoRepositoryChanges()));
+
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Clean..."), QLatin1String("Git.CleanRepository"),
+ globalcontext, true, SLOT(cleanRepository()));
+
m_createRepositoryAction = new QAction(tr("Create Repository..."), this);
Core::Command *createRepositoryCommand = actionManager->registerAction(m_createRepositoryAction, "Git.CreateRepository", globalcontext);
connect(m_createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository()));
gitContainer->addAction(createRepositoryCommand);
- createRepositoryAction(actionManager, gitContainer,
- tr("Clean Repository..."), QLatin1String("Git.CleanRepository"),
- globalcontext, true, SLOT(cleanRepository()));
+ // --------------
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Info"), this));
createRepositoryAction(actionManager, gitContainer,
tr("Launch gitk"), QLatin1String("Git.LaunchGitK"),
globalcontext, true, &GitClient::launchGitK);
- gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Global"), this));
+ createRepositoryAction(actionManager, gitContainer,
+ tr("Branches..."), QLatin1String("Git.BranchList"),
+ globalcontext, false, SLOT(branchList()));
+
+ m_showAction = new QAction(tr("Show Commit..."), this);
+ Core::Command *showCommitCommand = actionManager->registerAction(m_showAction, "Git.ShowCommit", globalcontext);
+ connect(m_showAction, SIGNAL(triggered()), this, SLOT(showCommit()));
+ gitContainer->addAction(showCommitCommand);
+
+
+ // --------------
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.RarelyUsed"), this));
+
+ Core::ActionContainer *patchMenu = actionManager->createMenu(Core::Id("Git.PatchMenu"));
+ patchMenu->menu()->setTitle(tr("Patch"));
+ gitContainer->addMenu(patchMenu);
+
+ // Apply current file as patch is handled specially.
+ parameterActionCommand =
+ createParameterAction(actionManager, patchMenu,
+ tr("Apply from Editor"), tr("Apply \"%1\""),
+ QLatin1String("Git.ApplyCurrentFilePatch"),
+ globalcontext, true);
+ m_applyCurrentFilePatchAction = parameterActionCommand.first;
+ connect(m_applyCurrentFilePatchAction, SIGNAL(triggered()), this,
+ SLOT(applyCurrentFilePatch()));
+
+ createRepositoryAction(actionManager, patchMenu,
+ tr("Apply from File..."), QLatin1String("Git.ApplyPatch"),
+ globalcontext, true, SLOT(promptApplyPatch()));
+
+ Core::ActionContainer *stashMenu = actionManager->createMenu(Core::Id("Git.StashMenu"));
+ stashMenu->menu()->setTitle(tr("Stash"));
+ gitContainer->addMenu(stashMenu);
+
+ createRepositoryAction(actionManager, stashMenu,
+ tr("Stashes..."), QLatin1String("Git.StashList"),
+ globalcontext, false, SLOT(stashList()));
+
+ stashMenu->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.StashMenuPush"), this));
ActionCommandPair actionCommand =
- createRepositoryAction(actionManager, gitContainer,
- tr("Stash Snapshot..."), QLatin1String("Git.StashSnapshot"),
+ createRepositoryAction(actionManager, stashMenu,
+ tr("Stash"), QLatin1String("Git.Stash"),
+ globalcontext, true, SLOT(stash()));
+ actionCommand.first->setToolTip(tr("Saves the current state of your work and resets the repository."));
+
+ actionCommand = createRepositoryAction(actionManager, stashMenu,
+ tr("Take Snapshot..."), QLatin1String("Git.StashSnapshot"),
globalcontext, true, SLOT(stashSnapshot()));
actionCommand.first->setToolTip(tr("Saves the current state of your work."));
- actionCommand = createRepositoryAction(actionManager, gitContainer,
- tr("Stash"), QLatin1String("Git.Stash"),
- globalcontext, true, SLOT(stash()));
- actionCommand.first->setToolTip(tr("Saves the current state of your work and resets the repository."));
+ stashMenu->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.StashMenuPop"), this));
+
+ actionCommand = createRepositoryAction(actionManager, stashMenu,
+ tr("Stash Pop"), QLatin1String("Git.StashPop"),
+ globalcontext, true, &GitClient::stashPop);
+ actionCommand.first->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
+
+ Core::ActionContainer *subversionMenu = actionManager->createMenu(Core::Id("Git.Subversion"));
+ subversionMenu->menu()->setTitle(tr("Subversion"));
+ gitContainer->addMenu(subversionMenu);
+
+ createRepositoryAction(actionManager, subversionMenu,
+ tr("Log"), QLatin1String("Git.Subversion.Log"),
+ globalcontext, false, &GitClient::subversionLog);
+
+ createRepositoryAction(actionManager, subversionMenu,
+ tr("Fetch"), QLatin1String("Git.Subversion.Fetch"),
+ globalcontext, false, &GitClient::synchronousSubversionFetch);
+
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.PushPull"), this));
+
+ gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Global"), this));
createRepositoryAction(actionManager, gitContainer,
tr("Fetch"), QLatin1String("Git.Fetch"),
@@ -446,9 +506,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
globalcontext, true, SLOT(pull()));
actionCommand = createRepositoryAction(actionManager, gitContainer,
- tr("Stash Pop"), QLatin1String("Git.StashPop"),
- globalcontext, true, &GitClient::stashPop);
- actionCommand.first->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
+ tr("Push"), QLatin1String("Git.Push"),
+ globalcontext, true, SLOT(push()));
actionCommand = createRepositoryAction(actionManager, gitContainer,
tr("Commit..."), QLatin1String("Git.Commit"),
@@ -459,38 +518,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
tr("Amend Last Commit..."), QLatin1String("Git.AmendCommit"),
globalcontext, true, SLOT(startAmendCommit()));
- actionCommand = createRepositoryAction(actionManager, gitContainer,
- tr("Push"), QLatin1String("Git.Push"),
- globalcontext, true, SLOT(push()));
-
- gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Branch"), this));
-
- createRepositoryAction(actionManager, gitContainer,
- tr("Branches..."), QLatin1String("Git.BranchList"),
- globalcontext, false, SLOT(branchList()));
-
- createRepositoryAction(actionManager, gitContainer,
- tr("Stashes..."), QLatin1String("Git.StashList"),
- globalcontext, false, SLOT(stashList()));
-
- m_showAction = new QAction(tr("Show Commit..."), this);
- Core::Command *showCommitCommand = actionManager->registerAction(m_showAction, "Git.ShowCommit", globalcontext);
- connect(m_showAction, SIGNAL(triggered()), this, SLOT(showCommit()));
- gitContainer->addAction(showCommitCommand);
-
// Subversion in a submenu.
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Subversion"), this));
- Core::ActionContainer *subversionMenu = actionManager->createMenu(Core::Id("Git.Subversion"));
- subversionMenu->menu()->setTitle(tr("Subversion"));
- gitContainer->addMenu(subversionMenu);
-
- createRepositoryAction(actionManager, subversionMenu,
- tr("Log"), QLatin1String("Git.Subversion.Log"),
- globalcontext, false, &GitClient::subversionLog);
-
- createRepositoryAction(actionManager, subversionMenu,
- tr("Fetch"), QLatin1String("Git.Subversion.Fetch"),
- globalcontext, false, &GitClient::synchronousSubversionFetch);
if (0) {
const QList<QAction*> snapShotActions = createSnapShotTestActions();
@@ -593,7 +622,7 @@ void GitPlugin::undoRepositoryChanges()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
- const QString msg = tr("Would you like to revert all pending changes to the repository\n%1?").arg(state.topLevel());
+ const QString msg = tr("Revert all pending changes to the repository\n%1?").arg(QDir::toNativeSeparators(state.topLevel()));
const QMessageBox::StandardButton answer
= QMessageBox::question(m_core->mainWindow(),
tr("Revert"), msg,
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index b860ce8790de91f590e66ba0fba81aa7e1b3cae2..3cded7b2d87e8056b9483123da2d90982da05dd6 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -44,7 +44,7 @@ static const char timeoutKeyC[] = "TimeOut";
static const char pullRebaseKeyC[] = "PullRebase";
static const char promptToSubmitKeyC[] = "PromptForSubmit";
static const char omitAnnotationDateKeyC[] = "OmitAnnotationDate";
-static const char spaceIgnorantBlameKeyC[] = "SpaceIgnorantBlame";
+static const char ignoreSpaceChangesC[] = "SpaceIgnorantBlame";
static const char diffPatienceKeyC[] = "DiffPatience";
static const char winSetHomeEnvironmentKeyC[] = "WinSetHomeEnvironment";
static const char gitkOptionsKeyC[] = "GitKOptions";
@@ -69,7 +69,7 @@ GitSettings::GitSettings() :
pullRebase(bool(defaultPullRebase)),
promptToSubmit(true),
omitAnnotationDate(false),
- spaceIgnorantBlame(true),
+ ignoreSpaceChanges(true),
diffPatience(true),
winSetHomeEnvironment(false)
{
@@ -85,7 +85,7 @@ void GitSettings::fromSettings(QSettings *settings)
pullRebase = settings->value(QLatin1String(pullRebaseKeyC), bool(defaultPullRebase)).toBool();
promptToSubmit = settings->value(QLatin1String(promptToSubmitKeyC), true).toBool();
omitAnnotationDate = settings->value(QLatin1String(omitAnnotationDateKeyC), false).toBool();
- spaceIgnorantBlame = settings->value(QLatin1String(spaceIgnorantBlameKeyC), true).toBool();
+ ignoreSpaceChanges = settings->value(QLatin1String(ignoreSpaceChangesC), true).toBool();
diffPatience = settings->value(QLatin1String(diffPatienceKeyC), true).toBool();
winSetHomeEnvironment = settings->value(QLatin1String(winSetHomeEnvironmentKeyC), false).toBool();
gitkOptions = settings->value(QLatin1String(gitkOptionsKeyC)).toString();
@@ -102,7 +102,7 @@ void GitSettings::toSettings(QSettings *settings) const
settings->setValue(QLatin1String(pullRebaseKeyC), pullRebase);
settings->setValue(QLatin1String(promptToSubmitKeyC), promptToSubmit);
settings->setValue(QLatin1String(omitAnnotationDateKeyC), omitAnnotationDate);
- settings->setValue(QLatin1String(spaceIgnorantBlameKeyC), spaceIgnorantBlame);
+ settings->setValue(QLatin1String(ignoreSpaceChangesC), ignoreSpaceChanges);
settings->setValue(QLatin1String(diffPatienceKeyC), diffPatience);
settings->setValue(QLatin1String(winSetHomeEnvironmentKeyC), winSetHomeEnvironment);
settings->setValue(QLatin1String(gitkOptionsKeyC), gitkOptions);
@@ -114,7 +114,7 @@ bool GitSettings::equals(const GitSettings &s) const
return adoptPath == s.adoptPath && path == s.path && logCount == s.logCount
&& timeoutSeconds == s.timeoutSeconds && promptToSubmit == s.promptToSubmit
&& pullRebase == s.pullRebase
- && omitAnnotationDate == s.omitAnnotationDate && spaceIgnorantBlame == s.spaceIgnorantBlame
+ && omitAnnotationDate == s.omitAnnotationDate && ignoreSpaceChanges == s.ignoreSpaceChanges
&& diffPatience == s.diffPatience && winSetHomeEnvironment == s.winSetHomeEnvironment
&& gitkOptions == s.gitkOptions;
}
diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h
index 81cd280c6fe89925ac947030f3c403a3384a1923..d7235230621e812eadd8c56e7dc131c0e869bbab 100644
--- a/src/plugins/git/gitsettings.h
+++ b/src/plugins/git/gitsettings.h
@@ -59,7 +59,7 @@ struct GitSettings
bool pullRebase;
bool promptToSubmit;
bool omitAnnotationDate;
- bool spaceIgnorantBlame;
+ bool ignoreSpaceChanges;
bool diffPatience;
bool winSetHomeEnvironment;
QString gitkOptions;
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index d58a927fe2b12dc60278a3b47d84b5966cb68fb3..25e1a66693a0a15bd952c08c1d34ee2a14bba3f6 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -122,7 +122,6 @@ GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) :
m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this);
- m_gitSubmitPanelUi.emailLineEdit->setValidator(m_emailValidator);
connect(m_gitSubmitPanelUi.authorLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(authorInformationChanged()));
connect(m_gitSubmitPanelUi.emailLineEdit, SIGNAL(textChanged(QString)),
@@ -152,18 +151,21 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
bool GitSubmitEditorWidget::canSubmit() const
{
- if (m_gitSubmitPanelUi.authorLineEdit->text().isEmpty()
- || !emailIsValid())
+ if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()
+ || m_gitSubmitPanelUi.invalidEmailLabel->isVisible())
return false;
return SubmitEditorWidget::canSubmit();
}
void GitSubmitEditorWidget::authorInformationChanged()
{
+ bool bothEmpty = m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() &&
+ m_gitSubmitPanelUi.emailLineEdit->text().isEmpty();
+
m_gitSubmitPanelUi.invalidAuthorLabel->
- setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty());
+ setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() && !bothEmpty);
m_gitSubmitPanelUi.invalidEmailLabel->
- setVisible(!emailIsValid());
+ setVisible(!emailIsValid() && !bothEmpty);
updateSubmitAction();
}
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index e311239092a8923d55002c3948d20194ef43417f..93c273150538864290befa093b53436a2f36a02c 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -74,7 +74,7 @@ GitSettings SettingsPageWidget::settings() const
rc.pullRebase = m_ui.pullRebaseCheckBox->isChecked();
rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked();
rc.omitAnnotationDate = m_ui.omitAnnotationDataCheckBox->isChecked();
- rc.spaceIgnorantBlame = m_ui.spaceIgnorantBlameCheckBox->isChecked();
+ rc.ignoreSpaceChanges = m_ui.spaceIgnorantBlameCheckBox->isChecked();
rc.diffPatience = m_ui.diffPatienceCheckBox->isChecked();
rc.winSetHomeEnvironment = m_ui.winHomeCheckBox->isChecked();
rc.gitkOptions = m_ui.gitkOptionsLineEdit->text().trimmed();
@@ -90,7 +90,7 @@ void SettingsPageWidget::setSettings(const GitSettings &s)
m_ui.pullRebaseCheckBox->setChecked(s.pullRebase);
m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit);
m_ui.omitAnnotationDataCheckBox->setChecked(s.omitAnnotationDate);
- m_ui.spaceIgnorantBlameCheckBox->setChecked(s.spaceIgnorantBlame);
+ m_ui.spaceIgnorantBlameCheckBox->setChecked(s.ignoreSpaceChanges);
m_ui.diffPatienceCheckBox->setChecked(s.diffPatience);
m_ui.winHomeCheckBox->setChecked(s.winSetHomeEnvironment);
m_ui.gitkOptionsLineEdit->setText(s.gitkOptions);
diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index 30ca7b7ab473c488a3a1cee7046388ee74888a02..b474e19a080999b8aed4f5801e21f1b1dad5bfbc 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -2,6 +2,14 @@
<ui version="4.0">
<class>Git::Internal::SettingsPage</class>
<widget class="QWidget" name="Git::Internal::SettingsPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>361</width>
+ <height>444</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="environmentGroupBox">
@@ -130,7 +138,7 @@
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="spaceIgnorantBlameCheckBox">
<property name="text">
- <string>Ignore whitespace changes in annotation</string>
+ <string>Ignore whitespace changes in annotation and diff</string>
</property>
</widget>
</item>
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index 59ab1cadaae452939e0bdbef11a4cbdd8117c1a2..f7c2123db7c7f05a3da28d4b77d30665728957d4 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -37,6 +37,7 @@
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QtCore/QDebug>
+#include <QtCore/QDir>
#include <QtCore/QModelIndex>
#include <QtCore/QDateTime>
#include <QtGui/QStandardItemModel>
@@ -167,7 +168,7 @@ QString StashDialog::msgRepositoryLabel(const QString &repository)
{
return repository.isEmpty() ?
tr("<No repository>") :
- tr("Repository: %1").arg(repository);
+ tr("Repository: %1").arg(QDir::toNativeSeparators(repository));
}
void StashDialog::refresh(const QString &repository, bool force)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 043e3ed2d444f3707614087bde6a033231f969d0..decb9fa9af29933fe3b8c021b0d9753b37635b7d 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -82,7 +82,6 @@
#include <QtGui/QShortcut>
#include <QtGui/QStackedLayout>
#include <QtGui/QSplitter>
-#include <QtGui/QToolBar>
#include <QtHelp/QHelpEngine>
@@ -110,6 +109,16 @@ const char * const SB_OPENPAGES = "OpenPages";
# define DOCPATH "/../share/doc/qtcreator/"
#endif
+namespace {
+ QToolButton* toolButton(QAction *action)
+ {
+ QToolButton *button = new QToolButton;
+ button->setDefaultAction(action);
+ button->setPopupMode(QToolButton::DelayedPopup);
+ return button;
+ }
+}
+
HelpPlugin::HelpPlugin()
: m_mode(0),
m_core(0),
@@ -528,55 +537,44 @@ void HelpPlugin::createRightPaneContextViewer()
if (m_helpViewerForSideBar)
return;
- QAction *switchToHelp = new QAction(tr("Go to Help Mode"), this);
- connect(switchToHelp, SIGNAL(triggered()), this, SLOT(switchToHelpMode()));
+ Utils::StyledBar *toolBar = new Utils::StyledBar();
+ QAction *switchToHelp = new QAction(tr("Go to Help Mode"), toolBar);
+ connect(switchToHelp, SIGNAL(triggered()), this, SLOT(switchToHelpMode()));
QAction *back = new QAction(QIcon(QLatin1String(IMAGEPATH "previous.png")),
- tr("Previous"), this);
+ tr("Previous"), toolBar);
QAction *next = new QAction(QIcon(QLatin1String(IMAGEPATH "next.png")),
- tr("Next"), this);
-
- // Dummy layout to align the close button to the right
- QHBoxLayout *hboxLayout = new QHBoxLayout();
- hboxLayout->setSpacing(0);
- hboxLayout->setMargin(0);
-
- // left side actions
- QToolBar *rightPaneToolBar = new QToolBar();
- setupNavigationMenus(back, next, rightPaneToolBar);
+ tr("Next"), toolBar);
+ QAction *close = new QAction(QIcon(QLatin1String(Core::Constants::ICON_CLOSE)),
+ QLatin1String(""), toolBar);
+ connect(close, SIGNAL(triggered()), this, SLOT(slotHideRightPane()));
- rightPaneToolBar->addAction(switchToHelp);
- rightPaneToolBar->addAction(back);
- rightPaneToolBar->addAction(next);
-
- hboxLayout->addWidget(rightPaneToolBar);
- hboxLayout->addStretch();
-
- QToolButton *closeButton = new QToolButton();
- closeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE)));
- connect(closeButton, SIGNAL(clicked()), this, SLOT(slotHideRightPane()));
+ setupNavigationMenus(back, next, toolBar);
- // close button to the right
- hboxLayout->addWidget(closeButton);
+ QHBoxLayout *layout = new QHBoxLayout(toolBar);
+ layout->setSpacing(0);
+ layout->setMargin(0);
- QVBoxLayout *rightPaneLayout = new QVBoxLayout;
- rightPaneLayout->setMargin(0);
- rightPaneLayout->setSpacing(0);
+ layout->addWidget(toolButton(switchToHelp));
+ layout->addWidget(toolButton(back));
+ layout->addWidget(toolButton(next));
+ layout->addStretch();
+ layout->addWidget(toolButton(close));
QWidget *rightPaneSideBar = new QWidget;
- rightPaneSideBar->setLayout(rightPaneLayout);
addAutoReleasedObject(new Core::BaseRightPaneWidget(rightPaneSideBar));
- Utils::StyledBar *rightPaneStyledBar = new Utils::StyledBar;
- rightPaneStyledBar->setLayout(hboxLayout);
- rightPaneLayout->addWidget(rightPaneStyledBar);
-
m_helpViewerForSideBar = new HelpViewer(qreal(0.0), rightPaneSideBar);
connect(m_helpViewerForSideBar, SIGNAL(openFindToolBar()), this,
SLOT(openFindToolBar()));
#if !defined(QT_NO_WEBKIT)
m_helpViewerForSideBar->pageAction(QWebPage::OpenLinkInNewWindow)->setVisible(false);
#endif
+
+ QVBoxLayout *rightPaneLayout = new QVBoxLayout(rightPaneSideBar);
+ rightPaneLayout->setMargin(0);
+ rightPaneLayout->setSpacing(0);
+ rightPaneLayout->addWidget(toolBar);
rightPaneLayout->addWidget(m_helpViewerForSideBar);
rightPaneLayout->addWidget(new Core::FindToolBarPlaceHolder(rightPaneSideBar));
rightPaneSideBar->setFocusProxy(m_helpViewerForSideBar);
@@ -594,12 +592,12 @@ void HelpPlugin::createRightPaneContextViewer()
copy->setIcon(cmd->action()->icon());
connect(copy, SIGNAL(triggered()), m_helpViewerForSideBar, SLOT(copy()));
-
+
next->setEnabled(m_helpViewerForSideBar->isForwardAvailable());
connect(next, SIGNAL(triggered()), m_helpViewerForSideBar, SLOT(forward()));
connect(m_helpViewerForSideBar, SIGNAL(forwardAvailable(bool)), next,
SLOT(setEnabled(bool)));
-
+
back->setEnabled(m_helpViewerForSideBar->isBackwardAvailable());
connect(back, SIGNAL(triggered()), m_helpViewerForSideBar, SLOT(backward()));
connect(m_helpViewerForSideBar, SIGNAL(backwardAvailable(bool)), back,
@@ -924,25 +922,15 @@ void HelpPlugin::activateBookmarks()
m_sideBar->activateItem(m_bookmarkItem);
}
-QToolBar *HelpPlugin::createWidgetToolBar()
+Utils::StyledBar *HelpPlugin::createWidgetToolBar()
{
- QToolBar *toolBar = new QToolBar;
- toolBar->addWidget(OpenPagesManager::instance().openPagesComboBox());
-
- toolBar->addWidget(new QLabel(tr("Filtered by:")));
m_filterComboBox = new QComboBox;
- m_filterComboBox->setMinimumContentsLength(20);
- toolBar->addWidget(m_filterComboBox);
+ m_filterComboBox->setMinimumContentsLength(15);
connect(m_filterComboBox, SIGNAL(activated(QString)), this,
SLOT(filterDocumentation(QString)));
connect(m_filterComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(updateSideBarSource()));
- QWidget *dummy = new QWidget;
- QHBoxLayout *layout = new QHBoxLayout(dummy);
- layout->addStretch();
- toolBar->addWidget(dummy);
-
m_closeButton = new QToolButton();
m_closeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE)));
m_closeButton->setToolTip(tr("Close current page"));
@@ -950,14 +938,26 @@ QToolBar *HelpPlugin::createWidgetToolBar()
SLOT(closeCurrentPage()));
connect(&OpenPagesManager::instance(), SIGNAL(pagesChanged()), this,
SLOT(updateCloseButton()));
- toolBar->addWidget(m_closeButton);
+
+ Utils::StyledBar *toolBar = new Utils::StyledBar;
+
+ QHBoxLayout *layout = new QHBoxLayout(toolBar);
+ layout->setMargin(0);
+ layout->setSpacing(0);
+ layout->addWidget(OpenPagesManager::instance().openPagesComboBox(), 10);
+ layout->addSpacing(5);
+ layout->addWidget(new QLabel(tr("Filtered by:")));
+ layout->addWidget(m_filterComboBox);
+ layout->addStretch();
+ layout->addWidget(m_closeButton);
return toolBar;
}
-QToolBar *HelpPlugin::createIconToolBar(bool external)
+Utils::StyledBar *HelpPlugin::createIconToolBar(bool external)
{
- QToolBar *toolBar = new QToolBar;
+ Utils::StyledBar *toolBar = new Utils::StyledBar;
+ toolBar->setVisible(false);
QAction *home, *back, *next, *bookmark;
if (external) {
@@ -992,14 +992,15 @@ QToolBar *HelpPlugin::createIconToolBar(bool external)
setupNavigationMenus(back, next, toolBar);
- toolBar->addAction(home);
- toolBar->addAction(back);
- toolBar->addAction(next);
- toolBar->addSeparator();
- toolBar->addAction(bookmark);
- toolBar->setMovable(false);
- toolBar->addSeparator();
- toolBar->setVisible(false);
+ QHBoxLayout *layout = new QHBoxLayout(toolBar);
+ layout->setMargin(0);
+ layout->setSpacing(0);
+ layout->addWidget(toolButton(home));
+ layout->addWidget(toolButton(back));
+ layout->addWidget(toolButton(next));
+ layout->addWidget(new Utils::StyledSeparator(toolBar));
+ layout->addWidget(toolButton(bookmark));
+ layout->addWidget(new Utils::StyledSeparator(toolBar));
return toolBar;
}
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 8330b96f7f013e0ff4fe45d769959a08636b3b8b..0d387691cabb346f6b06f22623e0c5790e679ab6 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -37,7 +37,6 @@
QT_FORWARD_DECLARE_CLASS(QAction)
QT_FORWARD_DECLARE_CLASS(QComboBox)
QT_FORWARD_DECLARE_CLASS(QMenu)
-QT_FORWARD_DECLARE_CLASS(QToolBar)
QT_FORWARD_DECLARE_CLASS(QToolButton)
QT_FORWARD_DECLARE_CLASS(QUrl)
@@ -49,6 +48,10 @@ class SideBar;
class SideBarItem;
} // Core
+namespace Utils {
+class StyledBar;
+} // Utils
+
namespace Help {
namespace Internal {
class CentralWidget;
@@ -116,8 +119,8 @@ private:
void setupUi();
void resetFilter();
void activateHelpMode();
- QToolBar *createWidgetToolBar();
- QToolBar *createIconToolBar(bool external);
+ Utils::StyledBar *createWidgetToolBar();
+ Utils::StyledBar *createIconToolBar(bool external);
HelpViewer* viewerForContextMode();
void createRightPaneContextViewer();
@@ -162,8 +165,8 @@ private:
QMenu *m_backMenu;
QMenu *m_nextMenu;
- QToolBar *m_internalHelpBar;
- QToolBar *m_externalHelpBar;
+ Utils::StyledBar *m_internalHelpBar;
+ Utils::StyledBar *m_externalHelpBar;
};
} // namespace Internal
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index 7d6efefed117b0bc69e52b630e4bea0875f065d1..ebe15cb393b8a7f94d3e818f756cdb6c562353bf 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -69,7 +69,6 @@ OpenPagesManager::OpenPagesManager(QObject *parent)
m_comboBox = new QComboBox;
m_comboBox->setModel(m_model);
- m_comboBox->setMinimumContentsLength(40);
m_comboBox->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_comboBox, SIGNAL(activated(int)), this, SLOT(setCurrentPage(int)));
connect(m_comboBox, SIGNAL(customContextMenuRequested(QPoint)), this,
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 9949ef30452825b87cf213ec7944c9f55054a9d0..9b0786f7e826868aae37bb0a9fb9907e52aee056 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -151,13 +151,12 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi)
fi.reportResult(true);
return;
}
- QString workDir = m_environment.expandVariables(m_workingDirectory);
- QDir wd(workDir);
+ QDir wd(m_environment.expandVariables(m_workingDirectory));
if (!wd.exists())
wd.mkpath(wd.absolutePath());
m_process = new QProcess();
- m_process->setWorkingDirectory(workDir);
+ m_process->setWorkingDirectory(wd.absolutePath());
m_process->setEnvironment(m_environment.toStringList());
connect(m_process, SIGNAL(readyReadStandardOutput()),
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 8b589fc05944a27b5d4f7446ed2d406c5b698c77..3bcf9fcc93b661be8c505473620e103a5350cb75 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -328,6 +328,21 @@ void BuildSettingsWidget::deleteConfiguration()
deleteConfiguration(m_buildConfiguration);
}
+QString BuildSettingsWidget::uniqueName(const QString & name)
+{
+ QString result = name.trimmed();
+ if (!result.isEmpty()) {
+ QStringList bcNames;
+ foreach (BuildConfiguration *bc, m_target->buildConfigurations()) {
+ if (bc == m_buildConfiguration)
+ continue;
+ bcNames.append(bc->displayName());
+ }
+ result = Project::makeUnique(result, bcNames);
+ }
+ return result;
+}
+
void BuildSettingsWidget::renameConfiguration()
{
bool ok;
@@ -339,15 +354,10 @@ void BuildSettingsWidget::renameConfiguration()
if (!ok || !this)
return;
- if (!name.isEmpty()) {
- QStringList bcNames;
- foreach (BuildConfiguration *bc, m_target->buildConfigurations()) {
- if (bc == m_buildConfiguration)
- continue;
- bcNames.append(bc->displayName());
- }
- name = Project::makeUnique(name, bcNames);
- }
+ name = uniqueName(name);
+ if (name.isEmpty())
+ return;
+
m_buildConfiguration->setDisplayName(name);
}
@@ -359,15 +369,15 @@ void BuildSettingsWidget::cloneConfiguration(BuildConfiguration *sourceConfigura
return;
//: Title of a the cloned BuildConfiguration window, text of the window
- QString newDisplayName(QInputDialog::getText(this, tr("Clone Configuration"), tr("New configuration name:")));
- if (newDisplayName.isEmpty())
+ QString name = uniqueName(QInputDialog::getText(this, tr("Clone Configuration"), tr("New configuration name:")));
+ if (name.isEmpty())
return;
BuildConfiguration * bc(m_target->buildConfigurationFactory()->clone(m_target, sourceConfiguration));
if (!bc)
return;
- bc->setDisplayName(newDisplayName);
+ bc->setDisplayName(name);
m_target->addBuildConfiguration(bc);
updateBuildSettings();
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h
index 16af2ba60690dfc5590a9159649d5788cccd1930..9b560bb1c36e467a4d48ff142bacad25b9cc9bab 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h
@@ -107,6 +107,7 @@ private slots:
private:
void cloneConfiguration(BuildConfiguration *toClone);
void deleteConfiguration(BuildConfiguration *toDelete);
+ QString uniqueName(const QString & name);
Target *m_target;
BuildConfiguration *m_buildConfiguration;
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index b006691cae0df922a7db396cd3f1d24a3c3d93a7..612ef096457c393c87221b7985a14f4e161f1a39 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -116,10 +116,12 @@ QString DebuggingHelperLibrary::copy(const QString &qtInstallData,
return QString();
}
-QString DebuggingHelperLibrary::build(const QString &directory, const QString &makeCommand,
+bool DebuggingHelperLibrary::build(const QString &directory, const QString &makeCommand,
const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode)
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage)
{
- return buildHelper(QCoreApplication::tr("GDB helper"), QLatin1String("gdbmacros.pro"), directory,
- makeCommand, qmakeCommand, mkspec, env, targetMode);
+ return buildHelper(QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary",
+ "GDB helper"), QLatin1String("gdbmacros.pro"), directory,
+ makeCommand, qmakeCommand, mkspec, env, targetMode, output, errorMessage);
}
diff --git a/src/plugins/projectexplorer/debugginghelper.h b/src/plugins/projectexplorer/debugginghelper.h
index 4185935d63f116d48269f767d8f4bde8278a16bf..38a4e40770bbdd165099cde4b32af8799b0b2423 100644
--- a/src/plugins/projectexplorer/debugginghelper.h
+++ b/src/plugins/projectexplorer/debugginghelper.h
@@ -47,9 +47,10 @@ public:
static QStringList locationsByInstallData(const QString &qtInstallData);
// Build the helpers and return the output log/errormessage.
- static QString build(const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode);
+ static bool build(const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage);
// Copy the source files to a target location and return the chosen target location.
static QString copy(const QString &qtInstallData, QString *errorMessage);
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 68a6c57eb3126a3daae63537ae0168e2be5af731..5384ee5ccb78f39faf3f81d06f52051564486ed1 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -688,11 +688,7 @@ void OutputWindow::appendText(const QString &textIn, const QTextCharFormat &form
bool OutputWindow::isScrollbarAtBottom() const
{
- return isVisible()
- && (blockBoundingRect(document()->lastBlock()).bottom()
- + contentOffset().y() <= viewport()->rect().bottom());
-
- // return verticalScrollBar()->value() == verticalScrollBar()->maximum();
+ return verticalScrollBar()->value() == verticalScrollBar()->maximum();
}
void OutputWindow::clear()
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
index f13cfd60d95815a10b8acb9bc4917371c6229510..0692434fac1f85e95def66d4e440b2377c72bf5b 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>520</width>
+ <width>696</width>
<height>221</height>
</rect>
</property>
@@ -43,7 +43,7 @@
<item>
<widget class="Utils::WelcomeModeLabel" name="recentSessionsTitleLabel">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -70,12 +70,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
- <size>
- <width>270</width>
- <height>130</height>
- </size>
- </property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="Utils::WelcomeModeLabel" name="projTitleLabel">
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index b0d15b9c642d2fc2294c60882c51247cb8e19828..c2bcd078f5ed92ccd80f2ec2deebc9d8731e464d 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -293,15 +293,10 @@ void RunSettingsWidget::renameRunConfiguration()
if (!ok || !this)
return;
- if (!name.isEmpty()) {
- QStringList rcNames;
- foreach (RunConfiguration *rc, m_target->runConfigurations()) {
- if (rc == m_target->activeRunConfiguration())
- continue;
- rcNames.append(rc->displayName());
- }
- name = Project::makeUnique(name, rcNames);
- }
+ name = uniqueRCName(name);
+ if (name.isEmpty())
+ return;
+
m_target->activeRunConfiguration()->setDisplayName(name);
}
@@ -393,15 +388,9 @@ void RunSettingsWidget::renameDeployConfiguration()
if (!ok || !this)
return;
- if (!name.isEmpty()) {
- QStringList dcNames;
- foreach (DeployConfiguration *dc, m_target->deployConfigurations()) {
- if (dc == m_target->activeDeployConfiguration())
- continue;
- dcNames.append(dc->displayName());
- }
- name = Project::makeUnique(name, dcNames);
- }
+ name = uniqueDCName(name);
+ if (name.isEmpty())
+ return;
m_target->activeDeployConfiguration()->setDisplayName(name);
}
@@ -430,3 +419,33 @@ void RunSettingsWidget::updateDeployConfiguration(DeployConfiguration *dc)
m_deploySteps->init(dc->stepList());
m_deployLayout->addWidget(m_deploySteps);
}
+
+QString RunSettingsWidget::uniqueDCName(const QString &name)
+{
+ QString result = name.trimmed();
+ if (!result.isEmpty()) {
+ QStringList dcNames;
+ foreach (DeployConfiguration *dc, m_target->deployConfigurations()) {
+ if (dc == m_target->activeDeployConfiguration())
+ continue;
+ dcNames.append(dc->displayName());
+ }
+ result = Project::makeUnique(result, dcNames);
+ }
+ return result;
+}
+
+QString RunSettingsWidget::uniqueRCName(const QString &name)
+{
+ QString result = name.trimmed();
+ if (!result.isEmpty()) {
+ QStringList rcNames;
+ foreach (RunConfiguration *rc, m_target->runConfigurations()) {
+ if (rc == m_target->activeRunConfiguration())
+ continue;
+ rcNames.append(rc->displayName());
+ }
+ result = Project::makeUnique(result, rcNames);
+ }
+ return result;
+}
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index f90548c1eaa789ecf33e13c4eb6ce6b00f5d2c9a..0117104f7066a06fb3339955bafc1a8a9f42aa0b 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -104,7 +104,10 @@ private slots:
void renameDeployConfiguration();
private:
+ QString uniqueDCName(const QString &name);
+ QString uniqueRCName(const QString &name);
void updateDeployConfiguration(DeployConfiguration *);
+
Target *m_target;
RunConfigurationModel *m_runConfigurationsModel;
DeployConfigurationModel *m_deployConfigurationModel;
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index a492022092e32c2b467c854d6c1f45abdeba6b44..3c96a42c99ca03ab8af2aa98ac4c313e74b0efd8 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -269,8 +269,14 @@ bool SessionFile::save(const QString &fileName)
writer.saveValue(QLatin1String("ProjectDependencies"), QVariant(depMap));
- writer.saveValue(QLatin1String("OpenEditors"),
- m_core->editorManager()->openedEditors().count());
+ int editorCount = 0;
+ QList<Core::IEditor *> editors = m_core->editorManager()->openedEditors();
+ foreach (Core::IEditor *editor, editors) {
+ Q_ASSERT(editor);
+ if (!editor->isTemporary())
+ ++editorCount;
+ }
+ writer.saveValue(QLatin1String("OpenEditors"), editorCount);
writer.saveValue(QLatin1String("EditorSettings"),
m_core->editorManager()->saveState().toBase64());
diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index f3e99da2da25752ce5c9d3a9751f0a469c7bb0a8..77ae505eff7b599861778c78736a20ea6dd0af78 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -109,7 +109,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
foreach (const ModelNode &childNode, nodeList) {
- if (childNode.type() == "QtQuick/Component") {
+ if (childNode.type() == "Qt/Component") {
if (!childNode.id().isEmpty()) {
QStandardItem *item = new QStandardItem(childNode.id());
item->setData(QVariant::fromValue(childNode), ModelNodeRole);
@@ -160,7 +160,7 @@ void ComponentView::variantPropertiesChanged(const QList<VariantProperty>& /*pro
void ComponentView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, PropertyChangeFlags /*propertyChange*/) {}
void ComponentView::rootNodeTypeChanged(const QString &/*type*/, int /*majorVersion*/, int /*minorVersion*/) {}
void ComponentView::scriptFunctionsChanged(const ModelNode &/*node*/, const QStringList &/*scriptFunctionList*/) {}
-void ComponentView::instancePropertyChange(const QList<QPair<ModelNode, QString> > &propertyList) {};
+void ComponentView::instancePropertyChange(const QList<QPair<ModelNode, QString> > &/*propertyList*/) {};
void ComponentView::selectedNodesChanged(const QList<ModelNode> &/*selectedNodeList*/,
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index facc5814839503671456deaa8eaa6c144e952faf..67daf39827ee6725cb465be6e2bc3c36b60c13d0 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -269,7 +269,7 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit *
//m_d->masterModel = Model::create(m_d->textModifier, m_d->searchPath, errors);
- m_d->masterModel = Model::create("QtQick/Rectangle", 4, 7);
+ m_d->masterModel = Model::create("Qt/Rectangle", 4, 7);
#if defined(VIEWLOGGER)
m_d->viewLogger = new Internal::ViewLogger(m_d->model.data());
@@ -278,7 +278,7 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit *
m_d->masterModel->setFileUrl(m_d->searchPath);
- m_d->subComponentModel = Model::create("QtQuick/Rectangle", 4, 7);
+ m_d->subComponentModel = Model::create("Qt/Rectangle", 4, 7);
m_d->subComponentModel->setFileUrl(m_d->searchPath);
m_d->subComponentManager = new SubComponentManager(m_d->masterModel->metaInfo(), this);
@@ -468,7 +468,7 @@ void DesignDocumentController::deleteSelected()
void DesignDocumentController::copySelected()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
model->setMetaInfo(m_d->model->metaInfo());
model->setFileUrl(m_d->model->fileUrl());
foreach (const Import &import, m_d->model->imports())
@@ -514,7 +514,7 @@ void DesignDocumentController::copySelected()
foreach (ModelNode node, view.rootModelNode().allDirectSubModelNodes()) {
node.destroy();
}
- view.changeRootNodeType("QtQuick/Rectangle", 4, 7);
+ view.changeRootNodeType("Qt/Rectangle", 4, 7);
view.rootModelNode().setId("designer__Selection");
foreach (const ModelNode &selectedNode, selectedNodes) {
@@ -766,7 +766,7 @@ QString DesignDocumentController::contextHelpId() const
QString helpId;
if (!nodes.isEmpty()) {
helpId = nodes.first().type();
- helpId.replace("QtQuick/", "QML.");
+ helpId.replace("Qt/", "QML.");
}
return helpId;
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
index c9d91523169d0f42f89f740bd326d2ef9497ec28..6e63157a2b75bf0f43cc2f725b2b213a9f402a18 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
@@ -107,7 +107,7 @@ void DesignDocumentControllerView::fromClipboard()
QString DesignDocumentControllerView::toText() const
{
- QScopedPointer<Model> outputModel(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> outputModel(Model::create("Qt/Rectangle"));
outputModel->setMetaInfo(model()->metaInfo());
QPlainTextEdit textEdit;
textEdit.setPlainText("import Qt 4.7; Item {}");
@@ -129,7 +129,7 @@ QString DesignDocumentControllerView::toText() const
void DesignDocumentControllerView::fromText(QString text)
{
- QScopedPointer<Model> inputModel(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> inputModel(Model::create("Qt/Rectangle"));
inputModel->setMetaInfo(model()->metaInfo());
inputModel->setFileUrl(model()->fileUrl());
QPlainTextEdit textEdit;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 99a995e3b1d2cfb07389895b783f0d4958306e25..3533a95349e2879dd00ba462b78dc7963e3d275e 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -302,7 +302,7 @@ void NavigatorTreeModel::handleChangedItem(QStandardItem *item)
if (node.view()->rewriterView())
node.view()->rewriterView()->renameId(node.id(), item->text());
} else {
- QMessageBox::warning(0, tr("Invalid Id"), item->text() + tr(" is an invalid id"));
+ QMessageBox::warning(0, tr("Invalid Id"), tr("%1 is an invalid id").arg(item->text()));
item->setText(node.id());
}
} else if (item == itemRow.visibilityItem) {
@@ -351,7 +351,7 @@ void NavigatorTreeModel::setView(AbstractView *view)
m_view = view;
m_hiddenProperties.clear();
if (view) {
- ModelNode sampleItemNode(m_view->createModelNode("QtQuick/Item", 4, 7));
+ ModelNode sampleItemNode(m_view->createModelNode("Qt/Item", 4, 7));
m_hiddenProperties << visibleProperties(sampleItemNode);
addSubTree(view->rootModelNode());
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
index 64e03b0dc2bcbde02d6b2c69aa6e019dbe46ea50..3bd5ca8023c6f2d804c910d63d2c4ead5fd567db 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
@@ -806,13 +806,13 @@ void GradientLine::updateGradient()
modelNode.removeProperty(m_gradientName);
}
- ModelNode gradientNode = modelNode.view()->createModelNode("QtQuick/Gradient", 4, 7);
+ ModelNode gradientNode = modelNode.view()->createModelNode("Qt/Gradient", 4, 7);
if (!oldId.isNull())
gradientNode.setId(oldId);
for (int i = 0;i < m_stops.size(); i++) {
- ModelNode gradientStopNode = modelNode.view()->createModelNode("QtQuick/GradientStop", 4, 7);
+ ModelNode gradientStopNode = modelNode.view()->createModelNode("Qt/GradientStop", 4, 7);
gradientStopNode.variantProperty("position") = roundReal(m_stops.at(i));
gradientStopNode.variantProperty("color") = normalizeColor(m_colorList.at(i));
gradientNode.nodeListProperty("stops").reparentHere(gradientStopNode);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 24832155730f62c3edaf2c3387940faca4ee0dfa..51ce941ef32bcbabe73daea9f58eca769fd4ad1c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -310,7 +310,7 @@ PropertyEditor::~PropertyEditor()
void PropertyEditor::setupPane(const QString &typeName)
{
- QUrl qmlFile = fileToUrl(locateQmlFile(QLatin1String("QtQuick/ItemPane.qml")));
+ QUrl qmlFile = fileToUrl(locateQmlFile(QLatin1String("Qt/ItemPane.qml")));
QUrl qmlSpecificsFile;
qmlSpecificsFile = fileToUrl(locateQmlFile(typeName + "Specifics.qml"));
@@ -360,7 +360,7 @@ void PropertyEditor::changeValue(const QString &propertyName)
rewriterView()->renameId(m_selectedNode.id(), newId);
} else {
value->setValue(m_selectedNode.id());
- QMessageBox::warning(0, tr("Invalid Id"), newId + tr(" is an invalid id"));
+ QMessageBox::warning(0, tr("Invalid Id"), tr("%1 is an invalid id").arg(newId));
}
return;
}
@@ -577,7 +577,7 @@ QString templateGeneration(NodeMetaInfo type, NodeMetaInfo superType, const QmlO
"DoubleSpinBoxAlternate {\ntext: \"%1\"\nbackendValue: backendValues.%2\nbaseStateFlag: isBaseState\n}\n"
)).arg(name).arg(properName);
}
- if (typeName == "string" || typeName == "QString" || typeName =="url" || typeName =="QUrl") {
+ if (typeName == "string" || typeName == "QString" || typeName == "QUrl" || typeName == "url") {
qmlTemplate += QString(QLatin1String(
"QWidget {\nlayout: HorizontalLayout {\nLabel {\ntext: \"%1\"\ntoolTip: \"%1\"\n}\nLineEdit {\nbackendValue: backendValues.%2\nbaseStateFlag: isBaseState\n}\n}\n}\n"
)).arg(name).arg(properName);
@@ -716,10 +716,10 @@ void PropertyEditor::modelAttached(Model *model)
m_locked = true;
- setupPane("QtQuick/Rectangle");
- setupPane("QtQuick/Text");
- setupPane("QtQuick/TextInput");
- setupPane("QtQuick/TextEdit");
+ setupPane("Qt/Rectangle");
+ setupPane("Qt/Text");
+ setupPane("Qt/TextInput");
+ setupPane("Qt/TextEdit");
resetView();
m_locked = false;
@@ -895,7 +895,7 @@ QUrl PropertyEditor::qmlForNode(const ModelNode &modelNode, QString &className)
}
}
}
- return fileToUrl(QDir(m_qmlDir).filePath("QtQuick/emptyPane.qml"));
+ return fileToUrl(QDir(m_qmlDir).filePath("Qt/emptyPane.qml"));
}
QString PropertyEditor::locateQmlFile(const QString &relativePath) const
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 8c20d615734a5b034c8ff73963d7a728290a1dce..acda0ca8c565566c4610c3bd4f58e8324b90f29c 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -117,7 +117,7 @@ void StatesEditorView::createState(const QString &name)
qDebug() << __FUNCTION__ << name;
try {
- model()->addImport(Import::createLibraryImport("QtQuick", "1.0"));
+ model()->addImport(Import::createLibraryImport("Qt", "4.7"));
stateRootNode().states().addState(name);
} catch (RewritingException &e) {
QMessageBox::warning(0, "Error", e.description());
diff --git a/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
index 65b15d4d130dc458b01ad818122c5fb5c48d037d..83232f53f28bb66a7c1af499a81da66279554dcb 100644
--- a/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
@@ -195,23 +195,20 @@ void GraphicsObjectNodeInstance::paintRecursively(QGraphicsItem *graphicsItem, Q
void GraphicsObjectNodeInstance::paint(QPainter *painter) const
{
- painter->save();
- Q_ASSERT(graphicsObject());
- if (hasContent()) {
- QStyleOptionGraphicsItem option;
- initOption(graphicsObject(), &option, painter->transform());
- graphicsObject()->paint(painter, &option);
+ if (graphicsObject()) {
+ painter->save();
+ if (hasContent()) {
+ QStyleOptionGraphicsItem option;
+ initOption(graphicsObject(), &option, painter->transform());
+ graphicsObject()->paint(painter, &option);
- }
- foreach(QGraphicsItem *graphicsItem, graphicsObject()->childItems()) {
- QGraphicsObject *graphicsObject = qgraphicsitem_cast<QGraphicsObject*>(graphicsItem);
- if (graphicsObject
- && !nodeInstanceView()->hasInstanceForObject(graphicsObject))
- paintRecursively(graphicsItem, painter);
- }
+ }
+ foreach(QGraphicsItem *graphicsItem, graphicsObject()->childItems())
+ paintRecursively(graphicsItem, painter);
- painter->restore();
+ painter->restore();
+ }
}
QPair<QGraphicsObject*, bool> GraphicsObjectNodeInstance::createGraphicsObject(const NodeMetaInfo &metaInfo, QDeclarativeContext *context)
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
index 2cc7c2fc4d5ddedd4509a4c33f341ebe2fe6a503..acf2c0fb151794fe89cc2693fdf0d43f280f06df 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
@@ -135,33 +135,31 @@ Internal::ObjectNodeInstance::Pointer NodeInstance::createInstance(const NodeMet
if (!metaInfo.isValid())
instance = Internal::DummyNodeInstance::create();
- else if (metaInfo.isSubclassOf("QtWebKit/WebView", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QWidget", 4, 7))
instance = Internal::DummyNodeInstance::create();
- else if (metaInfo.isSubclassOf("QtQuick/QWidget", 1, 0))
- instance = Internal::DummyNodeInstance::create();
- else if (metaInfo.isSubclassOf("QtQuick/QGraphicsView", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QGraphicsView", 4, 7))
instance = Internal::GraphicsViewNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QDeclarativeView", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QDeclarativeView", 4, 7))
instance = Internal::QDeclarativeViewNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QGraphicsWidget", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QGraphicsWidget", 4, 7))
instance = Internal::GraphicsWidgetNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QDeclarativeBasePositioner", 1, 0))
+ else if (metaInfo.isSubclassOf("QDeclarativeBasePositioner", 4, 7))
instance = Internal::PositionerNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Item", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Item", 4, 7))
instance = Internal::QmlGraphicsItemNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QGraphicsScene", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QGraphicsScene", 4, 7))
instance = Internal::GraphicsSceneNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Component", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Component", 4, 7))
instance = Internal::ComponentNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/PropertyChanges", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/PropertyChanges", 4, 7))
instance = Internal::QmlPropertyChangesNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/State", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/State", 4, 7))
instance = Internal::QmlStateNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Transition", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Transition", 4, 7))
instance = Internal::QmlTransitionNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Behavior", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Behavior", 4, 7))
instance = Internal::BehaviorNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QtObject", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QtObject", 4, 7))
instance = Internal::ObjectNodeInstance::create(metaInfo, context, objectToBeWrapped);
else
instance = Internal::DummyNodeInstance::create();
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 6f98f505363a3cd9af5b6520316168268a8d6ca3..30b5d43acd566d90a9dccb7201b75ac0cf2bfed5 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -189,7 +189,7 @@ void NodeInstanceView::resetInstanceProperty(const AbstractProperty &property)
NodeInstance instance = instanceForNode(property.parentModelNode());
Q_ASSERT(instance.isValid());
const QString name = property.name();
- if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 1, 0)) {
+ if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 4, 7)) {
bool statePropertyWasReseted = activeStateInstance().resetStateProperty(instance, name, instance.resetVariant(name));
if (!statePropertyWasReseted)
instance.resetProperty(name);
@@ -207,7 +207,7 @@ void NodeInstanceView::setInstancePropertyBinding(const BindingProperty &propert
const QString expression = property.expression();
- if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 1, 0)) {
+ if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 4, 7)) {
bool stateBindingWasUpdated = activeStateInstance().updateStateBinding(instance, name, expression);
if (!stateBindingWasUpdated) {
if (property.isDynamic())
@@ -243,7 +243,7 @@ void NodeInstanceView::setInstancePropertyVariant(const VariantProperty &propert
const QVariant value = property.value();
- if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 1, 0)) {
+ if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 4, 7)) {
bool stateValueWasUpdated = activeStateInstance().updateStateVariant(instance, name, value);
if (!stateValueWasUpdated) {
if (property.isDynamic())
diff --git a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
index 3937759fa258f104c14373fcbf77b2a8fa4d48f4..f543f9de3ea375ad75b497c3a28523088ce070d3 100644
--- a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
@@ -58,6 +58,9 @@
#include <QFileInfo>
#include <QFileSystemWatcher>
#include <QPixmapCache>
+#ifndef QT_NO_WEBKIT
+#include <QGraphicsWebView>
+#endif
#include <QTextDocument>
@@ -655,7 +658,7 @@ ObjectNodeInstance::Pointer ObjectNodeInstance::create(const NodeMetaInfo &nodeM
return instance;
}
-static void stopAnimation(QObject *object, QObjectList &inspectedObjectList)
+static void stopAnimation(QObject *object)
{
if (object == 0)
return;
@@ -677,57 +680,78 @@ static void stopAnimation(QObject *object, QObjectList &inspectedObjectList)
} else if (timer) {
timer->blockSignals(true);
}
-
- ObjectNodeInstance::removeAnimationsFromComponents(object, inspectedObjectList);
}
-void ObjectNodeInstance::removeAnimationsFromComponents(QObject *object, QObjectList &inspectedObjectList)
+void allSubObject(QObject *object, QObjectList &objectList)
{
- if (inspectedObjectList.contains(object)) // prevent cycles
+ // don't add null pointer and stop if the object is already in the list
+ if (!object || objectList.contains(object))
return;
- inspectedObjectList.append(object);
+ objectList.append(object);
+
for (int index = QObject::staticMetaObject.propertyOffset();
index < object->metaObject()->propertyCount();
index++) {
- QMetaProperty metaProperty = object->metaObject()->property(index);
-
- // search recursive in objects
- if (metaProperty.isReadable()
- && metaProperty.isWritable()
- && QDeclarativeMetaType::isQObject(metaProperty.userType())) {
- QObject *propertyObject = QDeclarativeMetaType::toQObject(metaProperty.read(object));
- if (propertyObject) {
- stopAnimation(object, inspectedObjectList);
- }
- }
-
- // search recursive in objects list
- if (metaProperty.isReadable()
- && QDeclarativeMetaType::isList(metaProperty.userType())) {
- QDeclarativeListReference list(object, metaProperty.name());
- if (list.canCount() && list.canAt()) {
- for (int i = 0; i < list.count(); i++) {
- QObject *propertyObject = list.at(i);
- if (propertyObject) {
- stopAnimation(object, inspectedObjectList);
- }
- }
- }
- }
- }
-
-
- foreach(QObject *object, object->children()) {
- stopAnimation(object, inspectedObjectList);
- }
-
- QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(object);
- if (graphicsObject) {
- foreach(QGraphicsItem *item, graphicsObject->childItems()) {
- stopAnimation(item->toGraphicsObject(), inspectedObjectList);
- }
- }
+ QMetaProperty metaProperty = object->metaObject()->property(index);
+
+ // search recursive in property objects
+ if (metaProperty.isReadable()
+ && metaProperty.isWritable()
+ && QDeclarativeMetaType::isQObject(metaProperty.userType())) {
+ QObject *propertyObject = QDeclarativeMetaType::toQObject(metaProperty.read(object));
+ allSubObject(propertyObject, objectList);
+
+ }
+
+ // search recursive in property object lists
+ if (metaProperty.isReadable()
+ && QDeclarativeMetaType::isList(metaProperty.userType())) {
+ QDeclarativeListReference list(object, metaProperty.name());
+ if (list.canCount() && list.canAt()) {
+ for (int i = 0; i < list.count(); i++) {
+ QObject *propertyObject = list.at(i);
+ allSubObject(propertyObject, objectList);
+
+ }
+ }
+ }
+ }
+
+ // search recursive in object children list
+ foreach(QObject *childObject, object->children()) {
+ allSubObject(childObject, objectList);
+ }
+
+ // search recursive in graphics item childItems list
+ QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(object);
+ if (graphicsObject) {
+ foreach(QGraphicsItem *item, graphicsObject->childItems()) {
+ QGraphicsObject *childObject = item->toGraphicsObject();
+ allSubObject(childObject, objectList);
+ }
+ }
+}
+
+static void disableTiledBackingStore(QObject *object)
+{
+#ifndef QT_NO_WEBKIT
+ QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(object);
+ if (webView)
+ webView->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, false);
+#else
+ Q_UNUSED(object);
+#endif
+}
+
+void ObjectNodeInstance::tweakObjects(QObject *object)
+{
+ QObjectList objectList;
+ allSubObject(object, objectList);
+ foreach(QObject* childObject, objectList) {
+ disableTiledBackingStore(childObject);
+ stopAnimation(childObject);
+ }
}
/*!
@@ -750,8 +774,6 @@ QObject *ObjectNodeInstance::createInstance(const NodeMetaInfo &metaInfo, QDecla
QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(metaInfo.componentString()));
QDeclarativeContext *newContext = new QDeclarativeContext(context);
object = component.beginCreate(newContext);
- QObjectList inspectedObjectList;
- removeAnimationsFromComponents(object, inspectedObjectList);
component.completeCreate();
newContext->setParent(object);
} else {
@@ -771,6 +793,8 @@ QObject *ObjectNodeInstance::createInstance(const NodeMetaInfo &metaInfo, QDecla
QDeclarativeEngine::setObjectOwnership(object, QDeclarativeEngine::CppOwnership);
+ tweakObjects(object);
+
return object;
}
@@ -781,11 +805,6 @@ QObject* ObjectNodeInstance::createObject(const NodeMetaInfo &metaInfo, QDeclara
if (object == 0)
throw InvalidNodeInstanceException(__LINE__, __FUNCTION__, __FILE__);
- if (metaInfo.isComponent()) {
- QObjectList inspectedObjectList;
- removeAnimationsFromComponents(object, inspectedObjectList);
- }
-
return object;
}
diff --git a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h
index f62963cf44933a636817fdf9604f3fcc51bc741c..2f7715d10322bf93e962864fca4b4310fa6e415d 100644
--- a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h
+++ b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h
@@ -181,7 +181,7 @@ public:
virtual bool updateStateBinding(const NodeInstance &target, const QString &propertyName, const QString &expression);
virtual bool resetStateProperty(const NodeInstance &target, const QString &propertyName, const QVariant &resetValue);
- static void removeAnimationsFromComponents(QObject *object, QObjectList &inspectedObjectList);
+ static void tweakObjects(QObject *object);
NodeInstance nodeInstanceParentForObject(QObject *currentObject) const;
diff --git a/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp
index 732502e7a995e6db1db4f23cbe398f5676d1adac..ecb5ec5ae122637448e824aa3b98037ad4da375f 100644
--- a/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp
@@ -44,7 +44,7 @@ ProxyWidgetNodeInstance::ProxyWidgetNodeInstance(QGraphicsProxyWidget *widget)
ProxyWidgetNodeInstance::Pointer ProxyWidgetNodeInstance::create(const QString &typeName)
{
- QObject *object = QDeclarativeMetaType::qmlType(typeName.toLatin1(), 1, 0)->create();
+ QObject *object = QDeclarativeMetaType::qmlType(typeName.toLatin1(), 4, 7)->create();
Q_ASSERT(object);
if (object == 0)
return Pointer();
diff --git a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
index 524da7551a4e0f72969930a3013ba7f2e0bf49c3..c59359a87df401ec95b358cd79dc6f02864d06f0 100644
--- a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
@@ -320,6 +320,7 @@ void QmlGraphicsItemNodeInstance::doComponentComplete()
if (static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(qmlGraphicsItem()))->componentComplete)
return;
static_cast<QDeclarativeParserStatus*>(qmlGraphicsItem())->componentComplete();
+ QGraphicsItemPrivate::get(qmlGraphicsItem())->sendParentChangeNotification = 1;
}
}
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index 61f8bf7b27b592d28229810d648b324143262f6a..69ed6f52c75d35ba1a4261d4b0ccf454aa751308 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -129,7 +129,7 @@ void MetaInfoPrivate::loadPlugins(QDeclarativeEngine *engine)
QDeclarativeComponent pluginComponent(engine, 0);
QStringList pluginList;
- pluginList += "import QtQuick 1.0";
+ pluginList += "import Qt 4.7";
pluginList += "import QtWebKit 1.0";
// load maybe useful plugins
@@ -279,10 +279,10 @@ QList<QDeclarativeType*> MetaInfoPrivate::qmlTypes()
static inline bool isDepricatedQtType(const QString &typeName)
{
- if (typeName.length() < 3)
+ if (typeName.length() < 8)
return false;
- return (typeName.at(0) == 'Q' && typeName.at(1) == 't' && typeName.at(2) == '/');
+ return typeName.contains("QtQuick/");
}
void MetaInfoPrivate::typeInfo(const QMetaObject *qMetaObject, QString *typeName, int *majorVersion, int *minorVersion) const
@@ -304,7 +304,7 @@ void MetaInfoPrivate::typeInfo(const QMetaObject *qMetaObject, QString *typeName
}
if (isDepricatedQtType(qmlType->qmlTypeName())) { //### todo there has to be an alternative
QString properTypeName = qmlType->qmlTypeName();
- properTypeName.replace("Qt/", "QtQuick/");
+ properTypeName.replace("QtQuick/", "Qt/");
*typeName = properTypeName;
majVersion = 1;
minVersion = 0;
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index dbd6c973d13dec8242a695e3382f41619cd3e16a..81fb3552bf147a65e29d1584c916acff17db253b 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -328,10 +328,10 @@ void SubComponentManagerPrivate::unregisterQmlFile(const QFileInfo &fileInfo, co
static inline bool isDepricatedQtType(const QString &typeName)
{
- if (typeName.length() < 3)
+ if (typeName.length() < 8)
return false;
- return (typeName.at(0) == 'Q' && typeName.at(1) == 't' && typeName.at(2) == '/');
+ return typeName.contains("QtQuick/");
}
@@ -366,7 +366,7 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
rootObject.objectTypeMinorVersion());
} else {
QString properClassName = rootObject.objectType();
- properClassName.replace("Qt/", "QtQuick/");
+ properClassName.replace("QtQuick/", "Qt/");
nodeInfo.setSuperClass(properClassName,
1,
0);
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 56035fb53ff25dcf8a318d81d322bfa089dff432..8a714b1bf99cdb46cdb40cdfc4894e65adbd6343 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -90,7 +90,7 @@ ModelPrivate::ModelPrivate(Model *model) :
m_q(model),
m_writeLock(false)
{
- m_rootInternalNode = createNode("QtQuick/Item", 1, 0, PropertyListType());
+ m_rootInternalNode = createNode("Qt/Item", 4, 7, PropertyListType());
}
ModelPrivate::~ModelPrivate()
diff --git a/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp b/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp
index ad5b5ab829478159350c740d5b71195ab98576af..111d98091ceabfbe1f9803bebf03a86c4e73b8c4 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp
@@ -51,12 +51,12 @@ void QmlModelStateOperation::setTarget(const ModelNode &target)
bool QmlPropertyChanges::isValid() const
{
- return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("QtQuick/PropertyChanges", 1, 0);
+ return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("Qt/PropertyChanges", 4, 7);
}
bool QmlModelStateOperation::isValid() const
{
- return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("QDeclarativeStateOperation", 1, 0);
+ return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("QDeclarativeStateOperation", 4, 7);
}
void QmlPropertyChanges::removeProperty(const QString &name)
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index dd3426c53a91487341977a52f4efce007e3f8f55..8a6369475ac1cdcc70c74228a0a65cf715220a77 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -46,7 +46,7 @@ namespace QmlDesigner {
bool QmlItemNode::isValid() const
{
- return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().isSubclassOf("QtQuick/Item", 1, 0);
+ return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().isSubclassOf("Qt/Item", 4, 7);
}
bool QmlItemNode::isRootNode() const
@@ -302,7 +302,7 @@ QmlModelState QmlModelStateGroup::addState(const QString &name)
PropertyListType propertyList;
propertyList.append(qMakePair(QString("name"), QVariant(name)));
- ModelNode newState = modelNode().view()->createModelNode("QtQuick/State", 1, 0, propertyList);
+ ModelNode newState = modelNode().view()->createModelNode("Qt/State", 4, 7, propertyList);
modelNode().nodeListProperty("states").reparentHere(newState);
return newState;
diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
index e9dfbad5399969588f65d128499fcdd78282c557..191114bf1b7fcdf2aed65099d05fe70e7f3d63a1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
@@ -98,8 +98,8 @@ QmlItemNode QmlModelView::createQmlItemNodeFromImage(const QString &imageName, c
QmlItemNode newNode;
RewriterTransaction transaction = beginRewriterTransaction();
{
- const QString newImportUrl = QLatin1String("QtQuick");
- const QString newImportVersion = QLatin1String("1.0");
+ const QString newImportUrl = QLatin1String("Qt");
+ const QString newImportVersion = QLatin1String("4.7");
Import newImport = Import::createLibraryImport(newImportUrl, newImportVersion);
foreach (const Import &import, model()->imports()) {
@@ -129,7 +129,7 @@ QmlItemNode QmlModelView::createQmlItemNodeFromImage(const QString &imageName, c
}
propertyPairList.append(qMakePair(QString("source"), QVariant(relativeImageName)));
- newNode = createQmlItemNode("QtQuick/Image", 1, 0, propertyPairList);
+ newNode = createQmlItemNode("Qt/Image", 4, 7, propertyPairList);
parentNode.nodeAbstractProperty("data").reparentHere(newNode);
Q_ASSERT(newNode.isValid());
diff --git a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp
index 934f32d528f1ff220c737149b17095180f67e05d..bd17f083f17c5861ceced091925fe7ad30d91cc1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp
@@ -179,7 +179,7 @@ void QmlModelState::addChangeSetIfNotExists(const ModelNode &node)
return; //changeSet already there
}
- ModelNode newChangeSet = modelNode().view()->createModelNode("QtQuick/PropertyChanges", 1, 0);
+ ModelNode newChangeSet = modelNode().view()->createModelNode("Qt/PropertyChanges", 4, 7);
modelNode().nodeListProperty("changes").reparentHere(newChangeSet);
QmlPropertyChanges(newChangeSet).setTarget(node);
@@ -246,7 +246,7 @@ bool QmlModelState::isValid() const
{
return QmlModelNodeFacade::isValid() &&
modelNode().metaInfo().isValid() &&
- (modelNode().metaInfo().isSubclassOf("QtQuick/State", 1, 0) || isBaseState());
+ (modelNode().metaInfo().isSubclassOf("Qt/State", 4, 7) || isBaseState());
}
/**
@@ -280,7 +280,7 @@ QmlModelState QmlModelState::duplicate(const QString &name) const
// QmlModelState newState(stateGroup().addState(name));
PropertyListType propertyList;
propertyList.append(qMakePair(QString("name"), QVariant(name)));
- QmlModelState newState ( qmlModelView()->createModelNode("QtQuick/State", 1, 0, propertyList) );
+ QmlModelState newState ( qmlModelView()->createModelNode("Qt/State", 4, 7, propertyList) );
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
ModelNode newModelNode(qmlModelView()->createModelNode(childNode.type(), childNode.majorVersion(), childNode.minorVersion()));
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 4b4d9d6bd5f340e0648e3640647a90cc34f5e3f8..5b6765228958226f21de3d7ed9202a6d7e0fffcc 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -591,38 +591,15 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
setupImports(doc, differenceHandler);
foreach (const Import &import, m_rewriterView->model()->imports()) {
- if (import.url() == "Qt") {
- if (QMessageBox::question (0, QObject::tr("Deprecated import: import Qt 4.7", "QmlDesigner::TextToModelMerger"),
- QObject::tr("Deprecated import: import Qt 4.7\nuse import QtQuick 1.0 instead.\n\nDo you want to automatically fix the import?",
- "QmlDesigner::TextToModelMerger"),
- QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok) == QMessageBox::Ok) {
- QmlDesigner::QmlRefactoring refactoring(doc, *m_rewriterView->textModifier(), QStringList());
- RemoveImportRewriteAction removeImportRewriteAction(import);
-
- m_rewriterView->textModifier()->startGroup();
-
- Import qtQuickImport = Import::createLibraryImport("QtQuick", "1.0");
- AddImportRewriteAction addImportRewriteAction(qtQuickImport);
- bool success = addImportRewriteAction.execute(refactoring, *m_rewriterView->positionStorage());
-
- if (success) {
- success = refactoring.reparseDocument();
- }
- success = removeImportRewriteAction.execute(refactoring, *m_rewriterView->positionStorage());
-
- m_rewriterView->textModifier()->commitGroup();
-
- return false;
- } else {
+ if (import.url() == "QtQuick") {
QList<RewriterView::Error> errors;
- RewriterView::Error error(QObject::tr("Deprecated import: import Qt 4.7 use import QtQuick 1.0 instead",
- "QmlDesigner::TextToModelMerger"));
+ RewriterView::Error error(QCoreApplication::translate("QmlDesigner::TextToModelMerger",
+ "Unsupported import:\nimport QtQuick 1.0 use import Qt 4.7 instead"));
errors.append(error);
m_rewriterView->setErrors(errors);
return false;
}
}
- }
UiObjectMember *astRootNode = 0;
if (UiProgram *program = doc->qmlProgram())
@@ -704,7 +681,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (UiArrayBinding *array = cast<UiArrayBinding *>(member)) {
const QString astPropertyName = flatten(array->qualifiedId);
- if (typeName == QLatin1String("QtQuick/PropertyChanges") || context->lookupProperty(QString(), array->qualifiedId)) {
+ if (typeName == QLatin1String("Qt/PropertyChanges") || context->lookupProperty(QString(), array->qualifiedId)) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
QList<UiObjectMember *> arrayMembers;
for (UiArrayMemberList *iter = array->members; iter; iter = iter->next)
@@ -738,7 +715,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
const Interpreter::Value *propertyType = 0;
const Interpreter::ObjectValue *containingObject = 0;
QString name;
- if (context->lookupProperty(QString(), binding->qualifiedId, &propertyType, &containingObject, &name) || typeName == QLatin1String("QtQuick/PropertyChanges")) {
+ if (context->lookupProperty(QString(), binding->qualifiedId, &propertyType, &containingObject, &name) || typeName == QLatin1String("Qt/PropertyChanges")) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
if (context->isArrayProperty(propertyType, containingObject, name)) {
syncArrayProperty(modelProperty, QList<QmlJS::AST::UiObjectMember*>() << member, context, differenceHandler);
@@ -782,7 +759,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (!defaultPropertyItems.isEmpty()) {
if (defaultPropertyName.isEmpty()) {
- if (modelNode.type() != QLatin1String("QtQuick/Component"))
+ if (modelNode.type() != QLatin1String("Qt/Component"))
qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items.";
} else {
AbstractProperty modelProperty = modelNode.property(defaultPropertyName);
@@ -842,7 +819,7 @@ QString TextToModelMerger::syncScriptBinding(ModelNode &modelNode,
return QString();
if (isLiteralValue(script)) {
- if (modelNode.type() == QLatin1String("QtQuick/PropertyChanges")) {
+ if (modelNode.type() == QLatin1String("Qt/PropertyChanges")) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
const QVariant variantValue(deEscape(stripQuotes(astValue)));
syncVariantProperty(modelProperty, variantValue, QString(), differenceHandler);
@@ -867,7 +844,7 @@ QString TextToModelMerger::syncScriptBinding(ModelNode &modelNode,
syncVariantProperty(modelProperty, enumValue, QString(), differenceHandler);
return astPropertyName;
} else { // Not an enum, so:
- if (modelNode.type() == QLatin1String("QtQuick/PropertyChanges") || context->lookupProperty(prefix, script->qualifiedId)) {
+ if (modelNode.type() == QLatin1String("Qt/PropertyChanges") || context->lookupProperty(prefix, script->qualifiedId)) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
syncExpressionProperty(modelProperty, astValue, differenceHandler);
return astPropertyName;
@@ -996,7 +973,7 @@ void TextToModelMerger::syncNodeListProperty(NodeListProperty &modelListProperty
QString name;
if (UiObjectDefinition *definition = cast<UiObjectDefinition *>(arrayMember))
name = flatten(definition->qualifiedTypeNameId);
- if (name == QLatin1String("QtQuick/Component"))
+ if (name == QLatin1String("Qt/Component"))
setupComponent(newNode);
}
@@ -1310,7 +1287,7 @@ void ModelAmender::idsDiffer(ModelNode &modelNode, const QString &qmlId)
void TextToModelMerger::setupComponent(const ModelNode &node)
{
- Q_ASSERT(node.type() == QLatin1String("QtQuick/Component"));
+ Q_ASSERT(node.type() == QLatin1String("Qt/Component"));
QString componentText = m_rewriterView->extractText(QList<ModelNode>() << node).value(node);
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index 1480471785db97b5cc149c97ca416080e195f480..f4e419ad09e1920963f6f9fa8b1297c776db4728 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -38,8 +38,8 @@ namespace QmlDesigner {
QtQuickPlugin::QtQuickPlugin()
{
- qmlRegisterType<QDeclarativePen>("QtQuick", 1, 0, "Pen");
- qmlRegisterType<QDeclarativeScaleGrid>("QtQuick", 1, 0, "ScaleGrid");
+ qmlRegisterType<QDeclarativePen>("Qt", 4, 7, "Pen");
+ qmlRegisterType<QDeclarativeScaleGrid>("Qt", 4, 7, "ScaleGrid");
}
QString QtQuickPlugin::pluginName()
diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
index 4c828305a62fc57eaaa35fe853f20bff47594ea5..139a82bc056dbb7f80ebb1400392938b8c93f2ae 100644
--- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
+++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
@@ -1,5 +1,5 @@
<metainfo>
- <node name="QtQuick/Item" isContainer="true" icon=":/qtquickplugin/images/item-icon16.png">
+ <node name="Qt/Item" isContainer="true" icon=":/qtquickplugin/images/item-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="600"/>
<propertyDefaultValue name="height" type="int" defaultValue="400"/>
<itemlibraryentry name="Item" category="Qt - Basic" icon=":/qtquickplugin/images/item-icon.png">
@@ -7,14 +7,14 @@
<property name="height" type="int" value="200"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Rectangle" category="Qt - Basic" isContainer="true" icon=":/qtquickplugin/images/rect-icon16.png">
+ <node name="Qt/Rectangle" category="Qt - Basic" isContainer="true" icon=":/qtquickplugin/images/rect-icon16.png">
<itemlibraryentry name="Rectangle" category="Qt - Basic" icon=":/qtquickplugin/images/rect-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="color" type="QColor" value="#ffffff"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Text" icon=":/qtquickplugin/images/text-icon16.png">
+ <node name="Qt/Text" icon=":/qtquickplugin/images/text-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
<itemlibraryentry name="Text" category="Qt - Basic" icon=":/qtquickplugin/images/text-icon.png">
@@ -23,7 +23,7 @@
<property name="text" type="QString" value="text"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/TextEdit" isContainer="false" icon=":/qtquickplugin/images/text-edit-icon16.png">
+ <node name="Qt/TextEdit" isContainer="false" icon=":/qtquickplugin/images/text-edit-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
<itemlibraryentry name="Text Edit" category="Qt - Basic" icon=":/qtquickplugin/images/text-edit-icon.png">
@@ -32,7 +32,7 @@
<property name="text" type="QString" value="textEdit"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/TextInput" isContainer="false" icon=":/qtquickplugin/images/text-input-icon16.png">
+ <node name="Qt/TextInput" isContainer="false" icon=":/qtquickplugin/images/text-input-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
<itemlibraryentry name="Text Input" category="Qt - Basic" icon=":/qtquickplugin/images/text-input-icon.png">
@@ -41,13 +41,13 @@
<property name="text" type="QString" value="textInput"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/MouseArea" icon=":/qtquickplugin/images/mouse-area-icon16.png">
+ <node name="Qt/MouseArea" icon=":/qtquickplugin/images/mouse-area-icon16.png">
<itemlibraryentry name="Mouse Area" category="Qt - Interaction" icon=":/qtquickplugin/images/mouse-area-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Image" isContainer="true" icon=":/qtquickplugin/images/image-icon16.png">
+ <node name="Qt/Image" isContainer="true" icon=":/qtquickplugin/images/image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
<itemlibraryentry name="Image" category="Qt - Basic" icon=":/qtquickplugin/images/image-icon.png">
@@ -56,7 +56,7 @@
<property name="source" type="QUrl" value="qrc:/qtquickplugin/images/template_image.png"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/BorderImage" icon=":/qtquickplugin/images/border-image-icon16.png">
+ <node name="Qt/BorderImage" icon=":/qtquickplugin/images/border-image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
<itemlibraryentry name="Border Image" category="Qt - Basic" icon=":/qtquickplugin/images/border-image-icon.png">
@@ -65,7 +65,7 @@
<property name="source" type="QUrl" value="qrc:/qtquickplugin/images/template_image.png"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Flickable" icon=":/qtquickplugin/images/flickable-icon16.png">
+ <node name="Qt/Flickable" icon=":/qtquickplugin/images/flickable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
<itemlibraryentry name="Flickable" category="Qt - Widgets" icon=":/qtquickplugin/images/flickable-icon.png">
@@ -73,7 +73,7 @@
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Flipable" icon=":/qtquickplugin/images/flipable-icon16.png">
+ <node name="Qt/Flipable" icon=":/qtquickplugin/images/flipable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
<itemlibraryentry name="Flipable" category="Qt - Widgets" icon=":/qtquickplugin/images/flipable-icon.png">
@@ -81,28 +81,28 @@
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/GridView" icon=":/qtquickplugin/images/gridview-icon16.png">
+ <node name="Qt/GridView" icon=":/qtquickplugin/images/gridview-icon16.png">
<itemlibraryentry name="Grid View" category="Qt - Views" icon=":/qtquickplugin/images/gridview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/ListView" icon=":/qtquickplugin/images/listview-icon16.png">
+ <node name="Qt/ListView" icon=":/qtquickplugin/images/listview-icon16.png">
<itemlibraryentry name="List View" category="Qt - Views" icon=":/qtquickplugin/images/listview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/PathView" icon=":/qtquickplugin/images/pathview-icon16.png">
+ <node name="Qt/PathView" icon=":/qtquickplugin/images/pathview-icon16.png">
<itemlibraryentry name="Path View" category="Qt - Views" icon=":/qtquickplugin/images/pathview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/FocusScope" icon=":/qtquickplugin/images/focusscope-icon16.png">
+ <node name="Qt/FocusScope" icon=":/qtquickplugin/images/focusscope-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="100"/>
<propertyDefaultValue name="height" type="int" defaultValue="100"/>
<itemlibraryentry name="Focus Scope" category="Qt - Interaction" icon=":/qtquickplugin/images/focusscope-icon.png">
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index c3a465b27b5db0f975019b57f4e24935ccc93042..52d6a545b17abb6996d79583f3813474f729e3ab 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -973,7 +973,7 @@ void QmlJSTextEditor::updateOutlineIndexNow()
}
}
-static UiQualifiedId *qualifiedTypeNameId(UiObjectMember *m)
+static UiQualifiedId *qualifiedTypeNameId(Node *m)
{
if (UiObjectDefinition *def = cast<UiObjectDefinition *>(m))
return def->qualifiedTypeNameId;
@@ -1489,10 +1489,22 @@ void QmlJSTextEditor::updateToolTipNow()
if (m_contextPane && m_semanticInfo.isValid()) {
Node *newNode = m_semanticInfo.declaringMemberNoProperties(m_toolTipPosition);
- m_contextPane->apply(editableInterface(), m_semanticInfo.lookupContext(), newNode, false, true);
- m_oldCursorPosition = m_toolTipPosition;
- QList<TextEditor::Internal::RefactorMarker> markers;
- setRefactorMarkers(markers);
+ if (m_contextPane->isAvailable(editableInterface(), m_semanticInfo.lookupContext(), newNode)) {
+ if (UiQualifiedId *q = qualifiedTypeNameId(newNode)) {
+ const int start = q->identifierToken.begin();
+ for (; q; q = q->next) {
+ if (! q->next) {
+ const int end = q->identifierToken.end();
+ if (m_toolTipPosition >= start && m_toolTipPosition <= end) {
+ m_contextPane->apply(editableInterface(), m_semanticInfo.lookupContext(), newNode, false, true);
+ m_oldCursorPosition = m_toolTipPosition;
+ QList<TextEditor::Internal::RefactorMarker> markers;
+ setRefactorMarkers(markers);
+ }
+ }
+ }
+ }
+ }
}
}
@@ -1578,7 +1590,7 @@ void QmlJSTextEditor::wheelEvent(QWheelEvent *event)
LookupContext::Ptr lookupContext;
if (m_semanticInfo.isValid())
lookupContext = m_semanticInfo.lookupContext();
- m_contextPane->apply(editableInterface(), lookupContext, m_semanticInfo.declaringMemberNoProperties(position()), false, true);
+ m_contextPane->apply(editableInterface(), lookupContext, m_semanticInfo.declaringMemberNoProperties(m_oldCursorPosition), false, true);
}
}
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index b2a44a93666ebf8366d3be43af4ad20495a8ad9c..c98ca0e6a53867600bd848d65b3398a5d736c755 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -28,9 +28,6 @@ namespace Internal {
QmlOutlineItem::QmlOutlineItem(QmlOutlineModel *model) :
m_outlineModel(model)
{
- Qt::ItemFlags defaultFlags = flags();
- setFlags(Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags);
- setEditable(false);
}
QVariant QmlOutlineItem::data(int role) const
@@ -242,8 +239,9 @@ private:
int indent;
};
-QmlOutlineModel::QmlOutlineModel(QObject *parent) :
- QStandardItemModel(parent)
+QmlOutlineModel::QmlOutlineModel(QmlJSTextEditor *editor) :
+ QStandardItemModel(editor),
+ m_textEditor(editor)
{
m_icons = Icons::instance();
const QString resourcePath = Core::ICore::instance()->resourcePath();
@@ -335,6 +333,25 @@ bool QmlOutlineModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
return false;
}
+Qt::ItemFlags QmlOutlineModel::flags(const QModelIndex &index) const
+{
+ if (!index.isValid())
+ return QStandardItemModel::flags(index);
+
+ Qt::ItemFlags flags = Qt::ItemIsSelectable|Qt::ItemIsEnabled;
+
+ // only allow drag&drop if we're in sync
+ if (m_semanticInfo.isValid()
+ && m_semanticInfo.revision() == m_textEditor->editorRevision()) {
+ if (index.parent().isValid())
+ flags |= Qt::ItemIsDragEnabled;
+ if (index.data(ItemTypeRole) != NonElementBindingType)
+ flags |= Qt::ItemIsDropEnabled;
+ }
+ return flags;
+}
+
+
Document::Ptr QmlOutlineModel::document() const
{
return m_semanticInfo.document;
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h
index 8d31ee7c68b53ecae1191b529817da0f3513ab67..3717faa450b7584994e473dfcdb7f94ef842d13d 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.h
+++ b/src/plugins/qmljseditor/qmloutlinemodel.h
@@ -55,12 +55,13 @@ public:
NonElementBindingType // can be filtered out
};
- QmlOutlineModel(QObject *parent = 0);
+ QmlOutlineModel(QmlJSTextEditor *editor);
// QStandardItemModel
QStringList mimeTypes() const;
QMimeData *mimeData(const QModelIndexList &indexes) const;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
+ Qt::ItemFlags flags(const QModelIndex &index) const;
QmlJS::Document::Ptr document() const;
void update(const SemanticInfo &semanticInfo);
@@ -124,6 +125,7 @@ private:
QHash<QmlOutlineItem*,QIcon> m_itemToIcon;
QHash<QmlOutlineItem*,QmlJS::AST::Node*> m_itemToNode;
QHash<QmlOutlineItem*,QmlJS::AST::UiQualifiedId*> m_itemToIdNode;
+ QmlJSTextEditor *m_textEditor;
friend class QmlOutlineModelSync;
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
index bedec7dc30353951856b7790a45a7db5368ef6b4..a40c2afa7b6071016d9c63e8ec5c14e16e645e83 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp
@@ -59,7 +59,7 @@ static QToolButton *createToolButton(QAction *action)
QmlInspectorToolbar::QmlInspectorToolbar(QObject *parent) :
QObject(parent),
m_observerModeAction(0),
- m_reloadAction(0),
+// m_reloadAction(0),
m_playAction(0),
m_selectAction(0),
m_zoomAction(0),
@@ -91,7 +91,7 @@ void QmlInspectorToolbar::setEnabled(bool value)
//m_toQmlAction->setEnabled(value);
m_fromQmlAction->setEnabled(value);
- m_reloadAction->setEnabled(value);
+// m_reloadAction->setEnabled(value);
m_playAction->setEnabled(value);
m_selectAction->setEnabled(value);
m_zoomAction->setEnabled(value);
@@ -178,10 +178,10 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
- m_fromQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-small.png")), tr("Apply Changes to Document"), this);
- m_observerModeAction = new QAction(QIcon(QLatin1String(":/qml/images/observermode.png")), tr("Observer Mode"), this);
+ m_fromQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-small.png")), tr("Apply Changes on Save"), this);
+// m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), tr("Reload QML"), this);
- m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), tr("Reload"), this);
+ m_observerModeAction = new QAction(QIcon(QLatin1String(":/qml/images/observermode.png")), tr("Observer Mode"), this);
m_playAction = new QAction(m_pauseIcon, tr("Play/Pause Animations"), this);
m_selectAction = new QAction(QIcon(QLatin1String(":/qml/images/select-small.png")), tr("Select"), this);
m_zoomAction = new QAction(QIcon(QLatin1String(":/qml/images/zoom-small.png")), tr("Zoom"), this);
@@ -198,7 +198,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
m_fromQmlAction->setChecked(true);
am->registerAction(m_observerModeAction, QmlJSInspector::Constants::DESIGNMODE_ACTION, context);
- am->registerAction(m_reloadAction, QmlJSInspector::Constants::RELOAD_ACTION, context);
+// am->registerAction(m_reloadAction, QmlJSInspector::Constants::RELOAD_ACTION, context);
am->registerAction(m_playAction, QmlJSInspector::Constants::PLAY_ACTION, context);
am->registerAction(m_selectAction, QmlJSInspector::Constants::SELECT_ACTION, context);
am->registerAction(m_zoomAction, QmlJSInspector::Constants::ZOOM_ACTION, context);
@@ -248,9 +248,10 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
// configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::DEBUG)->action()));
// configBarLayout->addWidget(createToolButton(am->command(ProjectExplorer::Constants::STOP)->action()));
configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::FROM_QML_ACTION)->action()));
- configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::DESIGNMODE_ACTION)->action()));
- configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::RELOAD_ACTION)->action()));
+// configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::RELOAD_ACTION)->action()));
+ configBarLayout->addSpacing(10);
+ configBarLayout->addWidget(createToolButton(am->command(QmlJSInspector::Constants::DESIGNMODE_ACTION)->action()));
m_playButton = createToolButton(am->command(QmlJSInspector::Constants::PLAY_ACTION)->action());
m_playButton->setMenu(playSpeedMenu);
configBarLayout->addWidget(m_playButton);
@@ -277,7 +278,7 @@ void QmlInspectorToolbar::createActions(const Core::Context &context)
setEnabled(false);
connect(m_observerModeAction, SIGNAL(triggered()), SLOT(activateDesignModeOnClick()));
- connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
+// connect(m_reloadAction, SIGNAL(triggered()), SIGNAL(reloadSelected()));
connect(m_colorPickerAction, SIGNAL(triggered()), SLOT(activateColorPickerOnClick()));
@@ -330,7 +331,7 @@ void QmlInspectorToolbar::activateDesignModeOnClick()
{
bool checked = m_observerModeAction->isChecked();
- m_reloadAction->setEnabled(true);
+// m_reloadAction->setEnabled(true);
m_playAction->setEnabled(checked);
m_selectAction->setEnabled(checked);
m_zoomAction->setEnabled(checked);
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
index 31fa02f860440d46c486010820ef3de5f7cc9fde..09902706464246129862419bbc78b8dffcb1a2ff 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
@@ -116,7 +116,7 @@ private slots:
private:
QAction *m_observerModeAction;
- QAction *m_reloadAction;
+// QAction *m_reloadAction;
QAction *m_playAction;
QAction *m_selectAction;
QAction *m_zoomAction;
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
index 42f15c14d8786d01c1a6439892c2e4477e6869d0..069378b6fcfb145bf504f11a9c50f8c889a846de 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
@@ -44,6 +44,10 @@
#include <QAbstractSocket>
#include <QDebug>
+enum {
+ debug = false
+};
+
using namespace QmlJSInspector::Internal;
ClientProxy::ClientProxy(Debugger::QmlAdapter *adapter, QObject *parent)
@@ -266,7 +270,8 @@ bool ClientProxy::setBindingForObject(int objectDebugId,
const QVariant &value,
bool isLiteralValue)
{
- qDebug() << "setBindingForObject():" << objectDebugId << propertyName << value;
+ if (debug)
+ qDebug() << "setBindingForObject():" << objectDebugId << propertyName << value;
if (objectDebugId == -1)
return false;
@@ -280,7 +285,8 @@ bool ClientProxy::setBindingForObject(int objectDebugId,
bool ClientProxy::setMethodBodyForObject(int objectDebugId, const QString &methodName, const QString &methodBody)
{
- qDebug() << "setMethodBodyForObject():" << objectDebugId << methodName << methodBody;
+ if (debug)
+ qDebug() << "setMethodBodyForObject():" << objectDebugId << methodName << methodBody;
if (objectDebugId == -1)
return 0;
return m_client->setMethodBody(objectDebugId, methodName, methodBody);
@@ -288,7 +294,8 @@ bool ClientProxy::setMethodBodyForObject(int objectDebugId, const QString &metho
bool ClientProxy::resetBindingForObject(int objectDebugId, const QString& propertyName)
{
- qDebug() << "resetBindingForObject():" << objectDebugId << propertyName;
+ if (debug)
+ qDebug() << "resetBindingForObject():" << objectDebugId << propertyName;
if (objectDebugId == -1)
return false;
// if (propertyName == QLatin1String("id")) return false;
@@ -297,6 +304,8 @@ bool ClientProxy::resetBindingForObject(int objectDebugId, const QString& proper
QDeclarativeDebugExpressionQuery *ClientProxy::queryExpressionResult(int objectDebugId, const QString &expr, QObject *parent)
{
+ if (debug)
+ qDebug() << "queryExpressionResult():" << objectDebugId << expr << parent;
if (objectDebugId != -1)
return m_client->queryExpressionResult(objectDebugId,expr,parent);
return 0;
@@ -401,14 +410,14 @@ void ClientProxy::buildDebugIdHashRecursive(const QDeclarativeDebugObjectReferen
int rev = 0;
// handle the case where the url contains the revision number encoded. (for object created by the debugger)
- static QRegExp rx("^(.*)_(\\d+):(\\d+)$");
+ static QRegExp rx("^file://(.*)_(\\d+):(\\d+)$");
if (rx.exactMatch(filename)) {
filename = rx.cap(1);
rev = rx.cap(2).toInt();
lineNum += rx.cap(3).toInt() - 1;
}
- //convert the filename to a canonical filename in case of febug build.
+ //convert the filename to a canonical filename in case of shadow build.
bool isShadowBuild = InspectorUi::instance()->isShadowBuildProject();
if (isShadowBuild && rev == 0) {
QString shadowBuildDir = InspectorUi::instance()->debugProjectBuildDirectory();
diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index 6c25985f643e16e40aba4234ea6ae3083dfc876c..47a4783bd85dab80b4f7d9fb66b4779f5e6fa2f2 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -261,6 +261,11 @@ void InspectorUi::debugQueryUpdated(QDeclarativeDebugQuery::State newState)
disconnect(m_debugQuery,SIGNAL(stateChanged(QDeclarativeDebugQuery::State)),this,SLOT(debugQueryUpdated(QDeclarativeDebugQuery::State)));
}
+bool InspectorUi::isConnected() const
+{
+ return m_clientProxy;
+}
+
void InspectorUi::connected(ClientProxy *clientProxy)
{
m_clientProxy = clientProxy;
diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h
index ae56e4eca1a8fd167217a2a6b853b538f16e095c..ebcd795ddbbd3d8ee2b3f08c9d307ca8c9ac8542 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.h
+++ b/src/plugins/qmljsinspector/qmljsinspector.h
@@ -103,6 +103,7 @@ public:
bool isShadowBuildProject() const;
void setupUi();
+ bool isConnected() const;
void connected(ClientProxy *clientProxy);
void disconnected();
void setDebuggerEngine(Debugger::QmlEngine *qmlEngine);
diff --git a/src/plugins/qmljsinspector/qmljsinspectorconstants.h b/src/plugins/qmljsinspector/qmljsinspectorconstants.h
index 049d8ac477c7e7ecd3f85d67d3fc3515674ff6f0..0b376aaf76b30087152485b4d3caad3dbed013db 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorconstants.h
+++ b/src/plugins/qmljsinspector/qmljsinspectorconstants.h
@@ -43,7 +43,7 @@ const char * const INFO_EXPERIMENTAL = "QmlInspector.Experimental";
const char * const INFO_OUT_OF_SYNC = "QmlInspector.OutOfSyncWarning";
const char * const DESIGNMODE_ACTION = "QmlInspector.DesignMode";
-const char * const RELOAD_ACTION = "QmlInspector.Reload";
+//const char * const RELOAD_ACTION = "QmlInspector.Reload";
const char * const PLAY_ACTION = "QmlInspector.Play";
const char * const SELECT_ACTION = "QmlInspector.Select";
const char * const SELECT_MARQUEE_ACTION = "QmlInspector.SelectMarquee";
diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
index a89f00d0baaeec606350b633fd4eb95173ff2a1f..ff787e020b4822072d6b56347ed0c912bbc75863 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
@@ -140,7 +140,8 @@ void InspectorPlugin::objectAdded(QObject *object)
void InspectorPlugin::aboutToRemoveObject(QObject *obj)
{
if (m_clientProxy && m_clientProxy->qmlAdapter() == obj) {
- m_inspectorUi->disconnected();
+ if (m_inspectorUi->isConnected())
+ m_inspectorUi->disconnected();
delete m_clientProxy;
m_clientProxy = 0;
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
deleted file mode 100644
index e3537db8411e82702abfae92176d248a54a380dd..0000000000000000000000000000000000000000
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "qmlprojectimportwizard.h"
-
-#include "qmlprojectconstants.h"
-
-#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <projectexplorer/customwizard/customwizard.h>
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
-
-#include <utils/filenamevalidatinglineedit.h>
-#include <utils/filewizardpage.h>
-
-#include <QtGui/QIcon>
-
-#include <QtGui/QApplication>
-#include <QtGui/QStyle>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-
-#include <QtCore/QDir>
-#include <QtCore/QtDebug>
-#include <QtCore/QCoreApplication>
-
-using namespace Utils;
-
-namespace QmlProjectManager {
-namespace Internal {
-
-//////////////////////////////////////////////////////////////////////////////
-// QmlProjectImportWizardDialog
-//////////////////////////////////////////////////////////////////////////////
-
-QmlProjectImportWizardDialog::QmlProjectImportWizardDialog(QWidget *parent)
- : Utils::Wizard(parent)
-{
- setWindowTitle(tr("Import Existing QML Directory"));
-
- // first page
- m_firstPage = new FileWizardPage;
- m_firstPage->setTitle(tr("Project Name and Location"));
- m_firstPage->setFileNameLabel(tr("Project name:"));
- m_firstPage->setPathLabel(tr("Location:"));
-
- const int firstPageId = addPage(m_firstPage);
- wizardProgress()->item(firstPageId)->setTitle(tr("Location"));
-}
-
-QmlProjectImportWizardDialog::~QmlProjectImportWizardDialog()
-{ }
-
-QString QmlProjectImportWizardDialog::path() const
-{
- return m_firstPage->path();
-}
-
-void QmlProjectImportWizardDialog::setPath(const QString &path)
-{
- m_firstPage->setPath(path);
-}
-
-QString QmlProjectImportWizardDialog::projectName() const
-{
- return m_firstPage->fileName();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// QmlProjectImportWizard
-//////////////////////////////////////////////////////////////////////////////
-
-QmlProjectImportWizard::QmlProjectImportWizard()
- : Core::BaseFileWizard(parameters())
-{ }
-
-QmlProjectImportWizard::~QmlProjectImportWizard()
-{ }
-
-Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
-{
- Core::BaseFileWizardParameters parameters(ProjectWizard);
- // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128
- {
- QPixmap icon(22, 22);
- icon.fill(Qt::transparent);
- QPainter p(&icon);
- p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
- parameters.setIcon(icon);
- }
- parameters.setDisplayName(tr("Import Existing QML Directory"));
- parameters.setId(QLatin1String("QI.QML Import"));
- parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
- parameters.setCategory(QLatin1String(Qt4ProjectManager::Constants::QML_WIZARD_CATEGORY));
- parameters.setDisplayCategory(QCoreApplication::translate(Qt4ProjectManager::Constants::QML_WIZARD_TR_SCOPE,
- Qt4ProjectManager::Constants::QML_WIZARD_TR_CATEGORY));
- return parameters;
-}
-
-QWizard *QmlProjectImportWizard::createWizardDialog(QWidget *parent,
- const QString &defaultPath,
- const WizardPageList &extensionPages) const
-{
- QmlProjectImportWizardDialog *wizard = new QmlProjectImportWizardDialog(parent);
- setupWizard(wizard);
-
- wizard->setPath(defaultPath);
-
- foreach (QWizardPage *p, extensionPages)
- BaseFileWizard::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
-
- return wizard;
-}
-
-Core::GeneratedFiles QmlProjectImportWizard::generateFiles(const QWizard *w,
- QString *errorMessage) const
-{
- Q_UNUSED(errorMessage)
-
- const QmlProjectImportWizardDialog *wizard = qobject_cast<const QmlProjectImportWizardDialog *>(w);
- const QString projectPath = wizard->path();
- const QDir dir(projectPath);
- const QString projectName = wizard->projectName();
- const QString creatorFileName = QFileInfo(dir, projectName + QLatin1String(".qmlproject")).absoluteFilePath();
-
- QString projectContents;
- {
- QTextStream out(&projectContents);
-
- out
- //: Comment added to generated .qmlproject file
- << "/* " << tr("File generated by QtCreator", "qmlproject Template") << " */" << endl
- << endl
- << "import QmlProject 1.0" << endl
- << endl
- << "Project {" << endl
- //: Comment added to generated .qmlproject file
- << " /* " << tr("Include .qml, .js, and image files from current directory and subdirectories", "qmlproject Template") << " */" << endl
- << " QmlFiles {" << endl
- << " directory: \".\"" << endl
- << " }" << endl
- << " JavaScriptFiles {" << endl
- << " directory: \".\"" << endl
- << " }" << endl
- << " ImageFiles {" << endl
- << " directory: \".\"" << endl
- << " }" << endl
- //: Comment added to generated .qmlproject file
- << " /* " << tr("List of plugin directories passed to QML runtime", "qmlproject Template") << " */" << endl
- << " // importPaths: [ \"../exampleplugin\" ]" << endl
- << "}" << endl;
- }
- Core::GeneratedFile generatedCreatorFile(creatorFileName);
- generatedCreatorFile.setContents(projectContents);
- generatedCreatorFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute);
-
- Core::GeneratedFiles files;
- files.append(generatedCreatorFile);
-
- return files;
-}
-
-bool QmlProjectImportWizard::postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage)
-{
- return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l ,errorMessage);
-}
-
-} // namespace Internal
-} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h
deleted file mode 100644
index bc1d22e11fa7aed9777651acad3bf608aff9c13d..0000000000000000000000000000000000000000
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#ifndef QMLPROJECTIMPORTWIZARD_H
-#define QMLPROJECTIMPORTWIZARD_H
-
-#include <coreplugin/basefilewizard.h>
-#include <utils/wizard.h>
-
-QT_BEGIN_NAMESPACE
-class QDir;
-class QFileInfo;
-class QModelIndex;
-class QStringList;
-QT_END_NAMESPACE
-
-namespace Utils {
-class FileWizardPage;
-} // namespace Utils
-
-namespace QmlProjectManager {
-namespace Internal {
-
-class QmlProjectImportWizardDialog : public Utils::Wizard
-{
- Q_OBJECT
-
-public:
- QmlProjectImportWizardDialog(QWidget *parent = 0);
- virtual ~QmlProjectImportWizardDialog();
-
- QString path() const;
- void setPath(const QString &path);
-
- QString projectName() const;
-
-private:
- Utils::FileWizardPage *m_firstPage;
-};
-
-class QmlProjectImportWizard : public Core::BaseFileWizard
-{
- Q_OBJECT
-
-public:
- QmlProjectImportWizard();
- virtual ~QmlProjectImportWizard();
-
- static Core::BaseFileWizardParameters parameters();
-
-protected:
- virtual QWizard *createWizardDialog(QWidget *parent,
- const QString &defaultPath,
- const WizardPageList &extensionPages) const;
-
- virtual Core::GeneratedFiles generateFiles(const QWizard *w,
- QString *errorMessage) const;
-
- virtual bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
-};
-
-} // end of namespace Internal
-} // end of namespace QmlProjectManager
-
-#endif // QMLPROJECTIMPORTWIZARD_H
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index 1e662dfc02b6d9358da5afbd100105034c46b959..d18c79999b0618a96d55b4b9153ff3624fbd1af4 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -13,7 +13,6 @@ HEADERS += qmlproject.h \
qmlprojectmanager.h \
qmlprojectconstants.h \
qmlprojectnodes.h \
- qmlprojectimportwizard.h \
qmlprojectfile.h \
qmlprojectruncontrol.h \
qmlprojectrunconfiguration.h \
@@ -27,7 +26,6 @@ SOURCES += qmlproject.cpp \
qmlprojectplugin.cpp \
qmlprojectmanager.cpp \
qmlprojectnodes.cpp \
- qmlprojectimportwizard.cpp \
qmlprojectfile.cpp \
qmlprojectruncontrol.cpp \
qmlprojectrunconfiguration.cpp \
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
index ca170562014a02c82a5356bc0548cbcfdc2c1e33..b028af50d0906b8da8f788d1e8528466e58c08f2 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h
@@ -34,7 +34,7 @@ namespace Constants {
const char * const QML_RC_ID = "QmlProjectManager.QmlRunConfiguration";
const char * const QML_RC_DISPLAY_NAME = QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer");
-const char * const QML_VIEWER_KEY = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer";
+const char * const QML_VIEWER_QT_KEY = "QmlProjectManager.QmlRunConfiguration.QtVersion";
const char * const QML_VIEWER_ARGUMENTS_KEY = "QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments";
const char * const QML_VIEWER_TARGET_ID = "QmlProjectManager.QmlTarget";
const char * const QML_VIEWER_TARGET_DISPLAY_NAME = "QML Viewer";
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index f2d798b15dc1e707892fea356a43669fccf54a15..fc9565e5f6017185f19a10b0fff625d240e3d2ce 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -29,7 +29,6 @@
#include "qmlprojectplugin.h"
#include "qmlprojectmanager.h"
-#include "qmlprojectimportwizard.h"
#include "qmlprojectapplicationwizard.h"
#include "qmlprojectconstants.h"
#include "qmlproject.h"
@@ -77,7 +76,6 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
addAutoReleasedObject(new Internal::QmlRunControlFactory);
addAutoReleasedObject(new QmlProjectApplicationWizard);
- addAutoReleasedObject(new QmlProjectImportWizard);
QmlProjectFileFormat::registerDeclarativeTypes();
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 0a801a5f929a1f2366f8d38f003bd73f86f67f6d..aa7dab53ffe90edff3658b0e8b601e10a3dc0805 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -42,6 +42,7 @@
#include <utils/pathchooser.h>
#include <utils/debuggerlanguagechooser.h>
#include <utils/detailswidget.h>
+#include <utils/qtcassert.h>
#include <qt4projectmanager/qtversionmanager.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qt4projectmanager/qmlobservertool.h>
@@ -50,6 +51,7 @@
#include <QComboBox>
#include <QCoreApplication>
#include <QLineEdit>
+#include <QPushButton>
#include <QSpinBox>
#include <QStringListModel>
#include <QDebug>
@@ -58,23 +60,26 @@ namespace QmlProjectManager {
QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent) :
ProjectExplorer::RunConfiguration(parent, QLatin1String(Constants::QML_RC_ID)),
+ m_qtVersionId(-1),
m_fileListModel(new QStringListModel(this)),
m_projectTarget(parent),
m_usingCurrentFile(true),
m_isEnabled(false)
{
ctor();
+ updateQtVersions();
}
QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent, QmlProjectRunConfiguration *source) :
ProjectExplorer::RunConfiguration(parent, source),
- m_qmlViewerCustomPath(source->m_qmlViewerCustomPath),
+ m_qtVersionId(source->m_qtVersionId),
m_qmlViewerArgs(source->m_qmlViewerArgs),
m_fileListModel(new QStringListModel(this)),
m_projectTarget(parent)
{
ctor();
setMainScript(source->m_scriptFile);
+ updateQtVersions();
}
bool QmlProjectRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *bc) const
@@ -95,8 +100,7 @@ void QmlProjectRunConfiguration::ctor()
this, SLOT(changeCurrentFile(Core::IEditor*)));
Qt4ProjectManager::QtVersionManager *qtVersions = Qt4ProjectManager::QtVersionManager::instance();
- connect(qtVersions, SIGNAL(qtVersionsChanged(QList<int>)), this, SLOT(updateEnabled()));
- connect(qtVersions, SIGNAL(qtVersionsChanged(QList<int>)), this, SLOT(onViewerChanged()));
+ connect(qtVersions, SIGNAL(qtVersionsChanged(QList<int>)), this, SLOT(updateQtVersions()));
setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
}
@@ -110,17 +114,24 @@ Internal::QmlProjectTarget *QmlProjectRunConfiguration::qmlTarget() const
return static_cast<Internal::QmlProjectTarget *>(target());
}
-bool QmlProjectRunConfiguration::qmlObserverAvailable() const
+QString QmlProjectRunConfiguration::viewerPath() const
{
- return m_qmlObserverAvailable;
+ Qt4ProjectManager::QtVersion *version = qtVersion();
+ if (!version) {
+ return QString();
+ } else {
+ return version->qmlviewerCommand();
+ }
}
-QString QmlProjectRunConfiguration::viewerPath() const
+QString QmlProjectRunConfiguration::observerPath() const
{
- if (!m_qmlViewerCustomPath.isEmpty())
- return m_qmlViewerCustomPath;
-
- return viewerDefaultPath();
+ Qt4ProjectManager::QtVersion *version = qtVersion();
+ if (!version) {
+ return QString();
+ } else {
+ return version->qmlObserverTool();
+ }
}
QStringList QmlProjectRunConfiguration::viewerArguments() const
@@ -149,6 +160,23 @@ QString QmlProjectRunConfiguration::workingDirectory() const
return projectFile.absolutePath();
}
+int QmlProjectRunConfiguration::qtVersionId() const
+{
+ return m_qtVersionId;
+}
+
+Qt4ProjectManager::QtVersion *QmlProjectRunConfiguration::qtVersion() const
+{
+ if (m_qtVersionId == -1)
+ return 0;
+
+ Qt4ProjectManager::QtVersionManager *versionManager = Qt4ProjectManager::QtVersionManager::instance();
+ Qt4ProjectManager::QtVersion *version = versionManager->version(m_qtVersionId);
+ QTC_ASSERT(version, return 0);
+
+ return version;
+}
+
static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
{
return s1.toLower() < s2.toLower();
@@ -171,22 +199,24 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
connect(m_fileListCombo.data(), SIGNAL(activated(QString)), this, SLOT(setMainScript(QString)));
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(updateFileComboBox()));
- Utils::PathChooser *qmlViewer = new Utils::PathChooser;
- qmlViewer->setExpectedKind(Utils::PathChooser::ExistingCommand);
- qmlViewer->setPath(m_qmlViewerCustomPath);
+ m_qtVersionComboBox = new QComboBox;
+ m_qtVersionComboBox.data()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ connect(m_qtVersionComboBox.data(), SIGNAL(activated(int)), this, SLOT(onQtVersionSelectionChanged()));
- connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onViewerChanged()));
+ QPushButton *pushButton = new QPushButton;
+ pushButton->setText(tr("Manage Qt versions"));
+ connect(pushButton, SIGNAL(clicked()), this, SLOT(manageQtVersions()));
- m_qmlViewerExecutable = new QLabel;
- m_qmlViewerExecutable.data()->setText(viewerPath() + " " + m_qmlViewerArgs);
+ QHBoxLayout *qtVersionLayout = new QHBoxLayout;
+ qtVersionLayout->addWidget(m_qtVersionComboBox.data());
+ qtVersionLayout->addWidget(pushButton);
QLineEdit *qmlViewerArgs = new QLineEdit;
qmlViewerArgs->setText(m_qmlViewerArgs);
connect(qmlViewerArgs, SIGNAL(textChanged(QString)), this, SLOT(onViewerArgsChanged()));
- form->addRow(tr("Custom QML Viewer:"), qmlViewer);
+ form->addRow(tr("Qt version:"), qtVersionLayout);
form->addRow(tr("Arguments:"), qmlViewerArgs);
- form->addRow(QString(), m_qmlViewerExecutable.data());
QWidget *debuggerLabelWidget = new QWidget;
QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget);
@@ -213,6 +243,9 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
connect(debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
this, SLOT(qmlDebugServerPortChanged(uint)));
+ updateQtVersions();
+ updateEnabled();
+
return detailsWidget;
}
@@ -274,24 +307,18 @@ void QmlProjectRunConfiguration::setMainScript(const QString &scriptFile)
}
}
-void QmlProjectRunConfiguration::onViewerChanged()
+void QmlProjectRunConfiguration::onQtVersionSelectionChanged()
{
- if (Utils::PathChooser *chooser = qobject_cast<Utils::PathChooser *>(sender())) {
- m_qmlViewerCustomPath = chooser->path();
- }
- if (!m_qmlViewerExecutable.isNull()) {
- m_qmlViewerExecutable.data()->setText(viewerPath() + " " + m_qmlViewerArgs);
- }
+ QVariant data = m_qtVersionComboBox.data()->itemData(m_qtVersionComboBox.data()->currentIndex());
+ QTC_ASSERT(data.isValid() && data.canConvert(QVariant::Int), return)
+ m_qtVersionId = data.toInt();
+ updateEnabled();
}
void QmlProjectRunConfiguration::onViewerArgsChanged()
{
if (QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender()))
m_qmlViewerArgs = lineEdit->text();
-
- if (!m_qmlViewerExecutable.isNull()) {
- m_qmlViewerExecutable.data()->setText(viewerPath() + " " + m_qmlViewerArgs);
- }
}
void QmlProjectRunConfiguration::useCppDebuggerToggled(bool toggled)
@@ -313,7 +340,7 @@ QVariantMap QmlProjectRunConfiguration::toMap() const
{
QVariantMap map(ProjectExplorer::RunConfiguration::toMap());
- map.insert(QLatin1String(Constants::QML_VIEWER_KEY), m_qmlViewerCustomPath);
+ map.insert(QLatin1String(Constants::QML_VIEWER_QT_KEY), m_qtVersionId);
map.insert(QLatin1String(Constants::QML_VIEWER_ARGUMENTS_KEY), m_qmlViewerArgs);
map.insert(QLatin1String(Constants::QML_MAINSCRIPT_KEY), m_scriptFile);
return map;
@@ -321,9 +348,11 @@ QVariantMap QmlProjectRunConfiguration::toMap() const
bool QmlProjectRunConfiguration::fromMap(const QVariantMap &map)
{
- m_qmlViewerCustomPath = map.value(QLatin1String(Constants::QML_VIEWER_KEY)).toString();
+ m_qtVersionId = map.value(QLatin1String(Constants::QML_VIEWER_QT_KEY), -1).toInt();
m_qmlViewerArgs = map.value(QLatin1String(Constants::QML_VIEWER_ARGUMENTS_KEY)).toString();
m_scriptFile = map.value(QLatin1String(Constants::QML_MAINSCRIPT_KEY), M_CURRENT_FILE).toString();
+
+ updateQtVersions();
setMainScript(m_scriptFile);
return RunConfiguration::fromMap(map);
@@ -364,35 +393,76 @@ void QmlProjectRunConfiguration::updateEnabled()
qmlFileFound = !m_mainScriptFilename.isEmpty();
}
- bool newValue = QFileInfo(viewerPath()).exists() && qmlFileFound;
+ bool newValue = (QFileInfo(viewerPath()).exists()
+ || QFileInfo(observerPath()).exists()) && qmlFileFound;
- if (m_isEnabled != newValue) {
- m_isEnabled = newValue;
- emit isEnabledChanged(m_isEnabled);
- }
+
+ // Always emit change signal to force reevaluation of run/debug buttons
+ m_isEnabled = newValue;
+ emit isEnabledChanged(m_isEnabled);
}
-QString QmlProjectRunConfiguration::viewerDefaultPath() const
+void QmlProjectRunConfiguration::updateQtVersions()
{
- QString path;
-
- // Try to locate default path in Qt Versions
Qt4ProjectManager::QtVersionManager *qtVersions = Qt4ProjectManager::QtVersionManager::instance();
- foreach (Qt4ProjectManager::QtVersion *version, qtVersions->validVersions()) {
- if (version->supportsTargetId(Qt4ProjectManager::Constants::DESKTOP_TARGET_ID)) {
- // Search for QmlObserver
- const QString qtInstallData = version->versionInfo().value("QT_INSTALL_DATA");
- path = Qt4ProjectManager::QmlObserverTool::toolByInstallData(qtInstallData);
- m_qmlObserverAvailable = !path.isEmpty();
-
- if (path.isEmpty() && !version->qmlviewerCommand().isEmpty()) {
- path = version->qmlviewerCommand();
+
+ //
+ // update m_qtVersionId
+ //
+ if (!qtVersions->isValidId(m_qtVersionId)
+ || !isValidVersion(qtVersions->version(m_qtVersionId))) {
+ m_qtVersionId = -1;
+ // take first one you find
+ foreach (Qt4ProjectManager::QtVersion *version, qtVersions->validVersions()) {
+ if (isValidVersion(version)) {
+ m_qtVersionId = version->uniqueId();
break;
}
}
}
- return path;
+ updateEnabled();
+
+ if (!m_qtVersionComboBox)
+ return;
+
+ //
+ // update combobox
+ //
+ m_qtVersionComboBox.data()->clear();
+
+ foreach (Qt4ProjectManager::QtVersion *version, qtVersions->validVersions()) {
+ if (isValidVersion(version)) {
+ m_qtVersionComboBox.data()->addItem(version->displayName(), version->uniqueId());
+ }
+ }
+
+ if (m_qtVersionId != -1) {
+ int index = m_qtVersionComboBox.data()->findData(m_qtVersionId);
+ QTC_ASSERT(index >= 0, return);
+ m_qtVersionComboBox.data()->setCurrentIndex(index);
+ } else {
+ m_qtVersionComboBox.data()->addItem(tr("Invalid Qt version"), -1);
+ m_qtVersionComboBox.data()->setCurrentIndex(0);
+ }
+
+}
+
+void QmlProjectRunConfiguration::manageQtVersions()
+{
+ Core::ICore *core = Core::ICore::instance();
+ core->showOptionsDialog(Qt4ProjectManager::Constants::QT_SETTINGS_CATEGORY,
+ Qt4ProjectManager::Constants::QTVERSION_SETTINGS_PAGE_ID);
+}
+
+bool QmlProjectRunConfiguration::isValidVersion(Qt4ProjectManager::QtVersion *version)
+{
+ if (version
+ && version->supportsTargetId(Qt4ProjectManager::Constants::DESKTOP_TARGET_ID)
+ && !version->qmlviewerCommand().isEmpty()) {
+ return true;
+ }
+ return false;
}
} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index ebb189d63278bc81d2e078901dfcaf1cdcaf38ae..7381fa1b54586f49db6183fae68c3f846a026890 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -42,12 +42,15 @@ namespace Core {
class IEditor;
}
+namespace Qt4ProjectManager {
+class QtVersion;
+}
+
namespace QmlProjectManager {
namespace Internal {
class QmlProjectTarget;
class QmlProjectRunConfigurationFactory;
-
}
const char * const CURRENT_FILE = QT_TRANSLATE_NOOP("QmlManager", "<Current File>");
@@ -59,6 +62,9 @@ class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplor
Q_OBJECT
friend class Internal::QmlProjectRunConfigurationFactory;
+ // used in qmldumptool.cpp
+ Q_PROPERTY(int qtVersionId READ qtVersionId)
+
public:
QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent);
virtual ~QmlProjectRunConfiguration();
@@ -67,10 +73,12 @@ public:
bool isEnabled(ProjectExplorer::BuildConfiguration *bc) const;
- bool qmlObserverAvailable() const;
QString viewerPath() const;
+ QString observerPath() const;
QStringList viewerArguments() const;
QString workingDirectory() const;
+ int qtVersionId() const;
+ Qt4ProjectManager::QtVersion *qtVersion() const;
// RunConfiguration
virtual QWidget *createConfigurationWidget();
@@ -87,42 +95,42 @@ private slots:
void updateEnabled();
- void onViewerChanged();
+ void onQtVersionSelectionChanged();
void onViewerArgsChanged();
void useCppDebuggerToggled(bool toggled);
void useQmlDebuggerToggled(bool toggled);
void qmlDebugServerPortChanged(uint port);
+ void updateQtVersions();
+ void manageQtVersions();
protected:
- QString viewerDefaultPath() const;
QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent, QmlProjectRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map);
void setEnabled(bool value);
private:
void ctor();
+ static bool isValidVersion(Qt4ProjectManager::QtVersion *version);
// absolute path to current file (if being used)
QString m_currentFileFilename;
// absolute path to selected main script (if being used)
QString m_mainScriptFilename;
+ int m_qtVersionId;
QString m_scriptFile;
- QString m_qmlViewerCustomPath;
QString m_qmlViewerArgs;
QStringListModel *m_fileListModel;
// weakpointer is used to make sure we don't try to manipulate
// widget which was deleted already, as can be the case here.
- QWeakPointer<QLabel> m_qmlViewerExecutable;
+ QWeakPointer<QComboBox> m_qtVersionComboBox;
QWeakPointer<QComboBox> m_fileListCombo;
Internal::QmlProjectTarget *m_projectTarget;
bool m_usingCurrentFile;
bool m_isEnabled;
- mutable bool m_qmlObserverAvailable;
-
};
} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
index d41ac9df63932be8b7f80ae9679047b192c71d11..757b23dc272bf01e8f7347387429090f58da9ade 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
@@ -43,10 +43,15 @@
#include <debugger/debuggeruiswitcher.h>
#include <debugger/debuggerengine.h>
#include <qmljsinspector/qmljsinspectorconstants.h>
+#include <qt4projectmanager/qtversionmanager.h>
+#include <qt4projectmanager/qmlobservertool.h>
+#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include <QApplication>
#include <QDir>
#include <QLabel>
#include <QMessageBox>
+#include <QPushButton>
using ProjectExplorer::RunConfiguration;
using ProjectExplorer::RunControl;
@@ -62,7 +67,11 @@ QmlRunControl::QmlRunControl(QmlProjectRunConfiguration *runConfiguration, QStri
m_applicationLauncher.setEnvironment(environment.toStringList());
m_applicationLauncher.setWorkingDirectory(runConfiguration->workingDirectory());
- m_executable = runConfiguration->viewerPath();
+ if (mode == ProjectExplorer::Constants::RUNMODE) {
+ m_executable = runConfiguration->viewerPath();
+ } else {
+ m_executable = runConfiguration->observerPath();
+ }
m_commandLineArguments = runConfiguration->viewerArguments();
connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,bool)),
@@ -137,11 +146,22 @@ bool QmlRunControlFactory::canRun(RunConfiguration *runConfiguration,
{
QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration*>(runConfiguration);
if (mode == ProjectExplorer::Constants::RUNMODE) {
- return config != 0;
- } else if (mode == ProjectExplorer::Constants::DEBUGMODE) {
+ return config != 0 && !config->viewerPath().isEmpty();
+ } else {
bool qmlDebugSupportInstalled = Debugger::DebuggerUISwitcher::instance()->supportedLanguages()
& Debugger::QmlLanguage;
- return (config != 0) && qmlDebugSupportInstalled;
+
+ if (config && qmlDebugSupportInstalled) {
+ if (!config->observerPath().isEmpty()) {
+ return true;
+ }
+
+ if (config->qtVersion() && Qt4ProjectManager::QmlObserverTool::canBuild(config->qtVersion())) {
+ return true;
+ } else {
+ return false;
+ }
+ }
}
return false;
@@ -156,7 +176,7 @@ RunControl *QmlRunControlFactory::create(RunConfiguration *runConfiguration,
RunControl *runControl = 0;
if (mode == ProjectExplorer::Constants::RUNMODE) {
runControl = new QmlRunControl(config, mode);
- } else {
+ } else if (mode == ProjectExplorer::Constants::DEBUGMODE) {
runControl = createDebugRunControl(config);
}
return runControl;
@@ -178,20 +198,46 @@ ProjectExplorer::RunControl *QmlRunControlFactory::createDebugRunControl(QmlProj
Utils::Environment environment = Utils::Environment::systemEnvironment();
Debugger::DebuggerStartParameters params;
params.startMode = Debugger::StartInternal;
- params.executable = runConfig->viewerPath();
+ params.executable = runConfig->observerPath();
params.qmlServerAddress = "127.0.0.1";
params.qmlServerPort = runConfig->qmlDebugServerPort();
- params.qmlObserverAvailable = runConfig->qmlObserverAvailable();
params.processArgs = runConfig->viewerArguments();
params.processArgs.append(QLatin1String("-qmljsdebugger=port:") + QString::number(runConfig->qmlDebugServerPort()));
params.workingDirectory = runConfig->workingDirectory();
params.environment = environment.toStringList();
params.displayName = runConfig->displayName();
+ if (params.executable.isEmpty()) {
+ showQmlObserverToolWarning();
+ return 0;
+ }
+
Debugger::DebuggerRunControl *debuggerRunControl = Debugger::DebuggerPlugin::createDebugger(params, runConfig);
return debuggerRunControl;
}
+void QmlRunControlFactory::showQmlObserverToolWarning() {
+ QMessageBox dialog(QApplication::activeWindow());
+ QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
+ QMessageBox::ActionRole);
+ dialog.addButton(tr("Cancel"), QMessageBox::ActionRole);
+ dialog.setDefaultButton(qtPref);
+ dialog.setWindowTitle(tr("QML Observer Missing"));
+ dialog.setText(tr("QML Observer could not be found."));
+ dialog.setInformativeText(tr(
+ "QML Observer is used to offer debugging features for "
+ "QML applications, such as interactive debugging and inspection tools."
+ "It must be compiled for each used Qt version separately. "
+ "On the Qt4 options page, select the current Qt installation "
+ "and click Rebuild."));
+ dialog.exec();
+ if (dialog.clickedButton() == qtPref) {
+ Core::ICore::instance()->showOptionsDialog(
+ Qt4ProjectManager::Constants::QT_SETTINGS_CATEGORY,
+ Qt4ProjectManager::Constants::QTVERSION_SETTINGS_PAGE_ID);
+ }
+}
+
} // namespace Internal
} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
index cf260c2eca70dbd12049c6be458f779fdb39be5d..9254becabc0a5edce1825e174119b99828c636b6 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
@@ -78,6 +78,7 @@ public:
private:
ProjectExplorer::RunControl *createDebugRunControl(QmlProjectRunConfiguration *runConfig);
+ static void showQmlObserverToolWarning();
};
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index 460d9abd5daa2b35a02857c7cb9493529ac21f81..9bee8580ac1293fda50b99229a7f9dd9dffbb2d2 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -101,7 +101,7 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent
m_currentTip = rand()%tips.count();
QTextDocument *doc = ui->didYouKnowTextBrowser->document();
- doc->setDefaultStyleSheet("a:link {color:black;}");
+ doc->setDefaultStyleSheet("* {color:black;};");
ui->didYouKnowTextBrowser->setDocument(doc);
ui->didYouKnowTextBrowser->setText(tips.at(m_currentTip));
@@ -434,9 +434,9 @@ QStringList GettingStartedWelcomePageWidget::tipsOfTheDay()
tips.append(tr("You can return to edit mode from any other mode at any time by hitting <tt>Escape</tt>."));
//:%1 gets replaced by Alt (Win/Unix) or Cmd (Mac)
tips.append(tr("You can switch between the output pane by hitting <tt>%1+n</tt> where n is the number denoted "
- "on the buttons at the window bottom:"
- "<ul><li>1 - Build Issues</li><li>2 - Search Results</li><li>3 - Application Output</li>"
- "<li>4 - Compile Output</li></ul>").arg(altShortcut));
+ "on the buttons at the window bottom: <br /><br />"
+ "1: Build Issues, 2: Search Results, 3: Application Output, "
+ "4: Compile Output").arg(altShortcut));
tips.append(tr("You can quickly search methods, classes, help and more using the "
"<a href=\"qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html\">Locator bar</a> (<tt>%1+K</tt>).").arg(ctrlShortcut));
tips.append(tr("You can add custom build steps in the "
@@ -482,12 +482,12 @@ void GettingStartedWelcomePageWidget::showFeature(int feature)
}
if (item.category == QLatin1String("Event")) {
- ui->detailsLabel->setText(QString::fromLatin1("<a href='%1'>Details...</a>").arg(item.url));
+ ui->detailsLabel->setText(tr("<a href='%1'>Details...</a>").arg(item.url));
ui->detailsLabel->show();
ui->detailsLabel->setOpenExternalLinks(true);
}
else if (item.category == QLatin1String("Tutorial")) {
- ui->detailsLabel->setText(QString::fromLatin1("<a href='%1'>Take Tutorial</a>").arg(item.url+"?view=split"));
+ ui->detailsLabel->setText(tr("<a href='%1'>Take Tutorial</a>").arg(item.url+"?view=split"));
ui->detailsLabel->show();
ui->detailsLabel->setOpenExternalLinks(true);
}
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index bb3ecebd4628531c79a1302fdb5ff51853428d8b..0de51c8a7e8dceec64275f70d3ef2c745618c416 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>672</width>
+ <width>749</width>
<height>366</height>
</rect>
</property>
@@ -415,7 +415,7 @@
<widget class="QFrame" name="featureFrame">
<property name="maximumSize">
<size>
- <width>150</width>
+ <width>200</width>
<height>16777215</height>
</size>
</property>
@@ -457,14 +457,14 @@ border-bottom: 1px solid "#C9C9C9";
</size>
</property>
<property name="text">
- <string notr="true">Image</string>
+ <string notr="true"/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="featuredTextLabel">
<property name="text">
- <string notr="true">Text</string>
+ <string notr="true"/>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -489,7 +489,7 @@ border-bottom: 1px solid "#C9C9C9";
<item>
<widget class="QLabel" name="detailsLabel">
<property name="text">
- <string notr="true">Link</string>
+ <string notr="true"/>
</property>
</widget>
</item>
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index bb8c97a36c5359f6b39d8f239521e925151e02ad..eab7c3a7646f5a44669a5843ca30d7b5cf08551e 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -106,9 +106,9 @@ QStringList QMakeStep::allArguments()
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
QStringList arguments;
if (bc->subNodeBuild())
- arguments << bc->subNodeBuild()->path();
+ arguments << QDir::toNativeSeparators(bc->subNodeBuild()->path());
else
- arguments << buildConfiguration()->target()->project()->file()->fileName();
+ arguments << QDir::toNativeSeparators(buildConfiguration()->target()->project()->file()->fileName());
arguments << "-r";
if (!additonalArguments.contains("-spec"))
@@ -153,6 +153,7 @@ QStringList QMakeStep::moreArguments()
<< QLatin1String("RCC_DIR=rcc");
}
+ // Do not turn debugger path into native path separators: Qmake does not like that!
arguments << QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH) + QLatin1Char('=') +
Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmljsdebugger");
return arguments;
@@ -209,10 +210,13 @@ bool QMakeStep::init()
setOutputParser(new QMakeParser);
- Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
- QString proFile = pro->file()->fileName();
+ Qt4ProFileNode *node = qt4bc->qt4Target()->qt4Project()->rootProjectNode();
+ if (qt4bc->subNodeBuild())
+ node = qt4bc->subNodeBuild();
+ QString proFile = node->path();
+
m_tasks = qt4BuildConfiguration()->qtVersion()->reportIssues(proFile, workingDirectory);
- m_scriptTemplate = pro->rootProjectNode()->projectType() == ScriptTemplate;
+ m_scriptTemplate = node->projectType() == ScriptTemplate;
return AbstractProcessStep::init();
}
diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp
index cc675ce6b0f20e213eade5591642b9617e11b270..7ca17122823913996e548995df31c9eac0c4788e 100644
--- a/src/plugins/qt4projectmanager/qmldumptool.cpp
+++ b/src/plugins/qt4projectmanager/qmldumptool.cpp
@@ -36,8 +36,10 @@
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/runconfiguration.h>
#include <qtconcurrent/runextensions.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
+#include <utils/qtcassert.h>
#include <QDesktopServices>
#include <QCoreApplication>
#include <QDir>
@@ -50,7 +52,7 @@ using namespace Qt4ProjectManager;
class QmlDumpBuildTask;
typedef QHash<int, QmlDumpBuildTask *> QmlDumpByVersion;
-Q_GLOBAL_STATIC(QmlDumpByVersion, runningQmlDumpBuilds);
+Q_GLOBAL_STATIC(QmlDumpByVersion, qmlDumpBuilds);
// A task suitable to be run by QtConcurrent to build qmldump.
class QmlDumpBuildTask : public QObject {
@@ -59,25 +61,32 @@ class QmlDumpBuildTask : public QObject {
public:
explicit QmlDumpBuildTask(QtVersion *version)
: m_version(*version)
+ , m_failed(false)
{
- runningQmlDumpBuilds()->insert(m_version.uniqueId(), this);
+ qmlDumpBuilds()->insert(m_version.uniqueId(), this);
}
void run(QFutureInterface<void> &future)
{
future.setProgressRange(0, 5);
future.setProgressValue(1);
- const QString output = m_version.buildDebuggingHelperLibrary(future, true);
-
- const QString qtInstallData = m_version.versionInfo().value("QT_INSTALL_DATA");
- QString path = QmlDumpTool::toolByInstallData(qtInstallData);
- if (path.isEmpty()) {
- qWarning() << "Could not build QML plugin dumping helper for " << m_version.displayName()
- << "\nOutput:\n" << output;
+ QString output;
+ QString errorMessage;
+ QString path;
+ if (m_version.buildDebuggingHelperLibrary(future, true, &output, &errorMessage)) {
+ const QString qtInstallData = m_version.versionInfo().value("QT_INSTALL_DATA");
+ path = QmlDumpTool::toolByInstallData(qtInstallData);
+ if (path.isEmpty())
+ errorMessage = QString::fromLatin1("Could not build QML plugin dumping helper for %1\nOutput:\n%2").
+ arg(m_version.displayName(), output);
+ }
+ m_failed = path.isEmpty();
+ if (m_failed) {
+ qWarning("%s", qPrintable(errorMessage));
+ } else {
+ // proceed in gui thread
+ metaObject()->invokeMethod(this, "finish", Qt::QueuedConnection, Q_ARG(QString, path));
}
-
- // proceed in gui thread
- metaObject()->invokeMethod(this, "finish", Qt::QueuedConnection, Q_ARG(QString, path));
}
void updateProjectWhenDone(ProjectExplorer::Project *project)
@@ -85,14 +94,16 @@ public:
m_projectsToUpdate.insert(project);
}
+ bool hasFailed() const
+ {
+ return m_failed;
+ }
+
public slots:
void finish(QString qmldumpPath)
{
deleteLater();
- runningQmlDumpBuilds()->remove(m_version.uniqueId());
-
- if (qmldumpPath.isEmpty())
- return;
+ qmlDumpBuilds()->remove(m_version.uniqueId());
// update qmldump path for all the project
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
@@ -111,6 +122,7 @@ public slots:
private:
QSet<ProjectExplorer::Project *> m_projectsToUpdate;
QtVersion m_version;
+ bool m_failed;
};
} // end of anonymous namespace
@@ -131,7 +143,7 @@ bool QmlDumpTool::canBuild(const QtVersion *qtVersion)
const QString installHeaders = qtVersion->versionInfo().value("QT_INSTALL_HEADERS");
const QString header = installHeaders + QLatin1String("/QtDeclarative/private/qdeclarativemetatype_p.h");
return qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID)
- && (checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1) || QFile::exists(header));
+ && QFile::exists(header);
}
static QtVersion *qtVersionForProject(ProjectExplorer::Project *project)
@@ -147,6 +159,17 @@ static QtVersion *qtVersionForProject(ProjectExplorer::Project *project)
return 0;
}
+ if (project && project->id() == QLatin1String("QmlProjectManager.QmlProject")) {
+ // We cannot access the QmlProject interfaces here, therefore use the metatype system
+ QTC_ASSERT(project->activeTarget() && project->activeTarget()->activeRunConfiguration(), return 0);
+ QVariant variant = project->activeTarget()->activeRunConfiguration()->property("qtVersionId");
+ QTC_ASSERT(variant.isValid() && variant.canConvert(QVariant::Int), return 0);
+ QtVersion *version = QtVersionManager::instance()->version(variant.toInt());
+ if (version && version->isValid())
+ return version;
+ return 0;
+ }
+
// else, find any desktop Qt version that has qmldump, or - if there isn't any -
// one that could build it
QtVersion *desktopQt = 0;
@@ -204,12 +227,14 @@ QStringList QmlDumpTool::locationsByInstallData(const QString &qtInstallData)
return result;
}
-QString QmlDumpTool::build(const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode)
+bool QmlDumpTool::build(const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage)
{
- return buildHelper(QCoreApplication::tr("qmldump"), QLatin1String("qmldump.pro"),
- directory, makeCommand, qmakeCommand, mkspec, env, targetMode);
+ return buildHelper(QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "qmldump"), QLatin1String("qmldump.pro"),
+ directory, makeCommand, qmakeCommand, mkspec, env, targetMode,
+ output, errorMessage);
}
QString QmlDumpTool::copy(const QString &qtInstallData, QString *errorMessage)
@@ -218,7 +243,8 @@ QString QmlDumpTool::copy(const QString &qtInstallData, QString *errorMessage)
QStringList files;
files << QLatin1String("main.cpp") << QLatin1String("qmldump.pro")
- << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT");
+ << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT")
+ << QLatin1String("Info.plist");
QString sourcePath = Core::ICore::instance()->resourcePath() + QLatin1String("/qml/qmldump/");
@@ -254,8 +280,10 @@ QString QmlDumpTool::qmlDumpPath(ProjectExplorer::Project *project)
QtVersion *version = qtVersionForProject(project);
if (version && path.isEmpty()) {
- if (runningQmlDumpBuilds()->contains(version->uniqueId())) {
- runningQmlDumpBuilds()->value(version->uniqueId())->updateProjectWhenDone(project);
+ QmlDumpBuildTask *qmlDumpBuildTask = qmlDumpBuilds()->value(version->uniqueId());
+ if (qmlDumpBuildTask) {
+ if (!qmlDumpBuildTask->hasFailed())
+ qmlDumpBuildTask->updateProjectWhenDone(project);
} else {
QmlDumpBuildTask *buildTask = new QmlDumpBuildTask(version);
buildTask->updateProjectWhenDone(project);
diff --git a/src/plugins/qt4projectmanager/qmldumptool.h b/src/plugins/qt4projectmanager/qmldumptool.h
index 6924690865b594b883d64d545b65942629deb60f..13fbe483d3560bb75d881eb052e8d632022e6298 100644
--- a/src/plugins/qt4projectmanager/qmldumptool.h
+++ b/src/plugins/qt4projectmanager/qmldumptool.h
@@ -53,9 +53,10 @@ public:
static QStringList locationsByInstallData(const QString &qtInstallData);
// Build the helpers and return the output log/errormessage.
- static QString build(const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode);
+ static bool build(const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage);
// Copy the source files to a target location and return the chosen target location.
static QString copy(const QString &qtInstallData, QString *errorMessage);
diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp
index f2b55cbac654199d3e384b3ad13dc98812d62395..623e527d190791fbe0fb4133c7a719b64bc2bac6 100644
--- a/src/plugins/qt4projectmanager/qmlobservertool.cpp
+++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp
@@ -99,12 +99,15 @@ QStringList QmlObserverTool::locationsByInstallData(const QString &qtInstallData
return result;
}
-QString QmlObserverTool::build(const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode)
+bool QmlObserverTool::build(const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage)
{
- return buildHelper(QCoreApplication::tr("QMLObserver"), QLatin1String("qmlobserver.pro"),
- directory, makeCommand, qmakeCommand, mkspec, env, targetMode);
+ return buildHelper(QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "QMLObserver"),
+ QLatin1String("qmlobserver.pro"),
+ directory, makeCommand, qmakeCommand, mkspec, env, targetMode,
+ output, errorMessage);
}
static inline bool mkpath(const QString &targetDirectory, QString *errorMessage)
@@ -137,7 +140,11 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
<< QLatin1String("content/Browser.qml") << QLatin1String("content/images/folder.png")
<< QLatin1String("content/images/titlebar.png") << QLatin1String("content/images/titlebar.sci")
<< QLatin1String("content/images/up.png")
- << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT");
+ << QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT")
+ << QLatin1String("crumblepath.qrc") << QLatin1String("images/crumblepath-segment-end.png")
+ << QLatin1String("images/crumblepath-segment-hover-end.png") << QLatin1String("images/crumblepath-segment-hover.png")
+ << QLatin1String("images/crumblepath-segment-selected-end.png") << QLatin1String("images/crumblepath-segment-selected.png")
+ << QLatin1String("images/crumblepath-segment.png");
QStringList debuggerLibFiles;
debuggerLibFiles << QLatin1String("jsdebuggeragent.cpp")
@@ -185,6 +192,7 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag
// Try to find a writeable directory.
foreach(const QString &directory, directories) {
if (!mkpath(directory + QLatin1String("/content/images"), errorMessage)
+ || !mkpath(directory + QLatin1String("/images"), errorMessage)
|| !mkpath(directory + QLatin1String("/qmljsdebugger/editor/images"), errorMessage)
|| !mkpath(directory + QLatin1String("/qmljsdebugger/include"), errorMessage)
|| !mkpath(directory + QLatin1String("/qmljsdebugger/include/qt_private"), errorMessage))
diff --git a/src/plugins/qt4projectmanager/qmlobservertool.h b/src/plugins/qt4projectmanager/qmlobservertool.h
index 78c8ffc5ae9f58c9dfaa009a67802ef0082809a0..f787171bdbdf6bae80a313786cc5d4e736a40080 100644
--- a/src/plugins/qt4projectmanager/qmlobservertool.h
+++ b/src/plugins/qt4projectmanager/qmlobservertool.h
@@ -54,9 +54,10 @@ public:
static QStringList locationsByInstallData(const QString &qtInstallData);
// Build the helpers and return the output log/errormessage.
- static QString build(const QString &directory, const QString &makeCommand,
- const QString &qmakeCommand, const QString &mkspec,
- const Utils::Environment &env, const QString &targetMode);
+ static bool build(const QString &directory, const QString &makeCommand,
+ const QString &qmakeCommand, const QString &mkspec,
+ const Utils::Environment &env, const QString &targetMode,
+ QString *output, QString *errorMessage);
// Copy the source files to a target location and return the chosen target location.
static QString copy(const QString &qtInstallData, QString *errorMessage);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index bc3938f883865824e4b270f08616570a5afbb700..d67de573fdc180d59782295bb36f61f0988a6ef6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -63,11 +63,13 @@ RunControl *MaemoDebugSupport::createDebugRunControl(MaemoRunConfiguration *runC
DebuggerStartParameters params;
const MaemoDeviceConfig &devConf = runConfig->deviceConfig();
- if (runConfig->useQmlDebugger()) {
+ const MaemoRunConfiguration::DebuggingType debuggingType
+ = runConfig->debuggingType();
+ if (debuggingType != MaemoRunConfiguration::DebugCppOnly) {
params.qmlServerAddress = runConfig->deviceConfig().server.host;
params.qmlServerPort = qmlServerPort(runConfig);
}
- if (runConfig->useCppDebugger()) {
+ if (debuggingType != MaemoRunConfiguration::DebugQmlOnly) {
params.processArgs = runConfig->arguments();
params.sysRoot = runConfig->sysRoot();
params.toolChainType = ToolChain::GCC_MAEMO;
@@ -113,7 +115,7 @@ MaemoDebugSupport::MaemoDebugSupport(MaemoRunConfiguration *runConfig,
: QObject(runControl), m_runControl(runControl), m_runConfig(runConfig),
m_deviceConfig(m_runConfig->deviceConfig()),
m_runner(new MaemoSshRunner(this, m_runConfig, true)),
- m_qmlOnlyDebugging(m_runConfig->useQmlDebugger() && !m_runConfig->useCppDebugger())
+ m_qmlOnlyDebugging(m_runConfig->debuggingType() == MaemoRunConfiguration::DebugQmlOnly)
{
connect(m_runControl, SIGNAL(engineRequestSetup()), this,
SLOT(handleAdapterSetupRequested()));
@@ -305,7 +307,7 @@ int MaemoDebugSupport::gdbServerPort(const MaemoRunConfiguration *rc)
int MaemoDebugSupport::qmlServerPort(const MaemoRunConfiguration *rc)
{
MaemoPortList portList = rc->freePorts();
- if (rc->useCppDebugger())
+ if (rc->debuggingType() != MaemoRunConfiguration::DebugQmlOnly)
portList.getNext();
return portList.getNext();
}
@@ -314,7 +316,7 @@ QString MaemoDebugSupport::environment(const MaemoRunConfiguration *rc)
{
QList<Utils::EnvironmentItem> env = rc->userEnvironmentChanges();
// FIXME: this must use command line argument instead: -qmljsdebugger=port:1234.
- if (rc->useQmlDebugger()) {
+ if (rc->debuggingType() != MaemoRunConfiguration::DebugCppOnly) {
// env << Utils::EnvironmentItem(QLatin1String(Debugger::Constants::E_QML_DEBUG_SERVER_PORT),
// QString::number(qmlServerPort(rc)));
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
index 272e1c2211dc363c53f212d58b58d2ee9b8013e8..c5740cb0c775936e8b8d66dbf50f7544c4a25c5d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
@@ -218,7 +218,7 @@ QString MaemoDeployableListModel::localExecutableFilePath() const
fileName += ti.target;
if (isLib)
fileName += QLatin1String(isStatic ? ".a" : ".so");
- return QDir::cleanPath(ti.buildDir + '/' + fileName);
+ return QDir::cleanPath(ti.workingDir + '/' + fileName);
}
QString MaemoDeployableListModel::remoteExecutableFilePath() const
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index 804f7e4d88081cbc15c8ddfccd468f490675f01b..d9e2b70259fd2357f8e4249a0bfbe8e0d3ce72e0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -567,7 +567,7 @@ void MaemoDeployStep::connectToDevice()
m_connection = SshConnection::create();
connect(m_connection.data(), SIGNAL(connected()), this,
SLOT(handleConnected()));
- connect(m_connection.data(), SIGNAL(error(SshError)), this,
+ connect(m_connection.data(), SIGNAL(error(Core::SshError)), this,
SLOT(handleConnectionFailure()));
if (canReUse) {
unmountOldDirs();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp
index 0ea53fa3696baa4f9d29a49b50b621e7ee1a567c..1442ee7ac25642cacac545edd8b65d1eb956b817 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp
@@ -47,7 +47,10 @@ MaemoDeviceEnvReader::MaemoDeviceEnvReader(QObject *parent, MaemoRunConfiguratio
: QObject(parent)
, m_stop(false)
, m_devConfig(config->deviceConfig())
+ , m_runConfig(config)
{
+ connect(config, SIGNAL(deviceConfigurationChanged(ProjectExplorer::Target*)),
+ this, SLOT(handleCurrentDeviceConfigChanged()));
}
MaemoDeviceEnvReader::~MaemoDeviceEnvReader()
@@ -59,11 +62,11 @@ void MaemoDeviceEnvReader::start()
m_stop = false;
if (m_connection)
disconnect(m_connection.data(), 0, this, 0);
-
+
const bool reuse = m_connection
&& m_connection->state() == Core::SshConnection::Connected
&& m_connection->connectionParameters() == m_devConfig.server;
-
+
if (!reuse)
m_connection = Core::SshConnection::create();
@@ -71,7 +74,7 @@ void MaemoDeviceEnvReader::start()
SLOT(executeRemoteCall()));
connect(m_connection.data(), SIGNAL(error(SshError)), this,
SLOT(handleConnectionFailure()));
-
+
if (reuse)
executeRemoteCall();
else
@@ -89,20 +92,13 @@ void MaemoDeviceEnvReader::stop()
}
}
-void MaemoDeviceEnvReader::setEnvironment()
-{
- if (m_remoteOutput.isEmpty())
- return;
- m_env = Utils::Environment(m_remoteOutput.split(QLatin1Char('\n'),
- QString::SkipEmptyParts));
-}
-
void MaemoDeviceEnvReader::executeRemoteCall()
{
if (m_stop)
return;
- const QByteArray remoteCall = MaemoGlobal::remoteSourceProfilesCommand().toUtf8() + "; env";
+ const QByteArray remoteCall = MaemoGlobal::remoteSourceProfilesCommand()
+ .toUtf8() + "; env";
m_remoteProcess = m_connection->createRemoteProcess(remoteCall);
connect(m_remoteProcess.data(), SIGNAL(closed(int)), this,
@@ -123,6 +119,14 @@ void MaemoDeviceEnvReader::handleConnectionFailure()
emit finished();
}
+void MaemoDeviceEnvReader::handleCurrentDeviceConfigChanged()
+{
+ m_devConfig = m_runConfig->deviceConfig();
+
+ m_env.clear();
+ emit finished();
+}
+
void MaemoDeviceEnvReader::remoteProcessFinished(int exitCode)
{
Q_ASSERT(exitCode == Core::SshRemoteProcess::FailedToStart
@@ -132,8 +136,12 @@ void MaemoDeviceEnvReader::remoteProcessFinished(int exitCode)
if (m_stop)
return;
+ m_env.clear();
if (exitCode == Core::SshRemoteProcess::ExitedNormally) {
- setEnvironment();
+ if (!m_remoteOutput.isEmpty()) {
+ m_env = Utils::Environment(m_remoteOutput.split(QLatin1Char('\n'),
+ QString::SkipEmptyParts));
+ }
} else {
emit error(tr("Error running remote process: %1")
.arg(m_remoteProcess->errorString()));
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h
index 3d53e93ba0ffcbd9061e0c6dc01330717165e75a..e5ad89e4635bce92895f9f04a0949bd9ef244eaa 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.h
@@ -67,12 +67,10 @@ signals:
void finished();
void error(const QString &error);
-private:
- void setEnvironment();
-
private slots:
void executeRemoteCall();
void handleConnectionFailure();
+ void handleCurrentDeviceConfigChanged();
void remoteProcessFinished(int exitCode);
void remoteOutput(const QByteArray &data);
@@ -83,6 +81,7 @@ private:
QString m_remoteOutput;
Utils::Environment m_env;
MaemoDeviceConfig m_devConfig;
+ MaemoRunConfiguration *m_runConfig;
QSharedPointer<Core::SshConnection> m_connection;
QSharedPointer<Core::SshRemoteProcess> m_remoteProcess;
};
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
index 5641225f1b7d9e3abd2c353dbfaceeeb5cff402e..d782e508182006423b42a446cb4af824607950ca 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
@@ -72,7 +72,6 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
, m_qemuAction(0)
, m_qemuProcess(new QProcess(this))
, m_runningQtId(-1)
- , m_needsSetup(true)
, m_userTerminated(false)
{
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-run.png", iconSize);
@@ -149,9 +148,6 @@ bool MaemoQemuManager::runtimeForQtVersion(int uniqueId, Runtime *rt) const
void MaemoQemuManager::qtVersionsChanged(const QList<int> &uniqueIds)
{
- if (m_needsSetup)
- setupRuntimes();
-
QtVersionManager *manager = QtVersionManager::instance();
foreach (int uniqueId, uniqueIds) {
if (manager->isValidId(uniqueId)) {
@@ -199,7 +195,6 @@ void MaemoQemuManager::projectAdded(ProjectExplorer::Project *project)
foreach (Target *target, project->targets())
targetAdded(target);
- m_qemuAction->setVisible(!m_runtimes.isEmpty() && sessionHasMaemoTarget());
}
void MaemoQemuManager::projectRemoved(ProjectExplorer::Project *project)
@@ -255,7 +250,7 @@ void MaemoQemuManager::targetAdded(ProjectExplorer::Target *target)
foreach (RunConfiguration *rc, target->runConfigurations())
toggleDeviceConnections(qobject_cast<MaemoRunConfiguration*> (rc), true);
- m_qemuAction->setVisible(!m_runtimes.isEmpty() && sessionHasMaemoTarget());
+ toggleStarterButton(target);
}
void MaemoQemuManager::targetRemoved(ProjectExplorer::Target *target)
@@ -522,19 +517,6 @@ void MaemoQemuManager::runtimeFolderChanged(const QString &directory)
// -- private
-void MaemoQemuManager::setupRuntimes()
-{
- m_needsSetup = false;
-
- const QList<QtVersion*> &versions = QtVersionManager::instance()
- ->versionsForTargetId(Constants::MAEMO_DEVICE_TARGET_ID);
-
- QList<int> uniqueIds;
- foreach (QtVersion *version, versions)
- uniqueIds.append(version->uniqueId());
- qtVersionsChanged(uniqueIds);
-}
-
void MaemoQemuManager::updateStarterIcon(bool running)
{
QIcon::State state;
@@ -554,9 +536,6 @@ void MaemoQemuManager::updateStarterIcon(bool running)
void MaemoQemuManager::toggleStarterButton(Target *target)
{
- if (m_needsSetup)
- setupRuntimes();
-
int uniqueId = -1;
if (target) {
if (Qt4Target *qt4Target = qobject_cast<Qt4Target*>(target)) {
@@ -567,12 +546,16 @@ void MaemoQemuManager::toggleStarterButton(Target *target)
}
}
+ if (m_runtimes.isEmpty() || !m_runtimes.contains(uniqueId))
+ qtVersionsChanged(QList<int>() << uniqueId);
+
bool isRunning = m_qemuProcess->state() != QProcess::NotRunning;
if (m_runningQtId == uniqueId)
isRunning = false;
m_qemuAction->setEnabled(m_runtimes.value(uniqueId, Runtime()).isValid()
&& targetUsesMatchingRuntimeConfig(target) && !isRunning);
+ m_qemuAction->setVisible(!m_runtimes.isEmpty() && sessionHasMaemoTarget());
}
bool MaemoQemuManager::sessionHasMaemoTarget() const
@@ -739,7 +722,12 @@ QString MaemoQemuManager::runtimeForQtVersion(const QString &qmakeCommand) const
&& infoReader.name() == QLatin1String("installed")) {
if (infoReader.readNext() == QXmlStreamReader::Characters
&& infoReader.text() == QLatin1String("true"))
- installedRuntimes << attrs.value(QLatin1String("runtime_id")).toString();
+ if (attrs.hasAttribute(QLatin1String(QLatin1String("runtime_id"))))
+ installedRuntimes << attrs.value(QLatin1String("runtime_id")).toString();
+ else if (attrs.hasAttribute(QLatin1String(QLatin1String("id")))) {
+ // older MADDE seems to use only id
+ installedRuntimes << attrs.value(QLatin1String("id")).toString();
+ }
break;
}
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
index 09e47997c7f587ffa26ccea2badc022a697b602e..6222ea972c1ea0c0261aebe83cc78331e439be5c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
@@ -123,7 +123,6 @@ private:
MaemoQemuManager(QObject *parent);
~MaemoQemuManager();
- void setupRuntimes();
bool sessionHasMaemoTarget() const;
void updateStarterIcon(bool running);
@@ -146,7 +145,6 @@ private:
QProcess *m_qemuProcess;
int m_runningQtId;
- bool m_needsSetup;
bool m_userTerminated;
QIcon m_qemuStarterIcon;
QMap<int, Runtime> m_runtimes;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 3aca439313de294877b1cb8e7ef931b602362466..84fdd1cb614607f53a254085405f8083c73bf8b0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -47,7 +47,7 @@ namespace Qt4ProjectManager {
namespace Internal {
MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
- : QObject(parent), m_utfsServerTimer(new QTimer(this)),
+ : QObject(parent), m_toolChain(0), m_utfsServerTimer(new QTimer(this)),
m_uploadJobId(SftpInvalidJob), m_state(Inactive)
{
connect(m_utfsServerTimer, SIGNAL(timeout()), this,
@@ -69,9 +69,10 @@ void MaemoRemoteMounter::setConnection(const Core::SshConnection::Ptr &connectio
bool MaemoRemoteMounter::addMountSpecification(const MaemoMountSpecification &mountSpec,
bool mountAsRoot)
{
+ Q_ASSERT(m_toolChain);
ASSERT_STATE(Inactive);
- if (mountSpec.isValid()) {
+ if (m_toolChain->allowsRemoteMounts() && mountSpec.isValid()) {
if (!m_portList.hasMore())
return false;
else
@@ -80,14 +81,17 @@ bool MaemoRemoteMounter::addMountSpecification(const MaemoMountSpecification &mo
return true;
}
+bool MaemoRemoteMounter::hasValidMountSpecifications() const
+{
+ return !m_mountSpecs.isEmpty();
+}
+
void MaemoRemoteMounter::mount()
{
ASSERT_STATE(Inactive);
Q_ASSERT(m_utfsServers.isEmpty());
Q_ASSERT(m_connection);
- if (!m_toolChain->allowsRemoteMounts())
- m_mountSpecs.clear();
if (m_mountSpecs.isEmpty()) {
setState(Inactive);
emit reportProgress(tr("No directories to mount"));
@@ -114,7 +118,6 @@ void MaemoRemoteMounter::unmount()
m_mountSpecs.at(i).mountSpec.remoteMountPoint);
}
- emit reportProgress(tr("Unmounting remote mount points..."));
m_umountStderr.clear();
m_unmountProcess = m_connection->createRemoteProcess(remoteCall.toUtf8());
connect(m_unmountProcess.data(), SIGNAL(closed(int)), this,
@@ -240,9 +243,8 @@ void MaemoRemoteMounter::handleUploadFinished(Core::SftpJobId jobId,
m_uploadJobId = SftpInvalidJob;
if (!errorMsg.isEmpty()) {
- emit error(tr("Could not upload UTFS client: %1").arg(errorMsg));
- setState(Inactive);
- return;
+ emit reportProgress(tr("Could not upload UTFS client (%1), continuing anyway.")
+ .arg(errorMsg));
}
startUtfsClients();
@@ -459,6 +461,8 @@ void MaemoRemoteMounter::setState(State newState)
m_state = newState;
}
+// TODO: Perhaps remove this one again, since it might interfere with
+// an unrelated application
void MaemoRemoteMounter::killUtfsClients()
{
const SshRemoteProcess::Ptr utfsClientKiller
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
index 9445d3d050d8c2fba92d59b7229efac39ddc1313..8e297be80dff983e3c7011cb894a25f0a2951187 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
@@ -63,6 +63,7 @@ public:
void setPortList(const MaemoPortList &portList) { m_portList = portList; }
bool addMountSpecification(const MaemoMountSpecification &mountSpec,
bool mountAsRoot);
+ bool hasValidMountSpecifications() const;
void resetMountSpecifications() { m_mountSpecs.clear(); }
void mount();
void unmount();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 724d2d191e03e275ecb1e81f2a86b0a7228a83cc..18e734f26568aed4225b97d769a8c6af59867372 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -304,6 +304,30 @@ void MaemoRunConfiguration::setArguments(const QStringList &args)
m_arguments = args;
}
+MaemoRunConfiguration::DebuggingType MaemoRunConfiguration::debuggingType() const
+{
+ if (!toolchain() || !toolchain()->allowsQmlDebugging())
+ return DebugCppOnly;
+ if (useCppDebugger()) {
+ if (useQmlDebugger())
+ return DebugCppAndQml;
+ return DebugCppOnly;
+ }
+ return DebugQmlOnly;
+}
+
+int MaemoRunConfiguration::portsUsedByDebuggers() const
+{
+ switch (debuggingType()) {
+ case DebugCppOnly:
+ case DebugQmlOnly:
+ return 1;
+ case DebugCppAndQml:
+ default:
+ return 2;
+ }
+}
+
void MaemoRunConfiguration::updateDeviceConfigurations()
{
emit deviceConfigurationChanged(target());
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
index b25848b92a4168c9c6ee3051cdd5d00106a9e3f5..42e328359446189104aa6be6c16999c16d015bf5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
@@ -71,6 +71,8 @@ public:
SystemEnvironmentBase = 1
};
+ enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml };
+
MaemoRunConfiguration(Qt4Target *parent, const QString &proFilePath);
virtual ~MaemoRunConfiguration();
@@ -96,6 +98,7 @@ public:
bool useRemoteGdb() const;
void setUseRemoteGdb(bool useRemoteGdb) { m_useRemoteGdb = useRemoteGdb; }
void updateFactoryState() { emit isEnabledChanged(true); }
+ DebuggingType debuggingType() const;
const QString gdbCmd() const;
const QString dumperLib() const;
@@ -116,7 +119,7 @@ public:
Utils::Environment systemEnvironment() const;
void setSystemEnvironment(const Utils::Environment &environment);
- int portsUsedByDebuggers() const { return useCppDebugger() + useQmlDebugger(); }
+ int portsUsedByDebuggers() const;
signals:
void deviceConfigurationChanged(ProjectExplorer::Target *target);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index 8d2279bf9ce98a13f8a4adf2b423cba5b065cd9a..ddc20d8ce506ef62dfd161781fa9753013e4e787 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -126,10 +126,11 @@ void MaemoRunConfigurationWidget::addGenericWidgets(QVBoxLayout *mainLayout)
m_debugCppOnlyButton = new QRadioButton(tr("C++ only"));
m_debugQmlOnlyButton = new QRadioButton(tr("QML only"));
m_debugCppAndQmlButton = new QRadioButton(tr("C++ and QML"));
+ m_debuggingLanguagesLabel = new QLabel(tr("Debugging type:"));
debugButtonsLayout->addWidget(m_debugCppOnlyButton);
debugButtonsLayout->addWidget(m_debugQmlOnlyButton);
debugButtonsLayout->addWidget(m_debugCppAndQmlButton);
- formLayout->addRow(tr("Debugging type:"), debugButtonsLayout);
+ formLayout->addRow(m_debuggingLanguagesLabel, debugButtonsLayout);
if (m_runConfiguration->useCppDebugger()) {
if (m_runConfiguration->useQmlDebugger())
m_debugCppAndQmlButton->setChecked(true);
@@ -283,6 +284,7 @@ void MaemoRunConfigurationWidget::updateTargetInformation()
void MaemoRunConfigurationWidget::handleDeploySpecsChanged()
{
m_remoteExecutableLabel->setText(m_runConfiguration->remoteExecutableFilePath());
+ m_runConfiguration->updateFactoryState();
}
void MaemoRunConfigurationWidget::handleBuildConfigChanged()
@@ -304,6 +306,11 @@ void MaemoRunConfigurationWidget::handleToolchainChanged()
const bool remoteMountsAvailable = toolChain->allowsRemoteMounts();
m_debugDetailsContainer->setVisible(remoteMountsAvailable);
m_mountDetailsContainer->setVisible(remoteMountsAvailable);
+ const bool qmlDebuggingAvailable = toolChain->allowsQmlDebugging();
+ m_debuggingLanguagesLabel->setVisible(qmlDebuggingAvailable);
+ m_debugCppOnlyButton->setVisible(qmlDebuggingAvailable);
+ m_debugQmlOnlyButton->setVisible(qmlDebuggingAvailable);
+ m_debugCppAndQmlButton->setVisible(qmlDebuggingAvailable);
}
m_runConfiguration->updateFactoryState();
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
index 2fb92edefdeaffe8635d334ad3d371fc96d725f5..be686ac00008381186c56f11e9b08c3c843ae998 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
@@ -107,6 +107,7 @@ private:
QLabel *m_localExecutableLabel;
QLabel *m_remoteExecutableLabel;
QLabel *m_devConfLabel;
+ QLabel *m_debuggingLanguagesLabel;
QRadioButton *m_debugCppOnlyButton;
QRadioButton *m_debugQmlOnlyButton;
QRadioButton *m_debugCppAndQmlButton;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index 597fb387a19a4b7b8b3c602cb45d3abb0de30ad6..a71277ee1776a6d58202f8fa041c3b9f5f980157 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -85,8 +85,8 @@ void MaemoRunControl::start()
SLOT(handleRemoteOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteProcessStarted()), this,
SLOT(handleRemoteProcessStarted()));
- connect(m_runner, SIGNAL(remoteProcessFinished(int)), this,
- SLOT(handleRemoteProcessFinished(int)));
+ connect(m_runner, SIGNAL(remoteProcessFinished(qint64)), this,
+ SLOT(handleRemoteProcessFinished(qint64)));
connect(m_runner, SIGNAL(reportProgress(QString)), this,
SLOT(handleProgressReport(QString)));
connect(m_runner, SIGNAL(mountDebugOutput(QString)), this,
@@ -118,11 +118,13 @@ void MaemoRunControl::startExecution()
.arg(m_runConfig->arguments().join(QLatin1String(" "))).toUtf8());
}
-void MaemoRunControl::handleRemoteProcessFinished(int exitCode)
+void MaemoRunControl::handleRemoteProcessFinished(qint64 exitCode)
{
- emit appendMessage(this,
- tr("Finished running remote process. Exit code was %1.").arg(exitCode),
- false);
+ if (exitCode != MaemoSshRunner::InvalidExitCode) {
+ emit appendMessage(this,
+ tr("Finished running remote process. Exit code was %1.")
+ .arg(exitCode), false);
+ }
setFinished();
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
index ffde0f7018996fac9476b009523ba28030eaf48c..4f8edb6da988ef0e308ccee037bc6c86ba8a69d5 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h
@@ -61,7 +61,7 @@ private slots:
void startExecution();
void handleSshError(const QString &error);
void handleRemoteProcessStarted() {}
- void handleRemoteProcessFinished(int exitCode);
+ void handleRemoteProcessFinished(qint64 exitCode);
void handleRemoteOutput(const QByteArray &output);
void handleRemoteErrorOutput(const QByteArray &output);
void handleProgressReport(const QString &progressString);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
index b39da25f22d8825823837b8f051b68c0d311cc54..16db4f4386977cb5f78b4a880c591a21466ce9ae 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
@@ -46,6 +46,10 @@
#include <QtCore/QFileInfo>
+#include <limits>
+
+#define ASSERT_STATE(state) assertState(state, Q_FUNC_INFO)
+
using namespace Core;
namespace Qt4ProjectManager {
@@ -55,8 +59,8 @@ MaemoSshRunner::MaemoSshRunner(QObject *parent,
MaemoRunConfiguration *runConfig, bool debugging)
: QObject(parent), m_runConfig(runConfig),
m_mounter(new MaemoRemoteMounter(this)),
- m_devConfig(runConfig->deviceConfig()), m_shuttingDown(false),
- m_debugging(debugging)
+ m_devConfig(runConfig->deviceConfig()),
+ m_debugging(debugging), m_state(Inactive)
{
m_procsToKill
<< QFileInfo(m_runConfig->localExecutableFilePath()).fileName()
@@ -77,27 +81,21 @@ MaemoSshRunner::~MaemoSshRunner() {}
void MaemoSshRunner::start()
{
- // Should not happen.
- if (m_shuttingDown) {
- emit error(tr("Cannot start deployment, as the clean-up from the last time has not finished yet."));
- return;
- }
+ ASSERT_STATE(QList<State>() << Inactive << StopRequested);
- m_stop = false;
+ setState(Connecting);
m_exitStatus = -1;
if (m_connection)
disconnect(m_connection.data(), 0, this, 0);
- bool reUse = isConnectionUsable();
- if (!reUse)
- m_connection = m_runConfig->deployStep()->sshConnection();
- reUse = isConnectionUsable();
+ m_connection = m_runConfig->deployStep()->sshConnection();
+ const bool reUse = isConnectionUsable();
if (!reUse)
m_connection = SshConnection::create();
connect(m_connection.data(), SIGNAL(connected()), this,
SLOT(handleConnected()));
- connect(m_connection.data(), SIGNAL(error(SshError)), this,
+ connect(m_connection.data(), SIGNAL(error(Core::SshError)), this,
SLOT(handleConnectionFailure()));
- if (reUse) {
+ if (reUse) {
handleConnected();
} else {
emit reportProgress(tr("Connecting to device..."));
@@ -107,41 +105,44 @@ void MaemoSshRunner::start()
void MaemoSshRunner::stop()
{
- if (m_shuttingDown)
+ if (m_state == PostRunCleaning || m_state == StopRequested
+ || m_state == Inactive)
return;
- m_stop = true;
- m_mounter->stop();
- if (m_cleaner)
- disconnect(m_cleaner.data(), 0, this, 0);
- cleanup(false);
+ setState(StopRequested);
+ cleanup();
}
void MaemoSshRunner::handleConnected()
{
- if (m_stop)
- return;
-
- cleanup(true);
+ ASSERT_STATE(QList<State>() << Connecting << StopRequested);
+ if (m_state == StopRequested) {
+ setState(Inactive);
+ } else {
+ setState(PreRunCleaning);
+ cleanup();
+ }
}
void MaemoSshRunner::handleConnectionFailure()
{
- emit error(tr("Could not connect to host: %1")
- .arg(m_connection->errorString()));
+ if (m_state == Inactive)
+ qWarning("Unexpected state %d in %s.", m_state, Q_FUNC_INFO);
+
+ const QString errorTemplate = m_state == Connecting
+ ? tr("Could not connect to host: %1") : tr("Connection failed: %1");
+ emitError(errorTemplate.arg(m_connection->errorString()));
}
-void MaemoSshRunner::cleanup(bool initialCleanup)
+void MaemoSshRunner::cleanup()
{
- if (!isConnectionUsable())
- return;
+ ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning
+ << StopRequested);
emit reportProgress(tr("Killing remote process(es)..."));
- m_shuttingDown = !initialCleanup;
// pkill behaves differently on Fremantle and Harmattan.
const char *const killTemplate = "pkill -%2 '^%1$'; pkill -%2 '/%1$';";
-
QString niceKill;
QString brutalKill;
foreach (const QString &proc, m_procsToKill) {
@@ -163,37 +164,41 @@ void MaemoSshRunner::handleCleanupFinished(int exitStatus)
|| exitStatus == SshRemoteProcess::KilledBySignal
|| exitStatus == SshRemoteProcess::ExitedNormally);
- if (m_shuttingDown) {
- m_unmountState = ShutdownUnmount;
- m_mounter->unmount();
- return;
- }
+ ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning
+ << StopRequested << Inactive);
- if (m_stop)
+ if (m_state == Inactive)
+ return;
+ if (m_state == StopRequested || m_state == PostRunCleaning) {
+ unmount();
return;
+ }
if (exitStatus != SshRemoteProcess::ExitedNormally) {
- emit error(tr("Initial cleanup failed: %1")
+ emitError(tr("Initial cleanup failed: %1")
.arg(m_cleaner->errorString()));
} else {
m_mounter->setConnection(m_connection);
- m_unmountState = InitialUnmount;
- m_mounter->unmount();
+ unmount();
}
}
void MaemoSshRunner::handleUnmounted()
{
- switch (m_unmountState) {
- case InitialUnmount: {
- if (m_stop)
- return;
+ ASSERT_STATE(QList<State>() << PreRunCleaning << PreMountUnmounting
+ << PostRunCleaning << StopRequested);
+
+ switch (m_state) {
+ case PreRunCleaning: {
m_mounter->resetMountSpecifications();
MaemoPortList portList = m_devConfig.freePorts();
if (m_debugging) { // gdbserver and QML inspector need one port each.
- if (m_runConfig->useCppDebugger() && !m_runConfig->useRemoteGdb())
+ MaemoRunConfiguration::DebuggingType debuggingType
+ = m_runConfig->debuggingType();
+ if (debuggingType != MaemoRunConfiguration::DebugQmlOnly
+ && !m_runConfig->useRemoteGdb())
portList.getNext();
- if (m_runConfig->useQmlDebugger())
+ if (debuggingType != MaemoRunConfiguration::DebugCppOnly)
portList.getNext();
}
m_mounter->setToolchain(m_runConfig->toolchain());
@@ -210,49 +215,54 @@ void MaemoSshRunner::handleUnmounted()
MaemoGlobal::remoteProjectSourcesMountPoint())))
return;
}
- m_unmountState = PreMountUnmount;
- m_mounter->unmount();
+ setState(PreMountUnmounting);
+ unmount();
break;
}
- case PreMountUnmount:
- if (m_stop)
- return;
- m_mounter->mount();
+ case PreMountUnmounting:
+ mount();
break;
- case ShutdownUnmount:
- Q_ASSERT(m_shuttingDown);
+ case PostRunCleaning:
+ case StopRequested:
m_mounter->resetMountSpecifications();
- m_shuttingDown = false;
- if (m_exitStatus == SshRemoteProcess::ExitedNormally) {
+ if (m_state == StopRequested) {
+ emit remoteProcessFinished(InvalidExitCode);
+ } else if (m_exitStatus == SshRemoteProcess::ExitedNormally) {
emit remoteProcessFinished(m_runner->exitCode());
- } else if (m_exitStatus == -1) {
- emit remoteProcessFinished(-1);
} else {
emit error(tr("Error running remote process: %1")
.arg(m_runner->errorString()));
}
- m_exitStatus = -1;
+ setState(Inactive);
break;
+ default: ;
}
}
void MaemoSshRunner::handleMounted()
{
- if (!m_stop)
+ ASSERT_STATE(QList<State>() << Mounting << StopRequested);
+
+ if (m_state == Mounting) {
+ setState(ReadyForExecution);
emit readyForExecution();
+ }
}
void MaemoSshRunner::handleMounterError(const QString &errorMsg)
{
- if (m_shuttingDown)
- m_shuttingDown = false;
- emit error(errorMsg);
+ ASSERT_STATE(QList<State>() << PreRunCleaning << PostRunCleaning
+ << PreMountUnmounting << Mounting << StopRequested << Inactive);
+
+ emitError(errorMsg);
}
void MaemoSshRunner::startExecution(const QByteArray &remoteCall)
{
+ ASSERT_STATE(ReadyForExecution);
+
if (m_runConfig->remoteExecutableFilePath().isEmpty()) {
- emit error(tr("Cannot run: No remote executable set."));
+ emitError(tr("Cannot run: No remote executable set."));
return;
}
@@ -265,6 +275,7 @@ void MaemoSshRunner::startExecution(const QByteArray &remoteCall)
SIGNAL(remoteOutput(QByteArray)));
connect(m_runner.data(), SIGNAL(errorOutputAvailable(QByteArray)), this,
SIGNAL(remoteErrorOutput(QByteArray)));
+ setState(ProcessStarting);
m_runner->start();
}
@@ -273,15 +284,19 @@ void MaemoSshRunner::handleRemoteProcessFinished(int exitStatus)
Q_ASSERT(exitStatus == SshRemoteProcess::FailedToStart
|| exitStatus == SshRemoteProcess::KilledBySignal
|| exitStatus == SshRemoteProcess::ExitedNormally);
+ ASSERT_STATE(QList<State>() << ProcessStarting << StopRequested << Inactive);
m_exitStatus = exitStatus;
- cleanup(false);
+ if (m_state != StopRequested && m_state != Inactive) {
+ setState(PostRunCleaning);
+ cleanup();
+ }
}
bool MaemoSshRunner::addMountSpecification(const MaemoMountSpecification &mountSpec)
{
if (!m_mounter->addMountSpecification(mountSpec, false)) {
- emit error(tr("The device does not have enough free ports "
+ emitError(tr("The device does not have enough free ports "
"for this run configuration."));
return false;
}
@@ -294,6 +309,80 @@ bool MaemoSshRunner::isConnectionUsable() const
&& m_connection->connectionParameters() == m_devConfig.server;
}
+void MaemoSshRunner::assertState(State expectedState, const char *func)
+{
+ assertState(QList<State>() << expectedState, func);
+}
+
+void MaemoSshRunner::assertState(const QList<State> &expectedStates,
+ const char *func)
+{
+ if (!expectedStates.contains(m_state))
+ qWarning("Unexpected state %d at %s.", m_state, func);
+}
+
+void MaemoSshRunner::setState(State newState)
+{
+ if (newState == Inactive) {
+ m_mounter->setConnection(SshConnection::Ptr());
+ if (m_connection) {
+ disconnect(m_connection.data(), 0, this, 0);
+ m_connection = SshConnection::Ptr();
+ }
+ if (m_cleaner)
+ disconnect(m_cleaner.data(), 0, this, 0);
+ }
+ m_state = newState;
+}
+
+void MaemoSshRunner::emitError(const QString &errorMsg)
+{
+ if (m_state != Inactive) {
+ emit error(errorMsg);
+ setState(Inactive);
+ }
+}
+
+void MaemoSshRunner::mount()
+{
+ setState(Mounting);
+ if (m_mounter->hasValidMountSpecifications()) {
+ emit reportProgress(tr("Mounting host directories..."));
+ m_mounter->mount();
+ } else {
+ handleMounted();
+ }
+}
+
+void MaemoSshRunner::unmount()
+{
+ ASSERT_STATE(QList<State>() << PreRunCleaning << PreMountUnmounting
+ << PostRunCleaning << StopRequested);
+ if (m_mounter->hasValidMountSpecifications()) {
+ QString message;
+ switch (m_state) {
+ case PreRunCleaning:
+ message = tr("Unmounting left-over host directory mounts...");
+ break;
+ case PreMountUnmounting:
+ message = tr("Potentially unmounting left-over host directory mounts...");
+ case StopRequested: case PostRunCleaning:
+ message = tr("Unmounting host directories...");
+ break;
+ default:
+ break;
+ }
+ emit reportProgress(message);
+ m_mounter->unmount();
+ } else {
+ handleUnmounted();
+ }
+}
+
+
+const qint64 MaemoSshRunner::InvalidExitCode
+ = std::numeric_limits<qint64>::min();
+
} // namespace Internal
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h
index 96447e0c4ecb6863b00ad83354f97128f9a22de2..2c756a2382b2b8db4e1d862de1e9a3cda17e7b24 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.h
@@ -67,6 +67,8 @@ public:
QSharedPointer<Core::SshConnection> connection() const { return m_connection; }
+ static const qint64 InvalidExitCode;
+
signals:
void error(const QString &error);
void mountDebugOutput(const QString &output);
@@ -75,7 +77,7 @@ signals:
void remoteErrorOutput(const QByteArray &output);
void reportProgress(const QString &progressOutput);
void remoteProcessStarted();
- void remoteProcessFinished(int exitCode);
+ void remoteProcessFinished(qint64 exitCode);
private slots:
void handleConnected();
@@ -87,9 +89,21 @@ private slots:
void handleMounterError(const QString &errorMsg);
private:
- void cleanup(bool initialCleanup);
+ enum State { Inactive, Connecting, PreRunCleaning, PostRunCleaning,
+ PreMountUnmounting, Mounting, ReadyForExecution,
+ ProcessStarting, StopRequested
+ };
+
+ void assertState(State expectedState, const char *func);
+ void assertState(const QList<State> &expectedStates, const char *func);
+ void setState(State newState);
+ void emitError(const QString &errorMsg);
+
+ void cleanup();
bool addMountSpecification(const MaemoMountSpecification &mountSpec);
bool isConnectionUsable() const;
+ void mount();
+ void unmount();
MaemoRunConfiguration * const m_runConfig; // TODO this pointer can be invalid
MaemoRemoteMounter * const m_mounter;
@@ -100,13 +114,9 @@ private:
QSharedPointer<Core::SshRemoteProcess> m_cleaner;
QStringList m_procsToKill;
- bool m_stop;
int m_exitStatus;
- bool m_shuttingDown;
const bool m_debugging;
-
- enum UnmountState { InitialUnmount, PreMountUnmount, ShutdownUnmount };
- UnmountState m_unmountState;
+ State m_state;
};
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
index 2bac839dc9e66186bd87222733a0be7b25d7a439..c64c35e6237e5b2ceff7c6d1d72358f68499ed68 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
@@ -81,6 +81,8 @@ MaemoTemplatesManager::MaemoTemplatesManager(QObject *parent) : QObject(parent)
= ProjectExplorerPlugin::instance()->session();
connect(session, SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
this, SLOT(handleActiveProjectChanged(ProjectExplorer::Project*)));
+ connect(session, SIGNAL(projectAdded(ProjectExplorer::Project*)), this,
+ SLOT(handleActiveProjectChanged(ProjectExplorer::Project*)));
connect(session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)),
this, SLOT(handleProjectToBeRemoved(ProjectExplorer::Project*)));
handleActiveProjectChanged(session->startupProject());
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
index 7589b1e24256df194fc8075b7c75cb424b4948a5..edda2c25d71e326815e1e7d87066a3d732e21445 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h
@@ -56,6 +56,7 @@ public:
MaemoVersion version() const;
bool allowsRemoteMounts() const { return version() == Maemo5; }
bool allowsPackagingDisabling() const { return version() == Maemo5; }
+ bool allowsQmlDebugging() const { return version() == Maemo6; }
protected:
bool equals(const ToolChain *other) const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
index 5702d3611b58b69bcf4d9e828a05cf86c4865a97..cde0deeee409b01e89c10cc424f2b790231dc9fc 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.cpp
@@ -36,65 +36,217 @@ using namespace ProjectExplorer::Constants;
using namespace Qt4ProjectManager;
RvctParser::RvctParser() :
- m_additionalInfo(false),
- m_lastLine(0)
+ m_task(0)
{
setObjectName(QLatin1String("RvctParser"));
// Start of a error or warning:
- m_warningOrError.setPattern("^\"([^\\(\\)]+[^\\d])\", line (\\d+):(\\s(Warning|Error):)\\s(.+)$");
+ m_warningOrError.setPattern("^\"([^\\(\\)]+[^\\d])\", line (\\d+):(\\s(Warning|Error):)\\s+([^\\s].*)$");
m_warningOrError.setMinimal(true);
// Last message for any file with warnings/errors.
- m_doneWithFile.setPattern("^([^\\(\\)]+[^\\d]):\\s(\\d+) warnings?,\\s(\\d+) errors?$");
- m_doneWithFile.setMinimal(true);
+ m_wrapUpTask.setPattern("^([^\\(\\)]+[^\\d]):\\s(\\d+) warnings?,\\s(\\d+) errors?$");
+ m_wrapUpTask.setMinimal(true);
// linker problems:
- m_linkerProblem.setPattern("^(\\S*)\\(\\S+\\):\\s(.+)$");
- m_linkerProblem.setMinimal(true);
+ m_genericProblem.setPattern("^(Error|Warning): (.*)$");
+ m_genericProblem.setMinimal(true);
+}
+
+RvctParser::~RvctParser()
+{
+ sendTask();
}
void RvctParser::stdError(const QString &line)
{
QString lne = line.trimmed();
- if (m_linkerProblem.indexIn(lne) > -1) {
- emit addTask(Task(Task::Error,
- m_linkerProblem.cap(2) /* description */,
- m_linkerProblem.cap(1) /* filename */,
- -1 /* linenumber */,
- TASK_CATEGORY_COMPILE));
- return;
- }
+ if (m_genericProblem.indexIn(lne) > -1) {
+ sendTask();
+
+ m_task = new Task(Task::Error,
+ m_genericProblem.cap(2) /* description */,
+ QString(),
+ -1 /* linenumber */,
+ TASK_CATEGORY_COMPILE);
+ if (m_warningOrError.cap(4) == "Warning")
+ m_task->type = Task::Warning;
+ else if (m_warningOrError.cap(4) == "Error")
+ m_task->type = Task::Error;
+ return;
+ }
if (m_warningOrError.indexIn(lne) > -1) {
- m_lastFile = m_warningOrError.cap(1);
- m_lastLine = m_warningOrError.cap(2).toInt();
+ sendTask();
- Task task(Task::Unknown,
- m_warningOrError.cap(5) /* description */,
- m_lastFile, m_lastLine,
- TASK_CATEGORY_COMPILE);
+ m_task = new Task(Task::Unknown,
+ m_warningOrError.cap(5) /* description */,
+ m_warningOrError.cap(1) /* file */, m_warningOrError.cap(2).toInt() /* line */,
+ TASK_CATEGORY_COMPILE);
if (m_warningOrError.cap(4) == "Warning")
- task.type = Task::Warning;
+ m_task->type = Task::Warning;
else if (m_warningOrError.cap(4) == "Error")
- task.type = Task::Error;
-
- m_additionalInfo = true;
-
- emit addTask(task);
+ m_task->type = Task::Error;
return;
}
- if (m_doneWithFile.indexIn(lne) > -1) {
- m_additionalInfo = false;
+ if (m_wrapUpTask.indexIn(lne) > -1) {
+ sendTask();
return;
}
- if (m_additionalInfo) {
- // Report any lines after a error/warning message as these contain
- // additional information on the problem.
- emit addTask(Task(Task::Unknown, lne,
- m_lastFile, m_lastLine,
- TASK_CATEGORY_COMPILE));
+ if (m_task) {
+ QString description = line;
+ if (description.startsWith(QLatin1String(" ")))
+ description = description.mid(2);
+ if (description.endsWith('\n'))
+ description.chop(1);
+ if (m_task->formats.isEmpty()) {
+ QTextLayout::FormatRange fr;
+ fr.start = m_task->description.count(); // incl. '\n' we are about to add!
+ fr.length = description.count() - 1;
+ fr.format.setFontItalic(true);
+ m_task->formats.append(fr);
+ } else {
+ m_task->formats[0].length += description.count() - 2 + 1;
+ }
+ m_task->description += QLatin1Char('\n') + description;
+
+ // Wrap up license error:
+ if (description.endsWith(QLatin1String("at \"www.macrovision.com\".")))
+ sendTask();
+
return;
}
IOutputParser::stdError(line);
}
+
+void RvctParser::sendTask()
+{
+ if (!m_task)
+ return;
+ emit addTask(*m_task);
+ delete m_task;
+ m_task = 0;
+}
+
+// Unit tests:
+
+#ifdef WITH_TESTS
+# include <QTest>
+
+# include "qt4projectmanagerplugin.h"
+# include <projectexplorer/metatypedeclarations.h>
+# include <projectexplorer/outputparser_test.h>
+
+using namespace Qt4ProjectManager::Internal;
+
+void Qt4ProjectManagerPlugin::testRvctOutputParser_data()
+{
+ QTest::addColumn<QString>("input");
+ QTest::addColumn<OutputParserTester::Channel>("inputChannel");
+ QTest::addColumn<QString>("childStdOutLines");
+ QTest::addColumn<QString>("childStdErrLines");
+ QTest::addColumn<QList<ProjectExplorer::Task> >("tasks");
+ QTest::addColumn<QString>("outputLines");
+
+
+ QTest::newRow("pass-through stdout")
+ << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
+ << QString::fromLatin1("Sometext") << QString()
+ << QList<ProjectExplorer::Task>()
+ << QString();
+ QTest::newRow("pass-through stderr")
+ << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
+ << QString() << QString::fromLatin1("Sometext")
+ << QList<ProjectExplorer::Task>()
+ << QString();
+
+ QTest::newRow("Rvct warning")
+ << QString::fromLatin1("\"../../../../s60-sdk/epoc32/include/stdapis/stlport/stl/_limits.h\", line 256: Warning: #68-D: integer conversion resulted in a change of sign\n"
+ " : public _Integer_limits<char, CHAR_MIN, CHAR_MAX, -1, true>\n"
+ " ^")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << (QList<ProjectExplorer::Task>()
+ << Task(Task::Warning,
+ QLatin1String("#68-D: integer conversion resulted in a change of sign\n"
+ " : public _Integer_limits<char, CHAR_MIN, CHAR_MAX, -1, true>\n"
+ " ^"),
+ QLatin1String("../../../../s60-sdk/epoc32/include/stdapis/stlport/stl/_limits.h"), 256,
+ Constants::TASK_CATEGORY_COMPILE)
+ )
+ << QString();
+ QTest::newRow("Rvct error")
+ << QString::fromLatin1("\"mainwindow.cpp\", line 22: Error: #20: identifier \"e\" is undefined\n"
+ " delete ui;e\n"
+ " ^")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << (QList<ProjectExplorer::Task>()
+ << Task(Task::Error,
+ QLatin1String("#20: identifier \"e\" is undefined\n"
+ " delete ui;e\n"
+ " ^"),
+ QLatin1String("mainwindow.cpp"), 22,
+ Constants::TASK_CATEGORY_COMPILE)
+ )
+ << QString();
+ QTest::newRow("Rvct linking error")
+ << QString::fromLatin1("Error: L6218E: Undefined symbol MainWindow::sth() (referred from mainwindow.o)")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << (QList<ProjectExplorer::Task>()
+ << Task(Task::Error,
+ QLatin1String("L6218E: Undefined symbol MainWindow::sth() (referred from mainwindow.o)"),
+ QString(), -1,
+ Constants::TASK_CATEGORY_COMPILE)
+ )
+ << QString();
+ QTest::newRow("Rvct license error")
+ << QString::fromLatin1("Error: C3397E: Cannot obtain license for Compiler (feature compiler) with license version >= 2.2:\n"
+ "Cannot find license file.\n"
+ " The license files (or license server system network addresses) attempted are \n"
+ "listed below. Use LM_LICENSE_FILE to use a different license file,\n"
+ " or contact your software provider for a license file.\n"
+ "Feature: compiler\n"
+ "Filename: /usr/local/flexlm/licenses/license.dat\n"
+ "License path: /usr/local/flexlm/licenses/license.dat\n"
+ "FLEXnet Licensing error:-1,359. System Error: 2 \"No such file or directory\"\n"
+ "For further information, refer to the FLEXnet Licensing End User Guide,\n"
+ "available at \"www.macrovision.com\".")
+ << OutputParserTester::STDERR
+ << QString() << QString()
+ << (QList<ProjectExplorer::Task>()
+ << Task(Task::Error,
+ QLatin1String("C3397E: Cannot obtain license for Compiler (feature compiler) with license version >= 2.2:\n"
+ "Cannot find license file.\n"
+ " The license files (or license server system network addresses) attempted are \n"
+ "listed below. Use LM_LICENSE_FILE to use a different license file,\n"
+ " or contact your software provider for a license file.\n"
+ "Feature: compiler\n"
+ "Filename: /usr/local/flexlm/licenses/license.dat\n"
+ "License path: /usr/local/flexlm/licenses/license.dat\n"
+ "FLEXnet Licensing error:-1,359. System Error: 2 \"No such file or directory\"\n"
+ "For further information, refer to the FLEXnet Licensing End User Guide,\n"
+ "available at \"www.macrovision.com\"."),
+ QString(), -1,
+ Constants::TASK_CATEGORY_COMPILE)
+ )
+ << QString();
+}
+
+void Qt4ProjectManagerPlugin::testRvctOutputParser()
+{
+ OutputParserTester testbench;
+ testbench.appendOutputParser(new RvctParser);
+ QFETCH(QString, input);
+ QFETCH(OutputParserTester::Channel, inputChannel);
+ QFETCH(QList<Task>, tasks);
+ QFETCH(QString, childStdOutLines);
+ QFETCH(QString, childStdErrLines);
+ QFETCH(QString, outputLines);
+
+ testbench.testParsing(input, inputChannel,
+ tasks, childStdOutLines, childStdErrLines,
+ outputLines);
+}
+#endif
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h
index 8c29c26617f70008af7d8a0121b12986cd6f62de..7f588902b9eed9b9299954be4c3a066ea9579457 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h
@@ -42,16 +42,17 @@ class RvctParser : public ProjectExplorer::IOutputParser
public:
RvctParser();
+ ~RvctParser();
virtual void stdError(const QString & line);
private:
+ void sendTask();
+
QRegExp m_warningOrError;
- QRegExp m_doneWithFile;
- QRegExp m_linkerProblem;
+ QRegExp m_wrapUpTask;
+ QRegExp m_genericProblem;
- bool m_additionalInfo;
- QString m_lastFile;
- int m_lastLine;
+ ProjectExplorer::Task * m_task;
};
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
index 3631c3bf577e30a28422b985f92745f4635f26ac..ec646942b04699b39b4e4818633ce3bcd979e799 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
@@ -517,72 +517,41 @@ bool S60ToolChainMixin::equals(const S60ToolChainMixin &rhs) const
&& m_device.name == rhs.m_device.name;
}
+static const char *epocHeaderPathsC[] = {
+ "include", "mkspecs/common/symbian", "epoc32/include",
+ "epoc32/include/osextensions/stdapis", "epoc32/include/osextensions/stdapis/sys",
+ "epoc32/include/stdapis", "epoc32/include/stdapis/sys",
+ "epoc32/include/osextensions/stdapis/stlport", "epoc32/include/stdapis/stlport",
+ "epoc32/include/oem", "epoc32/include/middleware", "epoc32/include/domain/middleware",
+ "epoc32/include/osextensions", "epoc32/include/domain/osextensions",
+ "epoc32/include/domain/osextensions/loc", "epoc32/include/domain/middleware/loc",
+ "epoc32/include/domain/osextensions/loc/sc", "epoc32/include/domain/middleware/loc/sc"
+};
+
QList<ProjectExplorer::HeaderPath> S60ToolChainMixin::epocHeaderPaths() const
{
QList<ProjectExplorer::HeaderPath> rc;
- const QString epocRootPath(S60Devices::cleanedRootPath(m_device.epocRoot));
-
- rc << ProjectExplorer::HeaderPath(epocRootPath,
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("include"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("mkspecs/common/symbian"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis/sys"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/sys"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis/stlport"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/stlport"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/oem"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/middleware"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions/loc"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware/loc"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions/loc/sc"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath)
- << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware/loc/sc"),
- ProjectExplorer::HeaderPath::GlobalHeaderPath);
+ QString root = m_device.epocRoot + QLatin1Char('/');
+ const int count = sizeof(epocHeaderPathsC) / sizeof(const char *);
+ for (int i = 0; i < count; ++i)
+ rc << ProjectExplorer::HeaderPath(root + QLatin1String(epocHeaderPathsC[i]),
+ ProjectExplorer::HeaderPath::GlobalHeaderPath);
return rc;
}
void S60ToolChainMixin::addEpocToEnvironment(Utils::Environment *env) const
{
- QString epocRootPath(m_device.epocRoot);
- if (!epocRootPath.endsWith(QChar('/')))
- epocRootPath.append(QChar('/'));
-
- env->prependOrSetPath(QDir::toNativeSeparators(epocRootPath + QLatin1String("epoc32/tools"))); // e.g. make.exe
- env->prependOrSetPath(QDir::toNativeSeparators(epocRootPath + QLatin1String("epoc32/gcc/bin"))); // e.g. gcc.exe
- env->prependOrSetPath(QDir::toNativeSeparators(epocRootPath + QLatin1String("perl/bin"))); // e.g. perl.exe (special SDK version)
+ QDir epocDir(m_device.epocRoot);
+ env->prependOrSetPath(epocDir.filePath(QLatin1String("epoc32/tools"))); // e.g. make.exe
+ env->prependOrSetPath(epocDir.filePath(QLatin1String("epoc32/gcc/bin"))); // e.g. gcc.exe
+ env->prependOrSetPath(epocDir.filePath(QLatin1String("perl/bin"))); // e.g. perl.exe (special SDK version)
- QString sbsHome(env->value(QLatin1String("SBS_HOME"))); // Do we use Raptor/SBSv2?
- if (!sbsHome.isEmpty())
- env->prependOrSetPath(sbsHome + QDir::separator() + QLatin1String("bin"));
- // No longer set EPOCDEVICE as it conflicts with packaging
- env->set(QLatin1String("EPOCROOT"), QDir::toNativeSeparators(S60Devices::cleanedRootPath(epocRootPath)));
+ addBaseToEnvironment(env);
}
static const char *gnuPocHeaderPathsC[] = {
- "epoc32/include", "epoc32/include/variant", "epoc32/include/stdapis",
+ "epoc32/include", "epoc32/include/variant", "epoc32/include/stdapis",
"epoc32/include/stdapis/stlport" };
QList<ProjectExplorer::HeaderPath> S60ToolChainMixin::gnuPocHeaderPaths() const
@@ -619,11 +588,19 @@ QList<ProjectExplorer::HeaderPath> S60ToolChainMixin::gnuPocRvctHeaderPaths(int
void S60ToolChainMixin::addGnuPocToEnvironment(Utils::Environment *env) const
{
env->prependOrSetPath(QDir::toNativeSeparators(m_device.toolsRoot + QLatin1String("/epoc32/tools")));
- const QString epocRootVar = QLatin1String("EPOCROOT");
- // No trailing slash is required here, so, do not perform path cleaning.
- // The variable also should be set since it is currently used for autodetection.
- if (env->find(epocRootVar) == env->constEnd())
- env->set(epocRootVar, m_device.epocRoot);
+ addBaseToEnvironment(env);
+}
+
+void S60ToolChainMixin::addBaseToEnvironment(Utils::Environment *env) const
+{
+ QString sbsHome(env->value(QLatin1String("SBS_HOME"))); // Do we use Raptor/SBSv2?
+ if (!sbsHome.isEmpty())
+ env->prependOrSetPath(sbsHome + QDir::separator() + QLatin1String("bin"));
+
+ QString epocRootPath(m_device.epocRoot);
+ if (!epocRootPath.endsWith(QChar('/')))
+ epocRootPath.append(QChar('/'));
+ env->set(QLatin1String("EPOCROOT"), QDir::toNativeSeparators(S60Devices::cleanedRootPath(epocRootPath)));
}
QDebug operator<<(QDebug db, const S60Devices::Device &d)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.h b/src/plugins/qt4projectmanager/qt-s60/s60devices.h
index 69d2a1a5e1e3995a984c02525e6f488173ab1b8b..8d60998754fb4311d973f317dfceb7adea90f127 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devices.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.h
@@ -184,6 +184,8 @@ public:
QStringList gnuPocRvctLibPaths(int armver, bool debug) const;
void addGnuPocToEnvironment(Utils::Environment *env) const;
+ void addBaseToEnvironment(Utils::Environment *env) const;
+
bool equals(const S60ToolChainMixin &rhs) const;
private:
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 00f4f752051b792636ac89ad1a4968fee79e9513..ae1033c42d74d2621c7559be639bacf6efd8ccc7 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -658,8 +658,12 @@ void Qt4BuildConfigurationFactory::update()
m_versions.clear();
QtVersionManager *vm = QtVersionManager::instance();
foreach (const QtVersion *version, vm->versions()) {
- m_versions.insert(QString::fromLatin1(QT4_BC_ID_PREFIX) + QString::fromLatin1("Qt%1").arg(version->uniqueId()),
- VersionInfo(tr("Using Qt Version \"%1\"").arg(version->displayName()), version->uniqueId()));
+ if (version->isValid()) {
+ QString key = QString::fromLatin1(QT4_BC_ID_PREFIX)
+ + QString::fromLatin1("Qt%1").arg(version->uniqueId());
+ VersionInfo info(tr("Using Qt Version \"%1\"").arg(version->displayName()), version->uniqueId());
+ m_versions.insert(key, info);
+ }
}
emit availableCreationIdsChanged();
}
@@ -718,6 +722,7 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target
QLineEdit::Normal,
version->displayName(),
&ok);
+ buildConfigurationName = buildConfigurationName.trimmed();
if (!ok || buildConfigurationName.isEmpty())
return 0;
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index 3fcfc8eb40cab8e4345a9937a72bde04f44696ab..f05803e11db8a9e1873f2771e4dba5a88549a9d5 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -85,6 +85,8 @@ private slots:
void testQtOutputParser();
void testSbsV2OutputParsers_data();
void testSbsV2OutputParsers();
+ void testRvctOutputParser_data();
+ void testRvctOutputParser();
#endif
private:
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 9c3d23dcd77b408e8cd6ac416cd5c9c49950c20b..41c5ab1b65a223e6d3cf075c5a2c546a47b75a70 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -54,6 +54,8 @@
#include <QtGui/QHelpEvent>
#include <QtGui/QToolTip>
+enum ModelRoles { BuildLogRole = Qt::UserRole, BuildRunningRole = Qt::UserRole + 1 };
+
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
@@ -74,8 +76,14 @@ void DebuggingHelperBuildTask::run(QFutureInterface<void> &future)
{
future.setProgressRange(0, 5);
future.setProgressValue(1);
- const QString output = m_version->buildDebuggingHelperLibrary(future);
- emit finished(m_version->displayName(), output);
+ QString output;
+ QString errorMessage;
+ if (m_version->buildDebuggingHelperLibrary(future, false, &output, &errorMessage)) {
+ emit finished(m_version->displayName(), output);
+ } else {
+ qWarning("%s", qPrintable(errorMessage));
+ emit finished(m_version->displayName(), errorMessage);
+ }
deleteLater();
}
@@ -232,7 +240,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
connect(m_ui->rebuildButton, SIGNAL(clicked()),
this, SLOT(buildDebuggingHelper()));
connect(m_ui->showLogButton, SIGNAL(clicked()),
- this, SLOT(showDebuggingBuildLog()));
+ this, SLOT(slotShowDebuggingBuildLog()));
showEnvironmentPage(0);
updateState();
@@ -315,7 +323,9 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(const QString &name, cons
// Update item view
QTreeWidgetItem *item = treeItemForIndex(index);
QTC_ASSERT(item, return)
- item->setData(2, Qt::UserRole, output);
+ item->setData(2, BuildRunningRole, QVariant(false));
+ item->setData(2, BuildLogRole, output);
+
QSharedPointerQtVersion qtVersion = m_versions.at(index);
const bool success = qtVersion->hasDebuggingHelper()
&& (!QmlDumpTool::canBuild(qtVersion.data()) || qtVersion->hasQmlDump())
@@ -325,10 +335,11 @@ void QtOptionsPageWidget::debuggingHelperBuildFinished(const QString &name, cons
// Update bottom control if the selection is still the same
if (index == currentIndex()) {
m_ui->showLogButton->setEnabled(true);
+ m_ui->rebuildButton->setEnabled(true);
updateDebuggingHelperStateLabel(m_versions.at(index).data());
- if (!success)
- showDebuggingBuildLog();
}
+ if (!success)
+ showDebuggingBuildLog(item);
}
void QtOptionsPageWidget::buildDebuggingHelper()
@@ -337,7 +348,12 @@ void QtOptionsPageWidget::buildDebuggingHelper()
if (index < 0)
return;
+ QTreeWidgetItem *item = treeItemForIndex(index);
+ QTC_ASSERT(item, return);
m_ui->showLogButton->setEnabled(false);
+ m_ui->rebuildButton->setEnabled(false);
+ item->setData(2, BuildRunningRole, QVariant(true));
+
// Run a debugging helper build task in the background.
DebuggingHelperBuildTask *buildTask = new DebuggingHelperBuildTask(m_versions.at(index));
connect(buildTask, SIGNAL(finished(QString,QString)), this, SLOT(debuggingHelperBuildFinished(QString,QString)),
@@ -348,21 +364,44 @@ void QtOptionsPageWidget::buildDebuggingHelper()
QLatin1String("Qt4ProjectManager::BuildHelpers"));
}
-void QtOptionsPageWidget::showDebuggingBuildLog()
+// Non-modal dialog
+class BuildLogDialog : public QDialog {
+public:
+ explicit BuildLogDialog(QWidget *parent = 0);
+ void setText(const QString &text);
+
+private:
+ Ui_ShowBuildLog m_ui;
+};
+
+BuildLogDialog::BuildLogDialog(QWidget *parent) : QDialog(parent)
{
- QTreeWidgetItem *currentItem = m_ui->qtdirList->currentItem();
+ m_ui.setupUi(this);
+ setAttribute(Qt::WA_DeleteOnClose, true);
+}
- int currentItemIndex = indexForTreeItem(currentItem);
+void BuildLogDialog::setText(const QString &text)
+{
+ m_ui.log->setPlainText(text); // Show and scroll to bottom
+ m_ui.log->moveCursor(QTextCursor::End);
+ m_ui.log->ensureCursorVisible();
+}
+
+void QtOptionsPageWidget::slotShowDebuggingBuildLog()
+{
+ if (const QTreeWidgetItem *currentItem = m_ui->qtdirList->currentItem())
+ showDebuggingBuildLog(currentItem);
+}
+
+void QtOptionsPageWidget::showDebuggingBuildLog(const QTreeWidgetItem *currentItem)
+{
+ const int currentItemIndex = indexForTreeItem(currentItem);
if (currentItemIndex < 0)
return;
- // Show and scroll to bottom
- QDialog dlg(this);
- Ui_ShowBuildLog ui;
- ui.setupUi(&dlg);
- ui.log->setPlainText(currentItem->data(2, Qt::UserRole).toString());
- ui.log->moveCursor(QTextCursor::End);
- ui.log->ensureCursorVisible();
- dlg.exec();
+ BuildLogDialog *dialog = new BuildLogDialog(this);
+ dialog->setWindowTitle(tr("Debugging Helper Build Log for '%1'").arg(currentItem->text(0)));
+ dialog->setText(currentItem->data(2, BuildLogRole).toString());
+ dialog->show();
}
QtOptionsPageWidget::~QtOptionsPageWidget()
@@ -472,10 +511,11 @@ void QtOptionsPageWidget::updateState()
m_ui->s60SDKPath->setEnabled(s60SDKPathEnabled);
m_ui->gccePath->setEnabled(enabled);
- const bool hasLog = enabled && !m_ui->qtdirList->currentItem()->data(2, Qt::UserRole).toString().isEmpty();
+ const QTreeWidgetItem *currentItem = m_ui->qtdirList->currentItem();
+ const bool buildRunning = currentItem && currentItem->data(2, BuildRunningRole).toBool();
+ const bool hasLog = enabled && currentItem && !currentItem->data(2, Qt::UserRole).toString().isEmpty();
m_ui->showLogButton->setEnabled(hasLog);
-
- m_ui->rebuildButton->setEnabled(version && version->isValid());
+ m_ui->rebuildButton->setEnabled(version && version->isValid() && !buildRunning);
updateDebuggingHelperStateLabel(version);
}
@@ -638,6 +678,7 @@ void QtOptionsPageWidget::versionChanged(QTreeWidgetItem *item, QTreeWidgetItem
} else {
m_ui->nameEdit->clear();
m_ui->qmakePath->setPath(QString()); // clear()
+
}
showEnvironmentPage(item);
updateState();
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h
index 293dd32306682800c996863159c35a940a5cc501..d13f6d0c42ff08d6bace8698729463be5b22a656 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.h
+++ b/src/plugins/qt4projectmanager/qtoptionspage.h
@@ -125,8 +125,11 @@ private slots:
void updateCurrentGcceDirectory();
void msvcVersionChanged();
void buildDebuggingHelper();
- void showDebuggingBuildLog();
+ void slotShowDebuggingBuildLog();
void debuggingHelperBuildFinished(const QString &versionName, const QString &output);
+
+private:
+ void showDebuggingBuildLog(const QTreeWidgetItem *currentItem);
};
class QtOptionsPage : public Core::IOptionsPage
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index bbaa22eb97c5e0caadecf71b1a96c5e2d50fe112..0e596a0bc0b81458ba42a5b62e48beaf406987bc 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1670,15 +1670,26 @@ QStringList QtVersion::debuggingHelperLibraryLocations() const
bool QtVersion::supportsBinaryDebuggingHelper() const
{
- QList<ProjectExplorer::ToolChain::ToolChainType> types = possibleToolChainTypes();
- if (types.contains(ProjectExplorer::ToolChain::GCC)
- || types.contains(ProjectExplorer::ToolChain::LINUX_ICC)
- || types.contains(ProjectExplorer::ToolChain::MSVC)
- || types.contains(ProjectExplorer::ToolChain::WINCE)
- || types.contains(ProjectExplorer::ToolChain::GCC_MAEMO)
- || types.contains(ProjectExplorer::ToolChain::OTHER)
- || types.contains(ProjectExplorer::ToolChain::UNKNOWN))
- return true;
+ foreach (ProjectExplorer::ToolChain::ToolChainType type, possibleToolChainTypes())
+ switch (type) {
+ case ProjectExplorer::ToolChain::GCC:
+ case ProjectExplorer::ToolChain::LINUX_ICC:
+ case ProjectExplorer::ToolChain::MinGW:
+ case ProjectExplorer::ToolChain::MSVC:
+ case ProjectExplorer::ToolChain::WINCE:
+ case ProjectExplorer::ToolChain::GCC_MAEMO:
+ case ProjectExplorer::ToolChain::OTHER:
+ case ProjectExplorer::ToolChain::UNKNOWN:
+ return true;
+ case ProjectExplorer::ToolChain::WINSCW:
+ case ProjectExplorer::ToolChain::GCCE :
+ case ProjectExplorer::ToolChain::RVCT_ARMV5:
+ case ProjectExplorer::ToolChain::RVCT_ARMV6:
+ case ProjectExplorer::ToolChain::GCCE_GNUPOC:
+ case ProjectExplorer::ToolChain::RVCT_ARMV5_GNUPOC:
+ case ProjectExplorer::ToolChain::INVALID:
+ break;
+ }
return false;
}
@@ -1745,66 +1756,70 @@ bool QtVersion::isQt64Bit() const
#endif
}
-QString QtVersion::buildDebuggingHelperLibrary(QFutureInterface<void> &future, bool onlyQmlDump)
+bool QtVersion::buildDebuggingHelperLibrary(QFutureInterface<void> &future,
+ bool onlyQmlDump,
+ QString *output, QString *errorMessage)
{
- QString qtInstallHeaders = versionInfo().value("QT_INSTALL_HEADERS");
- QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
- if (qtInstallData.isEmpty())
- return QString();
+ const QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
+ if (qtInstallData.isEmpty()) {
+ *errorMessage =
+ QCoreApplication::translate("QtVersion",
+ "Cannot determine the installation path for Qt version '%1'.").
+ arg(displayName());
+ return false;
+ }
Utils::Environment env = Utils::Environment::systemEnvironment();
addToEnvironment(env);
// TODO: the debugging helper doesn't comply to actual tool chain yet
QList<QSharedPointer<ProjectExplorer::ToolChain> > alltc = toolChains();
ProjectExplorer::ToolChain *tc = alltc.isEmpty() ? 0 : alltc.first().data();
- if (!tc)
- return QCoreApplication::translate("QtVersion", "The Qt Version has no toolchain.");
+ if (!tc) {
+ *errorMessage = QCoreApplication::translate("QtVersion", "The Qt Version has no toolchain.");
+ return false;
+ }
tc->addToEnvironment(env);
- QString output;
+ const QString target = (tc->type() == ToolChain::GCC_MAEMO ? QLatin1String("-unix") : QLatin1String(""));
+
+ // invalidate cache
+ m_versionInfoUpToDate = false;
if (!onlyQmlDump) {
- QString gdbHelperDirectory = DebuggingHelperLibrary::copy(qtInstallData, &output);
- if (!gdbHelperDirectory.isEmpty()) {
- output += DebuggingHelperLibrary::build(gdbHelperDirectory, tc->makeCommand(),
- qmakeCommand(), mkspec(), env,
- (tc->type() == ToolChain::GCC_MAEMO ? QLatin1String("-unix") : QLatin1String("")));
- }
+ const QString gdbHelperDirectory = DebuggingHelperLibrary::copy(qtInstallData, errorMessage);
+ if (gdbHelperDirectory.isEmpty())
+ return false;
+ if (!DebuggingHelperLibrary::build(gdbHelperDirectory, tc->makeCommand(),
+ qmakeCommand(), mkspec(), env,
+ target, output, errorMessage))
+ return false;
+
future.setProgressValue(2);
if (QmlObserverTool::canBuild(this)) {
- QString toolDirectory = QmlObserverTool::copy(qtInstallData, &output);
- if (!toolDirectory.isEmpty()) {
- output += QmlObserverTool::build(toolDirectory, tc->makeCommand(),
- qmakeCommand(), mkspec(), env,
- (tc->type() == ToolChain::GCC_MAEMO ? QLatin1String("-unix") : QLatin1String("")));
- }
+ const QString toolDirectory = QmlObserverTool::copy(qtInstallData, errorMessage);
+ if (toolDirectory.isEmpty())
+ return false;
+ if (!QmlObserverTool::build(toolDirectory, tc->makeCommand(),
+ qmakeCommand(), mkspec(), env, target, output, errorMessage))
+ return false;
} else {
- output += QCoreApplication::tr("Cannot build QMLObserver; Qt version must be 4.7.1 or higher.");
+ output->append(QCoreApplication::translate("Qt4ProjectManager::QtVersion", "Warning: Cannot build QMLObserver; Qt version must be 4.7.1 or higher."));
}
future.setProgressValue(3);
}
if (QmlDumpTool::canBuild(this)) {
- QString toolDirectory = QmlDumpTool::copy(qtInstallData, &output);
- if (!toolDirectory.isEmpty()) {
- output += QmlDumpTool::build(toolDirectory, tc->makeCommand(),
- qmakeCommand(), mkspec(), env,
- (tc->type() == ToolChain::GCC_MAEMO ? QLatin1String("-unix") : QLatin1String("")));
- }
+ const QString qmlDumpToolDirectory = QmlDumpTool::copy(qtInstallData, errorMessage);
+ if (qmlDumpToolDirectory.isEmpty())
+ return false;
+ if (!QmlDumpTool::build(qmlDumpToolDirectory, tc->makeCommand(),
+ qmakeCommand(), mkspec(), env, target, output, errorMessage))
+ return false;
+
} else {
- output += QCoreApplication::tr("Cannot build qmldump; Qt version must be 4.7.1 or higher.");
+ output->append(QCoreApplication::translate("Qt4ProjectManager::QtVersion", "Warning: Cannot build qmldump; Qt version must be 4.7.1 or higher."));
}
future.setProgressValue(4);
- // invalidate version before updating version info
- m_versionInfoUpToDate = false;
- updateVersionInfo();
-
- if (!onlyQmlDump) {
- m_hasDebuggingHelper = !debuggingHelperLibrary().isEmpty();
- m_hasQmlObserver = !qmlObserverTool().isEmpty();
- }
- m_hasQmlDump = !qmlDumpTool().isEmpty();
-
- return output;
+ return true;
}
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index b1bb046bcb27db334149b960e27990a2fc856580..ba6dbabab436a3a27acc1b6b47487e01cf1ade7e 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -122,7 +122,8 @@ public:
// Builds a debugging library
// returns the output of the commands
- QString buildDebuggingHelperLibrary(QFutureInterface<void> &future, bool onlyQmlDump = false);
+ bool buildDebuggingHelperLibrary(QFutureInterface<void> &future, bool onlyQmlDump,
+ QString *output, QString *errorMessage);
bool hasExamples() const;
QString examplesPath() const;
diff --git a/src/plugins/qt4projectmanager/showbuildlog.ui b/src/plugins/qt4projectmanager/showbuildlog.ui
index 5b31a76861cae86015ba20b776c6d28ebabebce4..e29e89494db71d830ab6e61277de57424cd67c63 100644
--- a/src/plugins/qt4projectmanager/showbuildlog.ui
+++ b/src/plugins/qt4projectmanager/showbuildlog.ui
@@ -30,7 +30,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
- <set>QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
index b15b995dd49df1e870b647fb04add25bdbb48a28..87fac8e16129afd107b35525048cfe21cddc6031 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizard.cpp
@@ -98,7 +98,12 @@ Core::BaseFileWizardParameters QmlStandaloneAppWizard::parameters()
parameters.setIcon(QIcon(QLatin1String(Constants::ICON_QML_STANDALONE)));
parameters.setDisplayName(tr("Qt Quick Application"));
parameters.setId(QLatin1String("QA.QMLA Application"));
- parameters.setDescription(tr("Creates a Qt Quick application that you can deploy to mobile devices."));
+ parameters.setDescription(tr("Creates a Qt Quick application project that can contain "
+ "both QML and C++ code and includes a QDeclarativeView.\n\n"
+ "You can build the application and deploy it on desktop and "
+ "mobile target platforms. For example, you can create signed "
+ "Symbian Installation System (SIS) packages for this type of "
+ "projects."));
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
Constants::QML_WIZARD_TR_CATEGORY));
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui
index ffe258e3863513d12aaff24673093ea7097e01e3..136b85b91d551183fb763e7ee0a3db0478b651b8 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneappwizardsourcespage.ui
@@ -23,7 +23,7 @@
<item row="0" column="0" colspan="2">
<widget class="QRadioButton" name="newQmlRadioButton">
<property name="text">
- <string>New 'main.qml' file, generated by this wizard.</string>
+ <string>Generate a main.qml file</string>
</property>
</widget>
</item>
@@ -65,7 +65,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Note: All files and directories which reside in the same directory as the Main QML File will be deployed. You can anytime modify the contents of that directory before deploying.</string>
+ <string>Note: All files and directories that reside in the same directory as the main QML file are deployed. You can modify the contents of the directory any time before deploying.</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 5e47b9d07a744d566c42a8b0ad98d15be68ceebc..05841df1124a31db6d97280b25878dc493198b01 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -632,7 +632,7 @@ void SubversionPlugin::revertAll()
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
const QString title = tr("Revert repository");
- if (QMessageBox::warning(0, title, tr("Would you like to revert all changes to the repository?"),
+ if (QMessageBox::warning(0, title, tr("Revert all pending changes to the repository?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
return;
// NoteL: Svn "revert ." doesn not work.
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index 3cc5118441390cc374af8a274ca10695d02aa5dc..303424dfac1f629c8aa27f795c50bf3bd14b0401 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -202,7 +202,7 @@ RefactoringFile::RefactoringFile(const RefactoringFile &other)
RefactoringFile::~RefactoringFile()
{
- if (m_refactoringChanges && m_openEditor)
+ if (m_refactoringChanges && m_openEditor && !m_fileName.isEmpty())
m_editor = m_refactoringChanges->openEditor(m_fileName, -1);
// apply changes, if any
@@ -227,14 +227,15 @@ RefactoringFile::~RefactoringFile()
}
// if this document doesn't have an editor, write the result to a file
- if (!m_editor) {
+ if (!m_editor && !m_fileName.isEmpty()) {
const QByteArray &newContents = doc->toPlainText().toUtf8();
QFile file(m_fileName);
file.open(QFile::WriteOnly);
file.write(newContents);
}
- m_refactoringChanges->fileChanged(m_fileName);
+ if (!m_fileName.isEmpty())
+ m_refactoringChanges->fileChanged(m_fileName);
}
delete m_document;
@@ -254,9 +255,9 @@ QTextDocument *RefactoringFile::mutableDocument() const
{
if (m_editor)
return m_editor->document();
- else if (!m_document && !m_fileName.isEmpty()) {
+ else if (!m_document) {
QString fileContents;
- {
+ if (!m_fileName.isEmpty()) {
QFile file(m_fileName);
if (file.open(QIODevice::ReadOnly))
fileContents = file.readAll();
diff --git a/src/plugins/texteditor/tooltip/tips.cpp b/src/plugins/texteditor/tooltip/tips.cpp
index 26b1d8ac3bc1976c8585be32a97c94629a83c6cf..7673413923fa34150cabd15769fc65dadf27c2a7 100644
--- a/src/plugins/texteditor/tooltip/tips.cpp
+++ b/src/plugins/texteditor/tooltip/tips.cpp
@@ -109,6 +109,8 @@ bool ColorTip::handleContentReplacement(const TipContent &content) const
void ColorTip::paintEvent(QPaintEvent *event)
{
+ QTipLabel::paintEvent(event);
+
const QColor &color = static_cast<const ColorContent &>(content()).color();
QPen pen;
@@ -124,8 +126,6 @@ void ColorTip::paintEvent(QPaintEvent *event)
QRect r(1, 1, rect().width() - 2, rect().height() - 2);
painter.drawTiledPixmap(r, m_tilePixMap);
painter.drawRect(r);
-
- QLabel::paintEvent(event);
}
TextTip::TextTip(QWidget *parent) : QTipLabel(parent)
diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.cpp b/src/plugins/vcsbase/basecheckoutwizardpage.cpp
index 111d069fb5c58632527b2ba10016ec1c64c89483..b575e839492833ca7820ead9b26c4f74cd916ef1 100644
--- a/src/plugins/vcsbase/basecheckoutwizardpage.cpp
+++ b/src/plugins/vcsbase/basecheckoutwizardpage.cpp
@@ -53,6 +53,8 @@ BaseCheckoutWizardPage::BaseCheckoutWizardPage(QWidget *parent) :
connect(d->ui.checkoutDirectoryLineEdit, SIGNAL(validChanged()),
this, SLOT(slotChanged()));
connect(d->ui.checkoutDirectoryLineEdit, SIGNAL(textEdited(QString)), this, SLOT(slotDirectoryEdited()));
+ connect(d->ui.branchComboBox, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(slotChanged()));
d->ui.pathChooser->setExpectedKind(Utils::PathChooser::Directory);
connect(d->ui.pathChooser, SIGNAL(validChanged()), this, SLOT(slotChanged()));
@@ -67,14 +69,31 @@ BaseCheckoutWizardPage::~BaseCheckoutWizardPage()
delete d;
}
-void BaseCheckoutWizardPage::addControl(QWidget *w)
+void BaseCheckoutWizardPage::addLocalControl(QWidget *w)
+{
+ d->ui.localLayout->addRow(w);
+}
+
+void BaseCheckoutWizardPage::addLocalControl(QString &description, QWidget *w)
{
- d->ui.formLayout->addRow(w);
+ d->ui.localLayout->addRow(description, w);
}
-void BaseCheckoutWizardPage::addControl(QString &description, QWidget *w)
+void BaseCheckoutWizardPage::addRepositoryControl(QWidget *w)
{
- d->ui.formLayout->addRow(description, w);
+ d->ui.repositoryLayout->addRow(w);
+}
+
+bool BaseCheckoutWizardPage::checkIsValid() const
+{
+ return d->ui.pathChooser->isValid()
+ && d->ui.checkoutDirectoryLineEdit->isValid()
+ && !d->ui.repositoryLineEdit->text().isEmpty();
+}
+
+void BaseCheckoutWizardPage::addRepositoryControl(QString &description, QWidget *w)
+{
+ d->ui.repositoryLayout->addRow(description, w);
}
bool BaseCheckoutWizardPage::isBranchSelectorVisible() const
@@ -167,6 +186,7 @@ void BaseCheckoutWizardPage::slotRefreshBranches()
if (current >= 0 && current < branchList.size())
d->ui.branchComboBox->setCurrentIndex(current);
}
+ slotChanged();
}
void BaseCheckoutWizardPage::slotRepositoryChanged(const QString &repo)
@@ -212,9 +232,7 @@ bool BaseCheckoutWizardPage::isComplete() const
void BaseCheckoutWizardPage::slotChanged()
{
- const bool valid = d->ui.pathChooser->isValid()
- && d->ui.checkoutDirectoryLineEdit->isValid()
- && !d->ui.repositoryLineEdit->text().isEmpty();
+ const bool valid = checkIsValid();
if (valid != d->m_valid) {
d->m_valid = valid;
diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.h b/src/plugins/vcsbase/basecheckoutwizardpage.h
index f4471298a77a746c107ca52bfc6cf785fe933866..9d5cbcc51943113d20e9b01c5ff85f839ca8b22c 100644
--- a/src/plugins/vcsbase/basecheckoutwizardpage.h
+++ b/src/plugins/vcsbase/basecheckoutwizardpage.h
@@ -71,7 +71,7 @@ public:
virtual bool isComplete() const;
- bool isBranchSelectorVisible() const ;
+ bool isBranchSelectorVisible() const;
protected:
void changeEvent(QEvent *e);
@@ -88,8 +88,14 @@ protected:
virtual QStringList branches(const QString &repository, int *current);
/* Add additional controls */
- void addControl(QWidget *w);
- void addControl(QString &description, QWidget *w);
+ void addLocalControl(QWidget *w);
+ void addLocalControl(QString &description, QWidget *w);
+
+ void addRepositoryControl(QWidget *w);
+ void addRepositoryControl(QString &description, QWidget *w);
+
+ /* Override validity information */
+ virtual bool checkIsValid() const;
private slots:
void slotRepositoryChanged(const QString &url);
diff --git a/src/plugins/vcsbase/basecheckoutwizardpage.ui b/src/plugins/vcsbase/basecheckoutwizardpage.ui
index eb48ba9b4671bb57a5f09afc770361bc4e618e23..f94995ccdf262571ddffe43bab5b3ed745fb85ca 100644
--- a/src/plugins/vcsbase/basecheckoutwizardpage.ui
+++ b/src/plugins/vcsbase/basecheckoutwizardpage.ui
@@ -13,64 +13,129 @@
<property name="windowTitle">
<string>WizardPage</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="repositoryLabel"/>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="repositoryLineEdit"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="checkoutDirectoryLabel">
- <property name="text">
- <string>Checkout Directory:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="Utils::ProjectNameValidatingLineEdit" name="checkoutDirectoryLineEdit"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="pathLabel">
- <property name="text">
- <string>Path:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="branchLabel">
- <property name="text">
- <string>Branch:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <layout class="QHBoxLayout" name="branchHorizontalLayout">
- <item>
- <widget class="QComboBox" name="branchComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="branchRefreshToolButton">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <widget class="QGroupBox" name="repositoryGroupBox">
+ <property name="title">
+ <string>Repository</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QFormLayout" name="repositoryLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="repositoryLabel"/>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="repositoryLineEdit">
+ <property name="toolTip">
+ <string>The remote repository to check out.</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="branchLabel">
+ <property name="text">
+ <string>Branch:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="branchHorizontalLayout">
+ <item>
+ <widget class="QComboBox" name="branchComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>The development branch in the remote repository to check out.</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="branchRefreshToolButton">
+ <property name="toolTip">
+ <string>Retrieve list of branches in repository.</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="localGroupBox">
+ <property name="title">
+ <string>Working Copy</string>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QFormLayout" name="localLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="pathLabel">
+ <property name="toolTip">
+ <string>The path in which the directory containing the checkout will be created.</string>
+ </property>
+ <property name="text">
+ <string>Checkout Path:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="Utils::PathChooser" name="pathChooser"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="checkoutDirectoryLabel">
+ <property name="toolTip">
+ <string>The local directory that will contain the code after the checkout.</string>
+ </property>
+ <property name="text">
+ <string>Checkout Directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="Utils::ProjectNameValidatingLineEdit" name="checkoutDirectoryLineEdit">
+ <property name="toolTip">
+ <string>The local directory that will contain the code after the checkout.</string>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</widget>
@@ -82,9 +147,8 @@
</customwidget>
<customwidget>
<class>Utils::PathChooser</class>
- <extends>QWidget</extends>
- <header location="global">utils/pathchooser.h</header>
- <container>1</container>
+ <extends>QLineEdit</extends>
+ <header>utils/pathchooser.h</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 333452b70e0c8e6b749c9daca47d9a0c7cacd19d..cfc10e88b888da00e06e4840edfee2f9048aed3b 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -466,6 +466,8 @@ VCSBaseSubmitEditor::PromptSubmitResult
bool *promptSetting,
bool forcePrompt) const
{
+ raiseSubmitEditor();
+
QString errorMessage;
QMessageBox::StandardButton answer = QMessageBox::Yes;
@@ -482,7 +484,8 @@ VCSBaseSubmitEditor::PromptSubmitResult
const QDialogButtonBox::StandardButton danswer =
Utils::CheckableMessageBox::question(parent, title, question,
tr("Prompt to submit"), promptSetting,
- QDialogButtonBox::Yes|QDialogButtonBox::No|QDialogButtonBox::Cancel,
+ QDialogButtonBox::Yes|QDialogButtonBox::No|
+ QDialogButtonBox::Cancel,
QDialogButtonBox::Yes);
answer = Utils::CheckableMessageBox::dialogButtonBoxToMessageBoxButton(danswer);
} else {
@@ -501,14 +504,14 @@ VCSBaseSubmitEditor::PromptSubmitResult
answer = static_cast<QMessageBox::StandardButton>(msgBox.exec());
}
switch (answer) {
- case QMessageBox::Cancel:
- return SubmitCanceled;
case QMessageBox::No:
return SubmitDiscarded;
+ case QMessageBox::Yes:
+ return SubmitConfirmed;
default:
break;
}
- return SubmitConfirmed;
+ return SubmitCanceled;
}
QString VCSBaseSubmitEditor::promptForNickName()
diff --git a/src/plugins/welcome/images/background_center_frame.png b/src/plugins/welcome/images/background_center_frame.png
index 76c166333ad0852699b8b6ac6150b5a963896628..d8f03519961d77819eaf06d65599dda02f4795e1 100644
Binary files a/src/plugins/welcome/images/background_center_frame.png and b/src/plugins/welcome/images/background_center_frame.png differ
diff --git a/src/plugins/welcome/images/center_frame_header.png b/src/plugins/welcome/images/center_frame_header.png
index f59cc41a48b7f4caa675e1adaf83726207da7b63..4d840b48f96dabfda3c7e03567c41e2305d94c41 100644
Binary files a/src/plugins/welcome/images/center_frame_header.png and b/src/plugins/welcome/images/center_frame_header.png differ
diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui
index d91c4d02d79088d1f2de5c1121503eeb572919ca..c8f6dbf684090e5ecba579c46361e1b66e268fd0 100644
--- a/src/plugins/welcome/welcomemode.ui
+++ b/src/plugins/welcome/welcomemode.ui
@@ -95,13 +95,13 @@ QToolButton:pressed, QPushButton:pressed{
<widget class="QFrame" name="mainFrame">
<property name="minimumSize">
<size>
- <width>662</width>
+ <width>700</width>
<height>550</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>662</width>
+ <width>750</width>
<height>550</height>
</size>
</property>
@@ -153,13 +153,13 @@ QToolButton:pressed, QPushButton:pressed{
<property name="minimumSize">
<size>
<width>649</width>
- <height>74</height>
+ <height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>649</width>
- <height>89</height>
+ <height>50</height>
</size>
</property>
<property name="styleSheet">
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index eb1b7f7463767460513fcefb6d3f66ef980e57fb..414b27fbbd4a50e40edf94e8628fb06627ef2fa1 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -4041,12 +4041,12 @@ bool Parser::parseObjCSelectorExpression(ExpressionAST *&node)
last->value->name_token = identifier_token;
last->value->colon_token = consumeToken();
- while (LA() != T_RPAREN) {
+ while (LA(1) == T_IDENTIFIER && LA(2) == T_COLON) {
last->next = new (_pool) ObjCSelectorArgumentListAST;
last = last->next;
last->value = new (_pool) ObjCSelectorArgumentAST;
- match(T_IDENTIFIER, &last->value->name_token);
- match(T_COLON, &last->value->colon_token);
+ last->value->name_token = consumeToken();
+ last->value->colon_token = consumeToken();
}
} else {
ObjCSelectorAST *args = new (_pool) ObjCSelectorAST;
@@ -4056,7 +4056,13 @@ bool Parser::parseObjCSelectorExpression(ExpressionAST *&node)
args->selector_argument_list->value->name_token = identifier_token;
}
+ if (LA(1) == T_IDENTIFIER && LA(2) == T_RPAREN) {
+ const char *txt = tok(1).spell();
+ consumeToken();
+ error(cursor(), "missing ':' after '%s'", txt);
+ }
match(T_RPAREN, &ast->rparen_token);
+
node = ast;
return true;
}
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index d58188b3f13313b327a970f17dc1d60244a0aa7b..03795f65ecd9bf9b190c38d1e671e0bc202ad3e3 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -45,7 +45,6 @@
#include <QtGui/QMenu>
#include <QtGui/QContextMenuEvent>
#include <QtGui/QListWidgetItem>
-#include <QtGui/QToolBar>
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpIndexWidget>
diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index af819e871f98092ff753298b424e25296e2a521b..4578de13d6f39e1ec5dc222b27a18a45f164b319 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -83,6 +83,8 @@ private slots:
void objc_protocol_forward_declaration_1();
void objc_protocol_definition_1();
void objc_method_attributes_1();
+ void objc_selector_error_recovery_1();
+ void objc_selector_error_recovery_2();
// expressions with (square) brackets
void normal_array_access();
@@ -832,6 +834,35 @@ void tst_AST::objc_method_attributes_1()
QCOMPARE(unit->spell(unavailableAttr->identifier_token), "unavailable");
}
+/*
+ @selector(foo)
+ @selector(foo:)
+ @selector(foo:bar:)
+ ...
+ */
+void tst_AST::objc_selector_error_recovery_1()
+{
+ QSharedPointer<TranslationUnit> unit(parseDeclaration("\n"
+ "void tst() {\n"
+ " @selector(foo:\n"
+ " int i = 1;\n"
+ "}\n"
+ ));
+ AST *ast = unit->ast();
+ QVERIFY(ast);
+}
+
+void tst_AST::objc_selector_error_recovery_2()
+{
+ QSharedPointer<TranslationUnit> unit(parseDeclaration("\n"
+ "void tst() {\n"
+ " @selector(foo:bar);\n"
+ "}\n"
+ ));
+ AST *ast = unit->ast();
+ QVERIFY(ast);
+}
+
void tst_AST::normal_array_access()
{
QSharedPointer<TranslationUnit> unit(parseDeclaration("\n"
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index ae8d351a478ea5c43de84617546ca7adb5f96d9f..7252902ebfc1c079e35a44d0b21307d3a80bd6dc 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -196,7 +196,6 @@ private slots:
private:
void dumpQAbstractItemHelper(QModelIndex &index);
void dumpQAbstractItemModelHelper(QAbstractItemModel &m);
- void dumpQDateTimeHelper(const QDateTime &d, bool isNull);
template <typename K, typename V> void dumpQHashNodeHelper(QHash<K, V> &hash);
void dumpQImageHelper(const QImage &img);
void dumpQImageDataHelper(QImage &img);
@@ -949,41 +948,30 @@ void tst_Dumpers::dumpQChar()
&c, NS"QChar", false);
}
-void tst_Dumpers::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
+void tst_Dumpers::dumpQDateTime()
{
- QByteArray value;
- if (d.isNull())
- value = "value='(null)'";
- else
- value = QByteArray("value='%',valueencoded='2'")
- << utfToBase64(d.toString());
+ // Case 1: Null object.
+ QDateTime d;
+ testDumper("value='(null)',type='$T',numchild='0'",
+ &d, NS"QDateTime", true);
- QByteArray expected = QByteArray("%,type='$T',numchild='3',children=["
- "{name='isNull',%},"
+ // Case 2: Non-null object.
+ d = QDateTime::currentDateTime();
+ testDumper(QByteArray("value='%',valueencoded='2',"
+ "type='$T',numchild='1',children=["
"{name='toTime_t',%},"
"{name='toString',%},"
"{name='toString_(ISO)',%},"
"{name='toString_(SystemLocale)',%},"
"{name='toString_(Locale)',%}]")
- << value
- << generateBoolSpec(d.isNull())
+ << utfToBase64(d.toString())
<< generateLongSpec((d.toTime_t()))
- << generateQStringSpec(d.toString(), isNull)
- << generateQStringSpec(d.toString(Qt::ISODate), isNull)
- << generateQStringSpec(d.toString(Qt::SystemLocaleDate), isNull)
- << generateQStringSpec(d.toString(Qt::LocaleDate), isNull);
- testDumper(expected, &d, NS"QDateTime", true);
-}
+ << generateQStringSpec(d.toString())
+ << generateQStringSpec(d.toString(Qt::ISODate))
+ << generateQStringSpec(d.toString(Qt::SystemLocaleDate))
+ << generateQStringSpec(d.toString(Qt::LocaleDate)),
+ &d, NS"QDateTime", true);
-void tst_Dumpers::dumpQDateTime()
-{
- // Case 1: Null object.
- QDateTime d;
- dumpQDateTimeHelper(d, true);
-
- // Case 2: Non-null object.
- d = QDateTime::currentDateTime();
- dumpQDateTimeHelper(d, false);
}
void tst_Dumpers::dumpQDir()
@@ -1196,11 +1184,9 @@ void tst_Dumpers::dumpQHashNode()
void tst_Dumpers::dumpQImageHelper(const QImage &img)
{
- QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='1',"
- "children=[{name='data',type='"NS"QImageData',addr='%'}]"
+ QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='0'"
<< N(img.width())
- << N(img.height())
- << ptrToBa(&img);
+ << N(img.height());
testDumper(expected, &img, NS"QImage", true);
}
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index cec7f02433bd337a7c135610fed7a0c5581eefd7..7ffb98ff6d31858c1e054f80c5036bbf8e8a564c 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -121,7 +121,7 @@ void tst_TestCore::cleanupTestCase()
void tst_TestCore::testModelCreateCoreModel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> testView(new TestView(model.data()));
@@ -140,17 +140,17 @@ void tst_TestCore::loadEmptyCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
model1->attachView(testRewriterView1.data());
QPlainTextEdit textEdit2;
- textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+ textEdit2.setPlainText("import Qt 4.7; Item{}");
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/item"));
+ QScopedPointer<Model> model2(Model::create("Qt/item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -163,10 +163,10 @@ void tst_TestCore::testRewriterView()
{
try {
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -179,15 +179,15 @@ void tst_TestCore::testRewriterView()
testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data());
- ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(childNode.isValid());
childNode.setId("childNode");
- ModelNode childNode2(addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
childNode2.setId("childNode2");
- ModelNode childNode3(addNodeListChild(childNode2, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data"));
childNode3.setId("childNode3");
- ModelNode childNode4(addNodeListChild(childNode3, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode4(addNodeListChild(childNode3, "Qt/Rectangle", 4, 7, "data"));
childNode4.setId("childNode4");
QVERIFY(childNode.isValid());
@@ -213,7 +213,7 @@ void tst_TestCore::testRewriterView()
testRewriterView->modelToTextMerger()->applyChanges();
- childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForAddition(childNode));
testRewriterView->modelToTextMerger()->applyChanges();
@@ -233,10 +233,10 @@ void tst_TestCore::testRewriterView()
void tst_TestCore::testRewriterErrors()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -250,10 +250,10 @@ void tst_TestCore::testRewriterErrors()
model->attachView(testRewriterView.data());
QVERIFY(testRewriterView->errors().isEmpty());
- textEdit.setPlainText("import QtQuick 1.0;\n\nError {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nError {\n}\n");
QVERIFY(!testRewriterView->errors().isEmpty());
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
QVERIFY(testRewriterView->errors().isEmpty());
}
@@ -267,7 +267,7 @@ void tst_TestCore::saveEmptyCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -279,10 +279,10 @@ void tst_TestCore::saveEmptyCoreModel()
modifier1.save(&buffer);
QPlainTextEdit textEdit2;
- textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+ textEdit2.setPlainText("import Qt 4.7; Item{}");
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/item"));
+ QScopedPointer<Model> model2(Model::create("Qt/item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -302,17 +302,17 @@ void tst_TestCore::loadAttributesInCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
model1->attachView(testRewriterView1.data());
QPlainTextEdit textEdit2;
- textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+ textEdit2.setPlainText("import Qt 4.7; Item{}");
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/item"));
+ QScopedPointer<Model> model2(Model::create("Qt/item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -337,7 +337,7 @@ void tst_TestCore::saveAttributesInCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -353,7 +353,7 @@ void tst_TestCore::saveAttributesInCoreModel()
textEdit2.setPlainText(buffer.data());
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model2(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -368,7 +368,7 @@ void tst_TestCore::testModelCreateRect()
{
try {
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -376,7 +376,7 @@ void tst_TestCore::testModelCreateRect()
model->attachView(view.data());
QVERIFY(view->rootModelNode().isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
@@ -404,7 +404,7 @@ void tst_TestCore::testModelCreateRect()
void tst_TestCore::testRewriterDynamicProperties()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" property int i\n"
@@ -431,7 +431,7 @@ void tst_TestCore::testRewriterDynamicProperties()
textEdit1.setPlainText(qmlString);
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -521,10 +521,10 @@ void tst_TestCore::testRewriterDynamicProperties()
// test model2text
// QPlainTextEdit textEdit2;
-// textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+// textEdit2.setPlainText("import Qt 4.7; Item{}");
// NotIndentingTextEditModifier modifier2(&textEdit2);
//
-// QScopedPointer<Model> model2(Model::create("QtQuick/Item"));
+// QScopedPointer<Model> model2(Model::create("Qt/Item"));
//
// QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
// testRewriterView2->setTextModifier(&modifier2);
@@ -538,7 +538,7 @@ void tst_TestCore::testRewriterDynamicProperties()
void tst_TestCore::testRewriterGroupedProperties()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Text {\n"
" font {\n"
@@ -551,7 +551,7 @@ void tst_TestCore::testRewriterGroupedProperties()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier1(&textEdit);
- QScopedPointer<Model> model1(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model1(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -575,7 +575,7 @@ void tst_TestCore::testRewriterGroupedProperties()
rootModelNode.removeProperty(QLatin1String("font.pointSize"));
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Text {\n"
"}\n");
@@ -586,7 +586,7 @@ void tst_TestCore::testRewriterGroupedProperties()
void tst_TestCore::testRewriterPreserveOrder()
{
const QLatin1String qmlString1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"width: 640\n"
@@ -607,7 +607,7 @@ void tst_TestCore::testRewriterPreserveOrder()
"}\n"
"}\n");
const QLatin1String qmlString2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"width: 640\n"
@@ -633,7 +633,7 @@ void tst_TestCore::testRewriterPreserveOrder()
textEdit.setPlainText(qmlString2);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier);
@@ -646,7 +646,7 @@ void tst_TestCore::testRewriterPreserveOrder()
RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
- ModelNode newModelNode = testRewriterView->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
@@ -668,7 +668,7 @@ void tst_TestCore::testRewriterPreserveOrder()
textEdit.setPlainText(qmlString1);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier);
@@ -681,7 +681,7 @@ void tst_TestCore::testRewriterPreserveOrder()
RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
- ModelNode newModelNode = testRewriterView->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
@@ -702,7 +702,7 @@ void tst_TestCore::testRewriterPreserveOrder()
void tst_TestCore::testRewriterActionCompression()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -722,7 +722,7 @@ void tst_TestCore::testRewriterActionCompression()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier1(&textEdit);
- QScopedPointer<Model> model1(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model1(Model::create("Qt/Rectangle"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier1);
@@ -748,7 +748,7 @@ void tst_TestCore::testRewriterActionCompression()
transaction.commit();
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -776,7 +776,7 @@ void tst_TestCore::testRewriterImports()
textEdit.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
model->setFileUrl(QUrl::fromLocalFile(fileName));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -787,7 +787,7 @@ void tst_TestCore::testRewriterImports()
QVERIFY(model->imports().size() == 3);
- // import QtQuick 1.0
+ // import Qt 4.7
Import import = model->imports().at(0);
QVERIFY(import.isLibraryImport());
QCOMPARE(import.url(), QString("Qt"));
@@ -815,7 +815,7 @@ void tst_TestCore::testRewriterImports()
void tst_TestCore::testRewriterChangeImports()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {}\n");
@@ -823,7 +823,7 @@ void tst_TestCore::testRewriterChangeImports()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView(0, RewriterView::Amend));
testRewriterView->setTextModifier(&modifier);
@@ -838,7 +838,7 @@ void tst_TestCore::testRewriterChangeImports()
model->addImport(webkitImport);
const QLatin1String qmlWithImport("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"import QtWebKit 1.0\n"
"\n"
"Rectangle {}\n");
@@ -847,7 +847,7 @@ void tst_TestCore::testRewriterChangeImports()
model->removeImport(webkitImport);
QCOMPARE(model->imports().size(), 1);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(textEdit.toPlainText(), qmlString);
@@ -859,7 +859,7 @@ void tst_TestCore::testRewriterChangeImports()
model->addImport(webkitImport);
const QLatin1String qmlWithAliasImport("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"import QtWebKit 1.0 as Web\n"
"\n"
"Rectangle {}\n");
@@ -868,7 +868,7 @@ void tst_TestCore::testRewriterChangeImports()
model->removeImport(webkitImport);
QCOMPARE(model->imports().size(), 1);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(textEdit.toPlainText(), qmlString);
@@ -878,23 +878,23 @@ void tst_TestCore::testRewriterChangeImports()
//
textEdit.setPlainText(qmlWithImport);
QCOMPARE(model->imports().size(), 2);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0"));
textEdit.setPlainText(qmlWithAliasImport);
QCOMPARE(model->imports().size(), 2);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0", "Web"));
textEdit.setPlainText(qmlString);
QCOMPARE(model->imports().size(), 1);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
}
void tst_TestCore::testRewriterForGradientMagic()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -932,7 +932,7 @@ void tst_TestCore::testRewriterForGradientMagic()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier);
@@ -948,7 +948,7 @@ void tst_TestCore::testRewriterForGradientMagic()
myRect.variantProperty("rotation") = QVariant(45);
QVERIFY(myRect.isValid());
- QScopedPointer<Model> model1(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
QVERIFY(model1.data());
QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -956,7 +956,7 @@ void tst_TestCore::testRewriterForGradientMagic()
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item {}");
+ textEdit1.setPlainText("import Qt 4.7; Item {}");
NotIndentingTextEditModifier modifier1(&textEdit1);
testRewriterView1->setTextModifier(&modifier1);
@@ -982,7 +982,7 @@ void tst_TestCore::loadSubItems()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -1000,7 +1000,7 @@ void tst_TestCore::createInvalidCoreModel()
void tst_TestCore::testModelCreateSubNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1012,7 +1012,7 @@ void tst_TestCore::testModelCreateSubNode()
QCOMPARE(view->methodCalls(), expectedCalls);
QVERIFY(view->rootModelNode().isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
@@ -1046,7 +1046,7 @@ void tst_TestCore::testModelCreateSubNode()
void tst_TestCore::testTypicalRewriterOperations()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1075,7 +1075,7 @@ void tst_TestCore::testTypicalRewriterOperations()
QCOMPARE(rootModelNode.bindingProperty("test").expression(), QString("parent.x"));
- ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 4 ,6, "data"));
+ ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4 ,6, "data"));
rootModelNode.nodeListProperty("test").reparentHere(childNode);
QCOMPARE(childNode.parentProperty(), rootModelNode.nodeAbstractProperty("test"));
QVERIFY(rootModelNode.property("test").isNodeAbstractProperty());
@@ -1095,7 +1095,7 @@ void tst_TestCore::testTypicalRewriterOperations()
void tst_TestCore::testBasicStates()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"id: root;\n"
"Rectangle {\n"
@@ -1134,7 +1134,7 @@ void tst_TestCore::testBasicStates()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1143,13 +1143,13 @@ void tst_TestCore::testBasicStates()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootModelNode.hasProperty("data"));
@@ -1246,7 +1246,7 @@ void tst_TestCore::testBasicStates()
void tst_TestCore::testModelBasicOperations()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1267,8 +1267,8 @@ void tst_TestCore::testModelBasicOperations()
QVERIFY(!rootModelNode.hasProperty("width"));
QVERIFY(!rootModelNode.hasProperty("children"));
- ModelNode childNode1(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "children"));
- ModelNode childNode2(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode1(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "children"));
+ ModelNode childNode2(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(childNode1.isValid());
QVERIFY(childNode2.isValid());
@@ -1306,7 +1306,7 @@ void tst_TestCore::testModelBasicOperations()
void tst_TestCore::testModelResolveIds()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1316,9 +1316,9 @@ void tst_TestCore::testModelResolveIds()
ModelNode rootNode = view->rootModelNode();
rootNode.setId("rootNode");
- ModelNode childNode1(addNodeListChild(rootNode, "QtQuick/Rectangle", 1, 0, "children"));
+ ModelNode childNode1(addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "children"));
- ModelNode childNode2(addNodeListChild(childNode1, "QtQuick/Rectangle", 1, 0, "children"));
+ ModelNode childNode2(addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "children"));
childNode2.setId("childNode2");
childNode2.bindingProperty("test").setExpression("parent.parent");
@@ -1329,7 +1329,7 @@ void tst_TestCore::testModelResolveIds()
childNode2.bindingProperty("test").setExpression("rootNode");
QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
- ModelNode childNode3(addNodeListChild(childNode2, "QtQuick/Rectangle", 1, 0, "children"));
+ ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "children"));
childNode3.setId("childNode3");
childNode2.nodeProperty("front").setModelNode(childNode3);
childNode2.bindingProperty("test").setExpression("childNode3.parent");
@@ -1364,7 +1364,7 @@ void tst_TestCore::testModelNodeListProperty()
//
// Test NodeListProperty API
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1382,7 +1382,7 @@ void tst_TestCore::testModelNodeListProperty()
QVERIFY(!rootChildren.isNodeListProperty());
QVERIFY(rootChildren.isEmpty());
- ModelNode rectNode = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode rectNode = view->createModelNode("Qt/Rectangle", 4, 7);
rootChildren.reparentHere(rectNode);
//
@@ -1393,7 +1393,7 @@ void tst_TestCore::testModelNodeListProperty()
QVERIFY(rootChildren.isNodeListProperty());
QVERIFY(!rootChildren.isEmpty());
- ModelNode mouseAreaNode = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode mouseAreaNode = view->createModelNode("Qt/Item", 4, 7);
NodeListProperty rectChildren = rectNode.nodeListProperty("children");
rectChildren.reparentHere(mouseAreaNode);
@@ -1421,7 +1421,7 @@ void tst_TestCore::testModelNodeListProperty()
void tst_TestCore::testBasicOperationsWithView()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1453,8 +1453,8 @@ void tst_TestCore::testBasicOperationsWithView()
QCOMPARE(rootInstance.size().width(), 10.0);
QCOMPARE(rootInstance.size().height(), 10.0);
- ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode childNode2(addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(childNode2.parentProperty().parentModelNode() == childNode);
QVERIFY(childNode.isValid());
@@ -1489,10 +1489,10 @@ void tst_TestCore::testBasicOperationsWithView()
QVERIFY(!childInstance2.isValid());
}
- childNode = addNodeListChild(rootModelNode, "QtQuick/Image", 1, 0, "data");
+ childNode = addNodeListChild(rootModelNode, "Qt/Image", 4, 7, "data");
QVERIFY(childNode.isValid());
- QCOMPARE(childNode.type(), QString("QtQuick/Image"));
- childNode2 = addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data");
+ QCOMPARE(childNode.type(), QString("Qt/Image"));
+ childNode2 = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setParentProperty(rootModelNode, "data");
QVERIFY(childNode2.isValid());
@@ -1531,7 +1531,7 @@ void tst_TestCore::testBasicOperationsWithView()
void tst_TestCore::testQmlModelView()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QmlModelView *view = new TestView(model.data());
@@ -1549,7 +1549,7 @@ void tst_TestCore::testQmlModelView()
propertyList.append(qMakePair(QString("width"), QVariant(20)));
propertyList.append(qMakePair(QString("height"), QVariant(20)));
- QmlObjectNode node1 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ QmlObjectNode node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
QVERIFY(node1.isValid());
QVERIFY(!node1.hasNodeParent());
@@ -1565,7 +1565,7 @@ void tst_TestCore::testQmlModelView()
QVERIFY(node1.instanceParent() == view->rootQmlObjectNode());
- QmlObjectNode node2 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ QmlObjectNode node2 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
QVERIFY(node2.isValid());
QVERIFY(!node2.hasNodeParent());
@@ -1593,12 +1593,12 @@ void tst_TestCore::testQmlModelView()
QCOMPARE(node1.instanceValue("x").toInt(), 2);
- QmlObjectNode node3 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node4 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node5 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node6 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node7 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node8 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ QmlObjectNode node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node4 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node5 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node6 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node7 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node8 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
node3.setParentProperty(node2.nodeAbstractProperty("children"));
node4.setParentProperty(node3.nodeAbstractProperty("children"));
@@ -1626,12 +1626,12 @@ void tst_TestCore::testQmlModelView()
QCOMPARE(node2.instanceValue("x").toInt(), 10); // is this right? or should it be a invalid qvariant?
- node1 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
node1.setId("node1");
QCOMPARE(node2.instanceValue("x").toInt(), 20);
- node3 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
node3.setParentProperty(node2.nodeAbstractProperty("children"));
QCOMPARE(node3.instanceValue("width").toInt(), 20);
node3.setVariantProperty("width", 0);
@@ -1653,7 +1653,7 @@ void tst_TestCore::testQmlModelView()
void tst_TestCore::testModelRemoveNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1666,7 +1666,7 @@ void tst_TestCore::testModelRemoveNode()
QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 1);
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
@@ -1678,7 +1678,7 @@ void tst_TestCore::testModelRemoveNode()
QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
}
- ModelNode subChildNode = addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(subChildNode.isValid());
QCOMPARE(childNode.allDirectSubModelNodes().count(), 1);
QVERIFY(childNode.allDirectSubModelNodes().contains(subChildNode));
@@ -1709,7 +1709,7 @@ void tst_TestCore::testModelRemoveNode()
QVERIFY(view->rootModelNode().isValid());
// delete node not in hierarchy
- childNode = view->createModelNode("QtQuick/Item", 1, 0);
+ childNode = view->createModelNode("Qt/Item", 4, 7);
childNode.destroy();
model->detachView(nodeInstanceView);
@@ -1717,7 +1717,7 @@ void tst_TestCore::testModelRemoveNode()
void tst_TestCore::reparentingNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
@@ -1734,7 +1734,7 @@ void tst_TestCore::reparentingNode()
NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
model->attachView(nodeInstanceView);
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QCOMPARE(childNode.parentProperty().parentModelNode(), rootModelNode);
QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode));
@@ -1744,7 +1744,7 @@ void tst_TestCore::reparentingNode()
QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
}
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Item", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Item", 4, 7, "data");
QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
@@ -1785,10 +1785,10 @@ void tst_TestCore::reparentingNode()
void tst_TestCore::reparentingNodeLikeDragAndDrop()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -1804,7 +1804,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
view->rootModelNode().setId("rootModelNode");
QCOMPARE(view->rootModelNode().id(), QString("rootModelNode"));
- ModelNode rectNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode rectNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
rectNode.setId("rect_1");
rectNode.variantProperty("x").setValue(20);
rectNode.variantProperty("y").setValue(30);
@@ -1813,7 +1813,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
RewriterTransaction transaction(view->beginRewriterTransaction());
- ModelNode textNode = addNodeListChild(view->rootModelNode(), "QtQuick/Text", 1, 0, "data");
+ ModelNode textNode = addNodeListChild(view->rootModelNode(), "Qt/Text", 4, 7, "data");
QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
@@ -1901,7 +1901,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
void tst_TestCore::testModelReorderSiblings()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1914,11 +1914,11 @@ void tst_TestCore::testModelReorderSiblings()
ModelNode rootModelNode = view->rootModelNode();
QVERIFY(rootModelNode.isValid());
- ModelNode a = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode a = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(a.isValid());
- ModelNode b = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode b = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(b.isValid());
- ModelNode c = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode c = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(c.isValid());
{
@@ -1952,7 +1952,7 @@ void tst_TestCore::testModelReorderSiblings()
void tst_TestCore::testModelRootNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1963,10 +1963,10 @@ void tst_TestCore::testModelRootNode()
ModelNode rootModelNode = view->rootModelNode();
QVERIFY(rootModelNode.isValid());
QVERIFY(rootModelNode.isRootNode());
- ModelNode topChildNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode topChildNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(topChildNode.isValid());
QVERIFY(rootModelNode.isRootNode());
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QVERIFY(rootModelNode.isValid());
QVERIFY(rootModelNode.isRootNode());
@@ -1983,15 +1983,15 @@ void tst_TestCore::testModelRootNode()
void tst_TestCore::reparentingNodeInModificationGroup()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
childNode.variantProperty("x").setValue(10);
childNode.variantProperty("y").setValue(10);
@@ -2033,7 +2033,7 @@ void tst_TestCore::reparentingNodeInModificationGroup()
void tst_TestCore::testModelAddAndRemoveProperty()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2074,7 +2074,7 @@ void tst_TestCore::testModelAddAndRemoveProperty()
void tst_TestCore::testModelViewNotification()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view1(new TestView(model.data()));
@@ -2096,7 +2096,7 @@ void tst_TestCore::testModelViewNotification()
QCOMPARE(view1->methodCalls(), expectedCalls);
QCOMPARE(view2->methodCalls(), expectedCalls);
- ModelNode childNode = addNodeListChild(view2->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view2->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
QCOMPARE(view1->methodCalls(), expectedCalls);
@@ -2146,7 +2146,7 @@ void tst_TestCore::testModelViewNotification()
void tst_TestCore::testRewriterTransaction()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2156,7 +2156,7 @@ void tst_TestCore::testRewriterTransaction()
RewriterTransaction transaction = view->beginRewriterTransaction();
QVERIFY(transaction.isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
childNode.destroy();
@@ -2166,7 +2166,7 @@ void tst_TestCore::testRewriterTransaction()
RewriterTransaction transaction2 = view->beginRewriterTransaction();
QVERIFY(transaction2.isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
childNode.destroy();
@@ -2193,7 +2193,7 @@ void tst_TestCore::testRewriterTransaction()
void tst_TestCore::testRewriterId()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2201,7 +2201,7 @@ void tst_TestCore::testRewriterId()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2216,16 +2216,16 @@ void tst_TestCore::testRewriterId()
model->attachView(testRewriterView.data());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootModelNode.isValid());
- ModelNode newNode(view->createModelNode("QtQuick/Rectangle", 1, 0));
+ ModelNode newNode(view->createModelNode("Qt/Rectangle", 4, 7));
newNode.setId("testId");
rootModelNode.nodeListProperty("data").reparentHere(newNode);
- const QLatin1String expected("import QtQuick 1.0\n"
+ const QLatin1String expected("import Qt 4.7\n"
"Rectangle {\n"
"Rectangle {\n"
" id: testId\n"
@@ -2237,7 +2237,7 @@ void tst_TestCore::testRewriterId()
void tst_TestCore::testRewriterNodeReparentingTransaction1()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2245,7 +2245,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2254,7 +2254,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2262,12 +2262,12 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
- ModelNode reparentNode = addNodeListChild(childNode1, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode reparentNode = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
@@ -2282,7 +2282,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
void tst_TestCore::testRewriterNodeReparentingTransaction2()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2290,7 +2290,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2299,7 +2299,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2307,8 +2307,8 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
childNode2.variantProperty("x") = 200;
childNode2.variantProperty("y") = 50;
@@ -2348,7 +2348,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
void tst_TestCore::testRewriterNodeReparentingTransaction3()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2356,7 +2356,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2365,7 +2365,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2373,10 +2373,10 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
@@ -2398,7 +2398,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
void tst_TestCore::testRewriterNodeReparentingTransaction4()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2406,7 +2406,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2415,7 +2415,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2423,11 +2423,11 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode5 = addNodeListChild(childNode2, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode5 = addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
@@ -2449,7 +2449,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
void tst_TestCore::testRewriterAddNodeTransaction()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2457,7 +2457,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2466,7 +2466,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2475,11 +2475,11 @@ void tst_TestCore::testRewriterAddNodeTransaction()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
- ModelNode newNode = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
newNode.variantProperty("x") = 100;
newNode.variantProperty("y") = 100;
@@ -2491,7 +2491,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
void tst_TestCore::testRewriterComponentId()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
" Component {\n"
" id: testComponent\n"
@@ -2504,7 +2504,7 @@ void tst_TestCore::testRewriterComponentId()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2517,17 +2517,17 @@ void tst_TestCore::testRewriterComponentId()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
ModelNode component(rootModelNode.allDirectSubModelNodes().first());
QVERIFY(component.isValid());
- QCOMPARE(component.type(), QString("QtQuick/Component"));
+ QCOMPARE(component.type(), QString("Qt/Component"));
QCOMPARE(component.id(), QString("testComponent"));
}
void tst_TestCore::testRewriterTransactionRewriter()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2535,7 +2535,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2544,7 +2544,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2557,7 +2557,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
{
RewriterTransaction transaction = view->beginRewriterTransaction();
- childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
childNode1.variantProperty("x") = 10;
childNode1.variantProperty("y") = 10;
}
@@ -2569,7 +2569,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
{
RewriterTransaction transaction = view->beginRewriterTransaction();
- childNode2 = addNodeListChild(childNode1, "QtQuick/Rectangle", 1, 0, "data");
+ childNode2 = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
childNode2.destroy();
}
@@ -2594,7 +2594,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
// property variant myArray: [ Rectangle {} ]
// property variant someGradient: Gradient {}
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Item {\n"
" property int intProperty\n"
" property bool boolProperty: true\n"
@@ -2607,7 +2607,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2625,7 +2625,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
//
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QCOMPARE(rootModelNode.properties().size(), 4);
@@ -2658,7 +2658,7 @@ void tst_TestCore::testRewriterPropertyAliases()
// where type is (int | bool | double | real | string | url | color | date | variant)
//
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Item {\n"
" property alias theText: t.text\n"
" default alias property yPos: t.y\n"
@@ -2669,7 +2669,7 @@ void tst_TestCore::testRewriterPropertyAliases()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2682,7 +2682,7 @@ void tst_TestCore::testRewriterPropertyAliases()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QList<AbstractProperty> properties = rootModelNode.properties();
QCOMPARE(properties.size(), 0); // TODO: How to represent alias properties? As Bindings?
@@ -2691,7 +2691,7 @@ void tst_TestCore::testRewriterPropertyAliases()
void tst_TestCore::testRewriterPositionAndOffset()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -2729,7 +2729,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2742,7 +2742,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QString string = QString(qmlString).mid(testRewriterView->nodeOffset(rootNode), testRewriterView->nodeLength(rootNode));
const QString qmlExpected0("Rectangle {\n"
@@ -2808,7 +2808,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
void tst_TestCore::testRewriterComponentTextModifier()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -2831,7 +2831,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2844,7 +2844,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode componentNode = rootNode.allDirectSubModelNodes().last();
@@ -2855,7 +2855,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
ComponentTextModifier componentTextModifier(&textModifier, componentStartOffset, componentEndOffset, rootStartOffset);
- const QString qmlExpected("import QtQuick 1.0\n"
+ const QString qmlExpected("import Qt 4.7\n"
" "
" "
" "
@@ -2876,19 +2876,19 @@ void tst_TestCore::testRewriterComponentTextModifier()
QCOMPARE(componentTextModifier.text(), qmlExpected);
- QScopedPointer<Model> componentModel(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> componentModel(Model::create("Qt/Item", 4, 7));
QScopedPointer<TestRewriterView> testRewriterViewComponent(new TestRewriterView());
testRewriterViewComponent->setTextModifier(&componentTextModifier);
componentModel->attachView(testRewriterViewComponent.data());
ModelNode componentrootNode = testRewriterViewComponent->rootModelNode();
QVERIFY(componentrootNode.isValid());
- QCOMPARE(componentrootNode.type(), QLatin1String("QtQuick/Component"));
+ QCOMPARE(componentrootNode.type(), QLatin1String("Qt/Component"));
}
void tst_TestCore::testRewriterPreserveType()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" Text {\n"
@@ -2901,7 +2901,7 @@ void tst_TestCore::testRewriterPreserveType()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2914,7 +2914,7 @@ void tst_TestCore::testRewriterPreserveType()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode textNode = rootNode.allDirectSubModelNodes().first();
QCOMPARE(QVariant::Bool, textNode.variantProperty("font.bold").value().type());
@@ -2923,7 +2923,7 @@ void tst_TestCore::testRewriterPreserveType()
textNode.variantProperty("font.bold") = QVariant(true);
textNode.variantProperty("font.pointSize") = QVariant(13.0);
- ModelNode newTextNode = addNodeListChild(rootNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode newTextNode = addNodeListChild(rootNode, "Qt/Text", 4, 7, "data");
newTextNode.variantProperty("font.bold") = QVariant(true);
newTextNode.variantProperty("font.pointSize") = QVariant(13.0);
@@ -2935,7 +2935,7 @@ void tst_TestCore::testRewriterPreserveType()
void tst_TestCore::testRewriterForArrayMagic()
{
try {
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: State {\n"
@@ -2946,7 +2946,7 @@ void tst_TestCore::testRewriterForArrayMagic()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2959,16 +2959,16 @@ void tst_TestCore::testRewriterForArrayMagic()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootNode.property(QLatin1String("states")).isNodeListProperty());
QmlItemNode rootItem(rootNode);
QVERIFY(rootItem.isValid());
QmlModelState state1(rootItem.states().addState("s2"));
- QCOMPARE(state1.modelNode().type(), QString("QtQuick/State"));
+ QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
- const QLatin1String expected("import QtQuick 1.0\n"
+ const QLatin1String expected("import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: [\n"
@@ -2989,7 +2989,7 @@ void tst_TestCore::testRewriterForArrayMagic()
void tst_TestCore::testRewriterWithSignals()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"\n"
"TextEdit {\n"
" onTextChanged: { print(\"foo\"); }\n"
@@ -2998,7 +2998,7 @@ void tst_TestCore::testRewriterWithSignals()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3011,7 +3011,7 @@ void tst_TestCore::testRewriterWithSignals()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/TextEdit"));
+ QCOMPARE(rootNode.type(), QString("Qt/TextEdit"));
QmlItemNode rootItem(rootNode);
QVERIFY(rootItem.isValid());
@@ -3021,7 +3021,7 @@ void tst_TestCore::testRewriterWithSignals()
void tst_TestCore::testRewriterNodeSliding()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" Rectangle {\n"
@@ -3041,7 +3041,7 @@ void tst_TestCore::testRewriterNodeSliding()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3054,7 +3054,7 @@ void tst_TestCore::testRewriterNodeSliding()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootNode.id(), QLatin1String("root"));
QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle1"));
@@ -3073,7 +3073,7 @@ void tst_TestCore::testRewriterNodeSliding()
void tst_TestCore::testRewriterExceptionHandling()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"Text {\n"
"}");
@@ -3081,7 +3081,7 @@ void tst_TestCore::testRewriterExceptionHandling()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Text", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3094,7 +3094,7 @@ void tst_TestCore::testRewriterExceptionHandling()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
try
{
@@ -3105,7 +3105,7 @@ void tst_TestCore::testRewriterExceptionHandling()
QFAIL("RewritingException should be thrown");
} catch (RewritingException &e) {
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
QVERIFY(!rootNode.hasProperty("bla"));
QVERIFY(!rootNode.hasProperty("text"));
}
@@ -3113,7 +3113,7 @@ void tst_TestCore::testRewriterExceptionHandling()
void tst_TestCore::testRewriterFirstDefinitionInside()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -3137,7 +3137,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3150,7 +3150,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode componentNode = rootNode.allDirectSubModelNodes().last();
@@ -3169,7 +3169,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
void tst_TestCore::testCopyModelRewriter1()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -3207,7 +3207,7 @@ void tst_TestCore::testCopyModelRewriter1()
textEdit1.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
QVERIFY(model1.data());
QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -3220,13 +3220,13 @@ void tst_TestCore::testCopyModelRewriter1()
ModelNode rootNode1 = view1->rootModelNode();
QVERIFY(rootNode1.isValid());
- QCOMPARE(rootNode1.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
QPlainTextEdit textEdit2;
textEdit2.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
QVERIFY(model2.data());
QScopedPointer<TestView> view2(new TestView(model2.data()));
@@ -3239,7 +3239,7 @@ void tst_TestCore::testCopyModelRewriter1()
ModelNode rootNode2 = view2->rootModelNode();
QVERIFY(rootNode2.isValid());
- QCOMPARE(rootNode2.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
//
@@ -3264,7 +3264,7 @@ void tst_TestCore::testCopyModelRewriter1()
const QLatin1String expected(
"\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -3339,7 +3339,7 @@ void tst_TestCore::testCopyModelRewriter1()
void tst_TestCore::testCopyModelRewriter2()
{
const QLatin1String qmlString1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"id: root\n"
@@ -3379,7 +3379,7 @@ void tst_TestCore::testCopyModelRewriter2()
const QLatin1String qmlString2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -3388,7 +3388,7 @@ void tst_TestCore::testCopyModelRewriter2()
textEdit1.setPlainText(qmlString1);
NotIndentingTextEditModifier textModifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
QVERIFY(model1.data());
QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -3401,7 +3401,7 @@ void tst_TestCore::testCopyModelRewriter2()
ModelNode rootNode1 = view1->rootModelNode();
QVERIFY(rootNode1.isValid());
- QCOMPARE(rootNode1.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
// read in 2
@@ -3410,7 +3410,7 @@ void tst_TestCore::testCopyModelRewriter2()
textEdit2.setPlainText(qmlString2);
NotIndentingTextEditModifier textModifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
QVERIFY(model2.data());
QScopedPointer<TestView> view2(new TestView(model2.data()));
@@ -3422,7 +3422,7 @@ void tst_TestCore::testCopyModelRewriter2()
ModelNode rootNode2 = view2->rootModelNode();
QVERIFY(rootNode2.isValid());
- QCOMPARE(rootNode2.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
//
@@ -3431,7 +3431,7 @@ void tst_TestCore::testCopyModelRewriter2()
merger.replaceModel(rootNode1);
QVERIFY(rootNode2.isValid());
- QCOMPARE(rootNode2.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(textEdit2.toPlainText(), qmlString1);
}
@@ -3446,7 +3446,7 @@ void tst_TestCore::testSubComponentManager()
textEdit.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
model->setFileUrl(QUrl::fromLocalFile(fileName));
QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model->metaInfo(), 0));
subComponentManager->update(QUrl::fromLocalFile(fileName), modifier.text().toUtf8());
@@ -3460,9 +3460,9 @@ void tst_TestCore::testSubComponentManager()
QVERIFY(testRewriterView->rootModelNode().isValid());
- QVERIFY(model->metaInfo().nodeMetaInfo("QtQuick/Rectangle").properties(true).keys().contains("border.width"));
+ QVERIFY(model->metaInfo().nodeMetaInfo("Qt/Rectangle").properties(true).keys().contains("border.width"));
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Pen"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
NodeMetaInfo myButtonMetaInfo = model->metaInfo().nodeMetaInfo("MyButton");
QVERIFY(myButtonMetaInfo.isValid());
QVERIFY(myButtonMetaInfo.properties(true).keys().contains("border.width"));
@@ -3471,7 +3471,7 @@ void tst_TestCore::testSubComponentManager()
void tst_TestCore::testAnchorsAndRewriting()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -3494,7 +3494,7 @@ void tst_TestCore::testAnchorsAndRewriting()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3507,7 +3507,7 @@ void tst_TestCore::testAnchorsAndRewriting()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QmlItemNode rootItemNode = view->rootQmlItemNode();
QVERIFY(rootItemNode.isValid());
@@ -3532,7 +3532,7 @@ void tst_TestCore::testAnchorsAndRewriting()
void tst_TestCore::testAnchorsAndRewritingCenter()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -3555,7 +3555,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3568,7 +3568,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QmlItemNode rootItemNode = view->rootQmlItemNode();
QVERIFY(rootItemNode.isValid());
@@ -3582,7 +3582,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
void tst_TestCore::loadQml()
{
-char qmlString[] = "import QtQuick 1.0\n"
+char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"id: root;\n"
"width: 200;\n"
@@ -3623,7 +3623,7 @@ char qmlString[] = "import QtQuick 1.0\n"
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3632,14 +3632,14 @@ char qmlString[] = "import QtQuick 1.0\n"
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rootModelNode.id(), QString("root"));
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
@@ -3649,7 +3649,7 @@ char qmlString[] = "import QtQuick 1.0\n"
QCOMPARE(rootModelNode.nodeListProperty("data").toModelNodeList().count(), 3);
ModelNode textNode1 = rootModelNode.nodeListProperty("data").toModelNodeList().first();
QVERIFY(textNode1.isValid());
- QCOMPARE(textNode1.type(), QString("QtQuick/Text"));
+ QCOMPARE(textNode1.type(), QString("Qt/Text"));
QCOMPARE(textNode1.id(), QString("text1"));
QCOMPARE(textNode1.variantProperty("text").value().toString(), QString("Hello World"));
QVERIFY(textNode1.hasProperty("anchors.centerIn"));
@@ -3665,13 +3665,13 @@ char qmlString[] = "import QtQuick 1.0\n"
ModelNode rectNode = rootModelNode.nodeListProperty("data").toModelNodeList().at(1);
QVERIFY(rectNode.isValid());
- QCOMPARE(rectNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rectNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rectNode.id(), QString("rectangle"));
QVERIFY(rectNode.hasProperty("gradient"));
QVERIFY(rectNode.property("gradient").isNodeProperty());
ModelNode gradientNode = rectNode.nodeProperty("gradient").modelNode();
QVERIFY(gradientNode.isValid());
- QCOMPARE(gradientNode.type(), QString("QtQuick/Gradient"));
+ QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
QVERIFY(gradientNode.hasProperty("stops"));
QVERIFY(gradientNode.property("stops").isNodeListProperty());
QCOMPARE(gradientNode.nodeListProperty("stops").toModelNodeList().count(), 2);
@@ -3682,15 +3682,15 @@ char qmlString[] = "import QtQuick 1.0\n"
QVERIFY(stop1.isValid());
QVERIFY(stop2.isValid());
- QCOMPARE(stop1.type(), QString("QtQuick/GradientStop"));
- QCOMPARE(stop2.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(stop1.type(), QString("Qt/GradientStop"));
+ QCOMPARE(stop2.type(), QString("Qt/GradientStop"));
QCOMPARE(stop1.variantProperty("position").value().toInt(), 0);
QCOMPARE(stop2.variantProperty("position").value().toInt(), 1);
ModelNode textNode2 = rootModelNode.nodeListProperty("data").toModelNodeList().last();
QVERIFY(textNode2.isValid());
- QCOMPARE(textNode2.type(), QString("QtQuick/Text"));
+ QCOMPARE(textNode2.type(), QString("Qt/Text"));
QCOMPARE(textNode2.id(), QString("text2"));
QCOMPARE(textNode2.variantProperty("width").value().toInt(), 80);
QCOMPARE(textNode2.variantProperty("height").value().toInt(), 20);
@@ -3701,17 +3701,17 @@ char qmlString[] = "import QtQuick 1.0\n"
void tst_TestCore::testMetaInfo()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
// test whether default type is registered
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item", 1, 0));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
// test whether types from plugins are registered
QVERIFY(model->metaInfo().hasNodeMetaInfo("QtWebKit/WebView", 1, 0));
// test whether non-qml type is registered
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // Qt 4.7 namespace
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
}
@@ -3723,20 +3723,20 @@ void tst_TestCore::testMetaInfoSimpleType()
// qmlRegisterType<QDeclarativeItem>("Qt",4,7,"Item")
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item", 1, 0));
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item", 1, 0));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
- NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("QtQuick/Item", 1, 0);
- NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("QtQuick/Item", 1, 0);
+ NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
+ NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
QCOMPARE(itemMetaInfo, itemMetaInfo2);
QVERIFY(itemMetaInfo.isValid());
- QCOMPARE(itemMetaInfo.typeName(), QLatin1String("QtQuick/Item"));
- QCOMPARE(itemMetaInfo.majorVersion(), 1);
- QCOMPARE(itemMetaInfo.minorVersion(), 0);
+ QCOMPARE(itemMetaInfo.typeName(), QLatin1String("Qt/Item"));
+ QCOMPARE(itemMetaInfo.majorVersion(), 4);
+ QCOMPARE(itemMetaInfo.minorVersion(), 7);
// super classes
NodeMetaInfo graphicsObjectInfo = itemMetaInfo.directSuperClass();
@@ -3745,15 +3745,17 @@ void tst_TestCore::testMetaInfoSimpleType()
QCOMPARE(graphicsObjectInfo.majorVersion(), -1);
QCOMPARE(graphicsObjectInfo.minorVersion(), -1);
- QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, QtQuick/QtObject
- QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 1, 0));
- QVERIFY(itemMetaInfo.isSubclassOf("QtQuick/QtObject", 1, 0));
+ QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, Qt/QtObject
+ QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 4, 7));
+ QVERIFY(itemMetaInfo.isSubclassOf("Qt/QtObject", 4, 7));
// availableInVersion
- QVERIFY(itemMetaInfo.availableInVersion(1, 0));
+ QVERIFY(itemMetaInfo.availableInVersion(4, 7));
+ QVERIFY(itemMetaInfo.availableInVersion(4, 8));
+ QVERIFY(itemMetaInfo.availableInVersion(5, 0));
QVERIFY(itemMetaInfo.availableInVersion(-1, -1));
- QVERIFY(!itemMetaInfo.availableInVersion(0, 8));
- QVERIFY(!itemMetaInfo.availableInVersion(0, 9));
+ QVERIFY(!itemMetaInfo.availableInVersion(4, 6));
+ QVERIFY(!itemMetaInfo.availableInVersion(3, 7));
}
void tst_TestCore::testMetaInfoUncreatableType()
@@ -3763,23 +3765,23 @@ void tst_TestCore::testMetaInfoUncreatableType()
// qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Animation"));
- NodeMetaInfo animationTypeInfo = model->metaInfo().nodeMetaInfo("QtQuick/Animation", 1, 0);
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Animation"));
+ NodeMetaInfo animationTypeInfo = model->metaInfo().nodeMetaInfo("Qt/Animation", 4, 7);
QVERIFY(animationTypeInfo.isValid());
QVERIFY(animationTypeInfo.isValid());
- QCOMPARE(animationTypeInfo.typeName(), QLatin1String("QtQuick/Animation"));
- QCOMPARE(animationTypeInfo.majorVersion(), 1);
- QCOMPARE(animationTypeInfo.minorVersion(), 0);
+ QCOMPARE(animationTypeInfo.typeName(), QLatin1String("Qt/Animation"));
+ QCOMPARE(animationTypeInfo.majorVersion(), 4);
+ QCOMPARE(animationTypeInfo.minorVersion(), 7);
NodeMetaInfo qObjectTypeInfo = animationTypeInfo.directSuperClass();
QVERIFY(qObjectTypeInfo.isValid());
- QCOMPARE(qObjectTypeInfo.typeName(), QLatin1String("QtQuick/QtObject"));
- QCOMPARE(qObjectTypeInfo.majorVersion(), 1);
- QCOMPARE(qObjectTypeInfo.minorVersion(), 0);
+ QCOMPARE(qObjectTypeInfo.typeName(), QLatin1String("Qt/QtObject"));
+ QCOMPARE(qObjectTypeInfo.majorVersion(), 4);
+ QCOMPARE(qObjectTypeInfo.minorVersion(), 7);
QCOMPARE(animationTypeInfo.superClasses().size(), 1);
}
@@ -3790,11 +3792,11 @@ void tst_TestCore::testMetaInfoExtendedType()
// qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/QGraphicsWidget"));
- NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo().nodeMetaInfo("QtQuick/QGraphicsWidget", 1, 0);
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/QGraphicsWidget"));
+ NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo().nodeMetaInfo("Qt/QGraphicsWidget", 4, 7);
QVERIFY(graphicsWidgetTypeInfo.isValid());
QVERIFY(graphicsWidgetTypeInfo.hasProperty("layout")); // from QGraphicsWidgetDeclarativeUI
QVERIFY(graphicsWidgetTypeInfo.hasProperty("font")); // from QGraphicsWidget
@@ -3820,13 +3822,13 @@ void tst_TestCore::testMetaInfoCustomType()
{
// Test type registered with qmlRegisterCustomType:
//
- // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 1, 0, "PropertyChanges", new QDeclarativePropertyChangesParser);
+ // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/PropertyChanges"));
- NodeMetaInfo propertyChangesInfo = model->metaInfo().nodeMetaInfo("QtQuick/PropertyChanges", 1, 0);
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/PropertyChanges"));
+ NodeMetaInfo propertyChangesInfo = model->metaInfo().nodeMetaInfo("Qt/PropertyChanges", 4, 7);
QVERIFY(propertyChangesInfo.isValid());
QVERIFY(propertyChangesInfo.hasProperty("target")); // from QDeclarativePropertyChanges
QVERIFY(propertyChangesInfo.hasProperty("restoreEntryValues")); // from QDeclarativePropertyChanges
@@ -3845,14 +3847,14 @@ void tst_TestCore::testMetaInfoCustomType()
void tst_TestCore::testMetaInfoEnums()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("QtQuick/Text"));
+ QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
QVERIFY(view->rootModelNode().metaInfo().hasProperty("transformOrigin"));
@@ -3869,14 +3871,14 @@ void tst_TestCore::testMetaInfoEnums()
void tst_TestCore::testMetaInfoProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data());
- NodeMetaInfo textNodeMetaInfo = model->metaInfo().nodeMetaInfo("QtQuick/TextEdit", 1, 0);
+ NodeMetaInfo textNodeMetaInfo = model->metaInfo().nodeMetaInfo("Qt/TextEdit", 4, 7);
QVERIFY(textNodeMetaInfo.hasProperty("text")); // QDeclarativeTextEdit
QVERIFY(textNodeMetaInfo.hasProperty("parent")); // QDeclarativeItem
QVERIFY(textNodeMetaInfo.hasProperty("x")); // QGraphicsObject
- QVERIFY(textNodeMetaInfo.hasProperty("objectName")); // QtQuick/QObject
+ QVERIFY(textNodeMetaInfo.hasProperty("objectName")); // Qt/QObject
QVERIFY(!textNodeMetaInfo.hasProperty("bla"));
QVERIFY(textNodeMetaInfo.property("text").isValid());
@@ -3889,18 +3891,18 @@ void tst_TestCore::testMetaInfoProperties()
void tst_TestCore::testMetaInfoDotProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Text"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Text"));
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Pen"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
- QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("QtQuick/Text"));
+ QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
QVERIFY(!view->rootModelNode().metaInfo().property("text").isValueType());
QVERIFY(view->rootModelNode().metaInfo().hasProperty("font"));
QVERIFY(view->rootModelNode().metaInfo().property("font").isValueType());
@@ -3912,7 +3914,7 @@ void tst_TestCore::testMetaInfoDotProperties()
QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.pointSize", true));
QVERIFY(view->rootModelNode().metaInfo().property("font.pointSize", true).isValid());
- ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
QVERIFY(rectNode.metaInfo().properties(true).keys().contains("pos.x"));
@@ -3931,15 +3933,15 @@ void tst_TestCore::testMetaInfoDotProperties()
void tst_TestCore::testMetaInfoListProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item"));
- QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("QtQuick/Item"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item"));
+ QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Item"));
QVERIFY(view->rootModelNode().metaInfo().hasProperty("states"));
QVERIFY(view->rootModelNode().metaInfo().property("states").isListProperty());
@@ -3963,10 +3965,10 @@ void tst_TestCore::testMetaInfoListProperties()
void tst_TestCore::testStatesRewriter()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0; Item {}\n");
+ textEdit.setPlainText("import Qt 4.7; Item {}\n");
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4010,10 +4012,10 @@ void tst_TestCore::testStatesRewriter()
void tst_TestCore::testGradientsRewriter()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("\nimport QtQuick 1.0\n\nItem {\n}\n");
+ textEdit.setPlainText("\nimport Qt 4.7\n\nItem {\n}\n");
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4029,9 +4031,9 @@ void tst_TestCore::testGradientsRewriter()
QVERIFY(rootModelNode.isValid());
- ModelNode rectNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rectNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
- const QLatin1String expected1("\nimport QtQuick 1.0\n"
+ const QLatin1String expected1("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4039,11 +4041,11 @@ void tst_TestCore::testGradientsRewriter()
"}\n");
QCOMPARE(textEdit.toPlainText(), expected1);
- ModelNode gradientNode(addNodeChild(rectNode, "QtQuick/Gradient", 1, 0, "gradient"));
+ ModelNode gradientNode(addNodeChild(rectNode, "Qt/Gradient", 4, 7, "gradient"));
QVERIFY(rectNode.hasNodeProperty("gradient"));
- const QLatin1String expected2("\nimport QtQuick 1.0\n"
+ const QLatin1String expected2("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4060,11 +4062,11 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::red))));
- ModelNode gradientStop1(gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList));
+ ModelNode gradientStop1(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
QVERIFY(gradientStop1.isValid());
stops.reparentHere(gradientStop1);
- const QLatin1String expected3("\nimport QtQuick 1.0\n"
+ const QLatin1String expected3("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4083,11 +4085,11 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.5)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
- ModelNode gradientStop2(gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList));
+ ModelNode gradientStop2(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
QVERIFY(gradientStop2.isValid());
stops.reparentHere(gradientStop2);
- const QLatin1String expected4("\nimport QtQuick 1.0\n"
+ const QLatin1String expected4("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4111,11 +4113,11 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.8)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::yellow))));
- ModelNode gradientStop3(gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList));
+ ModelNode gradientStop3(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
QVERIFY(gradientStop3.isValid());
stops.reparentHere(gradientStop3);
- const QLatin1String expected5("\nimport QtQuick 1.0\n"
+ const QLatin1String expected5("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4142,7 +4144,7 @@ void tst_TestCore::testGradientsRewriter()
gradientNode.removeProperty("stops");
- const QLatin1String expected6("\nimport QtQuick 1.0\n"
+ const QLatin1String expected6("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4159,7 +4161,7 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
- gradientStop1 = gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList);
+ gradientStop1 = gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList);
QVERIFY(gradientStop1.isValid());
stops.reparentHere(gradientStop1);
@@ -4167,7 +4169,7 @@ void tst_TestCore::testGradientsRewriter()
void tst_TestCore::testQmlModelStates()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4200,7 +4202,7 @@ void tst_TestCore::testQmlModelStates()
void tst_TestCore::testInstancesStates()
{
//
-// import QtQuick 1.0
+// import Qt 4.7
//
// Rectangle {
// Text {
@@ -4228,7 +4230,7 @@ void tst_TestCore::testInstancesStates()
// }
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4239,28 +4241,28 @@ void tst_TestCore::testInstancesStates()
//
ModelNode rootNode = view->rootModelNode();
- ModelNode textNode = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
textNode.setId("targetObject");
textNode.variantProperty("text").setValue("base state");
rootNode.nodeListProperty("data").reparentHere(textNode);
- ModelNode propertyChanges1Node = view->createModelNode("QtQuick/PropertyChanges", 1, 0);
+ ModelNode propertyChanges1Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
propertyChanges1Node.bindingProperty("target").setExpression("targetObject");
propertyChanges1Node.variantProperty("x").setValue(10);
propertyChanges1Node.variantProperty("text").setValue("state1");
- ModelNode state1Node = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode state1Node = view->createModelNode("Qt/State", 4, 7);
state1Node.variantProperty("name").setValue("state1");
state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
rootNode.nodeListProperty("states").reparentHere(state1Node);
- ModelNode propertyChanges2Node = view->createModelNode("QtQuick/PropertyChanges", 1, 0);
+ ModelNode propertyChanges2Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
propertyChanges2Node.bindingProperty("target").setExpression("targetObject");
propertyChanges2Node.variantProperty("text").setValue("state2");
- ModelNode state2Node = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode state2Node = view->createModelNode("Qt/State", 4, 7);
state2Node.variantProperty("name").setValue("state2");
state2Node.nodeListProperty("changes").reparentHere(propertyChanges2Node);
@@ -4357,7 +4359,7 @@ void tst_TestCore::testInstancesStates()
//
// move property changes of current state out of state
- ModelNode state3Node = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode state3Node = view->createModelNode("Qt/State", 4, 7);
QDeclarativeListReference changes(state1, "changes");
QCOMPARE(changes.count(), 1);
state3Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
@@ -4380,7 +4382,7 @@ void tst_TestCore::testInstancesStates()
textNode.variantProperty("text").setValue("base state");
// expressions
- ModelNode textNode2 = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode2 = view->createModelNode("Qt/Text", 4, 7);
textNode2.setId("targetObject2");
textNode2.variantProperty("text").setValue("textNode2");
@@ -4440,7 +4442,7 @@ void tst_TestCore::testInstancesStates()
void tst_TestCore::testStates()
{
//
-// import QtQuick 1.0
+// import Qt 4.7
//
// Rectangle {
// Text {
@@ -4459,7 +4461,7 @@ void tst_TestCore::testStates()
// }
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4468,7 +4470,7 @@ void tst_TestCore::testStates()
// build up model
ModelNode rootNode = view->rootModelNode();
- ModelNode textNode = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
textNode.setId("targetObject");
textNode.variantProperty("text").setValue("base state");
@@ -4484,7 +4486,7 @@ void tst_TestCore::testStates()
QVERIFY(textItem.isValid());
QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
- QCOMPARE(state1.modelNode().type(), QString("QtQuick/State"));
+ QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
QVERIFY(view->currentState().isBaseState());
@@ -4517,7 +4519,7 @@ void tst_TestCore::testStates()
QCOMPARE(changes.modelNode().variantProperty("text").value(), QVariant("state 1"));
QCOMPARE(changes.modelNode().bindingProperty("target").expression(), QString("targetObject"));
QCOMPARE(changes.target(), textNode);
- QCOMPARE(changes.modelNode().type(), QString("QtQuick/PropertyChanges"));
+ QCOMPARE(changes.modelNode().type(), QString("Qt/PropertyChanges"));
QCOMPARE(changes.modelNode().parentProperty().name(), QString("changes"));
QCOMPARE(changes.modelNode().parentProperty().parentModelNode(), state1.modelNode());
@@ -4536,7 +4538,7 @@ void tst_TestCore::testStates()
void tst_TestCore::testStatesBaseState()
{
//
-// import QtQuick 1.0
+// import Qt 4.7
//
// Rectangle {
// Text {
@@ -4555,7 +4557,7 @@ void tst_TestCore::testStatesBaseState()
// }
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4564,7 +4566,7 @@ void tst_TestCore::testStatesBaseState()
// build up model
ModelNode rootNode = view->rootModelNode();
- ModelNode textNode = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
textNode.setId("targetObject");
textNode.variantProperty("text").setValue("base state");
@@ -4580,7 +4582,7 @@ void tst_TestCore::testStatesBaseState()
QVERIFY(textItem.isValid());
QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
- QCOMPARE(state1.modelNode().type(), QString("QtQuick/State"));
+ QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
QVERIFY(view->currentState().isBaseState());
@@ -4590,7 +4592,7 @@ void tst_TestCore::testStatesBaseState()
QVERIFY(textItem.propertyAffectedByCurrentState("text"));
QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
- ModelNode newNode = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
QVERIFY(!QmlObjectNode(newNode).currentState().isBaseState());
view->setCurrentState(view->baseState()); //set currentState base state
@@ -4612,13 +4614,13 @@ void tst_TestCore::testStatesBaseState()
void tst_TestCore::testInstancesIdResolution()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- // import QtQuick 1.0
+ // import Qt 4.7
//
// Rectangle {
// id: root
@@ -4636,7 +4638,7 @@ void tst_TestCore::testInstancesIdResolution()
rootNode.variantProperty("width").setValue(100);
rootNode.variantProperty("height").setValue(100);
- ModelNode item1Node = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode item1Node = view->createModelNode("Qt/Rectangle", 4, 7);
item1Node.setId("item1");
item1Node.bindingProperty("width").setExpression("root.width");
item1Node.bindingProperty("height").setExpression("item2.height");
@@ -4656,7 +4658,7 @@ void tst_TestCore::testInstancesIdResolution()
// height: root.height
// }
- ModelNode item2Node = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode item2Node = view->createModelNode("Qt/Rectangle", 4, 7);
item2Node.setId("item2");
item2Node.bindingProperty("width").setExpression("root.width / 2");
item2Node.bindingProperty("height").setExpression("root.height");
@@ -4681,7 +4683,7 @@ void tst_TestCore::testInstancesIdResolution()
// height: 80
// }
- ModelNode item3Node = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode item3Node = view->createModelNode("Qt/Rectangle", 4, 7);
item3Node.setId("item3");
item3Node.variantProperty("height").setValue(80);
rootNode.nodeListProperty("data").reparentHere(item3Node);
@@ -4699,16 +4701,16 @@ void tst_TestCore::testInstancesNotInScene()
// test whether deleting an instance which is not in the scene crashes
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
- ModelNode node2 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
node2.setId("node2");
node1.nodeListProperty("children").reparentHere(node2);
@@ -4720,21 +4722,21 @@ void tst_TestCore::testInstancesBindingsInStatesStress()
{
//This is a stress test to provoke a crash
for (int j=0;j<20;j++) {
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
view->rootModelNode().nodeListProperty("children").reparentHere(node1);
- ModelNode node2 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Rectangle", 4, 7);
node2.setId("node2");
- ModelNode node3 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node3 = view->createModelNode("Qt/Rectangle", 4, 7);
node3.setId("node3");
node1.nodeListProperty("children").reparentHere(node2);
@@ -4825,21 +4827,21 @@ void tst_TestCore::testInstancesPropertyChangeTargets()
//this tests checks if a change of the target of a CropertyChange
//node is handled correctly
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
view->rootModelNode().nodeListProperty("children").reparentHere(node1);
- ModelNode node2 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Rectangle", 4, 7);
node2.setId("node2");
- ModelNode node3 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node3 = view->createModelNode("Qt/Rectangle", 4, 7);
node3.setId("node3");
node1.nodeListProperty("children").reparentHere(node2);
@@ -4931,21 +4933,21 @@ void tst_TestCore::testInstancesPropertyChangeTargets()
void tst_TestCore::testInstancesDeletePropertyChanges()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
view->rootModelNode().nodeListProperty("children").reparentHere(node1);
- ModelNode node2 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Rectangle", 4, 7);
node2.setId("node2");
- ModelNode node3 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node3 = view->createModelNode("Qt/Rectangle", 4, 7);
node3.setId("node3");
node1.nodeListProperty("children").reparentHere(node2);
@@ -5020,7 +5022,7 @@ void tst_TestCore::testInstancesDeletePropertyChanges()
void tst_TestCore::testInstancesChildrenLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5032,11 +5034,11 @@ void tst_TestCore::testInstancesChildrenLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "data");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
@@ -5110,7 +5112,7 @@ void tst_TestCore::testInstancesChildrenLowLevel()
void tst_TestCore::testInstancesResourcesLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5122,15 +5124,15 @@ void tst_TestCore::testInstancesResourcesLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "data");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
- ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "data");
+ ModelNode listModel = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "data");
QVERIFY(listModel.isValid());
listModel.setId("listModel");
@@ -5169,6 +5171,8 @@ void tst_TestCore::testInstancesResourcesLowLevel()
QCOMPARE(listReferenceResources.at(0), listModelObject);
QCOMPARE(listReferenceData.at(0), listModelObject);
+ QSKIP("This crashes", SkipAll); //### todo might be critical in the future
+
listReferenceResources.clear();
QCOMPARE(listReferenceData.count(), 2);
@@ -5186,8 +5190,6 @@ void tst_TestCore::testInstancesResourcesLowLevel()
QCOMPARE(listReferenceData.at(1), child1Item);
QCOMPARE(listReferenceData.at(2), child2Item);
- QSKIP("This crashes", SkipAll); //### todo might be critical in the future
-
listReferenceChildren.clear();
QCOMPARE(listReferenceData.count(), 1);
@@ -5209,7 +5211,7 @@ void tst_TestCore::testInstancesResourcesLowLevel()
QCOMPARE(listReferenceData.at(1), child1Item);
QCOMPARE(listReferenceData.at(2), child2Item);
- ModelNode listModel2 = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "data");
+ ModelNode listModel2 = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "data");
QVERIFY(listModel2.isValid());
listModel2.setId("listModel2");
@@ -5257,7 +5259,7 @@ void tst_TestCore::testInstancesResourcesLowLevel()
void tst_TestCore::testInstancesFlickableLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Flickable", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Flickable", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5269,15 +5271,15 @@ void tst_TestCore::testInstancesFlickableLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "flickableData");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "flickableData");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "flickableData");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "flickableData");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
- ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "flickableData");
+ ModelNode listModel = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "flickableData");
QVERIFY(listModel.isValid());
listModel.setId("listModel");
@@ -5345,7 +5347,7 @@ void tst_TestCore::testInstancesFlickableLowLevel()
void tst_TestCore::testInstancesReorderChildrenLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5357,23 +5359,23 @@ void tst_TestCore::testInstancesReorderChildrenLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "data");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
- ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "data");
+ ModelNode listModel = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "data");
QVERIFY(listModel.isValid());
listModel.setId("listModel");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode3.isValid());
childNode3.setId("childNode3");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode4.isValid());
childNode4.setId("childNode4");
@@ -5444,7 +5446,7 @@ void tst_TestCore::testInstancesReorderChildrenLowLevel()
void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5461,11 +5463,11 @@ void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
QVERIFY(state1.isValid());
QCOMPARE(state1.name(), QString("state1"));
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
childNode.setId("childNode");
- ModelNode subChildNode = addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(subChildNode.isValid());
subChildNode.setId("subChildNode");
@@ -5485,7 +5487,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
// Test attaching nodeinstanceview to an existing model
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5493,7 +5495,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
model->attachView(view.data());
ModelNode rootNode = view->rootModelNode();
- ModelNode rectangleNode = addNodeListChild(rootNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode rectangleNode = addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "data");
rectangleNode.variantProperty("width").setValue(100);
@@ -5518,7 +5520,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
void tst_TestCore::testQmlModelAddMultipleStates()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5549,7 +5551,7 @@ void tst_TestCore::testQmlModelAddMultipleStates()
void tst_TestCore::testQmlModelRemoveStates()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -5579,10 +5581,10 @@ void tst_TestCore::testQmlModelRemoveStates()
void tst_TestCore::testQmlModelStateWithName()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
+ textEdit1.setPlainText("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
testRewriterView1->setTextModifier(&modifier1);
@@ -5604,7 +5606,7 @@ void tst_TestCore::testQmlModelStateWithName()
view->setCurrentState(rootNode.states().allStates().at(0));
rootNode.setVariantProperty("width", 112);
- const QLatin1String expected1("import QtQuick 1.0; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 112 } } ] }\n");
+ const QLatin1String expected1("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 112 } } ] }\n");
QCOMPARE(textEdit1.toPlainText(), expected1);
QVERIFY(!rootNode.isInBaseState());
@@ -5624,10 +5626,10 @@ void tst_TestCore::testQmlModelStateWithName()
void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Rectangle {\n width: 640\n height: 480\n}\n");
+ textEdit1.setPlainText("import Qt 4.7; Rectangle {\n width: 640\n height: 480\n}\n");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
testRewriterView1->setTextModifier(&modifier1);
@@ -5644,7 +5646,7 @@ void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
void tst_TestCore::defaultPropertyValues()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5654,12 +5656,12 @@ void tst_TestCore::defaultPropertyValues()
QCOMPARE(view->rootModelNode().variantProperty("x").value().toDouble(), 0.0);
QCOMPARE(view->rootModelNode().variantProperty("width").value().toDouble(), 0.0);
- ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
QCOMPARE(rectNode.variantProperty("y").value().toDouble(), 0.0);
QCOMPARE(rectNode.variantProperty("width").value().toDouble(), 0.0);
- ModelNode imageNode(addNodeListChild(view->rootModelNode(), "QtQuick/Image", 1, 0, "data"));
+ ModelNode imageNode(addNodeListChild(view->rootModelNode(), "Qt/Image", 4, 7, "data"));
QCOMPARE(imageNode.variantProperty("y").value().toDouble(), 0.0);
QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0);
@@ -5668,10 +5670,10 @@ void tst_TestCore::defaultPropertyValues()
void tst_TestCore::testModelPropertyValueTypes()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
+ textEdit1.setPlainText("import Qt 4.7; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5689,7 +5691,7 @@ void tst_TestCore::testModelPropertyValueTypes()
void tst_TestCore::testModelNodeInHierarchy()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5697,9 +5699,9 @@ void tst_TestCore::testModelNodeInHierarchy()
model->attachView(view.data());
QVERIFY(view->rootModelNode().isInHierarchy());
- ModelNode node1 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode node1 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
QVERIFY(node1.isInHierarchy());
- ModelNode node2 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
QVERIFY(!node2.isInHierarchy());
node2.nodeListProperty("data").reparentHere(node1);
QVERIFY(!node2.isInHierarchy());
@@ -5710,11 +5712,11 @@ void tst_TestCore::testModelNodeInHierarchy()
void tst_TestCore::testModelNodeIsAncestorOf()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
//
- // import QtQuick 1.0
+ // import Qt 4.7
// Item {
// Item {
// id: item2
@@ -5732,11 +5734,11 @@ void tst_TestCore::testModelNodeIsAncestorOf()
model->attachView(view.data());
view->rootModelNode().setId("item1");
- ModelNode item2 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode item2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
item2.setId("item2");
- ModelNode item3 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode item3 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
item3.setId("item3");
- ModelNode item4 = addNodeListChild(item3, "QtQuick/Item", 1, 0, "data");
+ ModelNode item4 = addNodeListChild(item3, "Qt/Item", 4, 7, "data");
item4.setId("item4");
QVERIFY(view->rootModelNode().isAncestorOf(item2));
@@ -5749,7 +5751,7 @@ void tst_TestCore::testModelNodeIsAncestorOf()
void tst_TestCore::testModelDefaultProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5765,10 +5767,10 @@ void tst_TestCore::testModelDefaultProperties()
void tst_TestCore::loadAnchors()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5804,10 +5806,10 @@ void tst_TestCore::loadAnchors()
void tst_TestCore::changeAnchors()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5865,10 +5867,10 @@ void tst_TestCore::changeAnchors()
void tst_TestCore::anchorToSibling()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { Rectangle {} Rectangle { id: secondChild } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { Rectangle {} Rectangle { id: secondChild } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5909,10 +5911,10 @@ void tst_TestCore::anchorToSibling()
void tst_TestCore::removeFillAnchorByDetaching()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5989,10 +5991,10 @@ void tst_TestCore::removeFillAnchorByDetaching()
void tst_TestCore::removeFillAnchorByChanging()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -6069,7 +6071,7 @@ void tst_TestCore::removeFillAnchorByChanging()
void tst_TestCore::testModelBindings()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
@@ -6089,7 +6091,7 @@ void tst_TestCore::testModelBindings()
QCOMPARE(rootInstance.size().width(), 200.0);
QCOMPARE(rootInstance.size().height(), 100.0);
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
childNode.variantProperty("width") = 100;
childNode.variantProperty("height") = 100;
@@ -6127,7 +6129,7 @@ void tst_TestCore::testModelBindings()
void tst_TestCore::testModelDynamicProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
TestView *testView = new TestView(model.data());
@@ -6171,7 +6173,7 @@ void tst_TestCore::testModelDynamicProperties()
void tst_TestCore::testModelSliding()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6180,10 +6182,10 @@ void tst_TestCore::testModelSliding()
ModelNode rootModelNode(view->rootModelNode());
- ModelNode rect00(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode rect01(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode rect02(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode rect03(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rect00(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode rect01(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode rect02(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode rect03(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(rect00.isValid());
QVERIFY(rect01.isValid());
@@ -6239,13 +6241,13 @@ void tst_TestCore::testModelSliding()
void tst_TestCore::testRewriterChangeId()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { }";
+ const char* qmlString = "import Qt 4.7\nRectangle { }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6264,25 +6266,25 @@ void tst_TestCore::testRewriterChangeId()
QCOMPARE(rootModelNode.id(), QString("rectId"));
- QString expected = "import QtQuick 1.0\n"
+ QString expected = "import Qt 4.7\n"
"Rectangle { id: rectId }";
QCOMPARE(textEdit.toPlainText(), expected);
// change id for node outside of hierarchy
- ModelNode node = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node = view->createModelNode("Qt/Item", 4, 7);
node.setId("myId");
}
void tst_TestCore::testRewriterRemoveId()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { id: rect }";
+ const char* qmlString = "import Qt 4.7\nRectangle { id: rect }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6300,7 +6302,7 @@ void tst_TestCore::testRewriterRemoveId()
//
// remove id in text
//
- const char* qmlString2 = "import QtQuick 1.0\nRectangle { }";
+ const char* qmlString2 = "import Qt 4.7\nRectangle { }";
textEdit.setPlainText(qmlString2);
QCOMPARE(rootModelNode.id(), QString());
@@ -6308,13 +6310,13 @@ void tst_TestCore::testRewriterRemoveId()
void tst_TestCore::testRewriterChangeValueProperty()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { x: 10; y: 10 }";
+ const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6337,14 +6339,14 @@ void tst_TestCore::testRewriterChangeValueProperty()
// change property for node outside of hierarchy
PropertyListType properties;
properties.append(QPair<QString,QVariant>("x", 10));
- ModelNode node = view->createModelNode("QtQuick/Item", 1, 0, properties);
+ ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
node.variantProperty("x").setValue(20);
}
void tst_TestCore::testRewriterRemoveValueProperty()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"Rectangle {\n"
" x: 10\n"
" y: 10;\n"
@@ -6354,7 +6356,7 @@ void tst_TestCore::testRewriterRemoveValueProperty()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6375,7 +6377,7 @@ void tst_TestCore::testRewriterRemoveValueProperty()
rootModelNode.removeProperty("x");
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"Rectangle {\n"
" y: 10;\n"
"}\n");
@@ -6384,19 +6386,19 @@ void tst_TestCore::testRewriterRemoveValueProperty()
// remove property for node outside of hierarchy
PropertyListType properties;
properties.append(QPair<QString,QVariant>("x", 10));
- ModelNode node = view->createModelNode("QtQuick/Item", 1, 0, properties);
+ ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
node.removeProperty("x");
}
void tst_TestCore::testRewriterSignalProperty()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { onColorChanged: {} }";
+ const char* qmlString = "import Qt 4.7\nRectangle { onColorChanged: {} }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6416,13 +6418,13 @@ void tst_TestCore::testRewriterSignalProperty()
void tst_TestCore::testRewriterObjectTypeProperty()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { x: 10; y: 10 }";
+ const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6436,11 +6438,11 @@ void tst_TestCore::testRewriterObjectTypeProperty()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
- view->changeRootNodeType(QLatin1String("QtQuick/Text"), 1, 0);
+ view->changeRootNodeType(QLatin1String("Qt/Text"), 4, 7);
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Text"));
}
void tst_TestCore::testRewriterPropertyChanges()
@@ -6450,7 +6452,7 @@ void tst_TestCore::testRewriterPropertyChanges()
// Use a slightly more complicated example so that target properties are not resolved in default scope
const char* qmlString
- = "import QtQuick 1.0\n"
+ = "import Qt 4.7\n"
"Rectangle {\n"
" Text {\n"
" id: targetObj\n"
@@ -6470,7 +6472,7 @@ void tst_TestCore::testRewriterPropertyChanges()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6483,7 +6485,7 @@ void tst_TestCore::testRewriterPropertyChanges()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootNode.propertyNames().contains(QLatin1String("data")));
QVERIFY(rootNode.propertyNames().contains(QLatin1String("states")));
QCOMPARE(rootNode.propertyNames().count(), 2);
@@ -6494,7 +6496,7 @@ void tst_TestCore::testRewriterPropertyChanges()
ModelNode stateNode = statesProperty.toModelNodeList().first();
QVERIFY(stateNode.isValid());
- QCOMPARE(stateNode.type(), QString("QtQuick/State"));
+ QCOMPARE(stateNode.type(), QString("Qt/State"));
QCOMPARE(stateNode.propertyNames(), QStringList("changes"));
NodeListProperty stateChangesProperty = stateNode.property("changes").toNodeListProperty();
@@ -6521,13 +6523,13 @@ void tst_TestCore::testRewriterListModel()
try {
// ListModel uses a custom parser
- const char* qmlString = "import QtQuick 1.0; ListModel {\n ListElement {\n age: 12\n} \n}";
+ const char* qmlString = "import Qt 4.7; ListModel {\n ListElement {\n age: 12\n} \n}";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -6556,7 +6558,7 @@ void tst_TestCore::testRewriterListModel()
void tst_TestCore::testRewriterAddProperty()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6564,7 +6566,7 @@ void tst_TestCore::testRewriterAddProperty()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6577,7 +6579,7 @@ void tst_TestCore::testRewriterAddProperty()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
rootNode.variantProperty(QLatin1String("x")).setValue(123);
@@ -6586,7 +6588,7 @@ void tst_TestCore::testRewriterAddProperty()
QCOMPARE(rootNode.variantProperty(QLatin1String("x")).value(), QVariant(123));
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"x: 123\n"
@@ -6597,7 +6599,7 @@ void tst_TestCore::testRewriterAddProperty()
void tst_TestCore::testRewriterAddPropertyInNestedObject()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Rectangle {\n"
@@ -6608,7 +6610,7 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6621,18 +6623,18 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode childNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
QVERIFY(childNode.isValid());
- QCOMPARE(childNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(childNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(childNode.id(), QLatin1String("rectangle1"));
childNode.variantProperty(QLatin1String("x")).setValue(10);
childNode.variantProperty(QLatin1String("y")).setValue(10);
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Rectangle {\n"
@@ -6646,7 +6648,7 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
void tst_TestCore::testRewriterAddObjectDefinition()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6654,7 +6656,7 @@ void tst_TestCore::testRewriterAddObjectDefinition()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6667,20 +6669,20 @@ void tst_TestCore::testRewriterAddObjectDefinition()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
- ModelNode childNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode childNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeAbstractProperty(QLatin1String("data")).reparentHere(childNode);
QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
- QCOMPARE(childNode.type(), QString(QLatin1String("QtQuick/MouseArea")));
+ QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
}
void tst_TestCore::testRewriterAddStatesArray()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6688,7 +6690,7 @@ void tst_TestCore::testRewriterAddStatesArray()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6700,13 +6702,13 @@ void tst_TestCore::testRewriterAddStatesArray()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
- ModelNode stateNode = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode stateNode = view->createModelNode("Qt/State", 4, 7);
rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode);
const QString expected1 = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"states: [\n"
@@ -6716,11 +6718,11 @@ void tst_TestCore::testRewriterAddStatesArray()
"}");
QCOMPARE(textEdit.toPlainText(), expected1);
- ModelNode stateNode2 = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode stateNode2 = view->createModelNode("Qt/State", 4, 7);
rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode2);
const QString expected2 = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"states: [\n"
@@ -6736,7 +6738,7 @@ void tst_TestCore::testRewriterAddStatesArray()
void tst_TestCore::testRewriterRemoveStates()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: [\n"
@@ -6750,7 +6752,7 @@ void tst_TestCore::testRewriterRemoveStates()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6762,7 +6764,7 @@ void tst_TestCore::testRewriterRemoveStates()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
NodeListProperty statesProperty = rootNode.nodeListProperty(QLatin1String("states"));
QVERIFY(statesProperty.isValid());
@@ -6772,7 +6774,7 @@ void tst_TestCore::testRewriterRemoveStates()
state.destroy();
const QLatin1String expected1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: [\n"
@@ -6786,7 +6788,7 @@ void tst_TestCore::testRewriterRemoveStates()
state.destroy();
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6796,7 +6798,7 @@ void tst_TestCore::testRewriterRemoveStates()
void tst_TestCore::testRewriterRemoveObjectDefinition()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" MouseArea {\n"
@@ -6808,7 +6810,7 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6821,24 +6823,24 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 2);
ModelNode childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(1);
- QCOMPARE(childNode.type(), QString(QLatin1String("QtQuick/MouseArea")));
+ QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
childNode.destroy();
QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
- QCOMPARE(childNode.type(), QString(QLatin1String("QtQuick/MouseArea")));
+ QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
childNode.destroy();
QVERIFY(!rootNode.hasProperty(QLatin1String("data")));
const QString expected = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" // some comment here\n"
@@ -6846,9 +6848,9 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
QCOMPARE(textEdit.toPlainText(), expected);
// don't crash when deleting nodes not in any hierarchy
- ModelNode node1 = view->createModelNode("QtQuick/Rectangle", 1, 0);
- ModelNode node2 = addNodeListChild(node1, "QtQuick/Item", 1, 0, "data");
- ModelNode node3 = addNodeListChild(node2, "QtQuick/Item", 1, 0, "data");
+ ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
+ ModelNode node2 = addNodeListChild(node1, "Qt/Item", 4, 7, "data");
+ ModelNode node3 = addNodeListChild(node2, "Qt/Item", 4, 7, "data");
node3.destroy();
node1.destroy();
@@ -6857,7 +6859,7 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
void tst_TestCore::testRewriterRemoveScriptBinding()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" x: 10; // some comment\n"
@@ -6867,7 +6869,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6880,7 +6882,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rootNode.properties().size(), 2);
QVERIFY(rootNode.hasProperty(QLatin1String("x")));
@@ -6897,7 +6899,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
QCOMPARE(rootNode.properties().size(), 0);
const QString expected = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" // some comment\n"
@@ -6908,7 +6910,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
void tst_TestCore::testRewriterNodeReparenting()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -6920,7 +6922,7 @@ void tst_TestCore::testRewriterNodeReparenting()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6933,15 +6935,15 @@ void tst_TestCore::testRewriterNodeReparenting()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
ModelNode itemNode = rootNode.nodeListProperty("data").toModelNodeList().at(0);
QVERIFY(itemNode.isValid());
- QCOMPARE(itemNode.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(itemNode.type(), QLatin1String("Qt/Item"));
ModelNode mouseArea = itemNode.nodeListProperty("data").toModelNodeList().at(0);
QVERIFY(mouseArea.isValid());
- QCOMPARE(mouseArea.type(), QLatin1String("QtQuick/MouseArea"));
+ QCOMPARE(mouseArea.type(), QLatin1String("Qt/MouseArea"));
rootNode.nodeListProperty("data").reparentHere(mouseArea);
@@ -6949,7 +6951,7 @@ void tst_TestCore::testRewriterNodeReparenting()
QCOMPARE(rootNode.nodeListProperty("data").toModelNodeList().size(), 2);
QString expected = "\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -6961,9 +6963,9 @@ void tst_TestCore::testRewriterNodeReparenting()
QCOMPARE(textEdit.toPlainText(), expected);
// reparenting outside of the hierarchy
- ModelNode node1 = view->createModelNode("QtQuick/Rectangle", 1, 0);
- ModelNode node2 = view->createModelNode("QtQuick/Item", 1, 0);
- ModelNode node3 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
+ ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
+ ModelNode node3 = view->createModelNode("Qt/Item", 4, 7);
node2.nodeListProperty("data").reparentHere(node3);
node1.nodeListProperty("data").reparentHere(node2);
@@ -6971,7 +6973,7 @@ void tst_TestCore::testRewriterNodeReparenting()
rootNode.nodeListProperty("data").reparentHere(node1);
expected = "\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -6991,11 +6993,11 @@ void tst_TestCore::testRewriterNodeReparenting()
QCOMPARE(textEdit.toPlainText(), expected);
// reparent out of the hierarchy
- ModelNode node4 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node4 = view->createModelNode("Qt/Rectangle", 4, 7);
node4.nodeListProperty("data").reparentHere(node1);
expected = "\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7011,7 +7013,7 @@ void tst_TestCore::testRewriterNodeReparenting()
void tst_TestCore::testRewriterNodeReparentingWithTransaction()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: rootItem\n"
@@ -7028,7 +7030,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7041,17 +7043,17 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootNode.id(), QLatin1String("rootItem"));
ModelNode item1Node = rootNode.nodeListProperty("data").toModelNodeList().at(0);
QVERIFY(item1Node.isValid());
- QCOMPARE(item1Node.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(item1Node.type(), QLatin1String("Qt/Item"));
QCOMPARE(item1Node.id(), QLatin1String("firstItem"));
ModelNode item2Node = rootNode.nodeListProperty("data").toModelNodeList().at(1);
QVERIFY(item2Node.isValid());
- QCOMPARE(item2Node.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(item2Node.type(), QLatin1String("Qt/Item"));
QCOMPARE(item2Node.id(), QLatin1String("secondItem"));
RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
@@ -7062,7 +7064,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
transaction.commit();
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: rootItem\n"
@@ -7081,7 +7083,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
void tst_TestCore::testRewriterMovingInOut()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7089,7 +7091,7 @@ void tst_TestCore::testRewriterMovingInOut()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7102,13 +7104,13 @@ void tst_TestCore::testRewriterMovingInOut()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
- ModelNode newNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
const QLatin1String expected1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"MouseArea {\n"
@@ -7127,7 +7129,7 @@ void tst_TestCore::testRewriterMovingInOut()
newNode.destroy();
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7137,7 +7139,7 @@ void tst_TestCore::testRewriterMovingInOut()
void tst_TestCore::testRewriterMovingInOutWithTransaction()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7145,7 +7147,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7158,11 +7160,11 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
RewriterTransaction transaction = view->beginRewriterTransaction();
- ModelNode newNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
#define move(node, x, y) {\
@@ -7178,7 +7180,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
transaction.commit();
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7188,7 +7190,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
void tst_TestCore::testRewriterComplexMovingInOut()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7198,7 +7200,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7211,14 +7213,14 @@ void tst_TestCore::testRewriterComplexMovingInOut()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
ModelNode itemNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
- ModelNode newNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
const QLatin1String expected1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7238,7 +7240,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
move(newNode, 3, 3);
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7254,7 +7256,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
itemNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
const QLatin1String expected3("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7274,7 +7276,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
newNode.destroy();
const QLatin1String expected4("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7286,10 +7288,10 @@ void tst_TestCore::testRewriterComplexMovingInOut()
void tst_TestCore::removeCenteredInAnchorByDetaching()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { Rectangle { id: child; anchors.centerIn: parent } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { Rectangle { id: child; anchors.centerIn: parent } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -7340,7 +7342,7 @@ void tst_TestCore::removeCenteredInAnchorByDetaching()
void tst_TestCore::changePropertyBinding()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7349,7 +7351,7 @@ void tst_TestCore::changePropertyBinding()
ModelNode rootModelNode(view->rootModelNode());
rootModelNode.variantProperty("width") = 20;
- ModelNode firstChild = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode firstChild = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
firstChild.bindingProperty("width").setExpression(QString("parent.width"));
firstChild.variantProperty("height")= 10;
QVERIFY(firstChild.isValid());
@@ -7389,7 +7391,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7400,7 +7402,7 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Item"));
QVERIFY(rootModelNode.allDirectSubModelNodes().isEmpty());
}
@@ -7412,7 +7414,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7423,14 +7425,14 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 1);
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
ModelNode textNode(rootModelNode.allDirectSubModelNodes().first());
QVERIFY(textNode.isValid());
- QCOMPARE(textNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
}
@@ -7442,7 +7444,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7453,7 +7455,7 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 4);
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
@@ -7464,14 +7466,14 @@ void tst_TestCore::loadTestFiles()
ModelNode textNode(rootModelNode.nodeListProperty("data").toModelNodeList().first());
QVERIFY(textNode.isValid());
QCOMPARE(textNode.id(), QLatin1String("text"));
- QCOMPARE(textNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
ModelNode imageNode(rootModelNode.nodeListProperty("data").toModelNodeList().last());
QVERIFY(imageNode.isValid());
QCOMPARE(imageNode.id(), QLatin1String("image1"));
- QCOMPARE(imageNode.type(), QLatin1String("QtQuick/Image"));
+ QCOMPARE(imageNode.type(), QLatin1String("Qt/Image"));
QCOMPARE(imageNode.variantProperty("x").value().toInt(), 41);
QCOMPARE(imageNode.variantProperty("y").value().toInt(), 46);
QCOMPARE(imageNode.variantProperty("source").value().toUrl(), QUrl("images/qtcreator.png"));
@@ -7491,7 +7493,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7503,12 +7505,12 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
QVERIFY(!rootModelNode.allDirectSubModelNodes().isEmpty());
}
}
-static QString rectWithGradient = "import QtQuick 1.0\n"
+static QString rectWithGradient = "import Qt 4.7\n"
"Rectangle {\n"
" gradient: Gradient {\n"
" id: pGradient\n"
@@ -7528,7 +7530,7 @@ void tst_TestCore::loadGradient()
textEdit.setPlainText(rectWithGradient);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7547,7 +7549,7 @@ void tst_TestCore::loadGradient()
QVERIFY(gradientProperty.isNodeProperty());
ModelNode gradientPropertyModelNode = gradientProperty.toNodeProperty().modelNode();
QVERIFY(gradientPropertyModelNode.isValid());
- QCOMPARE(gradientPropertyModelNode.type(), QString("QtQuick/Gradient"));
+ QCOMPARE(gradientPropertyModelNode.type(), QString("Qt/Gradient"));
QCOMPARE(gradientPropertyModelNode.allDirectSubModelNodes().size(), 2);
AbstractProperty stopsProperty = gradientPropertyModelNode.property("stops");
@@ -7560,7 +7562,7 @@ void tst_TestCore::loadGradient()
ModelNode pOne = stops.first();
ModelNode pTwo = stops.last();
- QCOMPARE(pOne.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(pOne.type(), QString("Qt/GradientStop"));
QCOMPARE(pOne.id(), QString("pOne"));
QCOMPARE(pOne.allDirectSubModelNodes().size(), 0);
QCOMPARE(pOne.propertyNames().size(), 2);
@@ -7569,7 +7571,7 @@ void tst_TestCore::loadGradient()
QCOMPARE(pOne.variantProperty("color").value().type(), QVariant::Color);
QCOMPARE(pOne.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
- QCOMPARE(pTwo.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(pTwo.type(), QString("Qt/GradientStop"));
QCOMPARE(pTwo.id(), QString("pTwo"));
QCOMPARE(pTwo.allDirectSubModelNodes().size(), 0);
QCOMPARE(pTwo.propertyNames().size(), 2);
@@ -7582,8 +7584,8 @@ void tst_TestCore::loadGradient()
{
ModelNode gradientNode = rootModelNode.allDirectSubModelNodes().last();
QVERIFY(gradientNode.isValid());
- QVERIFY(!gradientNode.metaInfo().isSubclassOf("QtQuick/Item", -1, -1));
- QCOMPARE(gradientNode.type(), QString("QtQuick/Gradient"));
+ QVERIFY(!gradientNode.metaInfo().isSubclassOf("Qt/Item", -1, -1));
+ QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
QCOMPARE(gradientNode.id(), QString("secondGradient"));
QCOMPARE(gradientNode.allDirectSubModelNodes().size(), 2);
@@ -7597,7 +7599,7 @@ void tst_TestCore::loadGradient()
ModelNode nOne = stops.first();
ModelNode nTwo = stops.last();
- QCOMPARE(nOne.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(nOne.type(), QString("Qt/GradientStop"));
QCOMPARE(nOne.id(), QString("nOne"));
QCOMPARE(nOne.allDirectSubModelNodes().size(), 0);
QCOMPARE(nOne.propertyNames().size(), 2);
@@ -7606,7 +7608,7 @@ void tst_TestCore::loadGradient()
QCOMPARE(nOne.variantProperty("color").value().type(), QVariant::Color);
QCOMPARE(nOne.variantProperty("color").value().value<QColor>(), QColor("blue"));
- QCOMPARE(nTwo.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(nTwo.type(), QString("Qt/GradientStop"));
QCOMPARE(nTwo.id(), QString("nTwo"));
QCOMPARE(nTwo.allDirectSubModelNodes().size(), 0);
QCOMPARE(nTwo.propertyNames().size(), 2);
@@ -7624,7 +7626,7 @@ void tst_TestCore::changeGradientId()
textEdit.setPlainText(rectWithGradient);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7657,7 +7659,7 @@ void tst_TestCore::changeGradientId()
firstStop.destroy();
QVERIFY(!firstStop.isValid());
- ModelNode gradientStop = addNodeListChild(gradientNode, "QtQuick/GradientStop", 1, 0, "stops");
+ ModelNode gradientStop = addNodeListChild(gradientNode, "Qt/GradientStop", 4, 7, "stops");
gradientStop.variantProperty("position") = 0.5;
gradientStop.variantProperty("color") = QColor("yellow");
diff --git a/tests/auto/qml/qmldesigner/data/fx/attributes.qml b/tests/auto/qml/qmldesigner/data/fx/attributes.qml
index d58d77908b5c223dd2fd1ff9d2d7e034fbf847d6..e2d4ed37c412613b1cdbf693eb5f61121921ea37 100644
--- a/tests/auto/qml/qmldesigner/data/fx/attributes.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/attributes.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Item {
id: id;
diff --git a/tests/auto/qml/qmldesigner/data/fx/empty.qml b/tests/auto/qml/qmldesigner/data/fx/empty.qml
index f6760b6a9fa35ce82f23e450b6ed3169b53740fb..dd9e9ea19308e2bb439e1a4c61b163d862753e97 100644
--- a/tests/auto/qml/qmldesigner/data/fx/empty.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/empty.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Item {
}
diff --git a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml
index d225c43630641a563d92442cbbf859c2f14f60f4..bc17ab1b27d85d324bb58526d268e504e7989654 100644
--- a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Rectangle {
width: 200
diff --git a/tests/auto/qml/qmldesigner/data/fx/properties.qml b/tests/auto/qml/qmldesigner/data/fx/properties.qml
index e9078ff8e76038dcb7b10337365dde2b0ef3dc71..12b79f63f8043b108a6cc17355e2ea628fc41070 100644
--- a/tests/auto/qml/qmldesigner/data/fx/properties.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/properties.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Item {
property bool pushed
diff --git a/tests/auto/qml/qmldesigner/data/fx/states.qml b/tests/auto/qml/qmldesigner/data/fx/states.qml
index 836e0ca0173bdcd8075910490908e3e619e97052..2e50ca9b7be4f11e7593d160b511ad461f54a3ce 100644
--- a/tests/auto/qml/qmldesigner/data/fx/states.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/states.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Rectangle {
id: rect
diff --git a/tests/auto/qml/qmldesigner/data/fx/topitem.qml b/tests/auto/qml/qmldesigner/data/fx/topitem.qml
index 84ef3c829c8f0ec359524f3e994e6ee0d1e2b840..244a7ac6f3e97c671c6000b9cbcdd37f3d45b115 100644
--- a/tests/auto/qml/qmldesigner/data/fx/topitem.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/topitem.qml
@@ -1,5 +1,5 @@
-import QtQuick 1.0
-import QtQuick 1.0 as Qt46
+import Qt 4.7
+import Qt 4.7 as Qt46
import "subitems"
import "subitems" as Subdir
diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
index 9e2bc9ec9e9ac4cec1011d45e59e1acd21e606bc..bd0c23585550af522e95e8b22a7a78eafcd9d782 100644
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -57,6 +57,7 @@
#include <QtGui/QColor>
#include <QtGui/QFont>
#include <QtGui/QLabel>
+//#include <QtGui/private/qfixed_p.h>
#include <QtGui/QPainter>
#include <QtGui/QPainterPath>
#include <QtGui/QRegion>
@@ -454,7 +455,21 @@ QFileInfo testQFileInfo()
s = fi.bundleName();
s = fi.bundleName();
s = fi.bundleName();
- return fi;
+
+ QFileInfo result("/tmp/t");
+ return result;
+}
+
+void testQFixed()
+{
+/*
+ QFixed f = QFixed::fromReal(4.2);
+ f += 1;
+ f += 1;
+ f *= -1;
+ f += 1;
+ f += 1;
+*/
}
QHash<int, float> testQHash()
@@ -509,7 +524,8 @@ QHash<int, float> testQHash()
hash.insert("Welt", QPointer<QObject>(&ob));
hash.insert(".", QPointer<QObject>(&ob));
#endif
- return hgg0;
+ QHash<int, float> result;
+ return result;
}
void testQImage()
@@ -1118,7 +1134,8 @@ std::list<int> testStdList()
vec.push_back(true);
vec.push_back(false);
#endif
- return big;
+ std::list<int> result;
+ return result;
}
void testStdMap()
@@ -1193,7 +1210,8 @@ std::set<int> testStdSet()
std::set<QPointer<QObject> > hash;
QPointer<QObject> ptr(&ob);
#endif
- return hgg0;
+ std::set<int> result;
+ return result;
}
std::stack<int> testStdStack()
@@ -1219,7 +1237,8 @@ std::stack<int> testStdStack()
flist.push(1);
flist.push(2);
- return flist2;
+ std::stack<int> result;
+ return result;
}
std::string testStdString()
@@ -1259,7 +1278,8 @@ std::string testStdString()
v.push_back(str);
v.push_back(str);
- return str;
+ std::string result = "hi";
+ return result;
}
void testStdVector()
@@ -1343,7 +1363,8 @@ QStack<int> testQStack()
QStack<bool> vec;
vec.append(true);
vec.append(false);
- return big;
+ QStack<int> result;
+ return result;
}
void testQString()
@@ -1386,7 +1407,8 @@ QStringList testQStringList()
l << " fat ";
l.takeFirst();
l << " World ";
- return l;
+ QStringList result;
+ return result;
}
Foo testStruct()
@@ -1504,7 +1526,8 @@ QVariant testQVariant2()
var.setValue(my);
var.setValue(my);
#endif
- return QVariant("sss");
+ QVariant result("sss");
+ return result;
}
QVariant testQVariant3()
@@ -1522,7 +1545,9 @@ QVariant testQVariant3()
QVariant variant = qVariantFromValue(list);
list.clear();
list = qVariantValue<QList<int> >(variant);
- return QVariant("xxx");
+
+ QVariant result("xxx");
+ return result;
}
void testQVector()
@@ -2019,6 +2044,7 @@ int main(int argc, char *argv[])
testQDateTime();
testQTime();
testQFileInfo();
+ testQFixed();
testObject1();
testVector1();
testQHash1();
diff --git a/tests/manual/ssh/errorhandling/errorhandling.pro b/tests/manual/ssh/errorhandling/errorhandling.pro
new file mode 100644
index 0000000000000000000000000000000000000000..1161d4642da1b1d6e460403f9818986b1a4ee7b5
--- /dev/null
+++ b/tests/manual/ssh/errorhandling/errorhandling.pro
@@ -0,0 +1,4 @@
+include(../ssh.pri)
+
+TARGET=errorhandling
+SOURCES=main.cpp
diff --git a/tests/manual/ssh/main.cpp b/tests/manual/ssh/errorhandling/main.cpp
similarity index 100%
rename from tests/manual/ssh/main.cpp
rename to tests/manual/ssh/errorhandling/main.cpp
diff --git a/tests/manual/ssh/sftp/argumentscollector.cpp b/tests/manual/ssh/sftp/argumentscollector.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4ed54ef320a13c8392ebb5630a469920514c2294
--- /dev/null
+++ b/tests/manual/ssh/sftp/argumentscollector.cpp
@@ -0,0 +1,138 @@
+#include "argumentscollector.h"
+
+#include <iostream>
+
+using namespace std;
+using namespace Core;
+
+ArgumentsCollector::ArgumentsCollector(const QStringList &args)
+ : m_arguments(args)
+{
+}
+
+Parameters ArgumentsCollector::collect(bool &success) const
+{
+ Parameters parameters;
+ try {
+ bool authTypeGiven = false;
+ bool portGiven = false;
+ bool timeoutGiven = false;
+ bool smallFileCountGiven = false;
+ bool bigFileSizeGiven = false;
+ bool proxySettingGiven = false;
+ int pos;
+ int port;
+ for (pos = 1; pos < m_arguments.count() - 1; ++pos) {
+ if (checkAndSetStringArg(pos, parameters.sshParams.host, "-h")
+ || checkAndSetStringArg(pos, parameters.sshParams.uname, "-u"))
+ continue;
+ if (checkAndSetIntArg(pos, port, portGiven, "-p")
+ || checkAndSetIntArg(pos, parameters.sshParams.timeout, timeoutGiven, "-t")
+ || checkAndSetIntArg(pos, parameters.smallFileCount, smallFileCountGiven, "-c")
+ || checkAndSetIntArg(pos, parameters.bigFileSize, bigFileSizeGiven, "-s"))
+ continue;
+ if (checkAndSetStringArg(pos, parameters.sshParams.pwd, "-pwd")) {
+ if (!parameters.sshParams.privateKeyFile.isEmpty())
+ throw ArgumentErrorException(QLatin1String("-pwd and -k are mutually exclusive."));
+ parameters.sshParams.authType
+ = SshConnectionParameters::AuthByPwd;
+ authTypeGiven = true;
+ continue;
+ }
+ if (checkAndSetStringArg(pos, parameters.sshParams.privateKeyFile, "-k")) {
+ if (!parameters.sshParams.pwd.isEmpty())
+ throw ArgumentErrorException(QLatin1String("-pwd and -k are mutually exclusive."));
+ parameters.sshParams.authType
+ = SshConnectionParameters::AuthByKey;
+ authTypeGiven = true;
+ continue;
+ }
+ if (!checkForNoProxy(pos, parameters.sshParams.proxyType, proxySettingGiven))
+ throw ArgumentErrorException(QLatin1String("unknown option ") + m_arguments.at(pos));
+ }
+
+ Q_ASSERT(pos <= m_arguments.count());
+ if (pos == m_arguments.count() - 1) {
+ if (!checkForNoProxy(pos, parameters.sshParams.proxyType, proxySettingGiven))
+ throw ArgumentErrorException(QLatin1String("unknown option ") + m_arguments.at(pos));
+ }
+
+ if (!authTypeGiven)
+ throw ArgumentErrorException(QLatin1String("No authentication argument given."));
+ if (parameters.sshParams.host.isEmpty())
+ throw ArgumentErrorException(QLatin1String("No host given."));
+ if (parameters.sshParams.uname.isEmpty())
+ throw ArgumentErrorException(QLatin1String("No user name given."));
+
+ parameters.sshParams.port = portGiven ? port : 22;
+ if (!timeoutGiven)
+ parameters.sshParams.timeout = 30;
+ if (!smallFileCountGiven)
+ parameters.smallFileCount = 1000;
+ if (!bigFileSizeGiven)
+ parameters.bigFileSize = 1024;
+ success = true;
+ } catch (ArgumentErrorException &ex) {
+ cerr << "Error: " << qPrintable(ex.error) << endl;
+ printUsage();
+ success = false;
+ }
+ return parameters;
+}
+
+void ArgumentsCollector::printUsage() const
+{
+ cerr << "Usage: " << qPrintable(m_arguments.first())
+ << " -h <host> -u <user> "
+ << "-pwd <password> | -k <private key file> [ -p <port> ] "
+ << "[ -t <timeout> ] [ -c <small file count> ] "
+ << "[ -s <big file size in MB> ] [ -no-proxy ]" << endl;
+}
+
+bool ArgumentsCollector::checkAndSetStringArg(int &pos, QString &arg, const char *opt) const
+{
+ if (m_arguments.at(pos) == QLatin1String(opt)) {
+ if (!arg.isEmpty()) {
+ throw ArgumentErrorException(QLatin1String("option ") + opt
+ + QLatin1String(" was given twice."));
+ }
+ arg = m_arguments.at(++pos);
+ if (arg.isEmpty() && QLatin1String(opt) != QLatin1String("-pwd"))
+ throw ArgumentErrorException(QLatin1String("empty argument not allowed here."));
+ return true;
+ }
+ return false;
+}
+
+bool ArgumentsCollector::checkAndSetIntArg(int &pos, int &val,
+ bool &alreadyGiven, const char *opt) const
+{
+ if (m_arguments.at(pos) == QLatin1String(opt)) {
+ if (alreadyGiven) {
+ throw ArgumentErrorException(QLatin1String("option ") + opt
+ + QLatin1String(" was given twice."));
+ }
+ bool isNumber;
+ val = m_arguments.at(++pos).toInt(&isNumber);
+ if (!isNumber) {
+ throw ArgumentErrorException(QLatin1String("option ") + opt
+ + QLatin1String(" needs integer argument"));
+ }
+ alreadyGiven = true;
+ return true;
+ }
+ return false;
+}
+
+bool ArgumentsCollector::checkForNoProxy(int &pos,
+ SshConnectionParameters::ProxyType &type, bool &alreadyGiven) const
+{
+ if (m_arguments.at(pos) == QLatin1String("-no-proxy")) {
+ if (alreadyGiven)
+ throw ArgumentErrorException(QLatin1String("proxy setting given twice."));
+ type = SshConnectionParameters::NoProxy;
+ alreadyGiven = true;
+ return true;
+ }
+ return false;
+}
diff --git a/tests/manual/ssh/sftp/argumentscollector.h b/tests/manual/ssh/sftp/argumentscollector.h
new file mode 100644
index 0000000000000000000000000000000000000000..9eb776714a318d8037a225899002c1f357c54c73
--- /dev/null
+++ b/tests/manual/ssh/sftp/argumentscollector.h
@@ -0,0 +1,31 @@
+#ifndef ARGUMENTSCOLLECTOR_H
+#define ARGUMENTSCOLLECTOR_H
+
+#include "parameters.h"
+
+#include <QtCore/QStringList>
+
+class ArgumentsCollector
+{
+public:
+ ArgumentsCollector(const QStringList &args);
+ Parameters collect(bool &success) const;
+private:
+ struct ArgumentErrorException
+ {
+ ArgumentErrorException(const QString &error) : error(error) {}
+ const QString error;
+ };
+
+ void printUsage() const;
+ bool checkAndSetStringArg(int &pos, QString &arg, const char *opt) const;
+ bool checkAndSetIntArg(int &pos, int &val, bool &alreadyGiven,
+ const char *opt) const;
+ bool checkForNoProxy(int &pos,
+ Core::SshConnectionParameters::ProxyType &type,
+ bool &alreadyGiven) const;
+
+ const QStringList m_arguments;
+};
+
+#endif // ARGUMENTSCOLLECTOR_H
diff --git a/tests/manual/ssh/sftp/main.cpp b/tests/manual/ssh/sftp/main.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0b182917f1d41b82ef61f4e10aec15115ded5077
--- /dev/null
+++ b/tests/manual/ssh/sftp/main.cpp
@@ -0,0 +1,27 @@
+#include "argumentscollector.h"
+#include "sftptest.h"
+
+#include <coreplugin/ssh/sftpchannel.h>
+#include <coreplugin/ssh/sshconnection.h>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+
+#include <cstdlib>
+#include <iostream>
+
+using namespace Core;
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication app(argc, argv);
+ bool parseSuccess;
+ const Parameters parameters
+ = ArgumentsCollector(app.arguments()).collect(parseSuccess);
+ if (!parseSuccess)
+ return EXIT_FAILURE;
+ SftpTest sftpTest(parameters);
+ sftpTest.run();
+ return app.exec();
+}
diff --git a/tests/manual/ssh/sftp/parameters.h b/tests/manual/ssh/sftp/parameters.h
new file mode 100644
index 0000000000000000000000000000000000000000..540103525ae1ce77620f171b7ee6c781ad746968
--- /dev/null
+++ b/tests/manual/ssh/sftp/parameters.h
@@ -0,0 +1,14 @@
+#ifndef PARAMETERS_H
+#define PARAMETERS_H
+
+#include <coreplugin/ssh/sshconnection.h>
+
+struct Parameters {
+ Parameters() : sshParams(Core::SshConnectionParameters::DefaultProxy) {}
+
+ Core::SshConnectionParameters sshParams;
+ int smallFileCount;
+ int bigFileSize;
+};
+
+#endif // PARAMETERS_H
diff --git a/tests/manual/ssh/sftp/sftp.pro b/tests/manual/ssh/sftp/sftp.pro
new file mode 100644
index 0000000000000000000000000000000000000000..eb5b7d8e3b82fcaacbdd3ab3b4a2f3f19b60e17d
--- /dev/null
+++ b/tests/manual/ssh/sftp/sftp.pro
@@ -0,0 +1,6 @@
+include(../ssh.pri)
+
+TARGET=sftp
+SOURCES=main.cpp sftptest.cpp argumentscollector.cpp
+HEADERS=sftptest.h argumentscollector.h parameters.h
+
diff --git a/tests/manual/ssh/sftp/sftptest.cpp b/tests/manual/ssh/sftp/sftptest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f80e6298294eb6122bafe170ec09088addf482c2
--- /dev/null
+++ b/tests/manual/ssh/sftp/sftptest.cpp
@@ -0,0 +1,480 @@
+#include "sftptest.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+
+#include <iostream>
+
+using namespace Core;
+
+SftpTest::SftpTest(const Parameters ¶ms)
+ : m_parameters(params), m_state(Inactive), m_error(false),
+ m_bigFileUploadJob(SftpInvalidJob),
+ m_bigFileDownloadJob(SftpInvalidJob),
+ m_bigFileRemovalJob(SftpInvalidJob)
+{
+}
+
+SftpTest::~SftpTest()
+{
+ removeFiles(true);
+}
+
+void SftpTest::run()
+{
+ m_connection = SshConnection::create();
+ connect(m_connection.data(), SIGNAL(connected()), this,
+ SLOT(handleConnected()));
+ connect(m_connection.data(), SIGNAL(error(Core::SshError)), this,
+ SLOT(handleError()));
+ connect(m_connection.data(), SIGNAL(disconnected()), this,
+ SLOT(handleDisconnected()));
+ std::cout << "Connecting to host '"
+ << qPrintable(m_parameters.sshParams.host) << "'..." << std::endl;
+ m_state = Connecting;
+ m_connection->connectToHost(m_parameters.sshParams);
+}
+
+void SftpTest::handleConnected()
+{
+ if (m_state != Connecting) {
+ std::cerr << "Unexpected state " << m_state << " in function "
+ << Q_FUNC_INFO << "." << std::endl;
+ earlyDisconnectFromHost();
+ } else {
+ std::cout << "Connected. Initializing SFTP channel..." << std::endl;
+ m_channel = m_connection->createSftpChannel();
+ connect(m_channel.data(), SIGNAL(initialized()), this,
+ SLOT(handleChannelInitialized()));
+ connect(m_channel.data(), SIGNAL(initializationFailed(QString)), this,
+ SLOT(handleChannelInitializationFailure(QString)));
+ connect(m_channel.data(), SIGNAL(finished(Core::SftpJobId, QString)),
+ this, SLOT(handleJobFinished(Core::SftpJobId, QString)));
+ connect(m_channel.data(), SIGNAL(closed()), this,
+ SLOT(handleChannelClosed()));
+ m_state = InitializingChannel;
+ m_channel->initialize();
+ }
+}
+
+void SftpTest::handleDisconnected()
+{
+ if (m_state != Disconnecting) {
+ std::cerr << "Unexpected state " << m_state << " in function "
+ << Q_FUNC_INFO << std::endl;
+ m_error = true;
+ } else {
+ std::cout << "Connection closed." << std::endl;
+ }
+ std::cout << "Test finished. ";
+ if (m_error)
+ std::cout << "There were errors.";
+ else
+ std::cout << "No errors encountered.";
+ std::cout << std::endl;
+ qApp->quit();
+}
+
+void SftpTest::handleError()
+{
+ std::cerr << "Encountered SSH error: "
+ << qPrintable(m_connection->errorString()) << "." << std::endl;
+ qApp->quit();
+}
+
+void SftpTest::handleChannelInitialized()
+{
+ if (m_state != InitializingChannel) {
+ std::cerr << "Unexpected state " << m_state << "in function "
+ << Q_FUNC_INFO << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+
+ std::cout << "Creating " << m_parameters.smallFileCount
+ << " files of 1 KB each ..." << std::endl;
+ qsrand(QDateTime::currentDateTime().toTime_t());
+ for (int i = 0; i < m_parameters.smallFileCount; ++i) {
+ const QString fileName
+ = QLatin1String("sftptestfile") + QString::number(i + 1);
+ const FilePtr file(new QFile(QDir::tempPath() + QLatin1Char('/')
+ + fileName));
+ bool success = true;
+ if (!file->open(QIODevice::WriteOnly | QIODevice::Truncate))
+ success = false;
+ if (success) {
+ int content[1024/sizeof(int)];
+ for (size_t j = 0; j < sizeof content / sizeof content[0]; ++j)
+ content[j] = qrand();
+ file->write(reinterpret_cast<char *>(content), sizeof content);
+ file->close();
+ }
+ success = success && file->error() == QFile::NoError;
+ if (!success) {
+ std::cerr << "Error creating local file "
+ << qPrintable(file->fileName()) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ m_localSmallFiles << file;
+ }
+ std::cout << "Files created. Now uploading..." << std::endl;
+ foreach (const FilePtr &file, m_localSmallFiles) {
+ const QString localFilePath = file->fileName();
+ const QString remoteFp
+ = remoteFilePath(QFileInfo(localFilePath).fileName());
+ const SftpJobId uploadJob = m_channel->uploadFile(file->fileName(),
+ remoteFp, SftpOverwriteExisting);
+ if (uploadJob == SftpInvalidJob) {
+ std::cerr << "Error uploading local file "
+ << qPrintable(localFilePath) << " to remote file "
+ << qPrintable(remoteFp) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ m_smallFilesUploadJobs.insert(uploadJob, remoteFp);
+ }
+ m_state = UploadingSmall;
+}
+
+void SftpTest::handleChannelInitializationFailure(const QString &reason)
+{
+ std::cerr << "Could not initialize SFTP channel: " << qPrintable(reason)
+ << "." << std::endl;
+ earlyDisconnectFromHost();
+}
+
+void SftpTest::handleChannelClosed()
+{
+ if (m_state != ChannelClosing) {
+ std::cerr << "Unexpected state " << m_state << " in function "
+ << Q_FUNC_INFO << "." << std::endl;
+ } else {
+ std::cout << "SFTP channel closed. Now disconnecting..." << std::endl;
+ }
+ m_state = Disconnecting;
+ m_connection->disconnectFromHost();
+}
+
+void SftpTest::handleJobFinished(Core::SftpJobId job, const QString &error)
+{
+ switch (m_state) {
+ case UploadingSmall:
+ if (!handleJobFinished(job, m_smallFilesUploadJobs, error, "uploading"))
+ return;
+ if (m_smallFilesUploadJobs.isEmpty()) {
+ std::cout << "Uploading finished, now downloading for comparison..."
+ << std::endl;
+ foreach (const FilePtr &file, m_localSmallFiles) {
+ const QString localFilePath = file->fileName();
+ const QString remoteFp
+ = remoteFilePath(QFileInfo(localFilePath).fileName());
+ const QString downloadFilePath = cmpFileName(localFilePath);
+ const SftpJobId downloadJob = m_channel->downloadFile(remoteFp,
+ downloadFilePath, SftpOverwriteExisting);
+ if (downloadJob == SftpInvalidJob) {
+ std::cerr << "Error downloading remote file "
+ << qPrintable(remoteFp) << " to local file "
+ << qPrintable(downloadFilePath) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ m_smallFilesDownloadJobs.insert(downloadJob, remoteFp);
+ }
+ m_state = DownloadingSmall;
+ }
+ break;
+ case DownloadingSmall:
+ if (!handleJobFinished(job, m_smallFilesDownloadJobs, error, "downloading"))
+ return;
+ if (m_smallFilesDownloadJobs.isEmpty()) {
+ std::cout << "Downloading finished, now comparing..." << std::endl;
+ foreach (const FilePtr &ptr, m_localSmallFiles) {
+ if (!ptr->open(QIODevice::ReadOnly)) {
+ std::cerr << "Error opening local file "
+ << qPrintable(ptr->fileName()) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ const QString downloadedFilePath = cmpFileName(ptr->fileName());
+ QFile downloadedFile(downloadedFilePath);
+ if (!downloadedFile.open(QIODevice::ReadOnly)) {
+ std::cerr << "Error opening downloaded file "
+ << qPrintable(downloadedFilePath) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ if (!compareFiles(ptr.data(), &downloadedFile))
+ return;
+ }
+
+ std::cout << "Comparisons successful, now removing files..."
+ << std::endl;
+ QList<QString> remoteFilePaths;
+ foreach (const FilePtr &ptr, m_localSmallFiles) {
+ const QString downloadedFilePath = cmpFileName(ptr->fileName());
+ remoteFilePaths
+ << remoteFilePath(QFileInfo(ptr->fileName()).fileName());
+ if (!ptr->remove()) {
+ std::cerr << "Error: Failed to remove local file '"
+ << qPrintable(ptr->fileName()) << "'." << std::endl;
+ earlyDisconnectFromHost();
+ }
+ if (!QFile::remove(downloadedFilePath)) {
+ std::cerr << "Error: Failed to remove downloaded file '"
+ << qPrintable(downloadedFilePath) << "'." << std::endl;
+ earlyDisconnectFromHost();
+ }
+ }
+ m_localSmallFiles.clear();
+ foreach (const QString &remoteFp, remoteFilePaths) {
+ m_smallFilesRemovalJobs.insert(m_channel->removeFile(remoteFp),
+ remoteFp);
+ }
+ m_state = RemovingSmall;
+ }
+ break;
+ case RemovingSmall:
+ if (!handleJobFinished(job, m_smallFilesRemovalJobs, error, "removing"))
+ return;
+ if (m_smallFilesRemovalJobs.isEmpty()) {
+ std::cout << "Small files successfully removed. "
+ << "Now creating big file..." << std::endl;
+ const QLatin1String bigFileName("sftpbigfile");
+ m_localBigFile = FilePtr(new QFile(QDir::tempPath()
+ + QLatin1Char('/') + bigFileName));
+ bool success = m_localBigFile->open(QIODevice::WriteOnly);
+ const int blockSize = 8192;
+ const int blockCount = m_parameters.bigFileSize*1024*1024/blockSize;
+ for (int block = 0; block < blockCount; ++block) {
+ int content[blockSize/sizeof(int)];
+ for (size_t j = 0; j < sizeof content / sizeof content[0]; ++j)
+ content[j] = qrand();
+ m_localBigFile->write(reinterpret_cast<char *>(content),
+ sizeof content);
+ }
+ m_localBigFile->close();
+ success = success && m_localBigFile->error() == QFile::NoError;
+ if (!success) {
+ std::cerr << "Error trying to create big file '"
+ << qPrintable(m_localBigFile->fileName()) << "'."
+ << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+
+ std::cout << "Big file created. Now uploading ..." << std::endl;
+ m_bigJobTimer.start();
+ m_bigFileUploadJob
+ = m_channel->uploadFile(m_localBigFile->fileName(),
+ remoteFilePath(bigFileName), SftpOverwriteExisting);
+ if (m_bigFileUploadJob == SftpInvalidJob) {
+ std::cerr << "Error uploading file '" << bigFileName.latin1()
+ << "'." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ m_state = UploadingBig;
+ }
+ break;
+ case UploadingBig: {
+ if (!handleBigJobFinished(job, m_bigFileUploadJob, error, "uploading"))
+ return;
+ const qint64 msecs = m_bigJobTimer.elapsed();
+ std::cout << "Successfully uploaded big file. Took " << (msecs/1000)
+ << " seconds for " << m_parameters.bigFileSize << " MB."
+ << std::endl;
+ const QString localFilePath = m_localBigFile->fileName();
+ const QString downloadedFilePath = cmpFileName(localFilePath);
+ const QString remoteFp
+ = remoteFilePath(QFileInfo(localFilePath).fileName());
+ std::cout << "Now downloading big file for comparison..." << std::endl;
+ m_bigJobTimer.start();
+ m_bigFileDownloadJob = m_channel->downloadFile(remoteFp,
+ downloadedFilePath, SftpOverwriteExisting);
+ if (m_bigFileDownloadJob == SftpInvalidJob) {
+ std::cerr << "Error downloading remote file '"
+ << qPrintable(remoteFp) << "' to local file '"
+ << qPrintable(downloadedFilePath) << "'." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ m_state = DownloadingBig;
+ break;
+ }
+ case DownloadingBig: {
+ if (!handleBigJobFinished(job, m_bigFileDownloadJob, error, "downloading"))
+ return;
+ const qint64 msecs = m_bigJobTimer.elapsed();
+ std::cout << "Successfully downloaded big file. Took " << (msecs/1000)
+ << " seconds for " << m_parameters.bigFileSize << " MB."
+ << std::endl;
+ std::cout << "Now comparing big files..." << std::endl;
+ QFile downloadedFile(cmpFileName(m_localBigFile->fileName()));
+ if (!downloadedFile.open(QIODevice::ReadOnly)) {
+ std::cerr << "Error opening downloaded file '"
+ << qPrintable(downloadedFile.fileName()) << "': "
+ << qPrintable(downloadedFile.errorString()) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ if (!m_localBigFile->open(QIODevice::ReadOnly)) {
+ std::cerr << "Error opening big file '"
+ << qPrintable(m_localBigFile->fileName()) << "': "
+ << qPrintable(m_localBigFile->errorString()) << "."
+ << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ if (!compareFiles(m_localBigFile.data(), &downloadedFile))
+ return;
+ std::cout << "Comparison successful. Now removing big files..."
+ << std::endl;
+ if (!m_localBigFile->remove()) {
+ std::cerr << "Error: Could not remove file '"
+ << qPrintable(m_localBigFile->fileName()) << "'." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ if (!downloadedFile.remove()) {
+ std::cerr << "Error: Could not remove file '"
+ << qPrintable(downloadedFile.fileName()) << "'." << std::endl;
+ earlyDisconnectFromHost();
+ return;
+ }
+ const QString remoteFp
+ = remoteFilePath(QFileInfo(m_localBigFile->fileName()).fileName());
+ m_bigFileRemovalJob = m_channel->removeFile(remoteFp);
+ m_state = RemovingBig;
+ break;
+ }
+ case RemovingBig: {
+ if (!handleBigJobFinished(job, m_bigFileRemovalJob, error, "removing"))
+ return;
+ const QString remoteFp
+ = remoteFilePath(QFileInfo(m_localBigFile->fileName()).fileName());
+ std::cout << "Big files successfully removed. "
+ << "Now closing the SFTP channel..." << std::endl;
+ m_state = ChannelClosing;
+ m_channel->closeChannel();
+ break;
+ }
+ case Disconnecting:
+ break;
+ default:
+ if (!m_error) {
+ std::cerr << "Unexpected state " << m_state << " in function "
+ << Q_FUNC_INFO << "." << std::endl;
+ earlyDisconnectFromHost();
+ }
+ }
+}
+
+void SftpTest::removeFile(const FilePtr &file, bool remoteToo)
+{
+ if (!file)
+ return;
+ const QString localFilePath = file->fileName();
+ file->remove();
+ QFile::remove(cmpFileName(localFilePath));
+ if (remoteToo && m_channel
+ && m_channel->state() == SftpChannel::Initialized)
+ m_channel->removeFile(remoteFilePath(QFileInfo(localFilePath).fileName()));
+}
+
+QString SftpTest::cmpFileName(const QString &fileName) const
+{
+ return fileName + QLatin1String(".cmp");
+}
+
+QString SftpTest::remoteFilePath(const QString &localFileName) const
+{
+ return QLatin1String("/tmp/") + localFileName + QLatin1String(".upload");
+}
+
+void SftpTest::earlyDisconnectFromHost()
+{
+ m_error = true;
+ removeFiles(true);
+ if (m_channel)
+ disconnect(m_channel.data(), 0, this, 0);
+ m_state = Disconnecting;
+ removeFiles(true);
+ m_connection->disconnectFromHost();
+}
+
+void SftpTest::removeFiles(bool remoteToo)
+{
+ foreach (const FilePtr &file, m_localSmallFiles)
+ removeFile(file, remoteToo);
+ removeFile(m_localBigFile, remoteToo);
+}
+
+bool SftpTest::handleJobFinished(SftpJobId job, JobMap &jobMap,
+ const QString &error, const char *activity)
+{
+ JobMap::Iterator it = jobMap.find(job);
+ if (it == jobMap.end()) {
+ std::cerr << "Error: Unknown job " << job << "finished."
+ << std::endl;
+ earlyDisconnectFromHost();
+ return false;
+ }
+ if (!error.isEmpty()) {
+ std::cerr << "Error " << activity << " file " << qPrintable(it.value())
+ << ": " << qPrintable(error) << "." << std::endl;
+ earlyDisconnectFromHost();
+ return false;
+ }
+ jobMap.erase(it);
+ return true;
+}
+
+bool SftpTest::handleBigJobFinished(SftpJobId job, SftpJobId expectedJob,
+ const QString &error, const char *activity)
+{
+ if (job != expectedJob) {
+ std::cerr << "Error " << activity << " file '"
+ << qPrintable(m_localBigFile->fileName())
+ << "': Expected job id " << expectedJob
+ << ", got job id " << job << '.' << std::endl;
+ earlyDisconnectFromHost();
+ return false;
+ }
+ if (!error.isEmpty()) {
+ std::cerr << "Error " << activity << " file '"
+ << qPrintable(m_localBigFile->fileName()) << "': "
+ << qPrintable(error) << std::endl;
+ earlyDisconnectFromHost();
+ return false;
+ }
+ return true;
+}
+
+bool SftpTest::compareFiles(QFile *orig, QFile *copy)
+{
+ bool success = orig->size() == copy->size();
+ qint64 bytesLeft = orig->size();
+ orig->seek(0);
+ while (success && bytesLeft > 0) {
+ const qint64 bytesToRead = qMin(bytesLeft, Q_INT64_C(1024*1024));
+ const QByteArray origBlock = orig->read(bytesToRead);
+ const QByteArray copyBlock = copy->read(bytesToRead);
+ if (origBlock.size() != bytesToRead || origBlock != copyBlock)
+ success = false;
+ bytesLeft -= bytesToRead;
+ }
+ orig->close();
+ success = success && orig->error() == QFile::NoError
+ && copy->error() == QFile::NoError;
+ if (!success) {
+ std::cerr << "Error: Original file '" << qPrintable(orig->fileName())
+ << "'' differs from downloaded file '"
+ << qPrintable(copy->fileName()) << "'." << std::endl;
+ earlyDisconnectFromHost();
+ }
+ return success;
+}
diff --git a/tests/manual/ssh/sftp/sftptest.h b/tests/manual/ssh/sftp/sftptest.h
new file mode 100644
index 0000000000000000000000000000000000000000..10d4e5b373d65cc887d4565a039218572e9d30bc
--- /dev/null
+++ b/tests/manual/ssh/sftp/sftptest.h
@@ -0,0 +1,70 @@
+#ifndef SFTPTEST_H
+#define SFTPTEST_H
+
+#include "parameters.h"
+
+#include <coreplugin/ssh/sftpchannel.h>
+#include <coreplugin/ssh/sshconnection.h>
+
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+
+QT_FORWARD_DECLARE_CLASS(QFile);
+
+class SftpTest : public QObject
+{
+ Q_OBJECT
+public:
+ SftpTest(const Parameters ¶ms);
+ ~SftpTest();
+ void run();
+
+private slots:
+ void handleConnected();
+ void handleError();
+ void handleDisconnected();
+ void handleChannelInitialized();
+ void handleChannelInitializationFailure(const QString &reason);
+ void handleJobFinished(Core::SftpJobId job, const QString &error);
+ void handleChannelClosed();
+
+private:
+ typedef QHash<Core::SftpJobId, QString> JobMap;
+ typedef QSharedPointer<QFile> FilePtr;
+ enum State { Inactive, Connecting, InitializingChannel, UploadingSmall,
+ DownloadingSmall, RemovingSmall, UploadingBig, DownloadingBig,
+ RemovingBig, ChannelClosing, Disconnecting
+ };
+
+ void removeFile(const FilePtr &filePtr, bool remoteToo);
+ void removeFiles(bool remoteToo);
+ QString cmpFileName(const QString &localFileName) const;
+ QString remoteFilePath(const QString &localFileName) const;
+ void earlyDisconnectFromHost();
+ bool handleJobFinished(Core::SftpJobId job, JobMap &jobMap,
+ const QString &error, const char *activity);
+ bool handleBigJobFinished(Core::SftpJobId job, Core::SftpJobId expectedJob,
+ const QString &error, const char *activity);
+ bool compareFiles(QFile *orig, QFile *copy);
+
+ const Parameters m_parameters;
+ State m_state;
+ bool m_error;
+ Core::SshConnection::Ptr m_connection;
+ Core::SftpChannel::Ptr m_channel;
+ QList<FilePtr> m_localSmallFiles;
+ JobMap m_smallFilesUploadJobs;
+ JobMap m_smallFilesDownloadJobs;
+ JobMap m_smallFilesRemovalJobs;
+ FilePtr m_localBigFile;
+ Core::SftpJobId m_bigFileUploadJob;
+ Core::SftpJobId m_bigFileDownloadJob;
+ Core::SftpJobId m_bigFileRemovalJob;
+ QElapsedTimer m_bigJobTimer;
+};
+
+
+#endif // SFTPTEST_H
diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri
new file mode 100644
index 0000000000000000000000000000000000000000..cdbe6778b476133b966419ab30465391889191a3
--- /dev/null
+++ b/tests/manual/ssh/ssh.pri
@@ -0,0 +1,14 @@
+INCLUDEPATH += ../../../../src/plugins
+CREATORLIBPATH = ../../../../lib/qtcreator
+PLUGINPATH=$$CREATORLIBPATH/plugins/Nokia
+LIBS *= -L$$PLUGINPATH -lCore
+LIBS *= -L$$CREATORLIBPATH
+include (../../../qtcreator.pri)
+include (../../../src/plugins/coreplugin/coreplugin_dependencies.pri)
+QT += core
+QT -= gui
+CONFIG += console
+CONFIG -= app_bundle
+TEMPLATE = app
+DEPENDPATH+=.
+INCLUDEPATH+=.
\ No newline at end of file
diff --git a/tests/manual/ssh/ssh.pro b/tests/manual/ssh/ssh.pro
index 772ff2a39cb214e31c8c4f7c9ba8d3172b58c875..432f8f192b54a74555c291165b25c2fea75c7fac 100644
--- a/tests/manual/ssh/ssh.pro
+++ b/tests/manual/ssh/ssh.pro
@@ -4,23 +4,5 @@
#
#-------------------------------------------------
-INCLUDEPATH += ../../../src/plugins
-CREATORLIBPATH = ../../../lib/qtcreator
-PLUGINPATH=$$CREATORLIBPATH/plugins/Nokia
-LIBS *= -L$$PLUGINPATH -lCore
-LIBS *= -L$$CREATORLIBPATH
-include (../../../qtcreator.pri)
-include (../../../src/plugins/coreplugin/coreplugin_dependencies.pri)
-
-QT += core
-
-QT -= gui
-
-TARGET = ssh
-CONFIG += console
-CONFIG -= app_bundle
-
-TEMPLATE = app
-
-
-SOURCES += main.cpp
+TEMPLATE = subdirs
+SUBDIRS = errorhandling sftp