Commit dbcaadd8 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76
parents e01e8997 b9dfbd8e
doc/images/qmldesigner-run-settings.png

15.2 KB | W: | H:

doc/images/qmldesigner-run-settings.png

7.03 KB | W: | H:

doc/images/qmldesigner-run-settings.png
doc/images/qmldesigner-run-settings.png
doc/images/qmldesigner-run-settings.png
doc/images/qmldesigner-run-settings.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-toolchains.png

26.9 KB | W: | H:

doc/images/qtcreator-toolchains.png

16.3 KB | W: | H:

doc/images/qtcreator-toolchains.png
doc/images/qtcreator-toolchains.png
doc/images/qtcreator-toolchains.png
doc/images/qtcreator-toolchains.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -54,8 +54,9 @@
\list 1
\o Select \gui Projects, and then select the \gui QML check box in the
\gui {Run Settings}, to enable QML debugging.
\o In \gui Projects mode \gui {Run Settings}, select the
\gui {Enable QML} check box in the \gui {Debugger Settings} to
enable QML debugging.
\o For Qt 4.7, compile the QML Inspector debugging helper. For more information,
see \l{Debugging Helpers for QML}.
......@@ -82,7 +83,8 @@
functions. Therefore, you must make sure that the port is properly
protected by a firewall.
\o In the \gui {Run Settings}, select the \gui QML check box to enable
\o In the \gui {Run Settings}, \gui {Debugger Settings} section, select
the \gui {Enable QML} check box to enable
QML debugging.
\o Select \gui {Build > Rebuild Project} to clean and rebuild the
......@@ -98,7 +100,9 @@
\section1 Mixed C++/QML Debugging
To debug both the C++ and QML parts of your application at the same time,
select the checkboxes for both languages in the \gui{Run Settings}.
select the \gui {Enable C++} and \gui {Enable QML} checkboxes for both
languages in the \gui {Debugger Settings} section in the project
\gui{Run Settings}.
\image qtquick-debugging-settings.png
......
\section2 Specifying Debugger Settings
\image qtquick-debugging-settings.png "Debugger Settings"
To select the languages to debug, select the \gui {Enable C++} and
\gui {Enable QML} check boxes. The \gui {Debug port} is the port to
communicate with the debugger. You can use any free port in the registered
or dynamic port range.
\note Opening a socket at a well-known port presents a security risk. Anyone
on the Internet could connect to the application that you are debugging and
execute any JavaScript functions. Therefore, you must make sure that the
port is properly protected by a firewall.
If you debug more than one application at a time, you might receive an error
message stating that the port is already in use. Specify a free port number
in \gui {Debug port} and try again.
For more information about debugging, see \l{Debugging}.
......@@ -13,16 +13,6 @@
\o In the \gui {Main QML file}, select the file that \QQV will be
started with.
\o In the \gui Debugger group, select the languages to debug:
\gui{C++} and \gui QML. \gui {Debug port} is the port to access
\QQV. You can use any free port in the registered port range.
For more information, see \l{Debugging Qt Quick Projects}.
\endlist
\note Opening a socket at a well-known port presents a security risk. Anyone
on the Internet could connect to the application that you are debugging and
execute any JavaScript functions. Therefore, you must make sure that the
port is properly protected by a firewall.
\image qmldesigner-run-settings.png "Run settings for Qt Quick UI projects"
......@@ -249,7 +249,10 @@ QString Environment::searchInPath(const QStringList &executables,
if (exec.indexOf(slash) != -1)
continue;
foreach (const QString &p, path()) {
QString fp = p;
QString fp = QDir::fromNativeSeparators(p);
// Avoid turing / into // on windows which triggers windows to check
// for network drives!
if (!fp.endsWith(slash))
fp += slash;
fp += exec;
const QFileInfo fi(fp);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment