Merge remote-tracking branch 'origin/2.7'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f

dist/changes-2.7.0

@@ -0,0 +1,315 @@
+Qt Creator version 2.7 contains bug fixes and new features.
+
+There is a total of about 1350 changes by 63 individual contributors.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v2.6.2..origin/2.7
+
+General
+   * Fixed Qt version in About Qt Creator dialog
+   * Replaced deprecated Qt 4 functions with cross-version alternatives
+   * Improved kits setup (QTCREATORBUG-8576, QTCREATORBUG-8081)
+   * Implemented hiding of Mode tab icons when they become too small
+     (QTCREATORBUG-7879)
+   * Introduced general suppression mechanism for repeating messages
+
+Editing
+   * Fixed visual whitespace highlighting
+   * Implemented closing files with middle click in Open Documents view
+   * Improved painting performance after changing marks
+   * Fixed handling of invisible marks (QTCREATORBUG-7884)
+   * Added editing for bookmark notes (QTCREATORBUG-5572)
+   * Fixed bookmarks ordering (QTCREATORBUG-7923)
+   * Fixed re-opening of nested folds
+   * Fixed finding of block parentheses (QTCREATORBUG-8031)
+   * Fixed Replace All with regular expressions (QTCREATORBUG-8317)
+   * Added support to preserve casing in case-insensitive searches
+   * Added Save as to editors context menu
+   * Added ability to open links in new split (QTCREATORBUG-8117)
+
+Managing Projects
+   * Improved opening projects from command line: "qtcreator ." opens a
+     project found in the directory without explicitly naming it
+   * Implemented copying build and run settings for a kit to another kit
+     (Copy to Kit) and changing the kit while preserving the build and
+     run settings (Change Kit) in Projects mode
+   * Added displaying version control system information (branch name) in
+     the Projects view in the sidebar
+   * Added a configuration option in Build and Run options for the default
+     build directory. It can be set to '.' to force in-source builds by default
+   * Added an option to show hidden files in the File System view in the
+     sidebar
+
+Compilers
+   * Introduced adding custom compilers in the Build and Run options
+   * Simplified MSVC setup logic (QTCREATORBUG-8292)
+   * Added displaying elapsed time after building in the Compile Output pane
+
+QMake Projects
+   * Made command line parser understand more options: -spec/-platform,
+     -xspec/-xplatform, -t/-template, -tp/-template_prefix, -cache & -nocache
+   * Improved performance in the .pro parser
+   * Improved parsing of qdoc errors
+   * Aligned VPATH handling to actual qmake behavior
+     (QTCREATORBUG-8348)
+   * Fixed MinGW-w64 cross-compilation
+
+CMake Projects
+   * Added Ninja support
+   * Added code completion for CMake editor
+   * Fixed .ui code completion for some CMake projects
+   * Fixed build directory when adding build configurations
+     (QTCREATORBUG-8425)
+
+QBS Projects
+   * Implemented initial support for Qt Build Suite (QBS) projects
+   * Made Qt Creator itself compilable with QBS
+
+Generic Projects
+   * Implemented using MIME types to recognize source files (QTCREATORBUG-5451)
+
+Debugging
+   * Completed support for basic Qt 5 data types
+   * Created new suite of auto tests
+   * Fixed or improved display for several dozen data types in several
+     combinations of libraries (Qt, Standard Library, Boost, Eigen,
+     gcc built-in vector types) and debuggers (GDB, CDB)
+   * Added dumpers for QStringRef, C99 complex/_Complex
+   * Implemented gnuplot based display for QVector
+   * Implemented display in separate window for string-like data
+     types (QByteArray, std::string, char[], char* etc)
+   * Adjusted to GDB 7.5 changes
+   * Removed dependency on QmlJSTools
+   * Added shortcut to add breakpoint by double click on break view
+   * Made breakpoint markers draggable
+   * Added logging of exceptions (QTCREATORBUG-8141)
+   * Added option to use Intel-style disassembly
+   * Improved color highlighting of locals in memory view
+   * Made string cutoff value configurable
+   * Put separate string displays in tab widget (QTCREATORBUG-8344)
+   * Implemented basic value editing for CDB (QTCREATORBUG-8344)
+   * Implemented support for displaying images in CDB
+   * Added framework to wrap plain GDB pretty printers for use in Creator
+   * Implemented display format changes for multi-selection
+     (QTCREATORBUG-7577)
+
+Analyzer
+
+C++ Support
+   * Added GetterSetter quick fix
+   * Fixed semantic highlighting when multiple editors are visible
+   * Fixed Find/Rename Macro usage
+   * Added code completion for instantiation of templates with default argument
+   * Added C++11 alignof and alignas tokens
+   * Added support for C++11 brace initializers (QTCREATORBUG-7919 et al)
+   * Fixed parsing of C++11 noexcept(constant-expression_
+   * Added support for C++11 ref-qualifiers in function declarators: void
+     foo() const &; void bar() && and related pointer-to-member declarators
+   * Added parsing of alias declarations: using Foo = std::vector<int>::iterator
+   * Added support for C++11 enum classes and opaque enum declarations
+   * Fixed use of >> in C++11 template arguments
+   * Added hook for user specified commands after attaching to target
+   * Added CDB setting to ignore first-chance exceptions (QTCREATORBUG-8141)
+   * Improved handling of lambda captures (QTCREATORBUG-7968,
+     QTCREATORBUG-7949)
+   * Improved code completion for Qt containers (QTCREATORBUG-8228)
+   * Added support for -stdlib=.. variants
+   * Fixed code completion in nested classes when enclosing class is template
+   * Fixed code completion for operator-> (QTCREATORBUG-629)
+   * Fixed code completion when casting inside parentheses
+     (QTCREATORBUG-8368)
+   * Switched to C++11 parsing in cases of doubt (CMake/Autotools/Generic)
+   * Fixed constructor parsing in cases with unnamed parameters
+   * Introduced formatting options for pointers and references
+     (QTCREATORBUG-6169)
+
+QML/JS Support
+   * Improved JS Console
+   * Fixed indentation in if condition and lambda expressions
+     (QTCREATORBUG-7243)
+   * Added persistent trie to store imports
+   * Improved initial kit selection (QTCREATORBUG-8424)
+   * Added detection of import type from main file (QTCREATORBUG-8358)
+   * Fixed QmlProjectManager (QTCREATORBUG-8679, QTCREATORBUG-8680)
+
+GLSL Support
+
+Help
+   * Used zoom factor instead of text size multiplier (QTCREATORBUG-7199)
+   * Corrected setup of HelpNetworkReply for offline resources
+     (QTCREATORBUG-8211)
+
+Qt Designer
+
+Qt Quick Designer
+   * Provided initial support for QML 2
+   * Fixed imports
+   * Fixed crash (QTCREATORBUG-8399)
+   * Built qml2puppet by default for Qt 5
+   * Added manual test files for Qt Quick 2
+   * Added QQuickItem to New Class wizard
+
+Version control plugins
+
+Git
+   * Introduced MergeTool support
+   * Added timeout to the gerrit query process
+   * Added support for merge status
+   * Fixed log encoding
+   * Reorganized menu (QTCREATORBUG-8363)
+   * Added gitk launch for current file (QTCREATORBUG-8327)
+   * Added branch name validation (QTCREATORBUG-8370)
+   * Added Merge and Rebase (QTCREATORBUG-8367)
+   * Added auto stash when switching branches (QTCREATORBUG-8417)
+   * Added Soft Reset to Reset dialog
+   * Added context actions for cherry-pick and revert
+   * Implemented refreshing file list on commit page every time
+     it becomes visible (QTCREATORBUG-5645)
+
+SVN
+
+ClearCase
+   * Marked the plugin as non-experimental
+
+FakeVim
+   * Created new suite of auto tests
+   * Improved word movement, jump list, undo/redo
+   * Improved searching (QTCREATORBUG-7251 et al), including
+     correct cursor positioning, support for g*, g# commands
+   * Implemented handling of special key names (<left>, <leader>, ...)
+   * Improved appearance of command line widget
+   * Improved display of block text cursor on extra selections
+   * Fixed map handling in ex mode
+   * Implemented indentation commands with movement
+   * Implemented repeat commands in visual mode
+   * Implemented basic code folding
+   * Implemented global file marks
+   * Improved code completion in insert and replace modes
+   * ... and _a lot_ more. Special thanks to Lukas here.
+
+BinEditor:
+   * Fixed selection edge cases (QTCREATORBUG-5209)
+   * Fixed Ctrl+Home/End navigation
+   * Added selection using Shift+LeftClick
+
+WelcomePage:
+   * Added combobox to filter examples by Qt version (QTCREATORBUG-8377)
+   * Added highlighting of examples (QTCREATORBUG-8459)
+
+Platform Specific
+
+Mac
+
+Linux
+   * Added crash handler providing a backtrace for debug builds
+
+Windows
+   * Improved UI to handle x64 and amd64 etc toolchains
+
+Remote Linux Support
+   * Removed dependency on Qt4ProjectManager
+   * Implemented SSH tunneling as specified in RFC 4254
+
+QNX
+   * Used QtQuick2ApplicationViewer for BB Quick 2 app templates
+   * Used QML_INSTALL_QML variable for BB Qt 5 app templates
+   * Added bar-descriptor.xml to new project
+   * Added templates for Cascades Applications
+   * Added BlackBerry settings page
+   * Fixes sysroot path valus on BB10 generated kits
+   * Set default device host IP for physical device
+   * Added editor for Bar descriptor file
+
+Android
+   * Fixed ps output processing for busybox
+   * Improved local deployment (QTCREATORBUG-8538)
+
+Task List
+   * Implemented removal of single tasks from task list
+   * Added keyboard shortcuts for actions
+
+
+Code Paster
+   * Added command-line frontend
+
+Testing
+   * Updated Squish tests
+
+Tools
+   * Improved ast2png when parsing declarators
+   * Created group/world files in SDKtool (QTCREATORBUG-8458)
+
+Packaging
+
+Madde
+   * Plugin is now disabled by default
+
+Credits for these changes go to:
+
+Aaron McCarthy
+Aleksey Sidorov
+Alessandro Portale
+André Pönitz
+André Hartmann
+Andreas Holzammer
+Aurindam Jana
+BogDan Vatra
+Caroline Chao
+Christian A. Reiter
+Christian Kamm
+Christian Kandeler
+Christian Stenger
+Daniel Teske
+David Schulz
+Debao Zhang
+Eike Ziller
+El Mehdi Fekari
+Erik Verbruggen
+Eskil Abrahamsen
+Fawzi Mohamed
+Francois Ferrand
+Friedemann Kleint
+Hüseyin Kozan
+Jarek Kobus
+Jens Bache-Wiig
+Jörg Bornemann
+J-P Nurmi
+Kai Köhne
+Knut Petter Svendsen
+Lukas Holecek
+Marcel Krems
+Marco Bubke
+Marcus Folkesson
+Mathias Hasselmann
+Mehdi Fekari
+Michael Brüning
+Mitch Curtis
+Montel Laurent
+Nikolai Kosjar
+Orgad Shaneh
+Oswald Buddenhagen
+Petar Perisin
+Peter Kümmel
+Przemyslaw Gorszkowski
+Rafael Roquetto
+Ray Donnelly
+Robert Löhning
+Ryan May
+Sergey Belyashov
+Sergey Shambir
+Shawn Rutledge
+Steven Ceuppens
+Tasuku Suzuki
+Theo J.A. de Vries
+Thiago Macieira
+Thomas Hartmann
+Thorbjørn Lindeijer
+Tobias Hunger
+Tobias Nätterlund
+Tom DeBlauwe
+Vasiliy Sorokin
+Yuchen Deng

doc/api/qtcreator-dev-online-qt4.qdocconf

@@ -1,4 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(../config/compat.qdocconf)
-include(qtcreator-dev-online.qdocconf)
+include(../config/qtcreator-developer.qdocconf)
-
+include(../config/qt-html-templates-online.qdocconf)

doc/api/qtcreator-dev-online.qdocconf

@@ -1,4 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(../config/qtcreator-developer.qdocconf)
-include(../config/qt-html-templates-online.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)
 

doc/api/qtcreator-dev-qt4.qdocconf

@@ -1,3 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(../config/compat.qdocconf)
-include(qtcreator-dev.qdocconf)
+include(../config/qtcreator-developer.qdocconf)
+include(../config/qt-html-templates.qdocconf)

doc/api/qtcreator-dev.qdocconf

@@ -1,3 +1,3 @@
 # Run qdoc from the directory that contains this file.
 include(../config/qtcreator-developer.qdocconf)
-include(../config/qt-html-templates.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)

doc/config/qtcreator-developer.qdocconf

@@ -52,7 +52,7 @@ include(qt-defines.qdocconf)
 
 qhp.projects            = QtCreatorDev
 qhp.QtCreatorDev.file             = qtcreator-dev.qhp
-qhp.QtCreatorDev.namespace        = com.nokia.qtcreator.developer.$QTC_VERSION_TAG
+qhp.QtCreatorDev.namespace        = org.qt-project.qtcreator.developer.$QTC_VERSION_TAG
 qhp.QtCreatorDev.virtualFolder    = doc
 qhp.QtCreatorDev.indexTitle       = Extending Qt Creator Manual
 qhp.QtCreatorDev.filterAttributes = qtcreator $QTC_VERSION

doc/config/qtcreator-project.qdocconf

@@ -17,7 +17,7 @@ sources.fileextensions         = "*.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.$QTC_VERSION_TAG
+qhp.QtCreator.namespace        = org.qt-project.qtcreator.$QTC_VERSION_TAG
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator Manual $QTC_VERSION
 qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION

doc/doc.pri

@@ -21,7 +21,7 @@ defineReplace(cmdEnv) {
 }
 
 defineReplace(qdoc) {
-    return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG) $$QDOC_BIN")
+    return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN")
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp

doc/doxygen/Doxyfile

@@ -843,7 +843,7 @@ DOCSET_FEEDNAME        = "Qt Creator API"
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
-DOCSET_BUNDLE_ID       = com.nokia.qt-creator
+DOCSET_BUNDLE_ID       = org.qt-project.qt-creator
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
@@ -906,7 +906,7 @@ QCH_FILE               = ../qch/qt-creator-api.qch
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
-QHP_NAMESPACE          = com.nokia.qtcreator.1382
+QHP_NAMESPACE          = org.qt-project.qtcreator.1382
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see

doc/qtcreator-online-qt4.qdocconf

@@ -1,3 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(config/compat.qdocconf)
-include(qtcreator-online.qdocconf)
+include(config/qtcreator-project.qdocconf)
+include(config/qt-html-templates-online.qdocconf)

doc/qtcreator-online.qdocconf

@@ -1,4 +1,3 @@
 # Run qdoc from the directory that contains this file.
 include(config/qtcreator-project.qdocconf)
-include(config/qt-html-templates-online.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)
-

doc/qtcreator-qt4.qdocconf

@@ -1,3 +1,4 @@
 # Run qdoc from the directory that contains this file.
 include(config/compat.qdocconf)
-include(qtcreator.qdocconf)
+include(config/qtcreator-project.qdocconf)
+include(config/qt-html-templates.qdocconf)

doc/qtcreator.qdocconf

@@ -1,3 +1,3 @@
 # Run qdoc from the directory that contains this file.
 include(config/qtcreator-project.qdocconf)
-include(config/qt-html-templates.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)

doc/snippets/qml/datamodel.qml

@@ -1,15 +0,0 @@
-//! [0]
-import QtQuick 1.0
-
-ListModel {
-     ListElement {
-         name: "Ariane"
-     }
-     ListElement {
-         name: "Bella"
-     }
-     ListElement {
-         name: "Corinna"
-     }
-}
-//! [0]

doc/snippets/qml/dummydata.qml

@@ -1,8 +0,0 @@
-//! [0]
-ListView {
-    model: dataModel
-    delegate: ContactDelegate {
-        name: name
-    }
-}
-//! [0]

doc/snippets/qml/dummydatacontext.qml

@@ -1,11 +0,0 @@
-//! [0]
-import QtQuick 1.0
-import QmlDesigner 1.0
-
-DummyContextObject {
-    parent: Item {
-        width: 640
-        height: 300
-    }
-}
-//! [0]

doc/snippets/qml/quick-scalable-image.qml

@@ -1,12 +0,0 @@
-Item {
-    //! [properties and signal definitions]
-    property string text: ""
-    property int fontSize: 10
-
-    signal clicked
-
-    width: 60
-    height: 40
-
-    //! [properties and signal definitions]
-}

doc/src/editors/creator-coding-edit-mode.qdoc

@@ -123,8 +123,8 @@
 
     You can move directly to the definition or the declaration of a symbol by
     holding the \key Ctrl and clicking the symbol. If you have multiple splits
-    opened, link will be opened in next split. To open it in current split,
+    opened, you can open the link in the next split by holding \key Ctrl and
-    hold \key Ctrl and \key Alt while clicking on the symbol.
+    \key Alt while clicking on the symbol.
 
     To enable this moving function, in \gui Tools > \gui{Options} >
     \gui{Text Editor} > \gui Behavior, select \gui{Enable mouse navigation}.
@@ -132,17 +132,20 @@
     You can also select the symbol and press \key F2, or right-click the symbol
     and select \gui {Follow Symbol Under Cursor} to move to its definition or
     declaration. This feature is supported for namespaces, classes, methods,
-    variables, include statements, and macros. If you have multiple splits
+    variables, include statements, and macros.
-    opened, the result will be shown in another split.
 
     To switch between the definition and declaration of a symbol, press
     \key {Shift+F2} or right-click the symbol and select \gui {Switch Between
-    Method Declaration/Definition}. If you have multiple splits opened, the
+    Method Declaration/Definition}.
-    result will be shown in another split.
 
-    Although links are opened in another split by default, this can be disabled
+    Links are opened in the same split by default. Every operation can also be opened in
-    in \gui Tools > \gui{Options} > \gui{Text Editor} > \gui Display, by
+    the next split by prebending \key {Ctrl+E} to the shortcut. For example \key {Ctrl+E,F2}
-    unchecking \gui{Open Links in Next Split}.
+    to follow the symbol in the next split. If currently is just one editor open a split will be
+    automatically opened. The default behavior could also be changed in
+    \gui Tools > \gui{Options} > \gui{Text Editor} > \gui Display, by checking
+    \gui{Always Open Links in Next Split}. Additional symbols and switching between definition
+    and decleration is opened in another split. If you change the default behavior the shortcuts
+    for open in next split are used to open the target in the current split.
 
     \section1 Using Update Code Model
 

doc/src/editors/creator-editors.qdoc

@@ -469,20 +469,16 @@
         \li  Unnecessary parentheses
         \li
 
+    \target m126
     \row
         \li  M126
         \li  Warning
-        \li  == and != may perform type coercion, use === or !== to avoid
+        \li  == and != may perform type coercion, use === or !== to avoid it
         \li  The non-strict equality comparison is allowed to convert its
            arguments to a common type. That can lead to unexpected
-           results such as \c {' \t\r\n' == 0} being true. Prefer to use the
+           results such as \c {' \t\r\n' == 0} being true. Use the
            strict equality operators === and !== and be explicit about
            conversions you require.
-    \row
-        \li  M305
-        \li  Warning
-        \li  == and != perform type coercion, use === or !== to avoid
-        \li  (see above)
 
     \row
         \li  M127
@@ -493,13 +489,44 @@
     \row
         \li  M201
         \li  Hint
-        \li  Var declarations should be at the start of a function
+        \li  Place var declarations at the start of a function
         \li
 
     \row
         \li  M202
         \li  Hint
-        \li  Only use one statement per line
+        \li  Use only one statement per line
+        \li
+
+    \row
+        \li  M203
+        \li  Warning
+        \li  Imperative code is not supported in the Qt Quick Designer
+        \li
+
+    \row
+        \li  M204
+        \li  Warning
+        \li  This type is not supported in the Qt Quick Designer
+        \li
+    \row
+        \li  M205
+        \li  Warning
+        \li  Reference to parent item cannot be resolved correctly by the
+             Qt Quick Designer
+        \li
+
+    \row
+        \li  M206
+        \li  Warning
+        \li  This visual property binding cannot be evaluated in the local
+             context and might not show up in Qt Quick Designer as expected
+        \li
+
+    \row
+        \li  M207
+        \li  Warning
+        \li  Qt Quick Designer only supports states in the root item
         \li
 
     \row
@@ -531,7 +558,11 @@
         \li  Error
         \li  Invalid property type 'name'
         \li
-
+    \row
+        \li  M305
+        \li  Warning
+        \li  == and != perform type coercion, use === or !== to avoid it
+        \li  See \l{m126}{M126}.
     \row
         \li  M306
         \li  Warning
@@ -542,7 +573,7 @@
     \row
         \li  M307
         \li  Warning
-        \li  'new' should only be used with functions that start with an uppercase letter
+        \li  Use 'new' only with functions that start with an uppercase letter
         \li
 
     \row
@@ -569,6 +600,78 @@
         \li  Use 'type' instead of 'var' or 'variant' to improve performance
         \li
 
+    \row
+        \li  M312
+        \li  Error
+        \li  Missing property 'number'
+        \li
+
+    \row
+        \li  M313
+        \li  Error
+        \li  Object value expected
+        \li
+
+    \row
+        \li  M314
+        \li  Error
+        \li  Array value expected
+        \li
+
+    \row
+        \li  M315
+        \li  Error
+        \li  'Value' value expected
+        \li
+
+    \row
+        \li  M316
+        \li  Error
+        \li  Maximum number value is 'number'
+        \li
+
+    \row
+        \li  M317
+        \li  Error
+        \li  Minimum number value is 'number'
+        \li
+
+    \row
+        \li  M318
+        \li  Error
+        \li  Maximum number value is exclusive
+        \li
+
+    \row
+        \li  M319
+        \li  Error
+        \li  Minimum number value is exclusive
+        \li
+
+    \row
+        \li  M320
+        \li  Error
+        \li  String value does not match required pattern
+        \li
+
+    \row
+        \li  M321
+        \li  Error
+        \li  Minimum string value length is 'number'
+        \li
+
+    \row
+        \li  M322
+        \li  Error
+        \li  Maximum string value length is 'number'
+        \li
+
+    \row
+        \li  M323
+        \li  Error
+        \li  'Number' elements expected in array value
+        \li
+
     \endtable
 
 */

doc/src/howto/creator-ui.qdoc

@@ -197,6 +197,10 @@
     If you cannot see a file in the \gui Projects view, switch to the
     \gui {File System} view, which shows all the files in the file system.
 
+    To also show hidden files, click
+    \inlineimage qtcreator-filter.png
+    and select \gui {Filter Files} > \gui {Show Hidden Files}.
+
     To keep the position in the tree synchronized with the file
     opened in the editor, select \gui {Synchronize with Editor}.
 

doc/src/overview/creator-design-overview.qdoc

@@ -42,9 +42,6 @@
             You can either create Qt Quick projects from scratch or import
             existing projects to \QC. You can use the code editor (Edit mode)
             or the visual editor (Design mode) to develop Qt Quick applications.
-            However, the visual editor only supports Qt Quick 1, which is
-            offered in Qt 5 only for compatibility with Qt 4. We recommend that
-            you use Qt Quick 2 for new Qt 5 applications.
         \li \l{Developing Widget Based Applications}
 
             Widgets and forms created with \QD are integrated seamlessly with

doc/src/overview/creator-issues.qdoc

@@ -143,7 +143,7 @@
             produce inaccurate debug info that GCC applies also to
             non-optimized builds. For more information, see
             \l{http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44731}
-            {GCC Bugzilla <EFBFBD> Bug 44731}.
+            {GCC Bugzilla - Bug 44731}.
 
     \endlist
 

doc/src/projects/creator-projects-compilers.qdoc

@@ -56,6 +56,7 @@
 
         \li Clang is a C, C++, Objective C, and Objective C++ front-end for the
             LLVM compiler for Windows, Linux, and Mac OS X.
+
     \endlist
 
     To build an application using GCC, MinGW, or Clang, specify the path
@@ -86,7 +87,49 @@
 
     \endlist
 
-    \section2 Troubleshooting MinGW Compilation Errors
+    \section1 Adding Custom Compilers
+
+    To add a compiler that is not listed above or a remote compiler, use the
+    \gui Custom option and specify the paths to the directories where the
+    compiler and make tool are located and options for the compiler.
+
+    \image creator-compilers-custom.png
+
+    To add other compilers:
+
+    \list 1
+
+        \li Select \gui Tools > \gui Options > \gui {Build & Run} >
+            \gui Compilers > \gui Add > \gui Custom.
+
+        \li In the \gui Name field, enter a name for the compiler.
+
+        \li In the \gui {Compiler path} field, enter the path to the directory
+            where the compiler is located.
+
+        \li In the \gui {Make path} field, enter the path to the directory where
+            the make tool is located.
+
+       \li  In the \gui ABI field, specify the ABI version.
+
+        \li In the \gui {Predefined macros} field, specify the macros that the
+            compiler enables by default. Specify each macro on a separate line,
+            in the following format: MACRO[=value].
+
+        \li In the \gui {Header paths} field, specify the paths to directories
+            that the compiler checks for headers. Specify each path on a
+            separate line.
+
+        \li In the \gui {C++11 flags} field, specify the flags that turn on
+            C++11 support in the compiler.
+
+        \li In the \gui {Qt mkspecs} field, specify the path to the directory
+            where mkspecs are located. Usually, the path is specified relative
+            to the Qt mkspecs directory.
+
+    \endlist
+
+    \section1 Troubleshooting MinGW Compilation Errors
 
     If error messages displayed in the \gui {Compile Output} pane contain
     paths where slashes are missing (for example, C:QtSDK),

doc/src/projects/creator-projects-settings-build.qdoc

@@ -70,6 +70,10 @@
 
     \endlist
 
+    To make in-source builds the default option for all projects, select
+    \gui Tools > \gui Options > \gui {Build & Run} > \gui General, and enter a
+    period (.) in the \gui {Default build directory} field.
+
     \section1 Starting External Processes
 
     \QC executes external processes to accomplish tasks such as building

doc/src/projects/creator-projects-settings-overview.qdoc

@@ -37,20 +37,9 @@
     To view and modify the settings for currently open projects, switch to the
     \gui Projects mode by pressing \key Ctrl+5.
 
-    \image qtcreator-project-targets.png
+    You can select build and run \l{glossary-buildandrun-kit}{kits} for the
-
+    open projects and use the \gui Build menu commands to build, deploy, and
-    To add build and run \l{glossary-buildandrun-kit}{kits} for the project,
+    run projects.
-    select \gui {Add Kit}. The list
-    displays kits that are configured in \gui Tools > \gui Options >
-    \gui {Build & Run} > \gui Kits. To add kits to the list, select
-    \gui {Manage Kits}.
-
-    To remove a kit, hover the cursor over it (1) and click
-    \inlineimage qtcreator-target-remove.png "Remove Kit button"
-    .
-
-    You can select the kits and use the \gui Build menu commands to build,
-    deploy, and run projects.
 
     The project pane consists of the following tabs:
 
@@ -84,4 +73,20 @@
     If you have multiple projects open in \QC, use the tabs at the top of the
     window to navigate between their settings.
 
+    \section1 Selecting Kits
+
+    \image qtcreator-project-targets.png
+
+    To add kits for the project, select \gui {Add Kit}. The list displays kits
+    that are configured in \gui Tools > \gui Options > \gui {Build & Run} >
+    \gui Kits. To add kits to the list, select \gui {Manage Kits}.
+
+    To copy the build and run settings for a kit to another kit, select
+    \gui {Copy to Kit} in the kit menu.
+
+    To change the kit, while preserving the build and run settings, select
+    \gui {Change Kit}.
+
+    To remove a kit, select \gui {Remove Kit}
+
 */

doc/src/qtquick/qtquick-app-development.qdoc

@@ -36,7 +36,7 @@
 
     You can use the code editor (\l{Working in Edit Mode}{Edit mode}) or the
     visual editor (\l{Using Qt Quick Designer}{Design mode}) to develop Qt Quick
-    applications.However, the visual editor only supports Qt Quick 1.
+    applications.
 
     Typically, application development proceeds as follows:
 

doc/src/qtquick/qtquick-app-tutorial.qdoc

@@ -30,11 +30,8 @@
 
     \title Creating a Qt Quick 1 Application
 
-    \note \QMLD only supports Qt Quick 1, which is offered in Qt 5 only for
+    \note We recommend that you use Qt Quick 2 to develop new applications for
-    compatibility with Qt 4. We recommend that you use Qt Quick 2 for new
+    platforms that run Qt 5.
-    Qt 5 applications. You can use the code editor in the \gui Design mode to
-    develop Qt Quick 2 applications. For more information, see the Qt 5
-    documentation.
 
     This tutorial uses built-in QML elements and illustrates basic concepts of
     \l {http://qt-project.org/doc/qt-4.8/qtquick.html}{Qt Quick 1}.

doc/src/qtquick/qtquick-buttons.qdoc

@@ -148,7 +148,17 @@
         \li Specify properties and set expressions for the \gui Item, as
             illustrated by the following code snippet:
 
-            \snippet snippets/qml/quick-scalable-image.qml properties and signal definitions
+            \qml
+            Item {
+                property string text: ""
+                property int fontSize: 10
+
+                signal clicked
+
+                width: 60
+                height: 40
+            }
+            \endqml
 
             You will point to the properties and expression later.
 

doc/src/qtquick/qtquick-designer.qdoc

@@ -32,7 +32,15 @@
 
     You can edit .qml files in the \QMLD visual editor or in the code editor.
 
-    \note \QMLD only supports Qt Quick 1.
+    \note In \QC 2.7, \QMLD supports both Qt Quick 1 and Qt Quick 2. However,
+    the \QC packages that are not delivered with Qt 5 are still built with
+    Qt 4.8, and therefore do not contain qml2puppet, which is the external
+    process that is responsible for rendering Qt Quick 2. To develop Qt Quick 2
+    applications using \QMLD, download the Qt 5.0.1 packages and build
+    qml2puppet yourself. The sources for qml2puppet are located in
+    \c{qt-creator\share\qtcreator\qml\qmlpuppet\qml2puppet}. The qml2puppet is
+    installed to \c{qtbase\bin}. If you then configure Qt 5.0.1 for your
+    project, \QMLD picks up the qml2puppet and supports Qt Quick 2.0.
 
     In \gui Projects, double-click a .qml file to open it in the code editor.
     Then select the \gui {Design} mode to edit the file in the visual editor.
@@ -289,7 +297,14 @@
     For example, the following code snippet describes the file example.qml that
     contains a ListView that in turn specifies a C++ model:
 
-    \snippet snippets/qml/dummydata.qml 0
+    \qml
+        ListView {
+            model: dataModel
+            delegate: ContactDelegate {
+                name: name
+            }
+        }
+    \endqml
 
     Create a directory named \e dummydata in the root directory of the project,
     so that it is not deployed to the device. In the \c dummydata directory,
@@ -302,18 +317,32 @@
 
     Then create the dataModel.qml file that contains the dummy data:
 
-    \snippet snippets/qml/datamodel.qml 0
+    \qml
+        import QtQuick 1.0
+
+        ListModel {
+             ListElement {
+                 name: "Ariane"
+             }
+             ListElement {
+                 name: "Bella"
+             }
+             ListElement {
+                 name: "Corinna"
+             }
+        }
+    \endqml
 
     \section3 Creating Dummy Context
 
     The following example presents a common pattern in QML:
 
-    \code
+    \qml
         Item {
             width: parent.width
             height: parent.height
         }
-    \endcode
+    \endqml
 
     This works nicely for applications but \QMLD displays a zero-sized item.
     A parent for the opened file does not exist, because the context is
@@ -322,7 +351,17 @@
     application (here, example.qml) in the \c {dummydata/context} directory,
     you can fake a parent context:
 
-    \snippet snippets/qml/dummydatacontext.qml 0
+    \qml
+        import QtQuick 1.0
+        import QmlDesigner 1.0
+
+        DummyContextObject {
+            parent: Item {
+                width: 640
+                height: 300
+            }
+        }
+    \endqml
 
     \section2 Setting Anchors and Margins
 

qtcreator.qbs

@@ -161,6 +161,7 @@ Project {
         Depends { name: "Qt"; submodules: ["widgets", "network"] }
         Depends { name: "Utils" }
         Depends { name: "ExtensionSystem" }
+        Depends { name: "Core" }
 
         files: [
             "src/app/main.cpp",
@@ -175,14 +176,14 @@ Project {
         ]
 
         Group {
-            condition: qbs.targetOS == "linux" || qbs.targetOS == "macx"
+            condition: qbs.targetPlatform.indexOf("unix") != -1
             files: "bin/qtcreator.sh"
             qbs.install: true
             qbs.installDir: "bin"
         }
 
         Group {
-           condition: qbs.targetOS == "linux" || qbs.targetOS == "macx"
+           condition: qbs.targetPlatform.indexOf("unix") != -1
            files: [
                "src/shared/qtlockedfile/qtlockedfile_unix.cpp"
            ]

share/qtcreator/dumper/dumper.py

@@ -1750,16 +1750,6 @@ class Dumper:
                     dumper(self, value)
                 return
 
-            # Is this derived from QObject?
-            #try:
-            #    # If this access fails, it's not a QObject.
-            #    d = value["d_ptr"]["d"]
-            #    privateType = lookupType(self.ns + "QObjectPrivate").pointer()
-            #    objectName = d.cast(privateType).dereference()["objectName"]
-            #    self.putStringValue(objectName, 1)
-            #except:
-            #    pass
-
         # D arrays, gdc compiled.
         if typeName.endswith("[]"):
             n = value["length"]
@@ -1778,6 +1768,8 @@ class Dumper:
         fields = extractFields(type)
         #fields = type.fields()
 
+        self.tryPutObjectNameValue(value)  # Is this too expensive?
+
         self.putType(typeName)
         self.putAddress(value.address)
         self.putValue("{...}")
@@ -1807,6 +1799,29 @@ class Dumper:
             with Children(self):
                self.putFields(value)
 
+    def tryPutObjectNameValue(self, value):
+        try:
+            # Is this derived from QObject?
+            dd = value["d_ptr"]["d"]
+            privateTypeName = self.ns + "QObjectPrivate"
+            privateType = lookupType(privateTypeName)
+            staticMetaObject = value["staticMetaObject"]
+            d_ptr = dd.cast(privateType.pointer()).dereference()
+            objectName = None
+            try:
+                objectName = d_ptr["objectName"]
+            except: # Qt 5
+                p = d_ptr["extraData"]
+                if not isNull(p):
+                    objectName = p.dereference()["objectName"]
+            if not objectName is None:
+                data, size, alloc = qStringData(objectName)
+                if size > 0:
+                    str = readRawMemory(data, 2 * size)
+                    self.putValue(str, Hex4EncodedLittleEndian, 1)
+        except:
+            pass
+
     def putFields(self, value, dumpBase = True):
             type = stripTypedefs(value.type)
             # Insufficient, see http://sourceware.org/bugzilla/show_bug.cgi?id=10953:

share/qtcreator/dumper/qttypes.py

@@ -636,16 +636,22 @@ def qdump__QLinkedList(d, value):
 qqLocalesCount = None
 
 def qdump__QLocale(d, value):
-    # Check for uninitialized 'index' variable. Retrieve size of QLocale data array
+    # Check for uninitialized 'index' variable. Retrieve size of
-    # from variable in qlocale.cpp (default: 368/Qt 4.8), 368 being 'System'.
+    # QLocale data array from variable in qlocale.cpp.
+    # Default is 368 in Qt 4.8, 438 in Qt 5.0.1, the last one
+    # being 'System'.
     global qqLocalesCount
     if qqLocalesCount is None:
         try:
-            qqLocalesCount = int(value(qtNamespace() + 'locale_data_size'))
+            qqLocalesCount = int(value(d.ns + 'locale_data_size'))
         except:
-            qqLocalesCount = 368
+            qqLocalesCount = 438
+    try:
         index = int(value["p"]["index"])
-    check(index >= 0 and index <= qqLocalesCount)
+    except:
+        index = int(value["d"]["d"]["m_index"])
+    check(index >= 0)
+    check(index <= qqLocalesCount)
     d.putStringValue(call(value, "name"))
     d.putNumChild(0)
     return
@@ -714,6 +720,7 @@ def qdumpHelper__Qt4_QMap(d, value, forceLong):
                 base = it.cast(charPtr) - payloadSize
                 node = base.cast(nodeType.pointer()).dereference()
                 with SubItem(d, i):
+                    d.putField("iname", d.currentIName)
                     if isCompact:
                         #d.putType(valueType)
                         if forceLong:
@@ -770,6 +777,7 @@ def qdumpHelper__Qt5_QMap(d, value, forceLong):
                 i += 1
 
                 with SubItem(d, i):
+                    d.putField("iname", d.currentIName)
                     if isCompact:
                         if forceLong:
                             d.putName("[%s] %s" % (i, node["key"]))
@@ -812,21 +820,12 @@ def extractCString(table, offset):
 
 def qdump__QObject(d, value):
     #warn("OBJECT: %s " % value)
+    d.tryPutObjectNameValue(value)
+
     try:
-        privateTypeName = d.ns + "QObjectPrivate"
+        privateTypeName = self.ns + "QObjectPrivate"
         privateType = lookupType(privateTypeName)
         staticMetaObject = value["staticMetaObject"]
-        d_ptr = value["d_ptr"]["d"].cast(privateType.pointer()).dereference()
-        #warn("D_PTR: %s " % d_ptr)
-        objectName = None
-        try:
-            objectName = d_ptr["objectName"]
-        except: # Qt 5
-            p = d_ptr["extraData"]
-            if not isNull(p):
-                objectName = p.dereference()["objectName"]
-        if not objectName is None:
-            d.putStringValue(objectName)
     except:
         d.putPlainChildren(value)
         return
@@ -1574,8 +1573,18 @@ def qdump__QTextDocument(d, value):
 
 def qdump__QUrl(d, value):
     try:
+        # Qt 4
         data = value["d"].dereference()
         d.putByteArrayValue(data["encodedOriginal"])
+    except:
+        try:
+            # Qt 5
+            data = value["d"].dereference()
+            str = encodeString(data["scheme"])
+            str += "3a002f002f00"
+            str += encodeString(data["host"])
+            str += encodeString(data["path"])
+            d.putValue(str, Hex4EncodedLittleEndian)
         except:
             d.putPlainChildren(value)
             return
@@ -2138,10 +2147,10 @@ def qdump__std__string(d, value):
         encodingType = Hex2EncodedLatin1
         displayType = DisplayLatin1String
     elif charType.sizeof == 2:
-        encodingType = Hex4EncodedLatin1
+        encodingType = Hex4EncodedLittleEndian
         displayType = DisplayUtf16String
     else:
-        encodinfType = Hex8EncodedLatin1
+        encodingType = Hex8EncodedLittleEndian
         displayType = DisplayUtf16String
 
     d.putAddress(value.address)

share/qtcreator/generic-highlighter/alert.xml

@@ -25,37 +25,53 @@
 
  This file is included in every file that highlights the "alerts" keywords.
  That's why extensions and mimetype are empty.
+
+ Changes by Alex Turbov:
+  Introduce 3 alert levels and sort keywords according importance.
+  Few more keywords has been added.
 -->
 <language version="1.08" kateversion="2.3" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
   <highlighting>
-    <list name="alerts">
+    <list name="alerts_hi">
-      <item> ### </item>
       <item> ALERT </item>
-      <item> BUG </item>
+      <item> ATTENTION </item>
       <item> DANGER </item>
-      <item> DEPRECATED </item>
-      <item> FIXME </item>
       <item> HACK </item>
+      <item> SECURITY </item>
+    </list>
+    <list name="alerts_mid">
+      <item> BUG </item>
+      <item> FIXME </item>
+      <item> DEPRECATED </item>
+      <item> TASK </item>
+      <item> TODO </item>
+      <item> TBD </item>
+      <item> WARNING </item>
+      <item> NOLINT </item>
+    </list>
+    <list name="alerts_lo">
+      <item> ### </item>
       <item> NOTE </item>
       <item> NOTICE </item>
-      <item> SECURITY </item>
-      <item> TASK </item>
       <item> TEST </item>
       <item> TESTING </item>
-      <item> TODO </item>
-      <item> WARNING </item>
     </list>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
-        <keyword attribute="Alert" context="#stay" String="alerts" />
+        <keyword attribute="Alert Level 1" context="#stay" String="alerts_hi" />
+        <keyword attribute="Alert Level 2" context="#stay" String="alerts_mid" />
+        <keyword attribute="Alert Level 3" context="#stay" String="alerts_lo" />
       </context>
     </contexts>
     <itemDatas>
       <itemData name="Normal Text"   defStyleNum="dsNormal"/>
-      <itemData name="Alert" defStyleNum="dsAlert"/>
+      <itemData name="Alert Level 1" defStyleNum="dsAlert" color="#e85848" selColor="#e85848" backgroundColor="#451e1a" />
+      <itemData name="Alert Level 2" defStyleNum="dsAlert" color="#ca9219" selColor="#ca9219" backgroundColor="#451e1a" />
+      <itemData name="Alert Level 3" defStyleNum="dsAlert" color="#81ca2d" selColor="#81ca2d" />
     </itemDatas>
   </highlighting>
   <general>
     <keywords casesensitive="1"/>
   </general>
 </language>
+<!-- kate: indent-width 2; -->

share/qtcreator/generic-highlighter/autoconf.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language SYSTEM "/opt/kde3/share/apps/katepart/syntax/language.dtd">
-<!-- (c) 2008-2013 by Jürgen Heinemann http://www.hjcms.de
+<!-- (c) 2008-2011 by Jürgen Heinemann http://www.hjcms.de 
   @see http://www.gnu.org/software/automake/manual/autoconf/
 -->
-<language name="Autoconf Language" version="1.10" kateversion="2.4" section="Other" extensions="configure.ac;configure.in;configure.in.in;*.m4;*.M4" mimetype="text/x-m4;text/x-autoconf" author="Juergen Heinemann (nospam@hjcms.de)" license="LGPL">
+<language name="Autoconf Language" version="1.11" kateversion="2.4" section="Other"
+  extensions="configure.ac;configure.in;configure.in.in;*.m4;*.M4"
+  mimetype="text/x-m4;text/x-autoconf"
+  author="Juergen Heinemann (nospam@hjcms.de)" license="LGPL">
   <highlighting>
     <!-- http://www.gnu.org/software/automake/manual/autoconf/Program-_0026-Function-Index.html -->
     <list name="keywords">
@@ -351,7 +354,9 @@
         <RegExpr attribute="Variable" context="#stay" String="\$[a-z_]+" insensitive="true" endRegion="BeginRegion" />
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
-        <RegExpr attribute="Comment" context="#stay" String="(\bdnl|^#).*$" insensitive="true" endRegion="BeginRegion"/>
+        <RegExpr attribute="Pragmas" context="#stay" String="([\s\t]+#).*$" insensitive="true" endRegion="BeginRegion" />
+        <RegExpr attribute="Comment" context="#stay" String="(^#).*$" insensitive="true" endRegion="BeginRegion" />
+        <RegExpr attribute="Comment" context="#stay" String="(\bdnl\s).*$" insensitive="true" endRegion="BeginRegion" />
       </context>
       <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker"/>
       <context attribute="String" lineEndContext="#pop" name="String">
@@ -375,6 +380,7 @@
       <itemData name="Float"             defStyleNum="dsFloat" />
       <itemData name="Char"              defStyleNum="dsChar" />
       <itemData name="String"            defStyleNum="dsString" />
+      <itemData name="Pragmas"           defStyleNum="dsOthers" color="#00C000" />
       <itemData name="Comment"           defStyleNum="dsComment" />
       <itemData name="Symbol"            defStyleNum="dsNormal"/>
       <itemData name="Region Marker"     defStyleNum="dsRegionMarker" />

share/qtcreator/generic-highlighter/bash.xml

@@ -8,11 +8,12 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
     Changes by Sebastian Pipping (webmaster@hartwork.org)
+    Changes by Luiz Angelo Daros de Luca (luizluca@gmail.com)
     Released under the LGPL, part of kdelibs/kate -->
 
   <highlighting>
@@ -502,6 +503,10 @@
 
       <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
+        <IncludeRules context="FindSpecialCommands" />
+        <IncludeRules context="FindNormalCommands" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindSpecialCommands">
         <!-- start expression in double parentheses -->
         <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
         <!-- start expression in double brackets -->
@@ -517,24 +522,21 @@
         <!-- match do and if blocks -->
         <RegExpr attribute="Keyword" context="#stay" String="\bdo&noword;" beginRegion="do" />
         <RegExpr attribute="Keyword" context="#stay" String="\bdone&noword;" endRegion="do" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bif&noword;" beginRegion="if" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bif&eos;" beginRegion="if" />
         <RegExpr attribute="Keyword" context="#stay" String="\bfi&noword;" endRegion="if" />
         <!-- handle case as a special case -->
         <RegExpr attribute="Keyword" context="Case" String="\bcase&noword;" beginRegion="case" />
-        <!-- handle command line options -->
-        <RegExpr attribute="Option" context="#stay" String="-[A-Za-z0-9][A-Za-z0-9_]*" />
-        <RegExpr attribute="Option" context="#stay" String="--[a-z][A-Za-z0-9_-]*" />
         <!-- handle variable assignments -->
         <RegExpr attribute="Variable" context="Assign" String="\b&varname;\+?=" />
         <RegExpr attribute="Variable" context="AssignSubscr" String="\b&varname;(?=\[.+\]\+?=)" />
         <!-- handle functions with function keyword before keywords -->
         <StringDetect attribute="Function" context="#stay" String=":()" />
         <RegExpr attribute="Keyword" context="FunctionDef" String="\bfunction\b" />
+        <!-- mark function definitions without function keyword -->
+        <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
         <!-- handle keywords -->
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <RegExpr attribute="Builtin" context="#stay" String="\.(?=\s)" />
-        <keyword attribute="Builtin" context="#stay" String="builtins" />
-        <keyword attribute="Command" context="#stay" String="unixcommands" />
         <!-- handle commands that have variable names as argument -->
         <keyword attribute="Builtin" context="VarName" String="builtins_var" />
         <!-- handle here-string -->
@@ -547,8 +549,58 @@
         <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
         <!-- handle &, &&, | and || -->
         <RegExpr attribute="Control" context="#stay" String="([|&amp;])\1?" />
-        <!-- mark function definitions without function keyword -->
+      </context>      
-        <RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalCommands">
+        <keyword attribute="Builtin" context="CommandArgs" String="builtins" />
+        <keyword attribute="Command" context="CommandArgs" String="unixcommands" />
+        <RegExpr attribute="OtherCommand" context="#stay" String="&pathpart;*(?=/)" />
+        <RegExpr attribute="OtherCommand" context="#stay" String="~\w*" />
+        <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
+        <RegExpr attribute="OtherCommand" context="CommandArgs" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
+        <!-- This list is not complete. ie, ":" is missing but as it is in bash completition. -->
+        <RegExpr attribute="OtherCommand" context="CommandArgs" String="&pathpart;*" />        
+      </context>
+      
+      <!-- CommandArgs matches the items after a command -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgs">  
+        <LineContinue />
+        <IncludeRules context="FindMost" />
+        <RegExpr attribute="Keyword" context="#stay" String="\\$" />
+        <!-- handle keywords -->
+        <RegExpr attribute="Option" context="#stay" String="\.(?=\s)" />
+        <!-- handle here-string -->
+        <RegExpr attribute="Redirection" context="#stay" String="\d*&lt;&lt;&lt;" />
+        <!-- handle here document -->
+        <StringDetect attribute="Redirection" context="HereDoc" String="&lt;&lt;" lookAhead="true" />
+        <!-- handle process subst -->
+        <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
+        <!-- handle redirection -->
+        <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
+        <!-- handle &, &&, | and || -->
+        <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />        
+        <RegExpr attribute="Option" context="#stay" String="-?-[a-z][A-Za-z0-9_-]*" />
+        <keyword attribute="Option" context="#stay" String="keywords" />
+        <AnyChar String=")}" context="#pop" lookAhead="true"/>
+      </context>
+      
+      <!-- FindCommands matches many items that can be expected outside strings, substitutions etc, when inside a Backquote -->
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindCommandsBackq">
+        <IncludeRules context="FindSpecialCommands" />
+        <IncludeRules context="FindNormalCommandsBackq" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalCommandsBackq">
+        <keyword attribute="Builtin" context="CommandArgsBackq" String="builtins" />
+        <keyword attribute="Command" context="CommandArgsBackq" String="unixcommands" />
+        <RegExpr attribute="OtherCommand" context="#stay" String="&pathpart;*(?=/)" />
+        <RegExpr attribute="OtherCommand" context="#stay" String="~\w*" />
+        <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
+        <RegExpr attribute="OtherCommand" context="CommandArgsBackq" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
+        <RegExpr attribute="OtherCommand" context="CommandArgsBackq" String="&pathpart;*" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgsBackq"> 
+        <LineContinue />
+        <DetectChar attribute="Keyword" context="#pop" char="`" lookAhead="true"/>
+        <IncludeRules context="CommandArgs" />
       </context>
           
       <!-- FindOthers contains various rules to mark different shell input -->
@@ -801,7 +853,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="SubstBackq">
         <DetectChar attribute="Backquote" context="#pop" char="`" />
         <IncludeRules context="FindCommentsBackq" />
-        <IncludeRules context="FindCommands" />
+        <IncludeRules context="FindCommandsBackq" />
         <IncludeRules context="FindStrings" />
         <IncludeRules context="FindSubstitutions" />
         <IncludeRules context="FindOthers" />
@@ -877,6 +929,7 @@
       <itemData name="Control"		defStyleNum="dsKeyword" />
       <itemData name="Builtin"		defStyleNum="dsKeyword" color="#808" />
       <itemData name="Command"		defStyleNum="dsKeyword" color="#c0c" />
+      <itemData name="OtherCommand"	defStyleNum="dsKeyword" color="#303" />
       <itemData name="Redirection"	defStyleNum="dsKeyword" color="#238" />
       <itemData name="Escape"		defStyleNum="dsDataType" />
       <itemData name="String SingleQ"	defStyleNum="dsString" />

share/qtcreator/generic-highlighter/cmake.xml

@@ -24,8 +24,8 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<!-- generated for "cmake version 2.6-patch 3" -->
+<!-- generated for "cmake version 2.8.10.2" -->
-<language name="CMake" version="1.11" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
+<language name="CMake" version="1.14" kateversion="2.4" section="Other" extensions="CMakeLists.txt;*.cmake;" mimetype="" author="Alexander Neundorf (neundorf@kde.org)" license="LGPL">
   <highlighting>
 
     <list name = "commands">
@@ -137,19 +137,22 @@
 
     <list name="special_args">
       <!-- generated list -->
+      <item> A </item>
       <item> ABSOLUTE </item>
       <item> AFTER </item>
       <item> ALL </item>
       <item> ALPHABET </item>
       <item> AND </item>
       <item> APPEND </item>
+      <item> APPEND_STRING </item>
       <item> ARCHIVE </item>
       <item> ARGS </item>
       <item> ASCII </item>
+      <item> AUTHOR_WARNING </item>
+      <item> B </item>
       <item> BEFORE </item>
       <item> BRIEF_DOCS </item>
       <item> BUNDLE </item>
-      <item> C </item>
       <item> CACHE </item>
       <item> CLEAR </item>
       <item> CMAKE_FIND_ROOT_PATH_BOTH </item>
@@ -164,18 +167,22 @@
       <item> COMPILE_RESULT_VAR </item>
       <item> COMPONENT </item>
       <item> COMPONENTS </item>
+      <item> CONFIG </item>
       <item> CONFIGS </item>
+      <item> CONFIGURATION </item>
       <item> CONFIGURATIONS </item>
       <item> CONFIGURE </item>
       <item> COPYONLY </item>
       <item> COPY_FILE </item>
-      <item> CXX </item>
+      <item> CRLF </item>
       <item> DEFINED </item>
+      <item> DEFINITION </item>
       <item> DEPENDS </item>
       <item> DESTINATION </item>
       <item> DIRECTORY </item>
       <item> DIRECTORY_PERMISSIONS </item>
       <item> DOC </item>
+      <item> DOS </item>
       <item> DOWNLOAD </item>
       <item> ENV </item>
       <item> EQUAL </item>
@@ -188,6 +195,8 @@
       <item> EXCLUDE </item>
       <item> EXCLUDE_FROM_ALL </item>
       <item> EXISTS </item>
+      <item> EXPECTED_HASH </item>
+      <item> EXPECTED_MD5 </item>
       <item> EXPORT </item>
       <item> EXPR </item>
       <item> EXT </item>
@@ -199,20 +208,25 @@
       <item> FILE_PERMISSIONS </item>
       <item> FIND </item>
       <item> FOLLOW_SYMLINKS </item>
+      <item> FOO </item>
       <item> FORCE </item>
       <item> FRAMEWORK </item>
       <item> FULL_DOCS </item>
       <item> FUNCTION </item>
       <item> GET </item>
       <item> GLOB </item>
+      <item> GLOBAL </item>
       <item> GLOB_RECURSE </item>
       <item> GREATER </item>
       <item> GROUP_EXECUTE </item>
       <item> GROUP_READ </item>
+      <item> GUID </item>
       <item> HEX </item>
       <item> HINTS </item>
       <item> IMPLICIT_DEPENDS </item>
       <item> IMPORTED </item>
+      <item> IN </item>
+      <item> INACTIVITY_TIMEOUT </item>
       <item> INCLUDE_INTERNALS </item>
       <item> INHERITED </item>
       <item> INPUT_FILE </item>
@@ -220,16 +234,20 @@
       <item> IS_ABSOLUTE </item>
       <item> IS_DIRECTORY </item>
       <item> IS_NEWER_THAN </item>
+      <item> IS_SYMLINK </item>
+      <item> ITEMS </item>
       <item> LENGTH </item>
       <item> LENGTH_MAXIMUM </item>
       <item> LENGTH_MINIMUM </item>
       <item> LESS </item>
+      <item> LF </item>
       <item> LIBRARY </item>
       <item> LIMIT </item>
       <item> LIMIT_COUNT </item>
       <item> LIMIT_INPUT </item>
       <item> LIMIT_OUTPUT </item>
       <item> LINK_INTERFACE_LIBRARIES </item>
+      <item> LISTS </item>
       <item> LOG </item>
       <item> MACOSX_BUNDLE </item>
       <item> MAIN_DEPENDENCY </item>
@@ -246,22 +264,28 @@
       <item> NAME_WE </item>
       <item> NEW </item>
       <item> NEWLINE_CONSUME </item>
+      <item> NEWLINE_STYLE </item>
       <item> NOT </item>
       <item> NOTEQUAL </item>
       <item> NO_CMAKE_BUILDS_PATH </item>
       <item> NO_CMAKE_ENVIRONMENT_PATH </item>
       <item> NO_CMAKE_FIND_ROOT_PATH </item>
+      <item> NO_CMAKE_PACKAGE_REGISTRY </item>
       <item> NO_CMAKE_PATH </item>
+      <item> NO_CMAKE_SYSTEM_PACKAGE_REGISTRY </item>
       <item> NO_CMAKE_SYSTEM_PATH </item>
       <item> NO_DEFAULT_PATH </item>
       <item> NO_HEX_CONVERSION </item>
       <item> NO_MODULE </item>
       <item> NO_POLICY_SCOPE </item>
+      <item> NO_SOURCE_PERMISSIONS </item>
       <item> NO_SYSTEM_ENVIRONMENT_PATH </item>
+      <item> OBJECT </item>
       <item> OFFSET </item>
       <item> OLD </item>
       <item> ONLY_CMAKE_FIND_ROOT_PATH </item>
       <item> OPTIONAL </item>
+      <item> OPTIONAL_COMPONENTS </item>
       <item> OR </item>
       <item> OUTPUT </item>
       <item> OUTPUT_DIRECTORY </item>
@@ -272,6 +296,7 @@
       <item> OWNER_EXECUTE </item>
       <item> OWNER_READ </item>
       <item> OWNER_WRITE </item>
+      <item> PACKAGE </item>
       <item> PARENT_SCOPE </item>
       <item> PATH </item>
       <item> PATHS </item>
@@ -279,6 +304,7 @@
       <item> PATH_TO_MESA </item>
       <item> PATTERN </item>
       <item> PERMISSIONS </item>
+      <item> PLATFORM </item>
       <item> POLICY </item>
       <item> POP </item>
       <item> POST_BUILD </item>
@@ -289,15 +315,18 @@
       <item> PROGRAM </item>
       <item> PROGRAMS </item>
       <item> PROGRAM_ARGS </item>
+      <item> PROJECT_NAME </item>
       <item> PROPERTIES </item>
       <item> PROPERTY </item>
       <item> PUBLIC_HEADER </item>
       <item> PUSH </item>
       <item> QUIET </item>
       <item> RANDOM </item>
+      <item> RANDOM_SEED </item>
       <item> RANGE </item>
       <item> READ </item>
       <item> READ_WITH_PREFIX </item>
+      <item> REALPATH </item>
       <item> REGEX </item>
       <item> REGULAR_EXPRESSION </item>
       <item> RELATIVE </item>
@@ -324,7 +353,12 @@
       <item> SCRIPT </item>
       <item> SEND_ERROR </item>
       <item> SET </item>
+      <item> SHA1 </item>
+      <item> SHA224 </item>
+      <item> SHA256 </item>
+      <item> SHA384 </item>
       <item> SHARED </item>
+      <item> SHOW_PROGRESS </item>
       <item> SORT </item>
       <item> SOURCE </item>
       <item> SOURCES </item>
@@ -342,10 +376,15 @@
       <item> TEST </item>
       <item> TEST_VARIABLE </item>
       <item> TIMEOUT </item>
+      <item> TLS_CAINFO </item>
+      <item> TLS_VERIFY </item>
       <item> TOLOWER </item>
       <item> TOUPPER </item>
       <item> TO_CMAKE_PATH </item>
       <item> TO_NATIVE_PATH </item>
+      <item> TYPE </item>
+      <item> UNIX </item>
+      <item> UPLOAD </item>
       <item> USE_SOURCE_PERMISSIONS </item>
       <item> VALUE </item>
       <item> VAR </item>
@@ -356,6 +395,7 @@
       <item> VERSION_EQUAL </item>
       <item> VERSION_GREATER </item>
       <item> VERSION_LESS </item>
+      <item> WARNING </item>
       <item> WIN32 </item>
       <item> WORKING_DIRECTORY </item>
       <item> WRITE </item>
@@ -371,41 +411,60 @@
       <!-- generated list -->
       <item> ABSTRACT </item>
       <item> ADDITIONAL_MAKE_CLEAN_FILES </item>
+      <item> ADVANCED </item>
       <item> ALLOW_DUPLICATE_CUSTOM_TARGETS </item>
       <item> ARCHIVE_OUTPUT_DIRECTORY </item>
+      <item> ARCHIVE_OUTPUT_NAME </item>
+      <item> ATTACHED_FILES </item>
+      <item> ATTACHED_FILES_ON_FAIL </item>
+      <item> AUTOMOC </item>
+      <item> AUTOMOC_MOC_OPTIONS </item>
       <item> BUILD_WITH_INSTALL_RPATH </item>
+      <item> BUNDLE </item>
+      <item> BUNDLE_EXTENSION </item>
       <item> CACHE_VARIABLES </item>
-      <item> CLEAN_DIRECT_OUTPUT </item>
       <item> CLEAN_NO_CUSTOM </item>
       <item> COMPILE_DEFINITIONS </item>
       <item> COMPILE_FLAGS </item>
+      <item> COST </item>
       <item> DEBUG_CONFIGURATIONS </item>
       <item> DEBUG_POSTFIX </item>
       <item> DEFINE_SYMBOL </item>
       <item> DEFINITIONS </item>
+      <item> DEPENDS </item>
       <item> DISABLED_FEATURES </item>
       <item> ENABLED_FEATURES </item>
       <item> ENABLED_LANGUAGES </item>
       <item> ENABLE_EXPORTS </item>
+      <item> ENVIRONMENT </item>
       <item> EXCLUDE_FROM_ALL </item>
       <item> EXTERNAL_OBJECT </item>
       <item> EchoString </item>
       <item> FAIL_REGULAR_EXPRESSION </item>
       <item> FIND_LIBRARY_USE_LIB64_PATHS </item>
+      <item> FIND_LIBRARY_USE_OPENBSD_VERSIONING </item>
+      <item> FOLDER </item>
       <item> FRAMEWORK </item>
+      <item> Fortran_FORMAT </item>
       <item> Fortran_MODULE_DIRECTORY </item>
       <item> GENERATED </item>
       <item> GENERATOR_FILE_NAME </item>
       <item> GLOBAL_DEPENDS_DEBUG_MODE </item>
+      <item> GLOBAL_DEPENDS_NO_CYCLES </item>
+      <item> GNUtoMS </item>
       <item> HAS_CXX </item>
       <item> HEADER_FILE_ONLY </item>
+      <item> HELPSTRING </item>
       <item> IMPLICIT_DEPENDS_INCLUDE_TRANSFORM </item>
       <item> IMPORTED </item>
       <item> IMPORTED_CONFIGURATIONS </item>
       <item> IMPORTED_IMPLIB </item>
       <item> IMPORTED_LINK_DEPENDENT_LIBRARIES </item>
+      <item> IMPORTED_LINK_INTERFACE_LANGUAGES </item>
       <item> IMPORTED_LINK_INTERFACE_LIBRARIES </item>
+      <item> IMPORTED_LINK_INTERFACE_MULTIPLICITY </item>
       <item> IMPORTED_LOCATION </item>
+      <item> IMPORTED_NO_SONAME </item>
       <item> IMPORTED_SONAME </item>
       <item> IMPORT_PREFIX </item>
       <item> IMPORT_SUFFIX </item>
@@ -414,15 +473,21 @@
       <item> INSTALL_NAME_DIR </item>
       <item> INSTALL_RPATH </item>
       <item> INSTALL_RPATH_USE_LINK_PATH </item>
+      <item> INTERPROCEDURAL_OPTIMIZATION </item>
       <item> IN_TRY_COMPILE </item>
       <item> KEEP_EXTENSION </item>
+      <item> LABELS </item>
       <item> LANGUAGE </item>
       <item> LIBRARY_OUTPUT_DIRECTORY </item>
+      <item> LIBRARY_OUTPUT_NAME </item>
       <item> LINKER_LANGUAGE </item>
+      <item> LINK_DEPENDS </item>
       <item> LINK_DIRECTORIES </item>
       <item> LINK_FLAGS </item>
       <item> LINK_INTERFACE_LIBRARIES </item>
+      <item> LINK_INTERFACE_MULTIPLICITY </item>
       <item> LINK_SEARCH_END_STATIC </item>
+      <item> LINK_SEARCH_START_STATIC </item>
       <item> LISTFILE_STACK </item>
       <item> LOCATION </item>
       <item> MACOSX_BUNDLE </item>
@@ -431,26 +496,43 @@
       <item> MACOSX_PACKAGE_LOCATION </item>
       <item> MACROS </item>
       <item> MEASUREMENT </item>
+      <item> MODIFIED </item>
+      <item> NO_SONAME </item>
       <item> OBJECT_DEPENDS </item>
       <item> OBJECT_OUTPUTS </item>
+      <item> OSX_ARCHITECTURES </item>
       <item> OUTPUT_NAME </item>
       <item> PACKAGES_FOUND </item>
       <item> PACKAGES_NOT_FOUND </item>
       <item> PARENT_DIRECTORY </item>
       <item> PASS_REGULAR_EXPRESSION </item>
+      <item> PDB_NAME </item>
+      <item> PDB_OUTPUT_DIRECTORY </item>
+      <item> POSITION_INDEPENDENT_CODE </item>
       <item> POST_INSTALL_SCRIPT </item>
+      <item> PREDEFINED_TARGETS_FOLDER </item>
       <item> PREFIX </item>
       <item> PRE_INSTALL_SCRIPT </item>
       <item> PRIVATE_HEADER </item>
+      <item> PROCESSORS </item>
       <item> PROJECT_LABEL </item>
       <item> PUBLIC_HEADER </item>
       <item> REPORT_UNDEFINED_PROPERTIES </item>
+      <item> REQUIRED_FILES </item>
       <item> RESOURCE </item>
+      <item> RESOURCE_LOCK </item>
+      <item> RULE_LAUNCH_COMPILE </item>
+      <item> RULE_LAUNCH_CUSTOM </item>
+      <item> RULE_LAUNCH_LINK </item>
+      <item> RULE_MESSAGES </item>
       <item> RUNTIME_OUTPUT_DIRECTORY </item>
+      <item> RUNTIME_OUTPUT_NAME </item>
+      <item> RUN_SERIAL </item>
       <item> SKIP_BUILD_RPATH </item>
       <item> SOURCES </item>
       <item> SOVERSION </item>
       <item> STATIC_LIBRARY_FLAGS </item>
+      <item> STRINGS </item>
       <item> SUFFIX </item>
       <item> SYMBOLIC </item>
       <item> TARGET_ARCHIVES_MAY_BE_SHARED_LIBS </item>
@@ -458,14 +540,23 @@
       <item> TEST_INCLUDE_FILE </item>
       <item> TIMEOUT </item>
       <item> TYPE </item>
+      <item> USE_FOLDERS </item>
+      <item> VALUE </item>
       <item> VARIABLES </item>
       <item> VERSION </item>
+      <item> VS_DOTNET_REFERENCES </item>
+      <item> VS_GLOBAL_KEYWORD </item>
+      <item> VS_GLOBAL_PROJECT_TYPES </item>
       <item> VS_KEYWORD </item>
+      <item> VS_SCC_AUXPATH </item>
       <item> VS_SCC_LOCALPATH </item>
       <item> VS_SCC_PROJECTNAME </item>
       <item> VS_SCC_PROVIDER </item>
+      <item> VS_WINRT_EXTENSIONS </item>
+      <item> VS_WINRT_REFERENCES </item>
       <item> WILL_FAIL </item>
       <item> WIN32_EXECUTABLE </item>
+      <item> WORKING_DIRECTORY </item>
       <item> WRAP_EXCLUDE </item>
       <item> __CMAKE_DELETE_CACHE_CHANGE_VARS_ </item>
     </list>
@@ -484,36 +575,34 @@
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*BEGIN.*$" beginRegion="block" firstNonSpace="true"/>
         <RegExpr attribute="Region Marker" context="#stay" String="#\s*END.*$" endRegion="block" firstNonSpace="true"/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
+        <IncludeRules context="Detect Variables"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
         <RegExpr attribute="Macros" context="Macro Args" String="\w+\s*(?=\()"/>
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variables">
+        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
+        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="Command Args">
-        <DetectChar attribute="Normal Text" context="#pop" char=")"/>
-        <DetectChar attribute="Strings" context="String" char="&quot;"/>
         <keyword attribute="Special Args" context="#stay" String="special_args"/>
         <keyword attribute="Special Args" context="#stay" String="extra_special_args"/>
         <keyword attribute="Properties" context="#stay" String="properties"/>
         <keyword attribute="Properties" context="#stay" String="extra_properties"/>
-        <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
+        <IncludeRules context="Macro Args"/>
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="Macro Args">
         <DetectChar attribute="Normal Text" context="#pop" char=")"/>
+        <StringDetect attribute="Escapes" context="#stay" String="\&quot;"/>
         <DetectChar attribute="Strings" context="String" char="&quot;"/>
         <RegExpr attribute="Comment" context="#stay" String="#.*$"/>
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
+        <IncludeRules context="Detect Variables"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="Comment">
         <IncludeRules context="##Alerts" />
       </context>
       <context attribute="Strings" lineEndContext="#stay" name="String">
-        <DetectChar attribute="Strings" context="#pop" char="&quot;" />
+        <RegExpr attribute="Strings" context="#pop" String="&quot;(?=[ );]|$)" />
         <RegExpr attribute="Escapes" context="#stay" String="\\[&quot;$n\\]" />
-        <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*\w+\s*\}"/>
+        <IncludeRules context="Detect Variables"/>
-        <RegExpr attribute="CMake Variable" context="#stay" String="\$\{\s*\w+\s*\}"/>
       </context>
 
     </contexts>

share/qtcreator/generic-highlighter/css.xml

@@ -5,27 +5,17 @@
 
 Kate CSS syntax highlighting definition
 
-
 Changelog:
 
-    - Version 2.02, by Rafał Miłecki:
+- Version 2.06, by Mte90:
-        - Added CSS 3 properties "border-*-image" and "border-*-radius".
+- CSS3 tag
-        - Added CSS values "clip", "ellipsis" and "ellipsis-word".
-        - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset".
-        - Added CSS 3 color values: "rgba", "hsl" and "hsla".
-        - Added Gecko CSS properties: "-moz-border-*-colors".
-        - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-".
 
-    - Version 2.01, by Mathieu Bonnet:
+- Version 2.03, by Milian Wolff:
-        - Added CSS 3 property "border-radius".
+- Make it spelling aware
-        - Added Gecko CSS properties "-moz-border-radius" and "-moz-box-flex".
-        - Added Gecko CSS value "-moz-box".
-        - Added Trident CSS functional notation "expression".
-        - Extended the id and class syntax specifications, as per CSS 2.1 grammar.
 
 -->
 
-<language name="CSS" version="2.02" kateversion="2.4" section="Markup" extensions="*.css" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS" version="2.06" kateversion="2.4" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 	<highlighting>
 		<list name="properties">
@@ -33,9 +23,12 @@
 			<item> azimuth </item>
 			<item> background </item>
 			<item> background-attachment </item>
+			<item> background-break </item>
+			<item> background-clip </item>
 			<item> background-color </item>
 			<item> background-image </item>
 			<item> background-position </item>
+			<item> background-origin </item>
 			<item> background-repeat </item>
 			<item> border </item>
 			<item> border-bottom </item>
@@ -84,6 +77,7 @@
 			<item> font-style </item>
 			<item> font-variant </item>
 			<item> font-weight </item>
+			<item> font-stretch </item>
 			<item> height </item>
 			<item> left </item>
 			<item> letter-spacing </item>
@@ -155,11 +149,21 @@
 			<item> z-index </item>
 
 			<!-- CSS3 -->
+			<item> animation-name </item>
+			<item> animation-duration </item>
+			<item> animation-iteration </item>
+			<item> animation-direction </item>
+			<item> animation-delay </item>
+			<item> animation-play-state </item>
+			<item> animation-fill-mode </item>
+			<item> animation-timing-function </item>
+			<item> background-size </item>
 			<item> border-bottom-image </item>
 			<item> border-bottom-left-image </item>
 			<item> border-bottom-left-radius </item>
 			<item> border-bottom-right-image </item>
 			<item> border-bottom-right-radius </item>
+			<item> border-collapse </item>
 			<item> border-corner-image </item>
 			<item> border-image </item>
 			<item> border-left-image </item>
@@ -170,34 +174,158 @@
 			<item> border-top-left-radius </item>
 			<item> border-top-right-image </item>
 			<item> border-top-right-radius </item>
+			<item> box-align </item>
+			<item> box-direction </item>
+			<item> box-flex </item>
 			<item> box-shadow </item>
 			<item> box-sizing </item>
+			<item> column-count </item>
+			<item> column-fill </item>
+			<item> column-gap </item>
+			<item> column-rule-color </item>
+			<item> column-rule-style </item>
+			<item> column-rule-width </item>
+			<item> column-span </item>
+			<item> column-wisth </item>
+			<item> hyphens </item>
+			<item> linear-gradient </item>
 			<item> opacity </item>
+			<item> outline </item>
 			<item> outline-offset </item>
 			<item> overflow-x </item>
 			<item> overflow-y </item>
+			<item> pointer-events </item>
+			<item> resize </item>
+			<item> rotation </item>
+			<item> rotation-point </item>
+			<item> table-layout </item>
 			<item> text-overflow </item>
 			<item> text-shadow </item>
+			<item> text-wrap </item>
+			<item> transform-origin </item>
+			<item> transition </item>
+			<item> transition-property </item>
+			<item> transition-duration </item>
+			<item> word-wrap </item>
 
 			<!-- Gecko rendering engine CSS property extensions -->
+			<item> -moz-animation-name </item>
+			<item> -moz-animation-duration </item>
+			<item> -moz-animation-iteration </item>
+			<item> -moz-animation-direction </item>
+			<item> -moz-animation-delay </item>
+			<item> -moz-animation-play-state </item>
+			<item> -moz-animation-fill-mode </item>
+			<item> -moz-background-size </item>
+			<item> -moz-border-image </item>
 			<item> -moz-border-bottom-colors </item>
 			<item> -moz-border-left-colors </item>
 			<item> -moz-border-radius </item>
+			<item> -moz-border-radius-topleft </item>
+			<item> -moz-border-radius-topright </item>
+			<item> -moz-border-radius-bottomleft </item>
+			<item> -moz-border-radius-bottomright </item>
 			<item> -moz-border-right-colors </item>
 			<item> -moz-border-top-colors </item>
+			<item> -moz-box </item>
 			<item> -moz-box-flex </item>
+			<item> -moz-box-shadow </item>
+			<item> -moz-box-sizing </item>
+			<item> -moz-column-count </item>
+			<item> -moz-column-gap </item>
+			<item> -moz-hyphens </item>
+			<item> -moz-linear-gradient </item>
+			<item> -moz-opacity </item>
+			<item> -moz-outline-style </item>
+			<item> -moz-perspective </item>
+			<item> -moz-radial-gradient </item>
+			<item> -moz-resize </item>
+			<item> -moz-transform </item>
+			<item> -moz-transform-origin </item>
+			<item> -moz-transform-style </item>
+			<item> -moz-transition </item>
+			<item> -moz-transition-property </item>
+			<item> -moz-transition-duration </item>
 
 			<!-- Opera rendering engine CSS property extensions -->
 			<item> -o-background-size </item>
+			<item> -o-linear-gradient </item>
 			<item> -o-text-overflow </item>
+			<item> -o-transition </item>
+			<item> -o-transform-origin </item>
 
 			<!-- konq specific -->
-      <item> -khtml-background-size </item>
 			<item> konq_bgpos_x </item>
 			<item> konq_bgpos_y </item>
+			<item> -khtml-background-size </item>
+			<item> -khtml-border-top-left-radius </item>
+			<item> -khtml-border-top-right-radius </item>
+			<item> -khtml-border-bottom-left-radius </item>
+			<item> -khtml-border-bottom-right-radius </item>
+			<item> -khtml-border-radius </item>
+			<item> -khtml-box-shadow </item>
+			<item> -khtml-opacity </item>
 
 			<!-- Webkit rendering engine CSS property extensions -->
+			<item> -webkit-appearance </item>
+			<item> -webkit-animation-name </item>
+			<item> -webkit-animation-duration </item>
+			<item> -webkit-animation-iteration </item>
+			<item> -webkit-animation-direction </item>
+			<item> -webkit-animation-delay </item>
+			<item> -webkit-animation-play-state </item>
+			<item> -webkit-animation-fill-mode </item>
 			<item> -webkit-background-size </item>
+			<item> -webkit-border-image </item>
+			<item> -webkit-border-bottom-colors </item>
+			<item> -webkit-border-left-colors </item>
+			<item> -webkit-border-radius </item>
+			<item> -webkit-border-right-colors </item>
+			<item> -webkit-border-top-colors </item>
+			<item> -webkit-border-top-left-radius </item>
+			<item> -webkit-border-top-right-radius </item>
+			<item> -webkit-border-bottom-left-radius </item>
+			<item> -webkit-border-bottom-right-radius </item>
+			<item> -webkit-border-radius-bottomleft </item>
+			<item> -webkit-border-radius-bottomright </item>
+			<item> -webkit-box-flex </item>
+			<item> -webkit-box-reflect</item>
+			<item> -webkit-box-shadow </item>
+			<item> -webkit-box-sizing </item>
+			<item> -webkit-column-count </item>
+			<item> -webkit-column-gap </item>
+			<item> -webkit-hyphens </item>
+			<item> -webkit-linear-gradient </item>
+			<item> -webkit-gradient </item>
+			<item> -webkit-perspective </item>
+			<item> -webkit-text-fill-color </item>
+			<item> -webkit-text-stroke-color </item>
+			<item> -webkit-text-stroke-width </item>
+			<item> -webkit-text-size-adjust </item>
+			<item> -webkit-transform </item>
+			<item> -webkit-transform-origin </item>
+			<item> -webkit-transform-style </item>
+			<item> -webkit-transition </item>
+			<item> -webkit-transition-property </item>
+			<item> -webkit-transition-duration </item>
+
+			<!-- Trident (a.k.a., MSHTML) CSS property extensions -->
+			<item> filter </item>
+			<item> zoom </item>
+			<item> -ms-animation-name </item>
+			<item> -ms-animation-duration </item>
+			<item> -ms-animation-iteration </item>
+			<item> -ms-animation-direction </item>
+			<item> -ms-animation-delay </item>
+			<item> -ms-animation-play-state </item>
+			<item> -ms-animation-fill-mode </item>
+			<item> -ms-box-sizing </item>
+			<item> -ms-filter </item>
+			<item> -ms-interpolation-mode </item>
+			<item> -ms-linear-gradient </item>
+			<item> -ms-text-size-adjust </item>
+			<item> -ms-transform </item>
+			<item> -ms-transition </item>
 
 			<!-- font properties in @font-face -->
 			<item> font-family </item>
@@ -413,10 +541,7 @@
 			<item> monospace </item>
 			<item> border-box </item>
 			<item> content-box </item>
-      
+			<item> -epub-hyphens </item>
-      <!-- Gecko rendering engine CSS value extensions -->
-      <item> -moz-box </item>      
-      
 		</list>
 
 
@@ -424,6 +549,7 @@
 			<item> aqua </item>
 			<item> black </item>
 			<item> blue </item>
+			<item> cyan </item>
 			<item> fuchsia </item>
 			<item> gray </item>
 			<item> green </item>
@@ -557,7 +683,7 @@
 
 			<!-- finds arguments to properties -->
 			<context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
-	<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" />
+				<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b" />
 				<RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
 				<RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
 			</context>
@@ -672,22 +798,22 @@
 
 			</contexts>
 			<itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+				<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
-      <itemData name="Property"  defStyleNum="dsKeyword"/>
+				<itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
-      <itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1"/>
+				<itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
-      <itemData name="Media"  defStyleNum="dsDecVal" bold="1"/>
+				<itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
-      <itemData name="At Rule"  defStyleNum="dsDecVal" />
+				<itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
 				<itemData name="String"  defStyleNum="dsString"/>
-      <itemData name="Value"  defStyleNum="dsDataType" />
+				<itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
-      <itemData name="Important" defStyleNum="dsKeyword" />
+				<itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
-      <itemData name="Selector Attr" defStyleNum="dsChar" />
+				<itemData name="Selector Attr" defStyleNum="dsChar" spellChecking="false"/>
-      <itemData name="Selector Id"  defStyleNum="dsFloat" bold="1"/>
+				<itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
-      <itemData name="Selector Class"  defStyleNum="dsFloat" />
+				<itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
-      <itemData name="Selector Pseudo"  defStyleNum="dsDecVal" />
+				<itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
 				<itemData name="Comment" defStyleNum="dsComment" />
-      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
+				<itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
-      <itemData name="Alert" defStyleNum="dsAlert"/>
+				<itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
-      <itemData name="Error" defStyleNum="dsError"/>
+				<itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
 			</itemDatas>
 		</highlighting>
 		<general>

share/qtcreator/generic-highlighter/doxygen.xml

@@ -8,6 +8,7 @@
 
   Copyright 2004 Dominik Haumann (dhdev@gmx.de)
   Copyright 2007 Matthew Woehlke (mw_triad@users.sourceforge.net)
+  Copyright 2009-2012 Alex Turbov (I.zaufi@gmail.com)
 
  **********************************************************************
  * This library is free software; you can redistribute it and/or      *
@@ -26,270 +27,216 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language name="Doxygen" version="1.30" kateversion="2.4" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="9">
-  <highlighting>
-    <!-- note: all tags may begin with a \ or @ char
-         so if you add/change tags you have to do it twice -->
-    <list name="TagOnly">
-      <item> \arg </item>
-      <item> \attention </item>
-      <item> \author </item>
-      <item> \callgraph </item>
-      <item> \code </item>
-      <item> \dot </item>
-      <item> \else </item>
-      <item> \endcode </item>
-      <item> \endcond </item>
-      <item> \enddot </item>
-      <item> \endhtmlonly </item>
-      <item> \endif </item>
-      <item> \endlatexonly </item>
-      <item> \endlink </item>
-      <item> \endmanonly </item>
-      <item> \endverbatim </item>
-      <item> \endxmlonly </item>
-      <item> \f[ </item>
-      <item> \f] </item>
-      <item> \f$ </item>
-      <item> \hideinitializer </item>
-      <item> \htmlonly </item>
-      <item> \interface </item>
-      <item> \internal </item>
-      <item> \invariant </item>
-      <item> \~ </item>
-      <item> \@ </item>
-      <item> \$ </item>
-      <item> \\ </item>
-      <item> \# </item>
-      <item> \latexonly </item>
-      <item> \li </item>
-      <item> \manonly </item>
-      <item> \n </item>
-      <item> \nosubgrouping </item>
-      <item> \note </item>
-      <item> \only </item>
-      <item> \post </item>
-      <item> \pre </item>
-      <item> \remarks </item>
-      <item> \return </item>
-      <item> \returns </item>
-      <item> \sa </item>
-      <item> \see </item>
-      <item> \showinitializer </item>
-      <item> \since </item>
-      <item> \test </item>
-      <item> \todo </item>
-      <item> \verbatim </item>
-      <item> \warning </item>
-      <item> \xmlonly </item>
 
-      <item> @arg </item>
+<language name="Doxygen"
-      <item> @attention </item>
+          version="1.33"
-      <item> @author </item>
+          kateversion="2.4"
-      <item> @callgraph </item>
+          section="Markup"
-      <item> @code </item>
+          extensions="*.dox;*.doxygen"
-      <item> @dot </item>
+          mimetype="text/x-doxygen"
-      <item> @else </item>
+          author="Dominik Haumann (dhdev@gmx.de)"
-      <item> @endcode </item>
+          license="LGPL"
-      <item> @endcond </item>
+          priority="9">
-      <item> @enddot </item>
+  <highlighting>
-      <item> @endhtmlonly </item>
+    <!-- NOTE: all tags may begin with a \ or @ char
-      <item> @endif </item>
+         so if you add/change tags you have to do it twice -->
-      <item> @endlatexonly </item>
+    <!-- NOTE: Tags @code/@endcode, @dot/@enddot, @vermatim/@endverbatim, @msc/@endmsc, @f[/@f]
-      <item> @endlink </item>
+         do not present in keywords due separate handle rules...
-      <item> @endmanonly </item>
+    -->
-      <item> @endverbatim </item>
+    <list name="TagOnly">
-      <item> @endxmlonly </item>
+      <item> \arg </item>              <item> @arg </item>
-      <item> @f[ </item>
+      <item> \author </item>           <item> @author </item>
-      <item> @f] </item>
+      <item> \authors </item>          <item> @authors </item>
-      <item> @f$ </item>
+      <item> \brief </item>            <item> @brief </item>
-      <item> @hideinitializer </item>
+      <item> \bug </item>              <item> @bug </item>
-      <item> @htmlonly </item>
+      <item> \callgraph </item>        <item> @callgraph </item>
-      <item> @interface </item>
+      <item> \callergraph </item>      <item> @callergraph </item>
-      <item> @internal </item>
+      <item> \date </item>             <item> @date </item>
-      <item> @invariant </item>
+      <item> \deprecated </item>       <item> @deprecated </item>
-      <item> @~ </item>
+      <item> \details </item>          <item> @details </item>
-      <item> @@ </item>
+      <item> \else </item>             <item> @else </item>
-      <item> @$ </item>
+      <item> \endcond </item>          <item> @endcond </item>
-      <item> @\ </item>
+      <item> \endhtmlonly </item>      <item> @endhtmlonly </item>
-      <item> @# </item>
+      <item> \endif </item>            <item> @endif </item>
-      <item> @latexonly </item>
+      <item> \enditernal </item>       <item> @enditernal </item>
-      <item> @li </item>
+      <item> \endlatexonly </item>     <item> @endlatexonly </item>
-      <item> @manonly </item>
+      <item> \endlink </item>          <item> @endlink </item>
-      <item> @n </item>
+      <item> \endmanonly </item>       <item> @endmanonly </item>
-      <item> @nosubgrouping </item>
+      <item> \endrtfonly </item>       <item> @endrtfonly </item>
-      <item> @note </item>
+      <item> \endxmlonly </item>       <item> @endxmlonly </item>
-      <item> @only </item>
+      <item> \f[ </item>               <item> @f[ </item>
-      <item> @post </item>
+      <item> \f] </item>               <item> @f] </item>
-      <item> @pre </item>
+      <item> \f$ </item>               <item> @f$ </item>
-      <item> @remarks </item>
+      <!-- TODO Add @f{environment}{ and @f} -->
-      <item> @return </item>
+      <item> \hideinitializer </item>  <item> @hideinitializer </item>
-      <item> @returns </item>
+      <item> \htmlonly </item>         <item> @htmlonly </item>
-      <item> @sa </item>
+      <!-- TODO @internal is a candidate to be handled separately, cuz may introduce folding region -->
-      <item> @see </item>
+      <item> \internal </item>         <item> @internal </item>
-      <item> @showinitializer </item>
+      <item> \invariant </item>        <item> @invariant </item>
-      <item> @since </item>
+      <item> \latexonly </item>        <item> @latexonly </item>
-      <item> @test </item>
+      <item> \li </item>               <item> @li </item>
-      <item> @todo </item>
+      <item> \manonly </item>          <item> @manonly </item>
-      <item> @verbatim </item>
+      <item> \n </item>                <item> @n </item>
-      <item> @warning </item>
+      <item> \nosubgrouping </item>    <item> @nosubgrouping </item>
-      <item> @xmlonly </item>
+      <item> \only </item>             <item> @only </item>
+      <item> \post </item>             <item> @post </item>
+      <item> \pre </item>              <item> @pre </item>
+      <item> \private </item>          <item> @pivate </item>
+      <item> \privatesection </item>   <item> @pivatesection </item>
+      <item> \protected </item>        <item> @protected </item>
+      <item> \protectedsection </item> <item> @protectedsection </item>
+      <item> \public </item>           <item> @public </item>
+      <item> \publicsection </item>    <item> @publicsection </item>
+      <item> \remarks </item>          <item> @remarks </item>
+      <item> \return </item>           <item> @return </item>
+      <item> \returns </item>          <item> @returns </item>
+      <item> \result </item>           <item> @result </item>
+      <item> \rtfonly </item>          <item> @rtfonly </item>
+      <item> \sa </item>               <item> @sa </item>
+      <item> \see </item>              <item> @see </item>
+      <item> \short </item>            <item> @short </item>
+      <item> \showinitializer </item>  <item> @showinitializer </item>
+      <item> \since </item>            <item> @since </item>
+      <item> \tableofcontents </item>  <item> @tableofcontents </item>
+      <item> \test </item>             <item> @test </item>
+      <item> \version </item>          <item> @version </item>
+      <item> \xmlonly </item>          <item> @xmlonly </item>
+      <!-- TODO Introduce separate context for @~ ? -->
+      <item> \# </item>                <item> @# </item>
+      <item> \$ </item>                <item> @$ </item>
+      <item> \% </item>                <item> @% </item>
+      <item> \&amp; </item>            <item> @&amp; </item>
+      <item> \&gt; </item>             <item> @&gt; </item>
+      <item> \&lt; </item>             <item> @&lt; </item>
+      <item> \&quot; </item>           <item> @&quot; </item>
+      <item> \:: </item>               <item> @:: </item>
+      <item> \@ </item>                <item> @@ </item>
+      <item> \\ </item>                <item> @\ </item>
+      <item> \~ </item>                <item> @~ </item>
     </list>
 
     <list name="TagWord">
-      <item> \addtogroup </item>
+      <item> \a </item>                <item> @a </item>
-      <item> \a </item>
+      <item> \anchor </item>           <item> @anchor </item>
-      <item> \anchor </item>
+      <item> \b </item>                <item> @b </item>
-      <item> \b </item>
+      <item> \c </item>                <item> @c </item>
-      <item> \c </item>
+      <item> \cond </item>             <item> @cond </item>
-      <item> \class </item>
+      <item> \copybrief </item>        <item> @copybrief </item>
-      <item> \cond </item>
+      <item> \copydetails </item>      <item> @copydetails </item>
-      <item> \copydoc </item>
+      <item> \copydoc </item>          <item> @copydoc </item>
-      <item> \def </item>
+      <item> \def </item>              <item> @def </item>
-      <item> \dontinclude </item>
+      <item> \dir </item>              <item> @dir </item>
-      <item> \dotfile </item>
+      <item> \dontinclude </item>      <item> @dontinclude </item>
-      <item> \e </item>
+      <item> \e </item>                <item> @e </item>
-      <item> \elseif </item>
+      <item> \elseif </item>           <item> @elseif </item>
-      <item> \em </item>
+      <item> \em </item>               <item> @em </item>
-      <item> \enum </item>
+      <item> \enum </item>             <item> @enum </item>
-      <item> \example </item>
+      <item> \example </item>          <item> @example </item>
-      <item> \exception </item>
+      <item> \exception </item>        <item> @exception </item>
-      <item> \exceptions </item>
+      <item> \exceptions </item>       <item> @exceptions </item>
-      <item> \file </item>
+      <item> \extends </item>          <item> @extends </item>
-      <item> \htmlinclude </item>
+      <item> \file </item>             <item> @file </item>
-      <item> \if </item>
+      <item> \htmlinclude </item>      <item> @htmlinclude </item>
-      <item> \ifnot </item>
+      <item> \if </item>               <item> @if </item>
-      <item> \include </item>
+      <item> \ifnot </item>            <item> @ifnot </item>
-      <item> \link </item>
+      <item> \implements </item>       <item> @implements </item>
-      <item> \namespace </item>
+      <item> \include </item>          <item> @include </item>
-      <item> \p </item>
+      <item> \includelineno </item>    <item> @includelineno </item>
-      <item> \package </item>
+      <item> \link </item>             <item> @link </item>
-      <item> \ref </item>
+      <item> \memberof </item>         <item> @memberof </item>
-      <item> \relatesalso </item>
+      <item> \namespace </item>        <item> @namespace </item>
-      <item> \relates </item>
+      <item> \p </item>                <item> @p </item>
-      <item> \retval </item>
+      <item> \package </item>          <item> @package </item>
-      <item> \throw </item>
+      <item> \property </item>         <item> @property </item>
-      <item> \throws </item>
+      <item> \relatedalso </item>      <item> @relatedalso </item>
-      <item> \verbinclude </item>
+      <item> \relatesalso </item>      <item> @relatesalso </item>
-      <item> \version </item>
+      <item> \related </item>          <item> @related </item>
-      <item> \xrefitem </item>
+      <item> \relates </item>          <item> @relates </item>
-
+      <item> \retval </item>           <item> @retval </item>
-      <item> @addtogroup </item>
+      <item> \throw </item>            <item> @throw </item>
-      <item> @a </item>
+      <item> \throws </item>           <item> @throws </item>
-      <item> @anchor </item>
+      <item> \verbinclude </item>      <item> @verbinclude </item>
-      <item> @b </item>
+      <item> \version </item>          <item> @version </item>
-      <item> @c </item>
+      <!-- TODO Introduce separate context for @xrefitem? -->
-      <item> @class </item>
+      <item> \xrefitem </item>         <item> @xrefitem </item>
-      <item> @cond </item>
-      <item> @copydoc </item>
-      <item> @def </item>
-      <item> @dontinclude </item>
-      <item> @dotfile </item>
-      <item> @e </item>
-      <item> @elseif </item>
-      <item> @em </item>
-      <item> @enum </item>
-      <item> @example </item>
-      <item> @exception </item>
-      <item> @exceptions </item>
-      <item> @file </item>
-      <item> @htmlinclude </item>
-      <item> @if </item>
-      <item> @ifnot </item>
-      <item> @include </item>
-      <item> @link </item>
-      <item> @namespace </item>
-      <item> @p </item>
-      <item> @package </item>
-      <item> @ref </item>
-      <item> @relatesalso </item>
-      <item> @relates </item>
-      <item> @retval </item>
-      <item> @throw </item>
-      <item> @throws </item>
-      <item> @verbinclude </item>
-      <item> @version </item>
-      <item> @xrefitem </item>
     </list>
     <list name="TagParam">
-      <item> \param </item>
+      <item> \param </item>            <item> @param </item>
-      <item> \tparam </item>
+      <!-- TODO @tparam has no optional direction actually! -->
-
+      <item> \tparam </item>           <item> @tparam </item>
-      <item> @param </item>
-      <item> @tparam </item>
     </list>
+    <!-- TODO Better (separate?) highlighting for @image required -->
     <list name="TagWordWord">
-      <item> \image </item>
+      <item> \image </item>            <item> @image </item>
-
-      <item> @image </item>
     </list>
+      <!-- TODO @union, @struct, @protocol, @interface, @class, @category
+           actually takes 3 params, 1 mandatory and 2 optional
+        -->
+      <!-- TODO @headerfile actually takes 2 params, where last one is optional -->
     <list name="TagWordString">
-      <item> \defgroup </item>
+      <item> \addtogroup </item>       <item> @addtogroup </item>
-      <item> \page </item>
+      <item> \category </item>         <item> @category </item>
-      <item> \paragraph </item>
+      <item> \class </item>            <item> @class </item>
-      <item> \section </item>
+      <item> \dotfile </item>          <item> @dotfile </item>
-      <item> \struct </item>
+      <item> \defgroup </item>         <item> @defgroup </item>
-      <item> \subsection </item>
+      <item> \interface </item>        <item> @interface </item>
-      <item> \subsubsection </item>
+      <item> \headerfile </item>       <item> @headerfile </item>
-      <item> \union </item>
+      <item> \mscfile </item>          <item> @mscfile </item>
-      <item> \weakgroup </item>
+      <item> \page </item>             <item> @page </item>
-
+      <item> \paragraph </item>        <item> @paragraph </item>
-      <item> @defgroup </item>
+      <item> \protocol </item>         <item> @prtocol </item>
-      <item> @page </item>
+      <item> \ref </item>              <item> @ref </item>
-      <item> @paragraph </item>
+      <item> \section </item>          <item> @section </item>
-      <item> @section </item>
+      <item> \snippet </item>          <item> @snippet </item>
-      <item> @struct </item>
+      <item> \struct </item>           <item> @struct </item>
-      <item> @subsection </item>
+      <item> \subpage </item>          <item> @subpage </item>
-      <item> @subsubsection </item>
+      <item> \subsection </item>       <item> @subsection </item>
-      <item> @union </item>
+      <item> \subsubsection </item>    <item> @subsubsection </item>
-      <item> @weakgroup </item>
+      <item> \union </item>            <item> @union </item>
+      <item> \weakgroup </item>        <item> @weakgroup </item>
     </list>
     <list name="TagString">
-      <item> \addindex </item>
+      <item> \addindex </item>         <item> @addindex </item>
-      <item> \brief </item>
+      <item> \copyright </item>        <item> @copyright </item>
-      <item> \bug </item>
+      <item> \fn </item>               <item> @fn </item>
-      <item> \date </item>
+      <item> \ingroup </item>          <item> @ingroup </item>
-      <item> \deprecated </item>
+      <item> \line </item>             <item> @line </item>
-      <item> \fn </item>
+      <item> \mainpage </item>         <item> @mainpage </item>
-      <item> \ingroup </item>
+      <item> \name </item>             <item> @name </item>
-      <item> \line </item>
+      <item> \overload </item>         <item> @overload </item>
-      <item> \mainpage </item>
+      <item> \par </item>              <item> @par </item>
-      <item> \name </item>
+      <item> \skip </item>             <item> @skip </item>
-      <item> \overload </item>
+      <item> \skipline </item>         <item> @skipline </item>
-      <item> \par </item>
+      <item> \typedef </item>          <item> @typedef </item>
-      <item> \short </item>
+      <item> \until </item>            <item> @until </item>
-      <item> \skip </item>
+      <item> \var </item>              <item> @var </item>
-      <item> \skipline </item>
-      <item> \typedef </item>
-      <item> \until </item>
-      <item> \var </item>
-
-      <item> @addindex </item>
-      <item> @brief </item>
-      <item> @bug </item>
-      <item> @date </item>
-      <item> @deprecated </item>
-      <item> @fn </item>
-      <item> @ingroup </item>
-      <item> @line </item>
-      <item> @mainpage </item>
-      <item> @name </item>
-      <item> @overload </item>
-      <item> @par </item>
-      <item> @short </item>
-      <item> @skip </item>
-      <item> @skipline </item>
-      <item> @typedef </item>
-      <item> @until </item>
-      <item> @var </item>
     </list>
+    <list name="Note">
+      <item> \note </item>             <item> @note </item>
+    </list>
+    <list name="Warning">
+      <item> \warning </item>          <item> @warning </item>
+    </list>
+    <list name="Attention">
+      <item> \attention </item>        <item> @attention </item>
+    </list>
+    <list name="Todo">
+      <item> \todo </item>             <item> @todo </item>
+    </list>
+
     <contexts>
-    <!-- different formats:
+    <!--
+      Different types of recognized command formats:
+      (w/ params specified according doxygen manual (http://www.stack.nl/~dimitri/doxygen/commands.html))
+
       @tag                       : TagOnly
-      @tag rest_of_line        : TagString
       @tag <word>                : TagWord
+      @tag (rest_of_line)        : TagString
+      @tag {paragraph}           : TagOnly
       @tag <word> <word>         : TagWordWord
-      @tag <word> rest_of_line : TagWordString
+      @tag <word> (rest_of_line) : TagWordString
+
+      TODO Not all commands are handled properly nowadays :( Need few more contexts...
     -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <RegExpr attribute="Comment" context="LineComment" String="//(!|(/(?=[^/]|$)))&lt;?" />
@@ -303,12 +250,14 @@
         <LineContinue attribute="Comment" context="#stay" />
         <DetectSpaces />
         <IncludeRules context="##Alerts" />
+        <IncludeRules context="SL_DetectEnv" />
         <keyword attribute="Tags" context="#stay" String="TagOnly" />
         <keyword attribute="Tags" context="SL_TagWord" String="TagWord" />
         <keyword attribute="Tags" context="SL_TagParam" String="TagParam" />
         <keyword attribute="Tags" context="SL_TagWordWord" String="TagWordWord" />
         <keyword attribute="Tags" context="SL_TagString" String="TagString" />
         <keyword attribute="Tags" context="SL_TagWordString" String="TagWordString" />
+        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\][^@\\ \t]+" />
         <DetectIdentifier />
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
@@ -320,12 +269,14 @@
         <IncludeRules context="##Alerts" />
         <Detect2Chars attribute="Region" context="#stay" char="@" char1="{" />
         <Detect2Chars attribute="Region" context="#stay" char="@" char1="}" />
+        <IncludeRules context="SL_DetectEnv" />
         <keyword attribute="Tags" context="#stay" String="TagOnly" />
         <keyword attribute="Tags" context="ML_TagWord" String="TagWord" />
         <keyword attribute="Tags" context="ML_TagParam" String="TagParam" />
         <keyword attribute="Tags" context="ML_TagWordWord" String="TagWordWord" />
         <keyword attribute="Tags" context="ML_TagString" String="TagString" />
         <keyword attribute="Tags" context="ML_TagWordString" String="TagWordString" />
+        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\][^@\\ \t]+" />
         <DetectIdentifier />
         <RegExpr attribute="Tags" context="#stay" String="\\(&lt;|&gt;)" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
@@ -334,7 +285,12 @@
       </context>
 
       <!-- NOTE: all contexts beginning with ML_ are for multiline comments
-     The following contexts contain a Detect2Chars that looks for a */ sequence to end multiline comments. Singleline comments do not have this limitation - that's why all contexts are copy&pasted and the line <Detect2Chars ... */> is removed. <IncludeRules context="acontext"> could be used instead but it would make context switching much more complex and very hard to understand! (But use IncludeRules where the rules don't refer to another SL_*/ML_* context, to help maintainability.)
+                 The following contexts contain a Detect2Chars that looks for a */ sequence
+                 to end multiline comments. Singleline comments do not have this limitation -
+                 that's why all contexts are copy&pasted and the line <Detect2Chars ... */> is removed.
+                 <IncludeRules context="acontext"> could be used instead but it would make context switching
+                 much more complex and very hard to understand! (But use IncludeRules where the rules don't
+                 refer to another SL_*/ML_* context, to help maintainability.)
       -->
       <!-- tag contexts -->
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWord">
@@ -463,21 +419,79 @@
         <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
       </context>
 
+      <context attribute="Comment" name="SL_DetectEnv" lineEndContext="#pop">
+        <RegExpr attribute="Tags" context="Code" String="[@\\]code\b" beginRegion="Code" />
+        <RegExpr attribute="Tags" context="Verbatim" String="[@\\]verbatim\b" beginRegion="Verbatim" />
+        <RegExpr attribute="Tags" context="Formula" String="[@\\]f\[" beginRegion="Formula" />
+        <RegExpr attribute="Tags" context="Msc" String="[@\\]msc\b" beginRegion="Msc" />
+        <RegExpr attribute="Tags" context="Dot" String="[@\\]dot\b" beginRegion="Dot" />
+        <keyword attribute="Note" context="#stay" String="Note" />
+        <keyword attribute="Warning" context="#stay" String="Warning" />
+        <keyword attribute="Attention" context="#stay" String="Attention" />
+        <keyword attribute="Todo" context="#stay" String="Todo" />
+        <RegExpr attribute="Entities" context="#stay" String="&amp;[A-Za-z]+&#59;" />
+      </context>
+
+      <context attribute="Comment" name="SL_DetectComment" lineEndContext="#pop">
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
+        <DetectChar attribute="Comment" context="#stay" char="*" />
+        <StringDetect attribute="Comment" context="#stay" String="///" />
+      </context>
+
+      <context attribute="Code" lineEndContext="#stay" name="Code">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]endcode\b" endRegion="Code" />
+      </context>
+
+      <context attribute="Verbatim" lineEndContext="#stay" name="Verbatim">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]endverbatim\b" endRegion="Verbatim" />
+      </context>
+
+      <context attribute="Formulas" lineEndContext="#stay" name="Formula">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]f\]" endRegion="Formula" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
+      </context>
+
+      <context attribute="Message Sequence Chart" lineEndContext="#stay" name="Msc">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]endmsc\b" endRegion="Msc" />
+      </context>
+
+      <context attribute="Dot Graph" lineEndContext="#stay" name="Dot">
+        <IncludeRules context="SL_DetectComment" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\]enddot\b" endRegion="Dot" />
+      </context>
+
   </contexts>
     <itemDatas>
       <itemData name="Normal Text"  defStyleNum="dsNormal" />
-      <itemData name="Tags"        defStyleNum="dsKeyword" color="#ca60ca" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="Tags"         defStyleNum="dsKeyword" color="#ca60ca" bold="1" italic="0" />
-      <itemData name="Word"        defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="Custom Tags"   defStyleNum="dsNormal"  color="#458C61" bold="1" italic="0" />
-      <itemData name="HTML Tag"    defStyleNum="dsKeyword" color="#000000" selColor="#ffffff" bold="1" italic="0" />
+      <itemData name="Word"         defStyleNum="dsKeyword" color="#0095ff" bold="1" italic="0" />
+      <itemData name="HTML Tag"     defStyleNum="dsKeyword" color="#000000" bold="1" italic="0" />
+      <itemData name="Entities"     defStyleNum="dsOthers" color="#4086C0" bold="1" italic="1" />
       <itemData name="Description"  defStyleNum="dsString"  color="#ff0000" />
-      <itemData name="Comment"     defStyleNum="dsComment" color="#0000ff" selColor="#ffffff" italic="1" />
+      <itemData name="Comment"      defStyleNum="dsComment" />
       <itemData name="Region"       defStyleNum="dsRegionMarker" />
       <itemData name="Identifier"   defStyleNum="dsOthers" />
       <itemData name="HTML Comment" defStyleNum="dsComment" />
       <itemData name="Types"        defStyleNum="dsDataType" />
+      <itemData name="Code"         defStyleNum="dsComment" />
+      <itemData name="Dot Graph"    defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Formulas"     defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Message Sequence Chart" defStyleNum="dsComment" color="#00A000" selColor="#ffffff" italic="1" />
+      <itemData name="Verbatim"     defStyleNum="dsComment" />
+      <itemData name="Note"         defStyleNum="dsKeyword" color="#81ca2d" selColor="#81ca2d" bold="1" italic="0" />
+      <itemData name="Warning"      defStyleNum="dsKeyword" color="#ca9219" selColor="#ca9219" bold="1" italic="0" />
+      <itemData name="Attention"    defStyleNum="dsKeyword" color="#e85848" selColor="#e85848" bold="1" italic="0" />
+      <itemData name="Todo"         defStyleNum="dsKeyword" color="#ca60ca" selColor="#ffffff" bold="1" italic="0" />
     </itemDatas>
   </highlighting>
   <general>
     <keywords casesensitive="0" weakDeliminator="\$~" />
   </general>
 </language>
+<!-- kate: indent-width 2; -->

share/qtcreator/generic-highlighter/dtd.xml

@@ -49,11 +49,11 @@
         <DetectIdentifier />
       </context>
 
-      <context name="PI" attribute="Normal" lineEndContext="#stay">
+      <context name="PI" attribute="Other" lineEndContext="#stay">
         <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
       </context>
 
-      <context name="Declaration" attribute="Normal" lineEndContext="#stay">
+      <context name="Declaration" attribute="Other" lineEndContext="#stay">
         <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
         <Detect2Chars attribute="Comment" context="InlineComment" char="-" char1="-" />
         <DetectChar attribute="Declaration" context="#pop" char="&gt;" endRegion="declaration" />
@@ -85,16 +85,17 @@
 
     <itemDatas>
       <itemData name="Normal" defStyleNum="dsNormal" />
+      <itemData name="Other" defStyleNum="dsNormal" />
       <itemData name="Comment" defStyleNum="dsComment" />
-      <itemData name="Processing Instruction" defStyleNum="dsKeyword" />
+      <itemData name="Processing Instruction" defStyleNum="dsKeyword" spellChecking="false" />
-      <itemData name="Declaration" defStyleNum="dsDataType" bold="1" />
+      <itemData name="Declaration" defStyleNum="dsDataType" bold="1" spellChecking="false" />
-      <itemData name="Name" defStyleNum="dsFunction" />
+      <itemData name="Name" defStyleNum="dsFunction" spellChecking="false" />
-      <itemData name="Delimiter" defStyleNum="dsDecVal" />
+      <itemData name="Delimiter" defStyleNum="dsDecVal" spellChecking="false" />
-      <itemData name="Symbol" defStyleNum="dsFloat" bold="1" />
+      <itemData name="Symbol" defStyleNum="dsFloat" bold="1" spellChecking="false" />
-      <itemData name="Keyword" defStyleNum="dsKeyword" />
+      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false" />
-      <itemData name="String" defStyleNum="dsString" />
+      <itemData name="String" defStyleNum="dsString" spellChecking="false" />
-      <itemData name="Entity" defStyleNum="dsDecVal" />
+      <itemData name="Entity" defStyleNum="dsDecVal" spellChecking="false" />
-      <itemData name="Local" defStyleNum="dsDecVal" bold="1" />
+      <itemData name="Local" defStyleNum="dsDecVal" bold="1" spellChecking="false" />
     </itemDatas>
   </highlighting>
 

share/qtcreator/generic-highlighter/html.xml

@@ -39,24 +39,24 @@
     <IncludeRules context="FindEntityRefs" />
   </context>
 
-  <context name="FindEntityRefs" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
   </context>
 
-  <context name="FindPEntityRefs" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindPEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <RegExpr attribute="PEntityRef" context="#stay" String="%&name;;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;%" />
   </context>
 
-  <context name="FindAttributes" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindAttributes" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Attribute" context="#stay" String="&name;" column="0"/>
     <RegExpr attribute="Attribute" context="#stay" String="\s+&name;" />
     <DetectChar attribute="Attribute" context="Value" char="=" />
   </context>
 
-  <context name="FindDTDRules" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindDTDRules" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
   </context>
 
@@ -69,23 +69,23 @@
     <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+" />
   </context>
 
-  <context name="CDATA" attribute="Normal Text" lineEndContext="#stay">
+  <context name="CDATA" attribute="Other Text" lineEndContext="#stay">
     <DetectSpaces/>
     <DetectIdentifier/>
     <StringDetect attribute="CDATA" context="#pop" String="]]&gt;" endRegion="cdata" />
     <StringDetect attribute="EntityRef" context="#stay" String="]]&amp;gt;" />
   </context>
 
-  <context name="PI" attribute="Normal Text" lineEndContext="#stay">
+  <context name="PI" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
   </context>
 
-  <context name="Doctype" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" endRegion="doctype" />
     <DetectChar attribute="Doctype" context="Doctype Internal Subset" char="[" beginRegion="int_subset" />
   </context>
 
-  <context name="Doctype Internal Subset" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype Internal Subset" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
     <IncludeRules context="FindDTDRules" />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
@@ -93,7 +93,7 @@
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
-  <context name="Doctype Markupdecl" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype Markupdecl" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl SQ" char="&apos;" />
@@ -109,48 +109,48 @@
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
-  <context name="El Open" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El Open" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" />
     <DetectChar attribute="Element" context="#pop" char="&gt;" />
     <IncludeRules context="FindAttributes" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="El Close" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El Close" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop" char="&gt;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="El Close 2" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El Close 2" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop#pop#pop" char="&gt;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="El Close 3" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El Close 3" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop#pop#pop#pop" char="&gt;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="CSS" attribute="Normal Text" lineEndContext="#stay">
+  <context name="CSS" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="style" />
     <DetectChar attribute="Element" context="CSS content" char="&gt;" />
     <IncludeRules context="FindAttributes" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="CSS content" attribute="Normal Text" lineEndContext="#stay">
+  <context name="CSS content" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
     <IncludeRules context="##CSS" includeAttrib="true"/>
   </context>
 
-  <context name="JS" attribute="Normal Text" lineEndContext="#stay">
+  <context name="JS" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="script" />
     <DetectChar attribute="Element" context="JS content" char="&gt;" />
     <IncludeRules context="FindAttributes" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="JS content" attribute="Normal Text" lineEndContext="#stay">
+  <context name="JS content" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
     <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
     <IncludeRules context="##JavaScript" includeAttrib="true"/>
@@ -161,13 +161,13 @@
     <IncludeRules context="##Alerts" />
   </context>
 
-  <context name="Value" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="Value NQ">
+  <context name="Value" attribute="Other Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="Value NQ">
     <DetectChar attribute="Value" context="Value DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Value SQ" char="&apos;" />
     <DetectSpaces />
   </context>
 
-  <context name="Value NQ" attribute="Normal Text" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
+  <context name="Value NQ" attribute="Other Text" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
     <IncludeRules context="FindEntityRefs" />
     <RegExpr attribute="Value" context="#stay" String="/(?!&gt;)" />
     <RegExpr attribute="Value" context="#stay" String="[^/&gt;&lt;&quot;&apos;\s]" />
@@ -186,16 +186,17 @@
 </contexts>
 <itemDatas>
   <itemData name="Normal Text" defStyleNum="dsNormal" />
+  <itemData name="Other Text" defStyleNum="dsNormal" spellChecking="false" />
   <itemData name="Comment" defStyleNum="dsComment" />
-  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" />
+  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" spellChecking="false" />
-  <itemData name="Processing Instruction" defStyleNum="dsKeyword" />
+  <itemData name="Processing Instruction" defStyleNum="dsKeyword" spellChecking="false" />
-  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
+  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
-  <itemData name="Element" defStyleNum="dsKeyword" />
+  <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
-  <itemData name="Attribute" defStyleNum="dsOthers" />
+  <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" />
+  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
-  <itemData name="EntityRef" defStyleNum="dsDecVal" />
+  <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
-  <itemData name="PEntityRef" defStyleNum="dsDecVal" />
+  <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
-  <itemData name="Error" defStyleNum="dsError" />
+  <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
 </itemDatas>
 
 </highlighting>

share/qtcreator/generic-highlighter/ini.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="INI Files" section="Configuration" extensions="*.ini;*.pls" mimetype="" version="1.0" kateversion="2.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="1.1" kateversion="2.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <list name="keywords">

share/qtcreator/generic-highlighter/java.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Java" version="1.19" kateversion="2.4" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Java" version="1.21" kateversion="2.4" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<list name="java15">
 			<item> ACTIVE </item>
@@ -142,7 +142,6 @@
 			<item> AncestorListener </item>
 			<item> AnnotatedElement </item>
 			<item> Annotation </item>
-			<item> Annotation </item>
 			<item> AnnotationFormatError </item>
 			<item> AnnotationTypeMismatchException </item>
 			<item> Any </item>
