Commit b57faed1 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by The Qt Project

Merge "Merge remote-tracking branch 'origin/4.1'"

parents 1b4301e9 35d7352b
......@@ -38,10 +38,12 @@ indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
$QDOC_INDEX_DIR/qtgui/qtgui.index \
$QDOC_INDEX_DIR/qthelp/qthelp.index \
$QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
$QDOC_INDEX_DIR/qtquickcontrols2/qtquickcontrols2.index \
$QDOC_INDEX_DIR/qtquickextras/qtquickextras.index \
$QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
$QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
$QDOC_INDEX_DIR/qtscript/qtscript.index \
$QDOC_INDEX_DIR/qtscxml/qtscxml.index \
$QDOC_INDEX_DIR/qtsensors/qtsensors.index \
$QDOC_INDEX_DIR/qttestlib/qttestlib.index \
$QDOC_INDEX_DIR/qtuitools/qtuitools.index \
......
doc/images/qmldesigner-bindings.png

5.71 KB | W: | H:

doc/images/qmldesigner-bindings.png

4.8 KB | W: | H:

doc/images/qmldesigner-bindings.png
doc/images/qmldesigner-bindings.png
doc/images/qmldesigner-bindings.png
doc/images/qmldesigner-bindings.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-vcs-gitbranch.png

32.4 KB | W: | H:

doc/images/qtcreator-vcs-gitbranch.png

14.4 KB | W: | H:

doc/images/qtcreator-vcs-gitbranch.png
doc/images/qtcreator-vcs-gitbranch.png
doc/images/qtcreator-vcs-gitbranch.png
doc/images/qtcreator-vcs-gitbranch.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -137,7 +137,7 @@
On OS X you can use the LLDB version delivered with Xcode or build from source.
The minimum supported version is LLDB 320.4.
On Linux, the minimum supported version is LLDB 3.7.
On Linux, the minimum supported version is LLDB 3.8.
\omit
......
......@@ -2537,6 +2537,11 @@
\key Space. The prefix is usually a single character. Then type the search
string (typically, a filename or class name) or the command to execute.
You can also double-click a locator filter in the filter list to use it. You
can use the up and down arrow keys or the \key Ctrl+P and \key Ctrl+N
keyboard shortcuts to move up and down the list, and then press \key Enter
to use the selected filter.
For example, to locate symbols matching QDataStream:
\list 1
......
......@@ -486,9 +486,9 @@
You can change the property values permanently in the code editor.
\section2 To-Do List
\section2 To-Do Entries
The \uicontrol {To-Do List Entries} pane lists the BUG, FIXME, NOTE, TODO, and
The \uicontrol {To-Do Entries} pane lists the BUG, FIXME, NOTE, TODO, and
WARNING keywords from the current file or from all project files. The
keywords are organized into information, warning, and error categories.
......
......@@ -481,7 +481,8 @@
\section4 Working with Branches
To work with Git branches, select \uicontrol{Branches}. The checked out branch
To work with Git branches, select \uicontrol Tools > \uicontrol Git >
\uicontrol {Local Repository} > \uicontrol {Branches}. The checked out branch
is shown in bold and underlined in the list of branches. Double-click branch
names to edit them.
......@@ -528,6 +529,9 @@
\row
\li \uicontrol Rebase
\li Copy local commits to the updated upstream head.
\row
\li \uicontrol Reset
\li Hard reset the active branch to the selected branch.
\row
\li \uicontrol {Cherry Pick}
\li Cherry pick the top commit from the selected branch.
......@@ -540,7 +544,8 @@
Patches are rewriting instructions that can be applied to a set of files.
To apply a patch file that is open in \QC, select \uicontrol Tools > \uicontrol Git >
\uicontrol {Local Repository} > \uicontrol {Apply from Editor}.
\uicontrol {Local Repository} > \uicontrol Patch >
\uicontrol {Apply from Editor}.
To select the patch file to apply from the file system, select
\uicontrol {Apply from File}.
......
......@@ -241,6 +241,15 @@
information on how version control systems are integrated in
\QC, see \l{Using Version Control Systems}
\li Import as qmake Project
Import an existing project that does not use any of the supported
build systems: qmake, Qbs, CMake, or Autotools. The wizard creates
a qmake .pro file, which enables you to use \QC as a code editor and
as a launcher for debugging and analysis tools. However, if you want
to build the project, you might need to edit the generated .pro
file.
\li Import Existing Project
Import an existing project that does not use any of the supported
......@@ -286,6 +295,10 @@
\list
\li Qt item model source and header files that you can use to create
classes derived from QAbstractItemModel, QAbstractTableModel, or
QAbstractListModel.
\li \QD forms and \QD form classes, which specify parts of user
interfaces in Qt widget based projects
......@@ -293,18 +306,32 @@
application executable
\li QML files, which specify items in Qt Quick projects.
\uicontrol {Qt Quick 1} creates a QML file that imports Qt Quick 1.1 and
\uicontrol {Qt Quick 2} creates a QML file that imports Qt Quick 2.0.
Select \uicontrol {Qt Quick 1} to add files to a Qt Quick 1 application
and \uicontrol {Qt Quick 2} to add files to a Qt Quick 2 application.
\uicontrol {Qt Quick UI File} creates an UI form (\e .ui.qml) and
the corresponding QML file.
\uicontrol {QML File (Qt Quick 2)} creates a QML file that imports
Qt Quick 2.0 and \uicontrol {Qt Quick UI File} creates an UI form
(\e .ui.qml) and the corresponding QML file.
\li JavaScript files that you can use to write the application logic in
Qt Quick projects
\endlist
\li Models and state charts
\list
\li Universal Modeling Language (UML) style models with structured
diagrams. However, the model editor uses a variant of UML and
provides only a subset of properties for specifying the
appearance of model elements. For more information, see
\l {Modeling}.
\li State Chart XML (SCXML) files that contain boilerplate code for
state machines. You can use the classes in the \l {Qt SCXML}
module to embed state machines created from the files in Qt
applications.
\endlist
\li GLSL
GLSL files that define fragment and vertex shaders in both Qt Quick
......@@ -322,6 +349,10 @@
\endlist
\li Java
Java class files that you can use to create Java classes.
\li Python
Python class and source files that you can use to create Python
......
......@@ -52,7 +52,7 @@
\li Select \uicontrol Projects > \uicontrol Editor.
\li In the \uicontrol {Editor Settings} field, select \uicontrol {Custom}.
\li In the \uicontrol {Editor settings} field, select \uicontrol {Custom}.
\li Specify text editor settings for the project.
......
......@@ -97,7 +97,7 @@
\li \l{Using Clang Static Analyzer}{Clang Static Analyzer}
\li \l{To-Do List}{To-Do} (experimental)
\li \l{To-Do Entries}{To-Do} (experimental)
\endlist
......
......@@ -98,7 +98,7 @@
to reference the rectangle from other places.
\li Select the \uicontrol Layout tab, and then click
the \inlineimage anchor-fill-normal.png
the \inlineimage anchor_fill.png
(\uicontrol {Fill to Parent}) button to anchor the rectangle
to the item.
......
......@@ -109,7 +109,7 @@
size.
\li In the \uicontrol Color field, click the
\inlineimage button_color_none_normal.png
\inlineimage icon_color_none.png
(\uicontrol Transparent) button to make the rectangle
transparent.
......@@ -131,7 +131,7 @@
\uicontrol Library to \e topLeftRect in the navigator.
\li Click \uicontrol {Layout}, and then click the
\inlineimage anchor-fill-normal.png
\inlineimage anchor_fill.png
(\uicontrol {Fill to Parent}) button to anchor the mouse area to the
rectangle.
......
......@@ -71,7 +71,7 @@
the rectangle and produce rounded corners for the button.
\li Select \uicontrol {Layout}, and then select the
\inlineimage anchor-fill-normal.png
\inlineimage anchor_fill.png
(\uicontrol {Fill to Parent}) button to anchor the rectangle to
the item.
......@@ -198,7 +198,7 @@
for example button_up.png.
\li Click \uicontrol {Layout}, and then click the
\inlineimage anchor-fill-normal.png
\inlineimage anchor_fill.png
(\uicontrol {Fill to Parent}) button to anchor the border image to the
\uicontrol Item.
......@@ -248,9 +248,9 @@
\endlist
\li Click \uicontrol {Layout}, and then click the
\inlineimage anchor-vertical-normal.png
\inlineimage anchor_vertical.png
(\uicontrol {Set Vertical Anchor}) and
\inlineimage anchor-horizontal-normal.png
\inlineimage anchor_horizontal.png
(\uicontrol {Set Horizontal Anchor})
buttons to inherit the vertical and horizontal centering from
the parent.
......
......@@ -90,6 +90,9 @@
when compared to Qt Quick Controls, on which the module is based. These
types work in conjunction with Qt Quick and Qt Quick Layouts.
Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
Qt Labs Controls.
Some ready-made controls, such as a gauge, dial, status indicator, and
tumbler, are provided by the \l {Qt Quick Extras} module.
......@@ -104,7 +107,7 @@
\list 1
\li Select \uicontrol File > \uicontrol {New File or Project} >
\uicontrol {Files and Classes} > \uicontrol Qt > \uicontrol {QML File (Qt Quick 1)} or
\uicontrol {Files and Classes} > \uicontrol Qt >
\uicontrol {QML File (Qt Quick 2)} > \uicontrol Choose to create a new .qml
file.
......
......@@ -108,13 +108,13 @@
\li Select \uicontrol Item to select the target object whose property you want
to change dynamically.
\li Select \uicontrol Property to specify the property to bind to a source
\li Select \uicontrol Property to select the property to bind to a source
property.
\li Select \uicontrol {Source Item} to specify the object whose property you
\li Select \uicontrol {Source Item} to select the object whose property you
want to use to determine the behavior of the target object.
\li Select \uicontrol {Source Property} to specify the property to bind the
\li Select \uicontrol {Source Property} to select the property to bind the
target property to.
\endlist
......
......@@ -92,16 +92,18 @@
\uicontrol {Qt Quick Controls Application}, or
\uicontrol {Qt Labs Controls Application} > \uicontrol Choose.
\li In the \uicontrol {Minimal required Qt version} field, select the Qt
version to develop with. The Qt version determines the Qt Quick
imports that are used in the QML files.
\li For some Qt Quick applications, you must select the Qt version to
develop with in the \uicontrol {Minimal required Qt version} field.
The Qt version determines the Qt Quick imports that are used in the
QML files.
\li Select the \uicontrol {With .ui.qml file} check box to create an UI
\li For some Qt Quick applications, you can select the
\uicontrol {With .ui.qml file} check box to create an UI
form that can contain a subset of the QML language. Similarly as
with the UI forms for \QD, it is recommended that you use \QMLD to
edit the UI forms. For more information, see \l{Qt Quick UI Forms}.
\li For a Qt Quick Controls application, you can also select the
\li For some Qt Quick applications, you can also select the
\uicontrol {Enable native styling} check box. \QC adds a dependency
to the Qt Widgets module to the \c .pro file.
......
......@@ -113,7 +113,7 @@
you remove an item, the child items are also removed.
You can show and hide items to focus on specific parts of the application.
Click the \inlineimage button_color_none_normal.png
Click the \inlineimage icon_color_none.png
(\uicontrol Transparent) button to change the visibility of an item on the
canvas. To change the
visibility of an item in the application, select the \uicontrol Visibility
......
......@@ -57,6 +57,9 @@
when compared to Qt Quick Controls, on which the module is based. These
types work in conjunction with Qt Quick and Qt Quick Layouts.
Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
Qt Labs Controls.
\section1 Adding Components to Screens
\list 1
......
......@@ -73,7 +73,7 @@
\li Select the split view in the navigator, then select the
\uicontrol Layout tab in \uicontrol Properties (4), and then click
the \inlineimage anchor-fill-normal.png
the \inlineimage anchor_fill.png
(\uicontrol {Fill to Parent}) button to anchor the split view to the
item.
......
......@@ -26,7 +26,7 @@ QtcProduct {
// The following would be conceptually right, but does not work currently as some autotests
// (e.g. extensionsystem) do not work when installed, because they want hardcoded
// absolute paths to resources in the build directory.
// cpp.rpaths: qbs.targetOS.contains("osx")
// cpp.rpaths: qbs.targetOS.contains("macos")
// ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"]
// : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator",
// "$ORIGIN/../" qtc.libDirName + "/qtcreator/plugins"]
......
......@@ -28,7 +28,7 @@ Product {
Group {
fileTagsFilter: ["qch"]
qbs.install: !qbs.targetOS.contains("osx")
qbs.install: !qbs.targetOS.contains("macos")
qbs.installDir: qtc.ide_doc_path
}
}
......@@ -4,7 +4,7 @@ function qtLibraryName(qbs, name)
if (qbs.debugInformation) {
if (qbs.targetOS.contains("windows"))
return name + "d";
else if (qbs.targetOS.contains("osx"))
else if (qbs.targetOS.contains("macos"))
return name + "_debug";
}
return name;
......
......@@ -18,14 +18,14 @@ QtcProduct {
var flags = base;
if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
if (qbs.targetOS.contains("osx"))
if (qbs.targetOS.contains("macos"))
flags.push("-compatibility_version", qtc.qtcreator_compat_version);
return flags;
}
cpp.sonamePrefix: qbs.targetOS.contains("osx")
cpp.sonamePrefix: qbs.targetOS.contains("macos")
? "@rpath"
: undefined
cpp.rpaths: qbs.targetOS.contains("osx")
cpp.rpaths: qbs.targetOS.contains("macos")
? ["@loader_path/../Frameworks"]
: ["$ORIGIN", "$ORIGIN/.."]
property string libIncludeBase: ".." // #include <lib/header.h>
......
......@@ -27,17 +27,17 @@ QtcProduct {
cpp.internalVersion: ""
cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"])
cpp.sonamePrefix: qbs.targetOS.contains("osx")
cpp.sonamePrefix: qbs.targetOS.contains("macos")
? "@rpath"
: undefined
cpp.rpaths: qbs.targetOS.contains("osx")
cpp.rpaths: qbs.targetOS.contains("macos")
? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"]
: ["$ORIGIN", "$ORIGIN/.."]
cpp.linkerFlags: {
var flags = base;
if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
if (qbs.targetOS.contains("osx"))
if (qbs.targetOS.contains("macos"))
flags.push("-compatibility_version", qtc.qtcreator_compat_version);
return flags;
}
......
......@@ -12,7 +12,7 @@ QtcProduct {
'/' + qtc.ide_library_path);
var relativePathToPlugins = FileInfo.relativePath('/' + qtc.ide_libexec_path,
'/' + qtc.ide_plugin_path);
var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN";
var prefix = qbs.targetOS.contains("macos") ? "@executable_path" : "$ORIGIN";
return [
FileInfo.joinPaths(prefix, relativePathToLibs),
FileInfo.joinPaths(prefix, relativePathToPlugins)
......
......@@ -8,7 +8,7 @@ Module {
property bool enableProjectFileUpdates: true
property bool installApiHeaders: false
property string libInstallDir: qtc.ide_library_path
property stringList libRPaths: qbs.targetOS.contains("osx")
property stringList libRPaths: qbs.targetOS.contains("macos")
? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)]
: ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path]
property string resourcesInstallDir: qtc.ide_data_path + "/qbs"
......
......@@ -16,10 +16,10 @@ Module {
+ ide_compat_version_minor + '.' + ide_compat_version_release
property string libDirName: "lib"
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin"
property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator"
property string ide_library_path: {
if (qbs.targetOS.contains("osx"))
if (qbs.targetOS.contains("macos"))
return ide_app_target + ".app/Contents/Frameworks"
else if (qbs.targetOS.contains("windows"))
return ide_app_path
......@@ -27,24 +27,24 @@ Module {
return libDirName + "/qtcreator"
}
property string ide_plugin_path: {
if (qbs.targetOS.contains("osx"))
if (qbs.targetOS.contains("macos"))
return ide_app_target + ".app/Contents/PlugIns"
else if (qbs.targetOS.contains("windows"))
return libDirName + "/qtcreator/plugins"
else
return ide_library_path + "/plugins"
}
property string ide_data_path: qbs.targetOS.contains("osx")
property string ide_data_path: qbs.targetOS.contains("macos")
? ide_app_target + ".app/Contents/Resources"
: "share/qtcreator"
property string ide_libexec_path: qbs.targetOS.contains("osx")
property string ide_libexec_path: qbs.targetOS.contains("macos")
? ide_data_path : qbs.targetOS.contains("windows")
? ide_app_path
: "libexec/qtcreator"
property string ide_bin_path: qbs.targetOS.contains("osx")
property string ide_bin_path: qbs.targetOS.contains("macos")
? ide_app_target + ".app/Contents/MacOS"
: ide_app_path
property string ide_doc_path: qbs.targetOS.contains("osx")
property string ide_doc_path: qbs.targetOS.contains("macos")
? ide_data_path + "/doc"
: "share/doc/qtcreator"
property string ide_include_path: "include"
......
......@@ -256,11 +256,6 @@ class Dumper(DumperBase):
self.qtNamespaceToReport = None
self.interpreterBreakpointResolvers = []
# The guess does not need to be updated during a fetchVariables()
# as the result is fixed during that time (ignoring "active"
# dumpers causing loading of shared objects etc).
self.currentQtNamespaceGuess = None