@@ -3767,13 +3766,6 @@
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
 				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
 					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
 				</Int>
 				<HlCChar attribute="Char" context="#stay"/>
@@ -3790,6 +3782,7 @@
 				<RegExpr attribute="Keyword" context="StaticImports" String="\b(import\s+static)\b" />
 				<RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
 				<RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
+				<RegExpr attribute="Annotation" context="#stay" String="@[_\w][_\w\d]*" />
 				<RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" />
 				<DetectChar attribute="Symbol" context="InFunctionCall" char="("/>
 				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
@@ -3837,6 +3830,7 @@
 		<itemDatas>
 			<itemData name="Normal Text"  defStyleNum="dsNormal"/>
 			<itemData name="Keyword"      defStyleNum="dsKeyword"/>
+			<itemData name="Annotation"   defStyleNum="dsFunction"/>
 			<itemData name="Function"     defStyleNum="dsFunction"/>
 			<itemData name="StaticImports"      defStyleNum="dsKeyword" color="#800080" selColor="#FFFFFF" bold="0" italic="0"/>
 			<itemData name="Imports"      defStyleNum="dsKeyword" color="#808000" selColor="#FFFFFF" bold="0" italic="0"/>

share/qtcreator/generic-highlighter/javadoc.xml

@@ -78,12 +78,12 @@
 				<RegExpr attribute="JavadocParam" context="#pop#pop" String="\S*(?=\*/)" />
 				<RegExpr attribute="JavadocParam" context="#pop" String="\S*(\s|$)" />
 			</context>
-			<context attribute="InlineTag" lineEndContext="#pop" name="InlineTagar">
+			<context attribute="InlineTag" name="InlineTagar">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" />
 				<IncludeRules context="##HTML"/>
 			</context>
-			<context attribute="InlineTag" lineEndContext="#pop" name="LiteralTagar">
+			<context attribute="InlineTag" name="LiteralTagar">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" />
 			</context>

share/qtcreator/generic-highlighter/perl.xml

@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.23" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund (anders@alweb.dk)" license="LGPL">
+<language name="Perl" version="1.26" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund (anders@alweb.dk)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> if </item>
@@ -56,18 +56,18 @@
       <item> break </item>
       <item> continue </item>
       <item> return </item>
-      <item> use </item>
-      <item> no </item>
-      <item> require </item>
       <item> my </item>
       <item> our </item>
       <item> local </item>
+      <item> state </item>
       <item> BEGIN </item>
       <item> END </item>
-      <item>require</item>
       <item> package </item>
       <item> sub </item>
       <item> do </item>
+      <item> given  </item>
+      <item> when  </item>
+      <item> default </item>
       <item> __END__ </item>
       <item> __DATA__ </item>
       <item> __FILE__ </item>
@@ -85,6 +85,7 @@
       <item> **= </item>
       <item> |= </item>
       <item> ||= </item>
+      <item> //= </item>
       <item> &amp;= </item>
       <item> &amp;&amp;= </item>
       <item> ?= </item>
@@ -94,6 +95,7 @@
      <!-- <item> / </item>//-->
       <item> % </item>
       <item> || </item>
+      <item> // </item>
       <item> &amp;&amp; </item>
       <item> | </item>
       <item> &amp; </item>
@@ -219,6 +221,7 @@
       <item>msgget</item>
       <item>msgrcv</item>
       <item>msgsnd</item>
+      <item>no</item>
       <item>oct</item>
       <item>open</item>
       <item>opendir</item>
@@ -242,6 +245,7 @@
       <item>redo</item>
       <item>ref</item>
       <item>rename</item>
+      <item>require</item>
       <item>reset</item>
       <item>return</item>
       <item>reverse</item>
@@ -305,6 +309,7 @@
       <item>unpack</item>
       <item>unshift</item>
       <item>untie</item>
+      <item>use</item>
       <item>utime</item>
       <item>values</item>
       <item>vec</item>
@@ -362,8 +367,9 @@
 
         <RegExpr attribute="Operator" context="find_here_document" String="\s*&lt;&lt;(?=\w+|\s*[&quot;'])" beginRegion="HereDocument" />
 
-        <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/" endRegion="Block"/>
+        <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/{1,2}" endRegion="Block"/>
-        <RegExpr attribute="Normal Text" context="#stay" String="\s*[)]\s*/" />
+        <RegExpr attribute="Normal Text" context="#stay" String="\s*[)\]]\s*/{1,2}" />
+
         <RegExpr attribute="Function" context="sub_name_def" String="\w+::" />
         <RegExpr attribute="Normal Text" context="#stay" String="\w+[=]" />
 
@@ -567,9 +573,9 @@
       </context>
 
       <context name="tr" attribute="Pattern" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" >
-        <RegExpr attribute="Pattern" context="#pop" String="([^)]*\)\s*\(?:[^)]*\)" />
+        <RegExpr attribute="Pattern" context="#pop" String="\([^)]*\)\s*\(?:[^)]*\)" />
-        <RegExpr attribute="Pattern" context="#pop" String="{[^}]*\}\s*\{[^}]*\}" />
+        <RegExpr attribute="Pattern" context="#pop" String="\{[^}]*\}\s*\{[^}]*\}" />
-        <RegExpr attribute="Pattern" context="#pop" String="\[[^}]*\]\s*\[[^\]]*\]" />
+        <RegExpr attribute="Pattern" context="#pop" String="\[[^]]*\]\s*\[[^\]]*\]" />
         <RegExpr attribute="Pattern" context="#pop" String="([^a-zA-Z0-9_\s[\]{}()]).*\1.*\1" minimal="true"/>
       </context>
 
@@ -661,7 +667,7 @@
         <RegExpr attribute="Data Type" context="var_detect" String="\$\$[\$\w_]" />
         <RegExpr attribute="Data Type" context="var_detect" String="\$[#_][\w_]" />
         <RegExpr attribute="Data Type" context="var_detect" String="\$+::" />
-        <RegExpr attribute="Special Variable" context="#stay" String="\$[^a-zA-Z0-9\s{][A-Z]?" />
+        <RegExpr attribute="Special Variable" context="var_detect" String="\$[^a-zA-Z0-9\s{][A-Z]?" />
         <RegExpr attribute="Data Type" context="var_detect" String="[\$@%]\{[\w_]+\}" />
         <AnyChar attribute="Data Type" context="var_detect" String="$@%" />
         <RegExpr attribute="Data Type" context="var_detect" String="\*[a-zA-Z_]+" />
@@ -679,7 +685,7 @@
         <RegExpr attribute="Data Type" context="var_detect_unsafe" String="\$+::" />
         <RegExpr attribute="Special Variable" context="#stay" String="\$[^a-zA-Z0-9\s{][A-Z]?" />
         <RegExpr attribute="Data Type" context="var_detect_unsafe" String="[\$@%]\{[\w_]+\}" />
-        <RegExpr attribute="Data Type" context="var_detect_unsafe" String="[\$@%]" />
+        <RegExpr attribute="Data Type" context="var_detect_unsafe" String="[\$@%]" /><!-- AnyChar! -->
         <RegExpr attribute="Data Type" context="var_detect_unsafe" String="\*\w+" />
         <AnyChar attribute="Operator" context="#pop" String="$@%*" />
       </context>
@@ -762,10 +768,9 @@
       </context>
 
       <context name="slash_safe_escape" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr attribute="Normal Text" context="#pop" String="\s*\]?\s*/" />
+        <RegExpr attribute="Normal Text" context="#pop" String="\s*\}\s*/{1,2}" endRegion="Block"/>
-        <RegExpr attribute="Normal Text" context="#pop" String="\s*\}?\s*/" endRegion="Block" />
+        <RegExpr attribute="Normal Text" context="#pop" String="\s*[)\]]?\s*/{1,2}" />
-        <RegExpr attribute="Normal Text" context="#pop" String="\s*\)?\s*/" />
+        <keyword attribute="Keyword" context="#pop" String="keywords" /><!-- wonder why??? -->
-        <keyword attribute="Keyword" context="#pop" String="keywords" />
       </context>
 
       <context name="package_qualified_blank" attribute="Normal Text" lineEndContext="#stay">

share/qtcreator/generic-highlighter/ruby.xml

@@ -7,6 +7,7 @@
   Copyright (C) 2004  by Sebastian Vuorinen (sebastian dot vuorinen at helsinki dot fi)
   Copyright (C) 2004  by Stefan Lang (langstefan@gmx.at)
   Copyright (C) 2008  by Robin Pedersen (robinpeder@gmail.com)
+  Copyright (C) 2011  by Miquel Sabaté (mikisabate@gmail.com)
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -25,17 +26,16 @@
 -->
 
 <!--
-	TODO:	* "Nested" HERE documents aren't recognized.
+    TODO: Division after gdl contexts is interpreted as regexp
-			* Division after gdl contexts is interpreted as regexp
 -->
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-          version="1.18" kateversion="2.4" 
+	  version="1.25" kateversion="2.4"
-	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb"
+	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
-	  author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi), Robin Pedersen (robinpeder@gmail.com)" license="LGPL">
+	  author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi), Robin Pedersen (robinpeder@gmail.com), Miquel Sabaté (mikisabate@gmail.com)" license="LGPL">
 	
 	<highlighting>
 	
@@ -67,7 +67,6 @@
 			<item> unless </item>
 			<item> until </item>
 			<item> when </item>
-			<item> while </item>
 			<item> yield </item>
 		</list>
 		
@@ -161,6 +160,7 @@
 			<item> readline </item>
 			<item> readlines </item>
 			<item> require </item>
+			<item> require_relative </item>
 			<item> scan </item>
 			<item> select </item>
 			<item> set_trace_func </item>
@@ -180,12 +180,6 @@
 			<item> warn </item>
 		</list>
 
-		<list name="attention">
-			<item> TODO </item>
-			<item> FIXME </item>
-			<item> NOTE </item>
-		</list>
-		
 		<contexts>
 			<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
 				<!-- ruby ignores newline after \ -->
@@ -201,7 +195,7 @@
 				<!-- check for statement modifiers with regexes -->
 				<DetectChar attribute="Operator" char="{" context="Find closing block brace" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="(\=|\(|\[|\{)\s*(if|unless|while|until)\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block" firstNonSpace="true"/>
+				<RegExpr attribute="Keyword" String="(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block" />
 				<RegExpr attribute="Keyword" String="\;\s*(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" beginRegion="def block" firstNonSpace="true"/>
 				<RegExpr attribute="Keyword" String="\;\s*(if|unless)\b" context="#stay" beginRegion="def block"/>
@@ -239,7 +233,7 @@
 				<RegExpr attribute="Global Variable" String="\$[a-zA-Z_0-9]+" context="check_div_1"/>
 				<RegExpr attribute="Global Variable" String="\$\-[a-zA-z_]\b" context="check_div_1"/>
 				<!-- special-character globals -->
-				<RegExpr attribute="Default globals" String="\$[\d_*`\!:?'/\\\-\&amp;&quot;]" context="check_div_1"/>
+				<RegExpr attribute="Default globals" String="\$[\d_*`+@;,.~=\!\$:?'/\\\-\&amp;&quot;&gt;&lt;]" context="check_div_1"/>
 				<RegExpr attribute="Global Constant" String="\b[_A-Z]+[A-Z_0-9]+\b" context="check_div_2"/>
 				<!-- Generally a module or class name like "File", "MyModule_1", .. -->
 				<RegExpr attribute="Constant" String="\b[A-Z]+_*([0-9]|[a-z])[_a-zA-Z0-9]*\b" context="check_div_2"/>
@@ -302,7 +296,7 @@
 				
 				<!-- recognize the beginning of a general delimited input format -->
 				<!-- this moves to the next context to separate out the exact nature of the GDL input -->
-				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[Qqxw]?[^\s])" beginRegion="GdlInput" />
+				<RegExpr attribute="GDL input" context="find_gdl_input" String="\s*[%](?=[QqxwW]?[^\s])" beginRegion="GdlInput" />
 				
 				<DetectChar attribute="Normal Text" char=")" context="check_div_1"/>
 				<DetectIdentifier attribute="Normal Text" context="check_div_2"/>
@@ -383,6 +377,7 @@
 			
 			<context name="Embedded documentation" attribute="Blockcomment" lineEndContext="#stay">
 				<RegExpr attribute="Comment" String="^=end(?:\s.*|$)" context="#pop" endRegion="comment block" column="0"/>
+				<IncludeRules context="##Alerts" />
 			</context>
 			
 			<context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
@@ -425,11 +420,11 @@
 			
 			<context name="Comment Line" attribute="Comment" lineEndContext="#pop">
 				<RegExpr attribute="Comment" String="\w\:\:\s" context="RDoc Label"/>
-				<keyword attribute="Alert" String="attention" context="#stay"/>
+				<IncludeRules context="##Alerts" />
 			</context>
 			
 			<context name="General Comment" attribute="Comment" lineEndContext="#pop">
-				<keyword attribute="Dec" String="attention" context="#stay"/>
+				<IncludeRules context="##Alerts" />
 			</context>
 			
 			<context name="RDoc Label" attribute="RDoc Value" lineEndContext="#pop"/>
@@ -448,22 +443,18 @@
 			</context>
 			<!-- these are the real heredoc contexts -->
 			<context name="indented_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^\s*%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" firstNonSpace="true"/>
 				<IncludeRules context="heredoc_rules" />
 			</context>
 			<context name="apostrophed_indented_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^\s*%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" firstNonSpace="true"/>
 			</context>
 			
 			<context name="normal_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" column="0"/>
 				<IncludeRules context="heredoc_rules" />
 			</context>
 			<context name="apostrophed_normal_heredoc" attribute="Here Document" lineEndContext="#stay" dynamic="true">
-<!--				<RegExpr attribute="Keyword" context="#pop#pop" String="^%1$" dynamic="true" endRegion="HereDocument"/>-->
 				<RegExpr attribute="Keyword" context="#pop#pop" String="%1$" dynamic="true" endRegion="HereDocument" column="0"/>
 			</context>
 			
@@ -486,6 +477,14 @@
 				<!-- then we handle the 'any char' format -->
 				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="w([^\s\w])" />
 
+				<!-- handle token arrays -->
+				<RegExpr attribute="GDL input" context="gdl_token_array_1" String="W\(" />
+				<RegExpr attribute="GDL input" context="gdl_token_array_2" String="W\{" />
+				<RegExpr attribute="GDL input" context="gdl_token_array_3" String="W\[" />
+				<RegExpr attribute="GDL input" context="gdl_token_array_4" String="W&lt;" />
+				<!-- then we handle the 'any char' format -->
+				<RegExpr attribute="GDL input" context="gdl_token_array_5" String="W([^\s\w])" />
+
 				<!-- handle apostrophed strings -->
 				<RegExpr attribute="GDL input" context="gdl_apostrophed_1" String="q\(" />
 				<RegExpr attribute="GDL input" context="gdl_apostrophed_2" String="q\{" />
@@ -899,7 +898,6 @@
 			
 			<!-- use these to mark errors and alerts things -->
 			<itemData name="Error" defStyleNum="dsError" />
-			<itemData name="Alert" defStyleNum="dsAlert" />
 			
 			<itemData name="Delimiter" defStyleNum="dsNormal" color="#FF9FEC"/>
 			<itemData name="Expression" defStyleNum="dsOthers"/>

share/qtcreator/generic-highlighter/valgrind-suppression.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="text/plain" version="1.0" kateversion="2.0" author="Milian Wolff (mail@milianw.de)" license="LGPL">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.0" author="Milian Wolff (mail@milianw.de)" license="LGPL">
 <highlighting>
 <contexts>
   <context name="File" attribute="Normal Text" lineEndContext="#stay">

share/qtcreator/generic-highlighter/xml.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
+	<!-- names must start with a letter, ideogram or underscore. \w matches any
+		 word character *or* a number, hence the lookahead -->
+	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="1.97" kateversion="2.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="2.03" kateversion="2.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -23,12 +25,12 @@
     <DetectIdentifier />
   </context>
 
-  <context name="FindEntityRefs" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
   </context>
 
-  <context name="FindPEntityRefs" attribute="Normal Text" lineEndContext="#stay">
+  <context name="FindPEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <RegExpr attribute="PEntityRef" context="#stay" String="%&name;;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;%" />
@@ -43,23 +45,23 @@
     <DetectIdentifier />
   </context>
 
-  <context name="CDATA" attribute="Normal Text" lineEndContext="#stay">
+  <context name="CDATA" attribute="Other Text" lineEndContext="#stay">
     <DetectSpaces />
     <DetectIdentifier />
     <StringDetect attribute="CDATA" context="#pop" String="]]&gt;" endRegion="cdata" />
     <StringDetect attribute="EntityRef" context="#stay" String="]]&amp;gt;" />
   </context>
 
-  <context name="PI" attribute="Normal Text" lineEndContext="#stay">
+  <context name="PI" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
   </context>
 
-  <context name="Doctype" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" endRegion="doctype" />
     <DetectChar attribute="Doctype" context="Doctype Internal Subset" char="[" beginRegion="int_subset" />
   </context>
 
-  <context name="Doctype Internal Subset" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype Internal Subset" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
     <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
@@ -67,7 +69,7 @@
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
-  <context name="Doctype Markupdecl" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Doctype Markupdecl" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl SQ" char="&apos;" />
@@ -83,7 +85,7 @@
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
-  <context name="Element" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Element" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="element" />
     <DetectChar attribute="Element" context="El Content" char="&gt;" />
     <RegExpr attribute="Attribute" context="Attribute" String="^&name;" />
@@ -91,22 +93,22 @@
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="El Content" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El Content" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El End" String="&lt;/&name;" />
     <IncludeRules context="FindXML" />
   </context>
 
-  <context name="El End" attribute="Normal Text" lineEndContext="#stay">
+  <context name="El End" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop#pop#pop" char="&gt;" endRegion="element" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="Attribute" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Attribute" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Attribute" context="Value" char="=" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
-  <context name="Value" attribute="Normal Text" lineEndContext="#stay">
+  <context name="Value" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Value" context="Value DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Value SQ" char="&apos;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
@@ -125,16 +127,17 @@
 </contexts>
 <itemDatas>
   <itemData name="Normal Text" defStyleNum="dsNormal" />
-  <itemData name="Comment" defStyleNum="dsComment" />
+  <itemData name="Other Text" defStyleNum="dsNormal" />
-  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" />
+  <itemData name="Comment" defStyleNum="dsComment" spellChecking="false" />
-  <itemData name="Processing Instruction" defStyleNum="dsKeyword" />
+  <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" spellChecking="false" />
-  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
+  <itemData name="Processing Instruction" defStyleNum="dsKeyword" spellChecking="false" />
-  <itemData name="Element" defStyleNum="dsKeyword" />
+  <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
-  <itemData name="Attribute" defStyleNum="dsOthers" />
+  <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" />
+  <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="EntityRef" defStyleNum="dsDecVal" />
+  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
-  <itemData name="PEntityRef" defStyleNum="dsDecVal" />
+  <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
-  <itemData name="Error" defStyleNum="dsError" />
+  <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
+  <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
 </itemDatas>
 
 </highlighting>

share/qtcreator/qml/qmldump/Info.plist.in

@@ -18,7 +18,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <key>CFBundleExecutable</key>
         <string>@EXECUTABLE@</string>
         <key>CFBundleIdentifier</key>
-    <string>com.nokia.qtcreator.qmldump</string>
+        <string>org.qt-project.qtcreator.qmldump</string>
         <key>CFBundleVersion</key>
         <string>$$QTCREATOR_VERSION</string>
         <key>CFBundleShortVersionString</key>

share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp

@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "changefileurlcommand.h"
+#include <QDataStream>
 
 namespace QmlDesigner {
 

share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in

@@ -18,7 +18,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-    <string>com.nokia.qtcreator.qml2puppet</string>
+        <string>org.qt-project.qtcreator.qml2puppet</string>
 	<key>CFBundleVersion</key>
 	<string>$$QTCREATOR_VERSION</string>
 	<key>CFBundleShortVersionString</key>

share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri

@@ -1,5 +1,5 @@
 
-QT += core gui qml quick network v8
+QT += core gui widgets qml quick network v8
 contains (QT_CONFIG, webkit) {
     QT += webkit
 }

share/qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in

@@ -18,7 +18,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-    <string>com.nokia.qtcreator.qmlpuppet</string>
+        <string>org.qt-project.qtcreator.qmlpuppet</string>
 	<key>CFBundleVersion</key>
 	<string>$$QTCREATOR_VERSION</string>
 	<key>CFBundleShortVersionString</key>

share/qtcreator/snippets/cpp.xml

@@ -65,4 +65,5 @@ case $value$:
 default:
     break;
 }</snippet>
+<snippet group="C++" trigger="Q_PROPERTY" id="cpp_q_property">Q_PROPERTY($name$ READ $name$ WRITE set$name$ NOTIFY $name$Changed);</snippet>
 </snippets>

share/qtcreator/templates/html5app/app.pro

@@ -1,3 +1,5 @@
+greaterThan(QT_MAJOR_VERSION, 4):QT += widgets webkitwidgets
+
 # Add more folders to ship with the application, here
 # DEPLOYMENTFOLDERS #
 folder_01.source = html

share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp

@@ -154,7 +154,7 @@ void Html5ApplicationViewer::setOrientation(ScreenOrientation orientation)
     case ScreenOrientationAuto:
         attribute = static_cast<Qt::WidgetAttribute>(130);
         break;
-#else // QT_VERSION < 0x040702
+#elif QT_VERSION < 0x050000
     case ScreenOrientationLockPortrait:
         attribute = Qt::WA_LockPortraitOrientation;
         break;
@@ -165,7 +165,10 @@ void Html5ApplicationViewer::setOrientation(ScreenOrientation orientation)
     case ScreenOrientationAuto:
         attribute = Qt::WA_AutoOrientation;
         break;
-#endif // QT_VERSION < 0x040702
+#else
+    default:
+        attribute = Qt::WidgetAttribute();
+#endif
     };
     setAttribute(attribute, true);
 }

share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h

@@ -8,6 +8,7 @@ class @COLLECTION_PLUGIN_CLASS@ : public QObject, public QDesignerCustomWidgetCo
 {
     Q_OBJECT
     Q_INTERFACES(QDesignerCustomWidgetCollectionInterface)
+    @COLLECTION_PLUGIN_METADATA@
 
 public:
     explicit @COLLECTION_PLUGIN_CLASS@(QObject *parent = 0);

share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro

@@ -1,4 +1,4 @@
-CONFIG      += designer plugin debug_and_release
+CONFIG      += plugin debug_and_release
 TARGET      = $$qtLibraryTarget(@PLUGIN_NAME@)
 TEMPLATE    = lib
 
@@ -7,6 +7,12 @@ SOURCES     =@PLUGIN_SOURCES@
 RESOURCES   = @PLUGIN_RESOURCES@
 LIBS        += -L. @WIDGET_LIBS@
 
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += designer
+} else {
+    CONFIG += designer
+}
+
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS    += target
 

share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.h

@@ -7,6 +7,7 @@ class @PLUGIN_CLASS@ : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
     Q_INTERFACES(QDesignerCustomWidgetInterface)
+    @SINGLE_PLUGIN_METADATA@
 
 public:
     @PLUGIN_CLASS@(QObject *parent = 0);

share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro

@@ -5,11 +5,11 @@ DEFINES += %PluginName:u%_LIBRARY
 
 # %PluginName% files
 
-SOURCES += %PluginName:l%plugin.cpp
+SOURCES += %PluginName:l%plugin.%CppSourceSuffix%
 
-HEADERS += %PluginName:l%plugin.h\
+HEADERS += %PluginName:l%plugin.%CppHeaderSuffix% \
-        %PluginName:l%_global.h\
+        %PluginName:l%_global.%CppHeaderSuffix% \
-        %PluginName:l%constants.h
+        %PluginName:l%constants.%CppHeaderSuffix%
 
 # Qt Creator linking
 

share/qtcreator/translations/qtcreator_cs.ts

@@ -11668,8 +11668,8 @@ se projektu &apos;%2&apos; nepodařilo přidat.</translation>
         <translation type="obsolete">Smazat sezení</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Co je to sezení?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Co je to sezení?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Switch to session</source>
@@ -11696,8 +11696,8 @@ se projektu &apos;%2&apos; nepodařilo přidat.</translation>
         <translation>&amp;Přepnout na sezení</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Co je sezení?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Co je sezení?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>New session name</source>
@@ -17692,12 +17692,12 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <translation type="obsolete">Pokud do svého projektu přidáte vnější knihovny, Qt Creator automaticky nabídné zvýrazňování skladby a doplňování kódu.</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Můžete přidat vlastní kroky při vytváření programu v &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;Nastavení sestavování&lt;/a&gt;.</translation>
+        <translation type="obsolete">Můžete přidat vlastní kroky při vytváření programu v &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;Nastavení sestavování&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Do jednoho sezení můžete přidat &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;závislosti&lt;/a&gt; mezi projekty.</translation>
+        <translation type="obsolete">Do jednoho sezení můžete přidat &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-dependencies.html&quot;&gt;závislosti&lt;/a&gt; mezi projekty.</translation>
     </message>
     <message>
         <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
@@ -17712,8 +17712,8 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <translation type="obsolete">Funkci &lt;tt&gt;Najít&lt;/tt&gt; si můžete pěkně vyladit tím, že vyberete &amp;quot;Celá slova&amp;quot; nebo &amp;quot;Rozlišující velká a malá písmena&amp;quot;. Jednoduše klepněte na ikony po pravé straně zadávacího pole.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Pokud přidáte&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;vnější knihovny&lt;/a&gt;, Qt Creator automaticky nabídne zvýrazňování skladby a doplnění kódu.</translation>
+        <translation type="obsolete">Pokud přidáte&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;vnější knihovny&lt;/a&gt;, Qt Creator automaticky nabídne zvýrazňování skladby a doplnění kódu.</translation>
     </message>
     <message>
         <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
@@ -17736,24 +17736,24 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <translation type="obsolete">Můžete přepínat mezi výstupními tabulkami stisknutím &lt;tt&gt;%1+n&lt;/tt&gt;, přičemž n je číslem, které se nalézá na tlačítkách při dolním okraji okna: &lt;ul&gt;&lt;li&gt;1 - Potíže se sestavováním&lt;/li&gt;&lt;li&gt;2 - Výsledky hledání&lt;/li&gt;&lt;li&gt;3 - Výstup aplikace&lt;/li&gt;&lt;li&gt;4 - Výstup sestavení&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Pomocí &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;pruhu s vyhledávačem&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;) můžete rychle vyhledávat postupy, třídy, nápovědu a další věci.</translation>
+        <translation type="obsolete">Pomocí &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;pruhu s vyhledávačem&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;) můžete rychle vyhledávat postupy, třídy, nápovědu a další věci.</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Můžete přidat vlastní kroky při vytvoření v &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;Nastavení sestavování&lt;/a&gt;.</translation>
+        <translation type="obsolete">Můžete přidat vlastní kroky při vytvoření v &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;Nastavení sestavování&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Do jednoho sezení můžete přidat &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;závislosti&lt;/a&gt; mezi projekty.</translation>
+        <translation type="obsolete">Do jednoho sezení můžete přidat &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;závislosti&lt;/a&gt; mezi projekty.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
         <translation type="obsolete">Můžete nastavit upřednostňované kódování editoru u každého projektu v &lt;tt&gt;Projekty -&gt; Nastavení editoru -&gt; Výchozí kódování&lt;/tt&gt;.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation type="obsolete">Qt Creator můžete používat s celou řadou &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;systémů určených pro správu verzí&lt;/a&gt;, jakými jsou Subversion, Perforce, CVS a Git.</translation>
+        <translation type="obsolete">Qt Creator můžete používat s celou řadou &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;systémů určených pro správu verzí&lt;/a&gt;, jakými jsou Subversion, Perforce, CVS a Git.</translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; follows symbol definition, &lt;tt&gt;Shift+F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
@@ -32493,8 +32493,8 @@ Při plné simulaci mezipaměti budou zapnuta další počítadla událostí:
         <translation type="obsolete">Přípojka pro ladič:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Jaké jsou předpoklady?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Jaké jsou předpoklady?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -49452,8 +49452,8 @@ Nainstalujte, prosím, alespoň jedno SDK.</translation>
         <translation>Port pro ladič:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Jaké jsou předpoklady?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Jaké jsou předpoklady?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Enable Debugging of Subprocesses</source>

share/qtcreator/translations/qtcreator_es.ts

@@ -2121,16 +2121,16 @@ Would you like to overwrite them?</source>
         <translation type="obsolete">Puede alternar entre paneles de salida tecleando &lt;tt&gt;%1+n&lt;/tt&gt;, donde n es el número indicado en los botones situados en la parte inferior de la ventana:&lt;ul&gt;&lt;li&gt;1 - Construcción&lt;/li&gt;&lt;li&gt;2 - Resultado de búsquedas&lt;/li&gt;&lt;li&gt;3 - Salida de aplicación&lt;/li&gt;&lt;li&gt;4 - Salida del compilador&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Puede buscar fácilmente métodos, clases, ayuda y más usando la  &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Barra Localizadora&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</translation>
+        <translation type="obsolete">Puede buscar fácilmente métodos, clases, ayuda y más usando la  &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Barra Localizadora&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Puede añadir etapas de construcción personalizadas en los &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;Ajustes de construcción&lt;/a&gt;.</translation>
+        <translation type="obsolete">Puede añadir etapas de construcción personalizadas en los &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;Ajustes de construcción&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Durante una sesión, puede añadir &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencias&lt;/a&gt; entre proyectos.</translation>
+        <translation type="obsolete">Durante una sesión, puede añadir &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencias&lt;/a&gt; entre proyectos.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
@@ -2141,8 +2141,8 @@ Would you like to overwrite them?</source>
         <translation type="obsolete">Puede modificar el binario a ser ejecutado cuando se presione el botón &lt;tt&gt;Ejecutar&lt;/tt&gt;: Añada &lt;tt&gt;Ejecutable personalizado&lt;/tt&gt; con un click en el botón &lt;tt&gt;+&lt;/tt&gt; en &lt;tt&gt;Proyectos -&gt; Ajustes de ejecución -&gt; Ajuste de ejecución&lt;/tt&gt; y luego seleccionando el nuevo objetivo en el combo box.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
-        <translation type="obsolete">Puede usar Qt Creator con varios &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;sistemas de control de versiones/revisiones&lt;/a&gt; como Subversion, Perforce y Git.</translation>
+        <translation type="obsolete">Puede usar Qt Creator con varios &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;sistemas de control de versiones/revisiones&lt;/a&gt; como Subversion, Perforce y Git.</translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
@@ -2161,8 +2161,8 @@ Would you like to overwrite them?</source>
         <translation type="obsolete">Puede personalizar la función &lt;tt&gt;Buscar&lt;/tt&gt; seleccionando  &amp;quot;Palabras completas solamente&amp;quot; o &amp;quot;Distinguir MAYÚS/minús&amp;quot;. Solo tiene que hacer clic en los íconos situados a la derecha del componente de edición de texto.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Si agrega &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerías externas&lt;/a&gt;, Qt Creator le ofrecerá automáticamente realce de sintaxis y autocompletado de código.</translation>
+        <translation type="obsolete">Si agrega &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerías externas&lt;/a&gt;, Qt Creator le ofrecerá automáticamente realce de sintaxis y autocompletado de código.</translation>
     </message>
 </context>
 <context>
@@ -9243,8 +9243,8 @@ Nombre base de librería: %1</translation>
     </message>
     <message>
         <location/>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;¿Qué es una sesión?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;¿Qué es una sesión?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -14565,8 +14565,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+2"/>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="unfinished">Si agrega &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerías externas&lt;/a&gt;, Qt Creator le ofrecerá automáticamente realce de sintaxis y autocompletado de código.</translation>
+        <translation type="unfinished">Si agrega &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerías externas&lt;/a&gt;, Qt Creator le ofrecerá automáticamente realce de sintaxis y autocompletado de código.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -14596,18 +14596,18 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+4"/>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="unfinished">Puede añadir etapas de construcción personalizadas en los &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;Ajustes de construcción&lt;/a&gt;.</translation>
+        <translation type="unfinished">Puede añadir etapas de construcción personalizadas en los &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;Ajustes de construcción&lt;/a&gt;.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="unfinished">Durante una sesión, puede añadir &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencias&lt;/a&gt; entre proyectos.</translation>
+        <translation type="unfinished">Durante una sesión, puede añadir &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencias&lt;/a&gt; entre proyectos.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -14621,7 +14621,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+3"/>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

share/qtcreator/translations/qtcreator_fr.ts

@@ -2564,8 +2564,8 @@ Voulez vous les écraser ?</translation>
         <translation type="obsolete">Vous pouvez affiner les résultats de la fonction recherche en sélectionnant &amp;quot;Mots complets&amp;quot; ou &amp;quot;Sensible à la casse&amp;quot;. Cliquez simplement sur les icônes sur le bord droit du champ de recherche.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Si vous ajoutez &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;des bibliothèques externes&lt;/a&gt;, Qt Creator proposera automatiquement la coloration syntaxique et l&apos;auto-complétion du code.</translation>
+        <translation type="obsolete">Si vous ajoutez &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;des bibliothèques externes&lt;/a&gt;, Qt Creator proposera automatiquement la coloration syntaxique et l&apos;auto-complétion du code.</translation>
     </message>
     <message>
         <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
@@ -12882,8 +12882,8 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <translation type="obsolete">Supprimer la session</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Qu&apos;est ce qu&apos;une session ?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Qu&apos;est ce qu&apos;une session ?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -12914,8 +12914,8 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <translation>Renommer la session</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Qu&apos;est-ce qu&apos;une session?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Qu&apos;est-ce qu&apos;une session?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Automatically restore the last session when Qt Creator is started.</source>
@@ -19805,12 +19805,12 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vous pouvez passer d&apos;un panneau de sortie à l&apos;autre avec les touches &lt;tt&gt;%1+n&lt;/tt&gt; où n est le numéro qui apparaît sur les boutons en dessous de la fenêtre : &lt;ul&gt;&lt;li&gt;1 - Problèmes de compilation&lt;/li&gt;&lt;li&gt;2 - Résultat de la recherche&lt;/li&gt;&lt;li&gt;3 - Sortie de l&apos;application&lt;/li&gt;&lt;li&gt;4 - Sortie de compilation&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-editor-locator.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Vous pouvez rapidement rechercher des méthodes, classes, de l&apos;aide et plus à l&apos;aide du &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Localisateur&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
+        <translation type="obsolete">Vous pouvez rapidement rechercher des méthodes, classes, de l&apos;aide et plus à l&apos;aide du &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Localisateur&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Dans une session, vous pouvez ajouter &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;des dépendances&lt;/a&gt; entre les projets.</translation>
+        <translation type="obsolete">Dans une session, vous pouvez ajouter &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-dependencies.html&quot;&gt;des dépendances&lt;/a&gt; entre les projets.</translation>
     </message>
     <message>
         <source>&lt;a href=&apos;%1&apos;&gt;Details...&lt;/a&gt;</source>
@@ -19825,12 +19825,12 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vous pouvez basculer entre les modes de Qt Creator en utilisant &lt;tt&gt;Ctrl+chiffre&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Accueil&lt;/li&gt;&lt;li&gt;2 - Editer&lt;/li&gt;&lt;li&gt;3 - Design&lt;/li&gt;&lt;li&gt;4 - Deboguer&lt;/li&gt;&lt;li&gt;5 - Projets&lt;/li&gt;&lt;li&gt;6 - Aide&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Vous pouvez ajouter vos propre étapes de compilation dans les &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;paramètres de compilation&lt;/a&gt;.</translation>
+        <translation type="obsolete">Vous pouvez ajouter vos propre étapes de compilation dans les &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;paramètres de compilation&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Dans une session, vous pouvez ajouter des &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dépendances&lt;/a&gt; entre des projets.</translation>
+        <translation type="obsolete">Dans une session, vous pouvez ajouter des &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dépendances&lt;/a&gt; entre des projets.</translation>
     </message>
     <message>
         <source>You can switch between Qt Creator&apos;s modes using &lt;tt&gt;Ctrl+number&lt;/tt&gt;:&lt;ul&gt;&lt;li&gt;1 - Welcome&lt;/li&gt;&lt;li&gt;2 - Edit&lt;/li&gt;&lt;li&gt;3 - Debug&lt;/li&gt;&lt;li&gt;4 - Projects&lt;/li&gt;&lt;li&gt;5 - Help&lt;/li&gt;&lt;li&gt;&lt;/li&gt;&lt;li&gt;6 - Output&lt;/li&gt;&lt;/ul&gt;</source>
@@ -19845,8 +19845,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vous pouvez affiner les résultats de la fonction recherche en sélectionnant &amp;quot;Mots complets&amp;quot; ou &amp;quot;Sensible à la casse&amp;quot;. Cliquez simplement sur les icônes sur le bord droit du champ de recherche.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Si vous ajoutez &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;des bibliothèques externes&lt;/a&gt;, Qt Creator proposera automatiquement la coloration syntaxique et l&apos;auto-complétion du code.</translation>
+        <translation type="obsolete">Si vous ajoutez &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;des bibliothèques externes&lt;/a&gt;, Qt Creator proposera automatiquement la coloration syntaxique et l&apos;auto-complétion du code.</translation>
     </message>
     <message>
         <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
@@ -19869,16 +19869,16 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vous pouvez passer d&apos;un panneau de sortie à l&apos;autre avec les touches &lt;tt&gt;%1+x&lt;/tt&gt; où x est le numéro qui apparaît sur les boutons en dessous de la fenêtre : &lt;ul&gt;&lt;li&gt;1 - Problèmes de compilation&lt;/li&gt;&lt;li&gt;2 - Résultat de la recherche&lt;/li&gt;&lt;li&gt;3 - Sortie de l&apos;application&lt;/li&gt;&lt;li&gt;4 - Sortie de compilation&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Vous pouvez rapidement rechercher des méthodes, classes, de l&apos;aide et plus à l&apos;aide du &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Localisateur&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
+        <translation type="obsolete">Vous pouvez rapidement rechercher des méthodes, classes, de l&apos;aide et plus à l&apos;aide du &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Localisateur&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Vous pouvez ajouter vos propre étapes de compilation dans les &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;paramètres de compilation&lt;/a&gt;.</translation>
+        <translation type="obsolete">Vous pouvez ajouter vos propre étapes de compilation dans les &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;paramètres de compilation&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Dans une session, vous pouvez ajouter des &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dépendances&lt;/a&gt; entre des projets.</translation>
+        <translation type="obsolete">Dans une session, vous pouvez ajouter des &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dépendances&lt;/a&gt; entre des projets.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
@@ -19893,8 +19893,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vous pouvez modifier le binaire qui sera exécuté lorsque vous appuyez sur le bouton &lt;tt&gt;Lancer&lt;/tt&gt; : Ajoutez un &lt;tt&gt;exécutable personnalisé&lt;/tt&gt; en cliquant sur le bouton &lt;tt&gt;+&lt;/tt&gt; dans &lt;tt&gt;Projets -&gt; Paramètres d&apos;exécutions -&gt; Configuration d&apos;exécution&lt;/tt&gt; et sélectionnez une nouvelle cible dans le menu déroulant.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation type="obsolete">Vous pouvez utiliser Qt Creator conjointement avec de nombreux &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;systèmes de gestion de version&lt;/a&gt; tel que Subversion, Perforce, CVS et Git.</translation>
+        <translation type="obsolete">Vous pouvez utiliser Qt Creator conjointement avec de nombreux &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;systèmes de gestion de version&lt;/a&gt; tel que Subversion, Perforce, CVS et Git.</translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
@@ -31369,8 +31369,8 @@ Preselects Qt for Simulator and mobile targets if available</source>
         <translation type="obsolete">Port du débogage :</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Quels sont les prérequis?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Quels sont les prérequis?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -34473,8 +34473,8 @@ stderr était : %1</translation>
         <translation type="obsolete">CODA</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-developing-symbian.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-developing-symbian.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-developing-symbian.html&quot;&gt;Quels sont les prérequis ?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-developing-symbian.html&quot;&gt;Quels sont les prérequis ?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Installation file:</source>
@@ -53270,8 +53270,8 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e
         <translation>Port du débogage :</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Quels sont les prérequis?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Quels sont les prérequis?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>

share/qtcreator/translations/qtcreator_hu.ts

@@ -2426,16 +2426,16 @@ Felül szeretné írni azokat?</translation>
         <translation type="obsolete">Válthat a kimeneti panelok között a(z) &lt;tt&gt;%1+n&lt;/tt&gt; lenyomásával, ahol az n az ablak alján található gombokon levő számot jelenti: &lt;ul&gt;&lt;li&gt;1 - Építési probléma&lt;/li&gt;&lt;li&gt;2 - Keresési eredmények&lt;/li&gt;&lt;li&gt;3 - Alkalmazás kimenet&lt;/li&gt;&lt;li&gt;4 - Fordítási kimenet&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Gyorsan rákereshet eljárások, osztályok, segítség és még több dologra a &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Lokátor bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;) használatával.</translation>
+        <translation type="obsolete">Gyorsan rákereshet eljárások, osztályok, segítség és még több dologra a &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Lokátor bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;) használatával.</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Hozzáadhatja a szokásos építési lépéseket az &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt; építési beállításokban&lt;/a&gt;.</translation>
+        <translation type="obsolete">Hozzáadhatja a szokásos építési lépéseket az &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt; építési beállításokban&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Egy szakaszon belül, hozzáadhatja a &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;függőségeket&lt;/a&gt; a projektek között.</translation>
+        <translation type="obsolete">Egy szakaszon belül, hozzáadhatja a &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;függőségeket&lt;/a&gt; a projektek között.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
@@ -2446,8 +2446,8 @@ Felül szeretné írni azokat?</translation>
         <translation type="obsolete">Módosíthatja a binárist, amelyik a &lt;tt&gt;Futtatás&lt;/tt&gt; gomb lenyomásakor lesz végrehajtva: Hozzáadhat egy &lt;/tt&gt;Szokásos futtatható fájlt&lt;tt&gt; a &lt;tt&gt;+&lt;/tt&gt; gombra kattintással a &lt;tt&gt;Projektek -&gt; Beállítások futtatása -&gt; Konfiguráció futtatása&lt;/tt&gt; menüben és aztán válassza ki az új célt a combo boxban.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
-        <translation type="obsolete">A Qt Creator-t használhatja számos &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;Verzió követő rendszerrel együtt&lt;/a&gt;, úgy mint a Subversion, Perforce és a GIT.</translation>
+        <translation type="obsolete">A Qt Creator-t használhatja számos &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;Verzió követő rendszerrel együtt&lt;/a&gt;, úgy mint a Subversion, Perforce és a GIT.</translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
@@ -2466,12 +2466,12 @@ Felül szeretné írni azokat?</translation>
         <translation type="obsolete">Behangolhatja a &lt;tt&gt;Keresés&lt;/tt&gt; funkciót a &amp;quot;Egész Szavak&amp;quot; vagy &amp;quot;Kis és nagybetűérzékenya&amp;quot; kiválasztásával. Egyszerűen csak kattintson az ikonra sor szerkesztésének jobb végén.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Ha hozzáad egy &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;külső könyvtárat&lt;/a&gt;, a Qt Creator automatikusan felkínálja a szintaksz kihangsúlyozást és a kód kiegészítést.</translation>
+        <translation type="obsolete">Ha hozzáad egy &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;külső könyvtárat&lt;/a&gt;, a Qt Creator automatikusan felkínálja a szintaksz kihangsúlyozást és a kód kiegészítést.</translation>
     </message>
     <message>
-        <source>If you add a &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add a &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Ha hozzáad egy &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;külső könyvtárat&lt;/a&gt;, a Qt Creator automatikusan felkínálja a szintaksz kihangsúlyozást és a kód kiegészítést.</translation>
+        <translation type="obsolete">Ha hozzáad egy &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;külső könyvtárat&lt;/a&gt;, a Qt Creator automatikusan felkínálja a szintaksz kihangsúlyozást és a kód kiegészítést.</translation>
     </message>
     <message>
         <source>&lt;style&gt;
@@ -13194,8 +13194,8 @@ Ok: %2</translation>
         <translation type="obsolete">Szakasz törlése</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Mi az a szakasz?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Mi az a szakasz?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Session</source>
@@ -13893,8 +13893,8 @@ Ok: %2</translation>
         <translation>Szakasz törlése</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Mi az a szakasz?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Mi az a szakasz?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Switch to session</source>
@@ -15715,8 +15715,8 @@ p, li { white-space: pre-wrap; }
         <translation>Behangolhatja a &lt;tt&gt;Keresés&lt;/tt&gt; funkciót a &amp;quot;Egész Szavak&amp;quot; vagy &amp;quot;Kis és nagybetűérzékenya&amp;quot; kiválasztásával. Egyszerűen csak kattintson az ikonra sor szerkesztésének jobb végén.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation>Ha hozzáad egy &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;külső könyvtárat&lt;/a&gt;, a Qt Creator automatikusan felkínálja a szintaksz kihangsúlyozást és a kód kiegészítést.</translation>
+        <translation>Ha hozzáad egy &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;külső könyvtárat&lt;/a&gt;, a Qt Creator automatikusan felkínálja a szintaksz kihangsúlyozást és a kód kiegészítést.</translation>
     </message>
     <message>
         <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
@@ -15739,24 +15739,24 @@ p, li { white-space: pre-wrap; }
         <translation>Válthat a kimeneti panelok között a(z) &lt;tt&gt;%1+n&lt;/tt&gt; lenyomásával, ahol az n az ablak alján található gombokon levő számot jelenti: &lt;ul&gt;&lt;li&gt;1 - Építési probléma&lt;/li&gt;&lt;li&gt;2 - Keresési eredmények&lt;/li&gt;&lt;li&gt;3 - Alkalmazás kimenet&lt;/li&gt;&lt;li&gt;4 - Fordítási kimenet&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation>Gyorsan rákereshet eljárásokra, osztályokra, segítségre és még több mindenre a &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Lokátor bar&lt;/a&gt; használatával (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
+        <translation>Gyorsan rákereshet eljárásokra, osztályokra, segítségre és még több mindenre a &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Lokátor bar&lt;/a&gt; használatával (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation>Hozzáadhat szokásos építési lépéseket az &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;építési beállításokban&lt;/a&gt;.</translation>
+        <translation>Hozzáadhat szokásos építési lépéseket az &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#build-settings&quot;&gt;építési beállításokban&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation>Egy szakaszon belül, hozzáadhat &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;függőségeket&lt;/a&gt;projektek között.</translation>
+        <translation>Egy szakaszon belül, hozzáadhat &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-pane.html#dependencies&quot;&gt;függőségeket&lt;/a&gt;projektek között.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
         <translation>Beállíthatja a kedvenc szerkesztő kódolását az összes Projektre a &lt;tt&gt;Projektek -&gt; Szerkesztő Beállítások -&gt; Alapértelmezett kódolás&lt;/tt&gt; menüpontban.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation>A Qt Creator-t használhatja számos &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;verzió követő rendszerrel&lt;/a&gt;, úgy mint Subversion, Perforce, CVS és Git. </translation>
+        <translation>A Qt Creator-t használhatja számos &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;verzió követő rendszerrel&lt;/a&gt;, úgy mint Subversion, Perforce, CVS és Git. </translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; follows symbol definition, &lt;tt&gt;Shift+F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>

share/qtcreator/translations/qtcreator_it.ts

@@ -2093,8 +2093,8 @@ Vuoi sovrascriverli?</translation>
         <translation type="obsolete">Puoi mostrare o nascondere la barra laterale con &lt;tt&gt;%1+0&lt;/tt&gt;.</translation>
     </message>
     <message>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="obsolete">Se aggiungi &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerie esterne&lt;/a&gt;, Qt Creator ne evidenzierà la sintassi e offrirà il relativo completamento del codice automaticamente.</translation>
+        <translation type="obsolete">Se aggiungi &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerie esterne&lt;/a&gt;, Qt Creator ne evidenzierà la sintassi e offrirà il relativo completamento del codice automaticamente.</translation>
     </message>
     <message>
         <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
@@ -2110,16 +2110,16 @@ Vuoi sovrascriverli?</translation>
         <translation type="obsolete">Puoi passare tra i pannelli di output premendo &lt;tt&gt;%1+n&lt;/tt&gt; dove n è il numero scritto sui bottoni in basso alla finestra: &lt;ul&gt;&lt;li&gt;1 - Problemi di Compilazione&lt;/li&gt;&lt;li&gt;2 - Risultati della Ricerca&lt;/li&gt;&lt;li&gt;3 - Output dell&apos;Applicazione&lt;/li&gt;&lt;li&gt;4 - Output di Compilazione&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Puoi trovare rapidamente metodi, classi, aiuto ed altro usando la &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Ricerca Rapida&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</translation>
+        <translation type="obsolete">Puoi trovare rapidamente metodi, classi, aiuto ed altro usando la &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Ricerca Rapida&lt;/a&gt; (&lt;tt&gt;Ctrl+K&lt;/tt&gt;).</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Puoi aggiungere passi di compilazione nelle &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;impostazioni di compilazione&lt;/a&gt;.</translation>
+        <translation type="obsolete">Puoi aggiungere passi di compilazione nelle &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;impostazioni di compilazione&lt;/a&gt;.</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Nell&apos;ambito di una sessione, puoi aggiungere &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dipendenze&lt;/a&gt; tra i progetti.</translation>
+        <translation type="obsolete">Nell&apos;ambito di una sessione, puoi aggiungere &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dipendenze&lt;/a&gt; tra i progetti.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
@@ -2130,8 +2130,8 @@ Vuoi sovrascriverli?</translation>
         <translation type="obsolete">Puoi cambiare l&apos;eseguibile che sarà avviato premendo il bottone &lt;tt&gt;Esegui&lt;/tt&gt;: Aggiungi un &lt;tt&gt;Eseguibile Personalizzato&lt;/tt&gt; facendo clic sul bottone &lt;tt&gt;+&lt;/tt&gt; in &lt;tt&gt;Progetti -&gt; Impostazioni di Esecuzione -&gt; Configurazione di Esecuzione&lt;/tt&gt;.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce and Git.</source>
-        <translation type="obsolete">Puoi usare Qt Creator sopra diversi &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;sistemi di controllo di versione&lt;/a&gt;, tipo Subversion, Perforce e Git.</translation>
+        <translation type="obsolete">Puoi usare Qt Creator sopra diversi &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;sistemi di controllo di versione&lt;/a&gt;, tipo Subversion, Perforce e Git.</translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
@@ -9245,8 +9245,8 @@ Nome di base della libreria: %1</translation>
     </message>
     <message>
         <location/>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Cos&apos;è una Sessione?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;Cos&apos;è una Sessione?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -14536,8 +14536,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+2"/>
-        <source>If you add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
+        <source>If you add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;external libraries&lt;/a&gt;, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translation type="unfinished">Se aggiungi &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerie esterne&lt;/a&gt;, Qt Creator ne evidenzierà la sintassi e offrirà il relativo completamento del codice automaticamente.</translation>
+        <translation type="unfinished">Se aggiungi &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-external-library-handling.html&quot;&gt;librerie esterne&lt;/a&gt;, Qt Creator ne evidenzierà la sintassi e offrirà il relativo completamento del codice automaticamente.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -14567,18 +14567,18 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+4"/>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="unfinished">Puoi aggiungere passi di compilazione nelle &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;impostazioni di compilazione&lt;/a&gt;.</translation>
+        <translation type="unfinished">Puoi aggiungere passi di compilazione nelle &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;impostazioni di compilazione&lt;/a&gt;.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="unfinished">Nell&apos;ambito di una sessione, puoi aggiungere &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dipendenze&lt;/a&gt; tra i progetti.</translation>
+        <translation type="unfinished">Nell&apos;ambito di una sessione, puoi aggiungere &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html#dependencies&quot;&gt;dipendenze&lt;/a&gt; tra i progetti.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -14592,7 +14592,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+3"/>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

share/qtcreator/translations/qtcreator_ja.ts

@@ -18729,8 +18729,8 @@ to project &apos;%2&apos;.</source>
         <translation>セッション名の変更</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;セッションて何？&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;セッションて何？&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Automatically restore the last session when Qt Creator is started.</source>
@@ -30707,8 +30707,8 @@ Will not be applied to whitespace in comments and strings.</source>
         <translation type="obsolete">デバッグポート:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;前提条件は？&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;前提条件は？&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -39114,8 +39114,8 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <translation>デバッグポート:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;前提条件は？&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;前提条件は？&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Enable Debugging of Subprocesses</source>

share/qtcreator/translations/qtcreator_pl.ts

@@ -1139,8 +1139,8 @@
         <translation>Zmień nazwę sesji</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Co to jest sesja?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Co to jest sesja?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Automatically restore the last session when Qt Creator is started.</source>
@@ -28732,8 +28732,8 @@ Wybierz poprawną nazwę pakietu dla aplikacji (np. &quot;org.przyklad.mojaaplik
         <translation>Port debugowania:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Jakie są wymogi?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Jakie są wymogi?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Enable Debugging of Subprocesses</source>

share/qtcreator/translations/qtcreator_ru.ts

@@ -8162,8 +8162,8 @@ Qt Creator не может подключиться к нему.</translation>
         <translation>Порт отладки:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Зачем нужно?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Зачем нужно?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Enable Debugging of Subprocesses</source>
@@ -19978,8 +19978,8 @@ to project &apos;%2&apos;.</source>
         <translation>Переименование сессии</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Что такое сессия?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Что такое сессия?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Automatically restore the last session when Qt Creator is started.</source>

share/qtcreator/translations/qtcreator_sl.ts

@@ -9560,8 +9560,8 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
     </message>
     <message>
         <location/>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Kaj je seja?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Kaj je seja?&lt;/a&gt;</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/sessiondialog.cpp" line="+213"/>
@@ -26619,8 +26619,8 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov:
     </message>
     <message>
         <location line="+7"/>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Kaj je potrebno?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Kaj je potrebno?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -38411,12 +38411,12 @@ Vedite: to lahko odstrani krajevno datoteko.</translation>
         <translation type="obsolete">Če v svoj projekt dodate zunanje knjižnice, bo Qt Creator zanje samodejno ponudil poudarjanje skladnje in dokončevanje kode.</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-editor-locator.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Metode, razrede, pomoč in ostalo lahko hitro najdete z uporabo &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html&quot;&gt;Lokatorja&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
+        <translation type="obsolete">Metode, razrede, pomoč in ostalo lahko hitro najdete z uporabo &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-editor-locator.html&quot;&gt;Lokatorja&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
     </message>
     <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
+        <source>Within a session, you can add &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation type="obsolete">Znotraj seje lahko dodate &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;odvisnosti&lt;/a&gt; med projekti.</translation>
+        <translation type="obsolete">Znotraj seje lahko dodate &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-dependencies.html&quot;&gt;odvisnosti&lt;/a&gt; med projekti.</translation>
     </message>
     <message>
         <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; follows symbol definition, &lt;tt&gt;Shift+F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
@@ -38451,16 +38451,16 @@ Vedite: to lahko odstrani krajevno datoteko.</translation>
         <translation type="obsolete">Med podokni z izhodom lahko preklapljate z uporabo &lt;tt&gt;%1+n&lt;/tt&gt;, kjer je n številka, ki je napisana na gumbih na dnu okna:&lt;ul&gt;&lt;li&gt;1 - Težave pri gradnji&lt;/li&gt;&lt;li&gt;2 - Rezultati iskanja&lt;/li&gt;&lt;li&gt;3 - Izhod programa&lt;/li&gt;&lt;li&gt;4 - Izhod prevajanja&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
+        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation type="obsolete">Korake gradnje po meri lahko dodate v &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;nastavitvah gradnje&lt;/a&gt;.</translation>
+        <translation type="obsolete">Korake gradnje po meri lahko dodate v &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-build-settings.html&quot;&gt;nastavitvah gradnje&lt;/a&gt;.</translation>
     </message>
     <message>
         <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
         <translation type="obsolete">Želeni nabor znakov za urejevalnik lahko za vsak projekt nastavite v &lt;tt&gt;Projekti → Nastavitve urejevalnika → Privzeti nabor znakov&lt;/tt&gt;.</translation>
     </message>
     <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
+        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation type="obsolete">Qt Creator lahko uporabljate z več &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;sistemi za nadzor različic&lt;/a&gt;, kot so na primer Git, Subversion, CVS in Perforce.</translation>
+        <translation type="obsolete">Qt Creator lahko uporabljate z več &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-version-control.html&quot;&gt;sistemi za nadzor različic&lt;/a&gt;, kot so na primer Git, Subversion, CVS in Perforce.</translation>
     </message>
     <message>
         <source>Explore Qt C++ Examples</source>
@@ -38483,8 +38483,8 @@ Vedite: to lahko odstrani krajevno datoteko.</translation>
         <translation type="obsolete">Ustvari projekt …</translation>
     </message>
     <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
+        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation type="obsolete">Metode, razrede, pomoč in ostalo lahko hitro najdete z uporabo &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-navigation.html&quot;&gt;Lokatorja&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
+        <translation type="obsolete">Metode, razrede, pomoč in ostalo lahko hitro najdete z uporabo &lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-navigation.html&quot;&gt;Lokatorja&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</translation>
     </message>
 </context>
 <context>

share/qtcreator/translations/qtcreator_uk.ts

@@ -15918,8 +15918,8 @@ to project &apos;%2&apos;.</source>
         <translation>&amp;Перемкнутись до</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Що таке сесія?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;Що таке сесія?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>New session name</source>
@@ -29419,8 +29419,8 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <translation>Зневаджувальний порт:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Які передумови?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;Які передумови?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -12372,8 +12372,8 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp
         <translation type="obsolete">删除会话</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;什么是会话?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;什么是会话?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -12404,8 +12404,8 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp
         <translation>重命名会话</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;什么是会话?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator&quot;&gt;什么是会话?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Automatically restore the last session when Qt Creator is started.</source>
@@ -30687,8 +30687,8 @@ Id必须以小写字母开头。</translation>
         <translation type="obsolete">调试端口:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;先决条件是什么?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;先决条件是什么?&lt;/a&gt;</translation>
     </message>
 </context>
 <context>
@@ -33548,8 +33548,8 @@ stderr was: %1</source>
         <translation type="obsolete">串行:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-developing-symbian.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-developing-symbian.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-developing-symbian.html&quot;&gt;先决条件是什么?&lt;/a&gt;</translation>
+        <translation type="obsolete">&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-developing-symbian.html&quot;&gt;先决条件是什么?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Installation file:</source>
@@ -53804,8 +53804,8 @@ Please choose a valid package name for your application (e.g. &quot;org.example.
         <translation>调试端口:</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;先决条件是什么?&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;先决条件是什么?&lt;/a&gt;</translation>
     </message>
     <message>
         <source>Enable Debugging of Subprocesses</source>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -9376,8 +9376,8 @@ Add, modify, and remove document filters, which determine the documentation set
     </message>
     <message>
         <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;What is a Session?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;什麼是工作階段？&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-project-managing-sessions.html&quot;&gt;什麼是工作階段？&lt;/a&gt;</translation>
     </message>
     <message>
         <location/>
@@ -37920,8 +37920,8 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <location line="+3"/>
-        <source>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
+        <source>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;What are the prerequisites?&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html&quot;&gt;先決條件是什麼？&lt;/a&gt;</translation>
+        <translation>&lt;a href=&quot;qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html&quot;&gt;先決條件是什麼？&lt;/a&gt;</translation>
     </message>
     <message>
         <location line="+11"/>

share/qtcreator/welcomescreen/gettingstarted.qml

@@ -82,7 +82,7 @@ Rectangle {
             title: qsTr("Building and Running an Example Application")
             number: 3
             imageUrl: "widgets/images/gettingStarted03.png"
-            onClicked: gettingStarted.openSplitHelp("qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html")
+            onClicked: gettingStarted.openSplitHelp("qthelp://org.qt-project.qtcreator/doc/creator-build-example-application.html")
         }
 
         GettingStartedItem {
@@ -96,7 +96,7 @@ Rectangle {
             description: qsTr("To find out what kind of integrated environment (IDE) Qt Creator is.")
             number: 1
 
-            onClicked: gettingStarted.openHelp("qthelp://com.nokia.qtcreator/doc/creator-overview.html")
+            onClicked: gettingStarted.openHelp("qthelp://org.qt-project.qtcreator/doc/creator-overview.html")
         }
 
         GettingStartedItem {
@@ -107,7 +107,7 @@ Rectangle {
             title: qsTr("User Interface")
             imageUrl: "widgets/images/gettingStarted02.png"
             number: 2
-            onClicked: gettingStarted.openHelp("qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html")
+            onClicked: gettingStarted.openHelp("qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html")
         }
 
         Grid {
@@ -123,7 +123,7 @@ Rectangle {
             IconAndLink {
                 iconName: "userguideIcon"
                 linkText: qsTr("User Guide")
-                onClicked: gettingStarted.openHelp("qthelp://com.nokia.qtcreator/doc/index.html")
+                onClicked: gettingStarted.openHelp("qthelp://org.qt-project.qtcreator/doc/index.html")
             }
 
             IconAndLink {

share/qtcreator/welcomescreen/qtcreator_tutorials.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <instructionals module="Qt">
   <tutorials>
-    <tutorial imageUrl="images/icons/buildrun.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html" projectPath="" name="Building and Running an Example Application">
+    <tutorial imageUrl="images/icons/buildrun.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-build-example-application.html" projectPath="" name="Building and Running an Example Application">
       <description><![CDATA[You can test that your installation is successful by opening an existing example application project.]]></description>
       <tags>qt creator,build,compile</tags>
     </tutorial>
-    <tutorial imageUrl="images/icons/qwidget.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-writing-program.html" projectPath="" name="Creating a Qt Widget Based Application">
+    <tutorial imageUrl="images/icons/qwidget.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-writing-program.html" projectPath="" name="Creating a Qt Widget Based Application">
       <description><![CDATA[This tutorial describes how to use Qt Creator to create a small Qt application, Text Finder.]]></description>
       <tags>qt,c++,text,qt designer,qt creator</tags>
     </tutorial>
-    <tutorial imageUrl="images/icons/qtquick.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-qml-application.html" projectPath="" name="Creating a Qt Quick Application">
+    <tutorial imageUrl="images/icons/qtquick.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/creator-qml-application.html" projectPath="" name="Creating a Qt Quick Application">
       <description><![CDATA[This tutorial uses basic elements and illustrates basic concepts of Qt Quick.]]></description>
       <tags>qt quick,qml,states,transitions,visual designer,qt creator</tags>
     </tutorial>

src/libs/QtcLibrary.qbs

@@ -13,7 +13,7 @@ DynamicLibrary {
         if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))
             return ["-Wl,-s"]
     }
-    cpp.includePaths: [ "." ]
+    cpp.includePaths: [ ".", ".." ]
 
     ProductModule {
         Depends { name: "cpp" }

src/libs/cplusplus/ResolveExpression.cpp

@@ -848,7 +848,7 @@ public:
     }
 
 private:
-    NamedType *getNamedType(FullySpecifiedType& type)
+    NamedType *getNamedType(FullySpecifiedType& type) const
     {
         NamedType *namedTy = type->asNamedType();
         if (! namedTy) {
@@ -858,19 +858,57 @@ private:
         return namedTy;
     }
 
-    QList<LookupItem> getNamedTypeItems(const Name *name, Scope *scope, ClassOrNamespace *binding)
+    QList<LookupItem> getNamedTypeItems(const Name *name, Scope *scope,
+                                        ClassOrNamespace *binding) const
     {
-        QList<LookupItem> namedTypeItems;
+        QList<LookupItem> namedTypeItems = typedefsFromScopeUpToFunctionScope(name, scope);
+        if (namedTypeItems.isEmpty()) {
             if (binding)
                 namedTypeItems = binding->lookup(name);
             if (ClassOrNamespace *scopeCon = _context.lookupType(scope))
                 namedTypeItems += scopeCon->lookup(name);
+        }
 
         return namedTypeItems;
     }
 
+    /// Return all typedefs with given name from given scope up to function scope.
+    static QList<LookupItem> typedefsFromScopeUpToFunctionScope(const Name *name, Scope *scope)
+    {
+        QList<LookupItem> results;
+        Scope *enclosingBlockScope = 0;
+        for (Block *block = scope->asBlock(); block;
+             block = enclosingBlockScope ? enclosingBlockScope->asBlock() : 0) {
+            const unsigned memberCount = block->memberCount();
+            for (unsigned i = 0; i < memberCount; ++i) {
+                Symbol *symbol = block->memberAt(i);
+                if (Declaration *declaration = symbol->asDeclaration()) {
+                    if (isTypedefWithName(declaration, name)) {
+                        LookupItem item;
+                        item.setDeclaration(declaration);
+                        item.setScope(block);
+                        item.setType(declaration->type());
+                        results.append(item);
+                    }
+                }
+            }
+            enclosingBlockScope = block->enclosingScope();
+        }
+        return results;
+    }
+
+    static bool isTypedefWithName(const Declaration *declaration, const Name *name)
+    {
+        if (declaration->isTypedef()) {
+            const Identifier *identifier = declaration->name()->identifier();
+            if (name->identifier()->isEqualTo(identifier))
+                return true;
+        }
+        return false;
+    }
+
     bool findTypedef(const QList<LookupItem>& namedTypeItems, FullySpecifiedType *type,
-                     Scope **scope, QSet<Symbol *>& visited)
+                     Scope **scope, QSet<Symbol *>& visited) const
     {
         bool foundTypedef = false;
         foreach (const LookupItem &it, namedTypeItems) {
@@ -931,6 +969,11 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
                 if (ClassOrNamespace *binding = findClass(type, scope))
                     return binding;
 
+            } else if (PointerType *ptrTy = ty->asPointerType()) {
+                FullySpecifiedType type = ptrTy->elementType();
+                if (ClassOrNamespace *binding = findClass(type, scope))
+                    return binding;
+
             } else if (ClassOrNamespace *binding = findClass(ty, scope)) {
                 // lookup for overloads of operator->
 

src/libs/cplusplus/TypePrettyPrinter.cpp

@@ -228,8 +228,8 @@ void TypePrettyPrinter::visitIndirectionType(
 
     _needsParens = true;
     acceptType(elementType);
-    (bool) switchIsIndirectionToArrayOrFunction(prevIsIndirectionToArrayOrFunction);
+    switchIsIndirectionToArrayOrFunction(prevIsIndirectionToArrayOrFunction);
-    (bool) switchIsIndirectionType(prevIsIndirectionType);
+    switchIsIndirectionType(prevIsIndirectionType);
 }
 
 void TypePrettyPrinter::visit(IntegerType *type)

src/libs/extensionsystem/pluginmanager.cpp

@@ -1309,6 +1309,7 @@ void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *s
         const int absoluteElapsedMS = m_profileTimer->elapsed();
         const int elapsedMS = absoluteElapsedMS - m_profileElapsedMS;
         m_profileElapsedMS = absoluteElapsedMS;
+        if (spec)
             m_profileTotal[spec] += elapsedMS;
         if (spec)
             qDebug("%-22s %-22s %8dms (%8dms)", what, qPrintable(spec->name()), absoluteElapsedMS, elapsedMS);

src/libs/qmljs/qmljssimplereader.cpp

@@ -129,7 +129,7 @@ bool SimpleAbstractStreamReader::readFile(const QString &fileName)
         file.close();
         return readFromSource(QString::fromLocal8Bit(source));
     }
-    addError(tr("Cannot find file %1").arg(fileName));
+    addError(tr("Cannot find file %1.").arg(fileName));
     return false;
 }
 
@@ -176,13 +176,13 @@ AST::SourceLocation SimpleAbstractStreamReader::currentSourceLocation() const
 bool SimpleAbstractStreamReader::readDocument(AST::UiProgram *ast)
 {
     if (!ast) {
-        addError(tr("Could not parse document"));
+        addError(tr("Could not parse document."));
         return false;
     }
 
     AST::UiObjectDefinition *uiObjectDefinition = AST::cast<AST::UiObjectDefinition *>(ast->members->member);
     if (!uiObjectDefinition) {
-        addError(tr("Expected document to contain a single object definition"));
+        addError(tr("Expected document to contain a single object definition."));
         return false;
     }
     readChild(uiObjectDefinition);
@@ -246,7 +246,7 @@ QVariant SimpleAbstractStreamReader::parsePropertyScriptBinding(AST::UiScriptBin
 
     AST::ExpressionStatement *expStmt = AST::cast<AST::ExpressionStatement *>(uiScriptBinding->statement);
     if (!expStmt) {
-        addError(tr("Expected expression statement after colon"), uiScriptBinding->statement->firstSourceLocation());
+        addError(tr("Expected expression statement after colon."), uiScriptBinding->statement->firstSourceLocation());
         return QVariant();
     }
 
@@ -282,7 +282,7 @@ QVariant SimpleAbstractStreamReader::parsePropertyExpression(AST::ExpressionNode
     if (numericLiteral)
         return numericLiteral->value;
 
-    addError(tr("Expected expression statement to be a literal"), expressionNode->firstSourceLocation());
+    addError(tr("Expected expression statement to be a literal."), expressionNode->firstSourceLocation());
     return QVariant();
 }
 
@@ -340,7 +340,7 @@ void SimpleReader::propertyDefinition(const QString &name, const QVariant &value
         qDebug() << "SimpleReader::propertyDefinition()" << m_currentNode.data()->name() << name << value;
 
     if (m_currentNode.data()->propertyNames().contains(name))
-        addError(tr("Property is defined twice"), currentSourceLocation());
+        addError(tr("Property is defined twice."), currentSourceLocation());
 
     m_currentNode.data()->setProperty(name, value);
 }

src/libs/qmljs/qmljsstaticanalysismessage.cpp

@@ -69,7 +69,7 @@ public:
 
 static inline QString msgInvalidConstructor(const char *what)
 {
-    return StaticAnalysisMessages::tr("do not use '%1' as a constructor").arg(QLatin1String(what));
+    return StaticAnalysisMessages::tr("Do not use '%1' as a constructor.").arg(QLatin1String(what));
 }
 
 StaticAnalysisMessages::StaticAnalysisMessages()
@@ -77,63 +77,63 @@ StaticAnalysisMessages::StaticAnalysisMessages()
     // When changing a message or severity, update the documentation, currently
     // in creator-editors.qdoc, accordingly.
     newMsg(ErrInvalidEnumValue, Error,
-           tr("invalid value for enum"));
+           tr("Invalid value for enum."));
     newMsg(ErrEnumValueMustBeStringOrNumber, Error,
-           tr("enum value must be a string or a number"));
+           tr("Enum value must be a string or a number."));
     newMsg(ErrNumberValueExpected, Error,
-           tr("number value expected"));
+           tr("Number value expected."));
     newMsg(ErrBooleanValueExpected, Error,
-           tr("boolean value expected"));
+           tr("Boolean value expected."));
     newMsg(ErrStringValueExpected, Error,
-           tr("string value expected"));
+           tr("String value expected."));
     newMsg(ErrInvalidUrl, Error,
-           tr("invalid URL"));
+           tr("Invalid URL."));
     newMsg(WarnFileOrDirectoryDoesNotExist, Warning,
-           tr("file or directory does not exist"));
+           tr("File or directory does not exist."));
     newMsg(ErrInvalidColor, Error,
-           tr("invalid color"));
+           tr("Invalid color."));
     newMsg(ErrAnchorLineExpected, Error,
-           tr("anchor line expected"));
+           tr("Anchor line expected."));
     newMsg(ErrPropertiesCanOnlyHaveOneBinding, Error,
-           tr("duplicate property binding"));
+           tr("Duplicate property binding."));
     newMsg(ErrIdExpected, Error,
-           tr("id expected"));
+           tr("Id expected."));
     newMsg(ErrInvalidId, Error,
-           tr("invalid id"));
+           tr("Invalid id."));
     newMsg(ErrDuplicateId, Error,
-           tr("duplicate id"));
+           tr("Duplicate id."));
     newMsg(ErrInvalidPropertyName, Error,
-           tr("invalid property name '%1'"), 1);
+           tr("Invalid property name '%1'."), 1);
     newMsg(ErrDoesNotHaveMembers, Error,
-           tr("'%1' does not have members"), 1);
+           tr("'%1' does not have members."), 1);
     newMsg(ErrInvalidMember, Error,
-           tr("'%1' is not a member of '%2'"), 2);
+           tr("'%1' is not a member of '%2'."), 2);
     newMsg(WarnAssignmentInCondition, Warning,
-           tr("assignment in condition"));
+           tr("Assignment in condition."));
     newMsg(WarnCaseWithoutFlowControl, Warning,
-           tr("unterminated non-empty case block"));
+           tr("Unterminated non-empty case block."));
     newMsg(WarnEval, Warning,
-           tr("do not use 'eval'"));
+           tr("Do not use 'eval'."));
     newMsg(WarnUnreachable, Warning,
-           tr("unreachable"));
+           tr("Unreachable."));
     newMsg(WarnWith, Warning,
-           tr("do not use 'with'"));
+           tr("Do not use 'with'."));
     newMsg(WarnComma, Warning,
-           tr("do not use comma expressions"));
+           tr("Do not use comma expressions."));
     newMsg(WarnAlreadyFormalParameter, Warning,
-           tr("'%1' is already a formal parameter"), 1);
+           tr("'%1' already is a formal parameter."), 1);
     newMsg(WarnUnnecessaryMessageSuppression, Warning,
-           tr("unnecessary message suppression"));
+           tr("Unnecessary message suppression."));
     newMsg(WarnAlreadyFunction, Warning,
-           tr("'%1' is already a function"), 1);
+           tr("'%1' already is a function."), 1);
     newMsg(WarnVarUsedBeforeDeclaration, Warning,
-           tr("var '%1' is used before its declaration"), 1);
+           tr("var '%1' is used before its declaration."), 1);
     newMsg(WarnAlreadyVar, Warning,
-           tr("'%1' is already a var"), 1);
+           tr("'%1' already is a var."), 1);
     newMsg(WarnDuplicateDeclaration, Warning,
-           tr("'%1' is declared more than once"), 1);
+           tr("'%1' is declared more than once."), 1);
     newMsg(WarnFunctionUsedBeforeDeclaration, Warning,
-           tr("function '%1' is used before its declaration"), 1);
+           tr("Function '%1' is used before its declaration."), 1);
     newMsg(WarnBooleanConstructor, Warning,
            msgInvalidConstructor("Boolean"));
     newMsg(WarnStringConstructor, Warning,
@@ -145,86 +145,86 @@ StaticAnalysisMessages::StaticAnalysisMessages()
     newMsg(WarnFunctionConstructor, Warning,
            msgInvalidConstructor("Function"));
     newMsg(HintAnonymousFunctionSpacing, Hint,
-           tr("the 'function' keyword and the opening parenthesis should be separated by a single space"));
+           tr("The 'function' keyword and the opening parenthesis should be separated by a single space."));
     newMsg(WarnBlock, Warning,
-           tr("do not use stand-alone blocks"));
+           tr("Do not use stand-alone blocks."));
     newMsg(WarnVoid, Warning,
-           tr("do not use void expressions"));
+           tr("Do not use void expressions."));
     newMsg(WarnConfusingPluses, Warning,
-           tr("confusing pluses"));
+           tr("Confusing pluses."));
     newMsg(WarnConfusingMinuses, Warning,
-           tr("confusing minuses"));
+           tr("Confusing minuses."));
     newMsg(HintDeclareVarsInOneLine, Hint,
-           tr("declare all function vars on a single line"));
+           tr("Declare all function vars on a single line."));
     newMsg(HintExtraParentheses, Hint,
-           tr("unnecessary parentheses"));
+           tr("Unnecessary parentheses."));
     newMsg(MaybeWarnEqualityTypeCoercion, MaybeWarning,
-           tr("== and != may perform type coercion, use === or !== to avoid"));
+           tr("== and != may perform type coercion, use === or !== to avoid it."));
     newMsg(WarnConfusingExpressionStatement, Warning,
-           tr("expression statements should be assignments, calls or delete expressions only"));
+           tr("Expression statements should be assignments, calls or delete expressions only."));
     newMsg(HintDeclarationsShouldBeAtStartOfFunction, Hint,
-           tr("var declarations should be at the start of a function"));
+           tr("Place var declarations at the start of a function."));
     newMsg(HintOneStatementPerLine, Hint,
-           tr("only use one statement per line"));
+           tr("Use only one statement per line."));
     newMsg(ErrUnknownComponent, Error,
-           tr("unknown component"));
+           tr("Unknown component."));
     newMsg(ErrCouldNotResolvePrototypeOf, Error,
-           tr("could not resolve the prototype '%1' of '%2'"), 2);
+           tr("Could not resolve the prototype '%1' of '%2'."), 2);
     newMsg(ErrCouldNotResolvePrototype, Error,
-           tr("could not resolve the prototype '%1'"), 1);
+           tr("Could not resolve the prototype '%1'."), 1);
     newMsg(ErrPrototypeCycle, Error,
-           tr("prototype cycle, the last non-repeated component is '%1'"), 1);
+           tr("Prototype cycle, the last non-repeated component is '%1'."), 1);
     newMsg(ErrInvalidPropertyType, Error,
-           tr("invalid property type '%1'"), 1);
+           tr("Invalid property type '%1'."), 1);
     newMsg(WarnEqualityTypeCoercion, Warning,
-           tr("== and != perform type coercion, use === or !== to avoid"));
+           tr("== and != perform type coercion, use === or !== to avoid it."));
     newMsg(WarnExpectedNewWithUppercaseFunction, Warning,
-           tr("calls of functions that start with an uppercase letter should use 'new'"));
+           tr("Calls of functions that start with an uppercase letter should use 'new'."));
     newMsg(WarnNewWithLowercaseFunction, Warning,
-           tr("'new' should only be used with functions that start with an uppercase letter"));
+           tr("Use 'new' only with functions that start with an uppercase letter."));
     newMsg(WarnNumberConstructor, Warning,
            msgInvalidConstructor("Function"));
     newMsg(HintBinaryOperatorSpacing, Hint,
-           tr("use spaces around binary operators"));
+           tr("Use spaces around binary operators."));
     newMsg(WarnUnintentinalEmptyBlock, Warning,
-           tr("unintentional empty block, use ({}) for empty object literal"));
+           tr("Unintentional empty block, use ({}) for empty object literal."));
     newMsg(HintPreferNonVarPropertyType, Hint,
-           tr("use %1 instead of 'var' or 'variant' to improve performance"), 1);
+           tr("Use %1 instead of 'var' or 'variant' to improve performance."), 1);
     newMsg(ErrMissingRequiredProperty, Error,
-           tr("missing property '%1'"), 1);
+           tr("Missing property '%1'."), 1);
     newMsg(ErrObjectValueExpected, Error,
-           tr("object value expected"));
+           tr("Object value expected."));
     newMsg(ErrArrayValueExpected, Error,
-           tr("array value expected"));
+           tr("Array value expected."));
     newMsg(ErrDifferentValueExpected, Error,
-           tr("%1 value expected"), 1);
+           tr("%1 value expected."), 1);
     newMsg(ErrSmallerNumberValueExpected, Error,
-           tr("maximum number value is %1"), 1);
+           tr("Maximum number value is %1."), 1);
     newMsg(ErrLargerNumberValueExpected, Error,
-           tr("minimum number value is %1"), 1);
+           tr("Minimum number value is %1."), 1);
     newMsg(ErrMaximumNumberValueIsExclusive, Error,
-           tr("maximum number value is exclusive"));
+           tr("Maximum number value is exclusive."));
     newMsg(ErrMinimumNumberValueIsExclusive, Error,
-           tr("minimum number value is exclusive"));
+           tr("Minimum number value is exclusive."));
     newMsg(ErrInvalidStringValuePattern, Error,
-           tr("string value does not match required pattern"));
+           tr("String value does not match required pattern."));
     newMsg(ErrLongerStringValueExpected, Error,
-           tr("minimum string value length is %1"), 1);
+           tr("Minimum string value length is %1."), 1);
     newMsg(ErrShorterStringValueExpected, Error,
-           tr("maximum string value length is %1"), 1);
+           tr("Maximum string value length is %1."), 1);
     newMsg(ErrInvalidArrayValueLength, Error,
-           tr("%1 elements expected in array value"), 1);
+           tr("%1 elements expected in array value."), 1);
     newMsg(WarnImperativeCodeNotEditableInVisualDesigner, Warning,
-            tr("Imperative code is not supported in the Qt Quick Designer"));
+            tr("Imperative code is not supported in the Qt Quick Designer."));
     newMsg(WarnUnsupportedTypeInVisualDesigner, Warning,
-            tr("This type is not supported in the Qt Quick Designer"));
+            tr("This type is not supported in the Qt Quick Designer."));
     newMsg(WarnReferenceToParentItemNotSupportedByVisualDesigner, Warning,
-            tr("Reference to parent item cannot be resolved correctly by the Qt Quick Designer"));
+            tr("Reference to parent item cannot be resolved correctly by the Qt Quick Designer."));
     newMsg(WarnUndefinedValueForVisualDesigner, Warning,
             tr("This visual property binding cannot be evaluated in the local context "
-               "and might not show up in Qt Quick Designer as expected"));
+               "and might not show up in Qt Quick Designer as expected."));
     newMsg(WarnStatesOnlyInRootItemForVisualDesigner, Warning,
-            tr("Qt Quick Designer only supports states in the root item "));
+            tr("Qt Quick Designer only supports states in the root item."));
 }
 
 } // anonymous namespace

src/libs/qmljs/qmljstypedescriptionreader.cpp

@@ -95,18 +95,18 @@ QString TypeDescriptionReader::warningMessage() const
 void TypeDescriptionReader::readDocument(UiProgram *ast)
 {
     if (!ast) {
-        addError(SourceLocation(), tr("Could not parse document"));
+        addError(SourceLocation(), tr("Could not parse document."));
         return;
     }
 
     if (!ast->imports || ast->imports->next) {
-        addError(SourceLocation(), tr("Expected a single import"));
+        addError(SourceLocation(), tr("Expected a single import."));
         return;
     }
 
     UiImport *import = ast->imports->import;
     if (toString(import->importUri) != QLatin1String("QtQuick.tooling")) {
-        addError(import->importToken, tr("Expected import of QtQuick.tooling"));
+        addError(import->importToken, tr("Expected import of QtQuick.tooling."));
         return;
     }
 
@@ -118,23 +118,23 @@ void TypeDescriptionReader::readDocument(UiProgram *ast)
                                    versionString.mid(dotIdx + 1).toInt());
     }
     if (version > ComponentVersion(1, 1)) {
-        addError(import->versionToken, tr("Expected version 1.1 or lower"));
+        addError(import->versionToken, tr("Expected version 1.1 or lower."));
         return;
     }
 
     if (!ast->members || !ast->members->member || ast->members->next) {
-        addError(SourceLocation(), tr("Expected document to contain a single object definition"));
+        addError(SourceLocation(), tr("Expected document to contain a single object definition."));
         return;
     }
 
     UiObjectDefinition *module = dynamic_cast<UiObjectDefinition *>(ast->members->member);
     if (!module) {
-        addError(SourceLocation(), tr("Expected document to contain a single object definition"));
+        addError(SourceLocation(), tr("Expected document to contain a single object definition."));
         return;
     }
 
     if (toString(module->qualifiedTypeNameId) != QLatin1String("Module")) {
-        addError(SourceLocation(), tr("Expected document to contain a Module {} member"));
+        addError(SourceLocation(), tr("Expected document to contain a Module {} member."));
         return;
     }
 
@@ -153,7 +153,7 @@ void TypeDescriptionReader::readModule(UiObjectDefinition *ast)
 
         if (!component || (typeName != QLatin1String("Component") && typeName != QLatin1String("ModuleApi"))) {
             addWarning(member->firstSourceLocation(),
-                       tr("Expected only 'Component' and 'ModuleApi' object definitions"));
+                       tr("Expected only Component and ModuleApi object definitions."));
             continue;
         }
 
@@ -197,7 +197,7 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast)
             else if (name == QLatin1String("Enum"))
                 readEnum(component, fmo);
             else
-                addWarning(component->firstSourceLocation(), tr("Expected only Property, Method, Signal and Enum object definitions"));
+                addWarning(component->firstSourceLocation(), tr("Expected only Property, Method, Signal and Enum object definitions."));
         } else if (script) {
             QString name = toString(script->qualifiedId);
             if (name == QLatin1String("name")) {
@@ -215,15 +215,15 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast)
             } else {
                 addWarning(script->firstSourceLocation(),
                            tr("Expected only name, prototype, defaultProperty, attachedType, exports "
-                              "and exportMetaObjectRevisions script bindings"));
+                              "and exportMetaObjectRevisions script bindings."));
             }
         } else {
-            addWarning(member->firstSourceLocation(), tr("Expected only script bindings and object definitions"));
+            addWarning(member->firstSourceLocation(), tr("Expected only script bindings and object definitions."));
         }
     }
 
     if (fmo->className().isEmpty()) {
-        addError(ast->firstSourceLocation(), tr("Component definition is missing a name binding"));
+        addError(ast->firstSourceLocation(), tr("Component definition is missing a name binding."));
         return;
     }
 
@@ -250,15 +250,15 @@ void TypeDescriptionReader::readModuleApi(UiObjectDefinition *ast)
                 apiInfo.cppName = readStringBinding(script);
             } else {
                 addWarning(script->firstSourceLocation(),
-                           tr("Expected only uri, version and name script bindings"));
+                           tr("Expected only uri, version and name script bindings."));
             }
         } else {
-            addWarning(member->firstSourceLocation(), tr("Expected only script bindings"));
+            addWarning(member->firstSourceLocation(), tr("Expected only script bindings."));
         }
     }
 
     if (!apiInfo.version.isValid()) {
-        addError(ast->firstSourceLocation(), tr("ModuleApi definition has no or invalid 'version' binding"));
+        addError(ast->firstSourceLocation(), tr("ModuleApi definition has no or invalid version binding."));
         return;
     }
 
@@ -284,7 +284,7 @@ void TypeDescriptionReader::readSignalOrMethod(UiObjectDefinition *ast, bool isM
             if (name == QLatin1String("Parameter"))
                 readParameter(component, &fmm);
             else
-                addWarning(component->firstSourceLocation(), tr("Expected only Parameter object definitions"));
+                addWarning(component->firstSourceLocation(), tr("Expected only Parameter object definitions."));
         } else if (script) {
             QString name = toString(script->qualifiedId);
             if (name == QLatin1String("name"))
@@ -294,15 +294,15 @@ void TypeDescriptionReader::readSignalOrMethod(UiObjectDefinition *ast, bool isM
             else if (name == QLatin1String("revision"))
                 fmm.setRevision(readIntBinding(script));
             else
-                addWarning(script->firstSourceLocation(), tr("Expected only name and type script bindings"));
+                addWarning(script->firstSourceLocation(), tr("Expected only name and type script bindings."));
 
         } else {
-            addWarning(member->firstSourceLocation(), tr("Expected only script bindings and object definitions"));
+            addWarning(member->firstSourceLocation(), tr("Expected only script bindings and object definitions."));
         }
     }
 
     if (fmm.methodName().isEmpty()) {
-        addError(ast->firstSourceLocation(), tr("Method or Signal is missing a name script binding"));
+        addError(ast->firstSourceLocation(), tr("Method or signal is missing a name script binding."));
         return;
     }
 
@@ -322,7 +322,7 @@ void TypeDescriptionReader::readProperty(UiObjectDefinition *ast, FakeMetaObject
         UiObjectMember *member = it->member;
         UiScriptBinding *script = dynamic_cast<UiScriptBinding *>(member);
         if (!script) {
-            addWarning(member->firstSourceLocation(), tr("Expected script binding"));
+            addWarning(member->firstSourceLocation(), tr("Expected script binding."));
             continue;
         }
 
@@ -340,11 +340,11 @@ void TypeDescriptionReader::readProperty(UiObjectDefinition *ast, FakeMetaObject
         else if (id == QLatin1String("revision"))
             revision = readIntBinding(script);
         else
-            addWarning(script->firstSourceLocation(), tr("Expected only type, name, revision, isPointer, isReadonly and isList script bindings"));
+            addWarning(script->firstSourceLocation(), tr("Expected only type, name, revision, isPointer, isReadonly and isList script bindings."));
     }
 
     if (name.isEmpty() || type.isEmpty()) {
-        addError(ast->firstSourceLocation(), tr("Property object is missing a name or type script binding"));
+        addError(ast->firstSourceLocation(), tr("Property object is missing a name or type script binding."));
         return;
     }
 
@@ -359,7 +359,7 @@ void TypeDescriptionReader::readEnum(UiObjectDefinition *ast, FakeMetaObject::Pt
         UiObjectMember *member = it->member;
         UiScriptBinding *script = dynamic_cast<UiScriptBinding *>(member);
         if (!script) {
-            addWarning(member->firstSourceLocation(), tr("Expected script binding"));
+            addWarning(member->firstSourceLocation(), tr("Expected script binding."));
             continue;
         }
 
@@ -369,7 +369,7 @@ void TypeDescriptionReader::readEnum(UiObjectDefinition *ast, FakeMetaObject::Pt
         else if (name == QLatin1String("values"))
             readEnumValues(script, &fme);
         else
-            addWarning(script->firstSourceLocation(), tr("Expected only name and values script bindings"));
+            addWarning(script->firstSourceLocation(), tr("Expected only name and values script bindings."));
     }
 
     fmo->addEnum(fme);
@@ -384,7 +384,7 @@ void TypeDescriptionReader::readParameter(UiObjectDefinition *ast, FakeMetaMetho
         UiObjectMember *member = it->member;
         UiScriptBinding *script = dynamic_cast<UiScriptBinding *>(member);
         if (!script) {
-            addWarning(member->firstSourceLocation(), tr("Expected script binding"));
+            addWarning(member->firstSourceLocation(), tr("Expected script binding."));
             continue;
         }
 
@@ -400,7 +400,7 @@ void TypeDescriptionReader::readParameter(UiObjectDefinition *ast, FakeMetaMetho
         } else if (id == QLatin1String("isList")) {
             // ### unhandled
         } else {
-            addWarning(script->firstSourceLocation(), tr("Expected only name and type script bindings"));
+            addWarning(script->firstSourceLocation(), tr("Expected only name and type script bindings."));
         }
     }
 
@@ -410,19 +410,19 @@ void TypeDescriptionReader::readParameter(UiObjectDefinition *ast, FakeMetaMetho
 QString TypeDescriptionReader::readStringBinding(UiScriptBinding *ast)
 {
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected string after colon"));
+        addError(ast->colonToken, tr("Expected string after colon."));
         return QString();
     }
 
     ExpressionStatement *expStmt = dynamic_cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected string after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected string after colon."));
         return QString();
     }
 
     StringLiteral *stringLit = dynamic_cast<StringLiteral *>(expStmt->expression);
     if (!stringLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected string after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected string after colon."));
         return QString();
     }
 
@@ -432,20 +432,20 @@ QString TypeDescriptionReader::readStringBinding(UiScriptBinding *ast)
 bool TypeDescriptionReader::readBoolBinding(AST::UiScriptBinding *ast)
 {
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected boolean after colon"));
+        addError(ast->colonToken, tr("Expected boolean after colon."));
         return false;
     }
 
     ExpressionStatement *expStmt = dynamic_cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected boolean after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected boolean after colon."));
         return false;
     }
 
     TrueLiteral *trueLit = dynamic_cast<TrueLiteral *>(expStmt->expression);
     FalseLiteral *falseLit = dynamic_cast<FalseLiteral *>(expStmt->expression);
     if (!trueLit && !falseLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected true or false after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected true or false after colon."));
         return false;
     }
 
@@ -455,19 +455,19 @@ bool TypeDescriptionReader::readBoolBinding(AST::UiScriptBinding *ast)
 double TypeDescriptionReader::readNumericBinding(AST::UiScriptBinding *ast)
 {
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected numeric literal after colon"));
+        addError(ast->colonToken, tr("Expected numeric literal after colon."));
         return 0;
     }
 
     ExpressionStatement *expStmt = AST::cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected numeric literal after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected numeric literal after colon."));
         return 0;
     }
 
     NumericLiteral *numericLit = AST::cast<NumericLiteral *>(expStmt->expression);
     if (!numericLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected numeric literal after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected numeric literal after colon."));
         return 0;
     }
 
@@ -479,19 +479,19 @@ ComponentVersion TypeDescriptionReader::readNumericVersionBinding(UiScriptBindin
     ComponentVersion invalidVersion;
 
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected numeric literal after colon"));
+        addError(ast->colonToken, tr("Expected numeric literal after colon."));
         return invalidVersion;
     }
 
     ExpressionStatement *expStmt = AST::cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected numeric literal after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected numeric literal after colon."));
         return invalidVersion;
     }
 
     NumericLiteral *numericLit = AST::cast<NumericLiteral *>(expStmt->expression);
     if (!numericLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected numeric literal after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected numeric literal after colon."));
         return invalidVersion;
     }
 
@@ -504,7 +504,7 @@ int TypeDescriptionReader::readIntBinding(AST::UiScriptBinding *ast)
     int i = static_cast<int>(v);
 
     if (i != v) {
-        addError(ast->firstSourceLocation(), tr("Expected integer after colon"));
+        addError(ast->firstSourceLocation(), tr("Expected integer after colon."));
         return 0;
     }
 
@@ -514,26 +514,26 @@ int TypeDescriptionReader::readIntBinding(AST::UiScriptBinding *ast)
 void TypeDescriptionReader::readExports(UiScriptBinding *ast, FakeMetaObject::Ptr fmo)
 {
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected array of strings after colon"));
+        addError(ast->colonToken, tr("Expected array of strings after colon."));
         return;
     }
 
     ExpressionStatement *expStmt = dynamic_cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected array of strings after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected array of strings after colon."));
         return;
     }
 
     ArrayLiteral *arrayLit = dynamic_cast<ArrayLiteral *>(expStmt->expression);
     if (!arrayLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected array of strings after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected array of strings after colon."));
         return;
     }
 
     for (ElementList *it = arrayLit->elements; it; it = it->next) {
         StringLiteral *stringLit = dynamic_cast<StringLiteral *>(it->expression);
         if (!stringLit) {
-            addError(arrayLit->firstSourceLocation(), tr("Expected array literal with only string literal members"));
+            addError(arrayLit->firstSourceLocation(), tr("Expected array literal with only string literal members."));
             return;
         }
         QString exp = stringLit->value.toString();
@@ -542,7 +542,7 @@ void TypeDescriptionReader::readExports(UiScriptBinding *ast, FakeMetaObject::Pt
         ComponentVersion version(exp.mid(spaceIdx + 1));
 
         if (spaceIdx == -1 || !version.isValid()) {
-            addError(stringLit->firstSourceLocation(), tr("Expected string literal to contain 'Package/Name major.minor' or 'Name major.minor'"));
+            addError(stringLit->firstSourceLocation(), tr("Expected string literal to contain 'Package/Name major.minor' or 'Name major.minor'."));
             continue;
         }
         QString package;
@@ -558,19 +558,19 @@ void TypeDescriptionReader::readExports(UiScriptBinding *ast, FakeMetaObject::Pt
 void TypeDescriptionReader::readMetaObjectRevisions(UiScriptBinding *ast, FakeMetaObject::Ptr fmo)
 {
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected array of numbers after colon"));
+        addError(ast->colonToken, tr("Expected array of numbers after colon."));
         return;
     }
 
     ExpressionStatement *expStmt = dynamic_cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected array of numbers after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected array of numbers after colon."));
         return;
     }
 
     ArrayLiteral *arrayLit = dynamic_cast<ArrayLiteral *>(expStmt->expression);
     if (!arrayLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected array of numbers after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected array of numbers after colon."));
         return;
     }
 
@@ -579,19 +579,19 @@ void TypeDescriptionReader::readMetaObjectRevisions(UiScriptBinding *ast, FakeMe
     for (ElementList *it = arrayLit->elements; it; it = it->next, ++exportIndex) {
         NumericLiteral *numberLit = cast<NumericLiteral *>(it->expression);
         if (!numberLit) {
-            addError(arrayLit->firstSourceLocation(), tr("Expected array literal with only number literal members"));
+            addError(arrayLit->firstSourceLocation(), tr("Expected array literal with only number literal members."));
             return;
         }
 
         if (exportIndex >= exportCount) {
-            addError(numberLit->firstSourceLocation(), tr("Meta object revision without matching export"));
+            addError(numberLit->firstSourceLocation(), tr("Meta object revision without matching export."));
             return;
         }
 
         const double v = numberLit->value;
         const int metaObjectRevision = static_cast<int>(v);
         if (metaObjectRevision != v) {
-            addError(numberLit->firstSourceLocation(), tr("Expected integer"));
+            addError(numberLit->firstSourceLocation(), tr("Expected integer."));
             return;
         }
 
@@ -602,19 +602,19 @@ void TypeDescriptionReader::readMetaObjectRevisions(UiScriptBinding *ast, FakeMe
 void TypeDescriptionReader::readEnumValues(AST::UiScriptBinding *ast, LanguageUtils::FakeMetaEnum *fme)
 {
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected object literal after colon"));
+        addError(ast->colonToken, tr("Expected object literal after colon."));
         return;
     }
 
     ExpressionStatement *expStmt = dynamic_cast<ExpressionStatement *>(ast->statement);
     if (!expStmt) {
-        addError(ast->statement->firstSourceLocation(), tr("Expected object literal after colon"));
+        addError(ast->statement->firstSourceLocation(), tr("Expected object literal after colon."));
         return;
     }
 
     ObjectLiteral *objectLit = dynamic_cast<ObjectLiteral *>(expStmt->expression);
     if (!objectLit) {
-        addError(expStmt->firstSourceLocation(), tr("Expected object literal after colon"));
+        addError(expStmt->firstSourceLocation(), tr("Expected object literal after colon."));
         return;
     }
 
@@ -625,7 +625,7 @@ void TypeDescriptionReader::readEnumValues(AST::UiScriptBinding *ast, LanguageUt
         if (minus)
             value = dynamic_cast<NumericLiteral *>(minus->expression);
         if (!propName || !value) {
-            addError(objectLit->firstSourceLocation(), tr("Expected object literal to contain only 'string: number' elements"));
+            addError(objectLit->firstSourceLocation(), tr("Expected object literal to contain only 'string: number' elements."));
             continue;
         }
 

src/libs/ssh/ssh.qbs

@@ -45,7 +45,17 @@ QtcLibrary {
     ].concat(botanFiles)
 
     property var botanIncludes: ["../3rdparty"]
-    property var botanLibs: qbs.targetOS === "windows" ? ["advapi32", "user32"] : ["rt", "dl"]
+    property var botanLibs: {
+        var result = [];
+        if (qbs.targetOS === "windows")
+            result.push("advapi32", "user32")
+        else {
+            result.push("rt")
+            if (qbs.targetOS === "linux" || qbs.targetOS === "mac")
+                result.push("dl")
+        }
+        return result
+    }
     property var botanDefines: {
             var result = ['BOTAN_DLL=']
             if (qbs.toolchain === "msvc")

src/libs/utils/elidinglabel.cpp

@@ -69,8 +69,12 @@ void ElidingLabel::paintEvent(QPaintEvent *)
     QRect contents = contentsRect().adjusted(m, m, -m, -m);
     QFontMetrics fm = fontMetrics();
     QString txt = text();
-    if (txt.length() > 4 && fm.width(txt) > contents.width())
+    if (txt.length() > 4 && fm.width(txt) > contents.width()) {
+        setToolTip(txt);
         txt = fm.elidedText(txt, m_elideMode, contents.width());
+    } else {
+        setToolTip(QString());
+    }
     int flags = QStyle::visualAlignment(layoutDirection(), alignment()) | Qt::TextSingleLine;
 
     QPainter painter(this);

src/libs/utils/pathchooser.cpp

@@ -521,7 +521,7 @@ bool PathChooser::validatePath(const QString &path, QString *errorMessage)
     case PathChooser::ExistingCommand:
         if (!fi.isFile() || !fi.isExecutable()) {
             if (errorMessage)
-                *errorMessage = tr("The path <b>%1</b> is not a executable file.").arg(QDir::toNativeSeparators(expandedPath));
+                *errorMessage = tr("The path <b>%1</b> is not an executable file.").arg(QDir::toNativeSeparators(expandedPath));
             return false;
         }
 

src/libs/utils/utils.qbs

@@ -15,7 +15,7 @@ QtcLibrary {
         ]
     }
     Properties {
-        condition: qbs.targetOS == "linux"
+        condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
         cpp.dynamicLibraries: ["X11"]
     }
 
@@ -205,13 +205,17 @@ QtcLibrary {
     }
 
     Group {
-        condition: qbs.targetOS == "linux" || qbs.targetOS == "mac"
+        condition: qbs.targetPlatform.indexOf("unix") != -1
         files: [
             "consoleprocess_unix.cpp",
         ]
     }
 
     ProductModule {
+        // ### [ remove, once qbs supports merging of ProductModule items in derived products
+        Depends { name: "cpp" }
+        cpp.includePaths: [ ".." ]
+        // ### ]
         Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
     }
 }

src/libs/zeroconf/dnsSdLib.cpp

@@ -110,7 +110,7 @@ public:
         // dynamic linking
         if (!dnsSdLib.load()) {
             m_isOk = false;
-            m_errorMsg = tr("could not load native library");
+            m_errorMsg = tr("Could not load native library.");
         }
         m_refDeallocate = reinterpret_cast<RefDeallocatePtr>(dnsSdLib.resolve("DNSServiceRefDeallocate"));
         m_resolve = reinterpret_cast<ResolvePtr>(dnsSdLib.resolve("DNSServiceResolve"));
@@ -138,9 +138,9 @@ public:
         if (m_isOk && m_getAddrInfo == 0) {
             m_isOk = false;
 #ifdef Q_OS_LINUX
-            m_errorMsg = tr("skipping over avahi compatibility lib (or obsolete mdnsd)");
+            m_errorMsg = tr("Skipping over Avahi compatibility lib (or obsolete mdnsd).");
 #else
-            m_errorMsg = tr("*WARNING* detected an obsolete version of Apple Bonjour, either disable/uninstall it or upgrade it, otherwise zeroconf will fail");
+            m_errorMsg = tr("Warning: Detected an obsolete version of Apple Bonjour. Disable, uninstall, or upgrade it, or zeroconf will fail.");
 #endif
         }
         if (DEBUG_ZEROCONF){

src/plugins/QtcPlugin.qbs

@@ -19,6 +19,7 @@ Product {
         return name;
     }
 
+    Depends { name: "ExtensionSystem" }
     Depends { name: "pluginspec" }
     Depends { name: "cpp" }
     Depends {

src/plugins/android/android.pro

@@ -37,7 +37,8 @@ HEADERS += \
     javaparser.h \
     androidplugin.h \
     androiddevicefactory.h \
-    androiddevice.h
+    androiddevice.h \
+    androidgdbserverkitinformation.h
 
 SOURCES += \
     androidconfigurations.cpp \
@@ -65,8 +66,8 @@ SOURCES += \
     javaparser.cpp \
     androidplugin.cpp \
     androiddevicefactory.cpp \
-    androiddevice.cpp
+    androiddevice.cpp \
-
+    androidgdbserverkitinformation.cpp
 
 FORMS += \
     androidsettingswidget.ui \

src/plugins/android/android.qbs

@@ -41,6 +41,8 @@ QtcPlugin {
         "androiddevice.h",
         "androiddevicefactory.cpp",
         "androiddevicefactory.h",
+        "androidgdbserverkitinformation.cpp",
+        "androidgdbserverkitinformation.h",
         "androidglobal.h",
         "androidmanager.cpp",
         "androidmanager.h",

src/plugins/android/androidconfigurations.cpp

@@ -73,7 +73,6 @@ namespace {
     const QLatin1String OpenJDKLocationKey("OpenJDKLocation");
     const QLatin1String KeystoreLocationKey("KeystoreLocation");
     const QLatin1String PartitionSizeKey("PartitionSize");
-    const QLatin1String NDKGccVersionRegExp("-\\d[\\.\\d]+");
     const QLatin1String ArmToolchainPrefix("arm-linux-androideabi");
     const QLatin1String X86ToolchainPrefix("x86");
     const QLatin1String ArmToolsPrefix("arm-linux-androideabi");
@@ -95,6 +94,15 @@ namespace {
     }
 }
 
+Abi::Architecture AndroidConfigurations::architectureForToolChainPrefix(const QString& toolchainprefix)
+{
+    if (toolchainprefix == ArmToolchainPrefix)
+        return Abi::ArmArchitecture;
+    if (toolchainprefix == X86ToolchainPrefix)
+        return Abi::X86Architecture;
+    return Abi::UnknownArchitecture;
+}
+
 QLatin1String AndroidConfigurations::toolchainPrefix(Abi::Architecture architecture)
 {
     switch (architecture) {
@@ -122,10 +130,6 @@ QLatin1String AndroidConfigurations::toolsPrefix(Abi::Architecture architecture)
 AndroidConfig::AndroidConfig(const QSettings &settings)
 {
     // user settings
-    armGdbLocation = FileName::fromString(settings.value(ArmGdbLocationKey).toString());
-    armGdbserverLocation = FileName::fromString(settings.value(ArmGdbserverLocationKey).toString());
-    x86GdbLocation = FileName::fromString(settings.value(X86GdbLocationKey).toString());
-    x86GdbserverLocation = FileName::fromString(settings.value(X86GdbserverLocationKey).toString());
     partitionSize = settings.value(PartitionSizeKey, 1024).toInt();
     sdkLocation = FileName::fromString(settings.value(SDKLocationKey).toString());
     ndkLocation = FileName::fromString(settings.value(NDKLocationKey).toString());
@@ -133,14 +137,6 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
     openJDKLocation = FileName::fromString(settings.value(OpenJDKLocationKey).toString());
     keystoreLocation = FileName::fromString(settings.value(KeystoreLocationKey).toString());
 
-    QRegExp versionRegExp(NDKGccVersionRegExp);
-    const QString &value = settings.value(NDKToolchainVersionKey).toString();
-    if (versionRegExp.exactMatch(value))
-        ndkToolchainVersion = value;
-    else
-        ndkToolchainVersion = value.mid(versionRegExp.indexIn(value)+1);
-    // user settings
-
     PersistentSettingsReader reader;
     if (reader.load(FileName::fromString(sdkSettingsFileName()))
             && settings.value(changeTimeStamp).toInt() != QFileInfo(sdkSettingsFileName()).lastModified().toMSecsSinceEpoch() / 1000) {
@@ -150,25 +146,6 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
         antLocation = FileName::fromString(reader.restoreValue(AntLocationKey).toString());
         openJDKLocation = FileName::fromString(reader.restoreValue(OpenJDKLocationKey).toString());
         keystoreLocation = FileName::fromString(reader.restoreValue(KeystoreLocationKey).toString());
-
-        QRegExp versionRegExp(NDKGccVersionRegExp);
-        const QString &value = reader.restoreValue(NDKToolchainVersionKey).toString();
-        if (versionRegExp.exactMatch(value))
-            ndkToolchainVersion = value;
-        else
-            ndkToolchainVersion = value.mid(versionRegExp.indexIn(value)+1);
-
-        if (armGdbLocation.isEmpty())
-            armGdbLocation = FileName::fromString(reader.restoreValue(ArmGdbLocationKey).toString());
-
-        if (armGdbserverLocation.isEmpty())
-            armGdbserverLocation = FileName::fromString(reader.restoreValue(ArmGdbserverLocationKey).toString());
-
-        if (x86GdbLocation.isEmpty())
-            x86GdbLocation = FileName::fromString(reader.restoreValue(X86GdbLocationKey).toString());
-
-        if (x86GdbserverLocation.isEmpty())
-            x86GdbserverLocation = FileName::fromString(reader.restoreValue(X86GdbserverLocationKey).toString());
         // persistent settings
     }
 
@@ -188,14 +165,9 @@ void AndroidConfig::save(QSettings &settings) const
     // user settings
     settings.setValue(SDKLocationKey, sdkLocation.toString());
     settings.setValue(NDKLocationKey, ndkLocation.toString());
-    settings.setValue(NDKToolchainVersionKey, ndkToolchainVersion);
     settings.setValue(AntLocationKey, antLocation.toString());
     settings.setValue(OpenJDKLocationKey, openJDKLocation.toString());
     settings.setValue(KeystoreLocationKey, keystoreLocation.toString());
-    settings.setValue(ArmGdbLocationKey, armGdbLocation.toString());
-    settings.setValue(ArmGdbserverLocationKey, armGdbserverLocation.toString());
-    settings.setValue(X86GdbLocationKey, x86GdbLocation.toString());
-    settings.setValue(X86GdbserverLocationKey, x86GdbserverLocation.toString());
     settings.setValue(PartitionSizeKey, partitionSize);
 }
 
@@ -240,25 +212,6 @@ QStringList AndroidConfigurations::sdkTargets(int minApiLevel) const
     return targets;
 }
 
-QStringList AndroidConfigurations::ndkToolchainVersions() const
-{
-    QRegExp versionRegExp(NDKGccVersionRegExp);
-    QStringList result;
-    FileName path = m_config.ndkLocation;
-    QDirIterator it(path.appendPath(QLatin1String("toolchains")).toString(),
-                    QStringList() << QLatin1String("*"), QDir::Dirs);
-    while (it.hasNext()) {
-        const QString &fileName = it.next();
-        int idx = versionRegExp.indexIn(fileName);
-        if (idx == -1)
-            continue;
-        QString version = fileName.mid(idx+1);
-        if (!result.contains(version))
-            result.append(version);
-    }
-    return result;
-}
-
 FileName AndroidConfigurations::adbToolPath() const
 {
     FileName path = m_config.sdkLocation;
@@ -296,71 +249,29 @@ FileName AndroidConfigurations::emulatorToolPath() const
     return path.appendPath(QLatin1String("tools/emulator" QTC_HOST_EXE_SUFFIX));
 }
 
-FileName AndroidConfigurations::toolPath(Abi::Architecture architecture) const
+FileName AndroidConfigurations::toolPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
     FileName path = m_config.ndkLocation;
     return path.appendPath(QString::fromLatin1("toolchains/%1-%2/prebuilt/%3/bin/%4")
             .arg(toolchainPrefix(architecture))
-            .arg(m_config.ndkToolchainVersion)
+            .arg(ndkToolChainVersion)
             .arg(ToolchainHost)
             .arg(toolsPrefix(architecture)));
 }
 
-FileName AndroidConfigurations::stripPath(Abi::Architecture architecture) const
+FileName AndroidConfigurations::stripPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture).append(QLatin1String("-strip" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-strip" QTC_HOST_EXE_SUFFIX));
 }
 
-FileName AndroidConfigurations::readelfPath(Abi::Architecture architecture) const
+FileName AndroidConfigurations::readelfPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture).append(QLatin1String("-readelf" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-readelf" QTC_HOST_EXE_SUFFIX));
 }
 
-FileName AndroidConfigurations::gccPath(Abi::Architecture architecture) const
+FileName AndroidConfigurations::gdbPath(Abi::Architecture architecture, const QString &ndkToolChainVersion) const
 {
-    return toolPath(architecture).append(QLatin1String("-gcc" QTC_HOST_EXE_SUFFIX));
+    return toolPath(architecture, ndkToolChainVersion).append(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
-}
-
-FileName AndroidConfigurations::gdbServerPath(Abi::Architecture architecture) const
-{
-    FileName gdbServerPath;
-    switch (architecture) {
-    case Abi::ArmArchitecture:
-        gdbServerPath = m_config.armGdbserverLocation;
-        break;
-    case Abi::X86Architecture:
-        gdbServerPath = m_config.x86GdbserverLocation;
-        break;
-    default:
-        gdbServerPath = FileName::fromString(Unknown);
-        break;
-    }
-
-    if (!gdbServerPath.isEmpty())
-        return gdbServerPath;
-    FileName path = m_config.ndkLocation;
-    return path.appendPath(QString::fromLatin1("toolchains/%1-%2/prebuilt/gdbserver")
-                           .arg(toolchainPrefix(architecture))
-                           .arg(m_config.ndkToolchainVersion));
-}
-
-FileName AndroidConfigurations::gdbPath(Abi::Architecture architecture) const
-{
-    FileName gdbPath;
-    switch (architecture) {
-    case Abi::ArmArchitecture:
-        gdbPath = m_config.armGdbLocation;
-        break;
-    case Abi::X86Architecture:
-        gdbPath = m_config.x86GdbLocation;
-        break;
-    default:
-        gdbPath = FileName::fromString(Unknown);
-        break;
-    }
-    if (!gdbPath.isEmpty())
-        return gdbPath;
-    return toolPath(architecture).append(QLatin1String("-gdb" QTC_HOST_EXE_SUFFIX));
 }
 
 FileName AndroidConfigurations::openJDKPath() const