aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetlana Abramenkova <sabramenkova@luxoft.com>2019-05-08 14:28:54 +0300
committerKavindra Palaraja <kpalaraja@luxoft.com>2019-05-10 07:45:12 +0000
commitb1c80cc0c6d2e883a7e04ec9233f621959b729bf (patch)
tree56d00b849c8776a7a44e4238757b92c3c7d83134
parentb04a7637085b2863a208b259bc9890af95800ffe (diff)
Sync the name of QML Live across the code, documentation, examples
Change-Id: I9ab0324f7ee4f6db6b4c87ad3eca5ea8926cb3ac Fixes: AUTOSUITE-909 Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com>
-rw-r--r--INSTALL.md4
-rw-r--r--README.md4
-rw-r--r--doc/concepts.qdoc56
-rw-r--r--doc/examples.qdoc6
-rw-r--r--doc/examples/contentplugin.qdoc18
-rw-r--r--doc/examples/customruntime.qdoc14
-rw-r--r--doc/images/workbench.pngbin153687 -> 153844 bytes
-rw-r--r--doc/index.qdoc10
-rw-r--r--doc/installation.qdoc18
-rw-r--r--doc/ipc-group.qdoc2
-rw-r--r--doc/qmllive-group.qdoc8
-rw-r--r--doc/qmllive-project.qdocconf38
-rw-r--r--doc/style/qt5-sidebar.html2
-rw-r--r--doc/usage.qdoc50
-rw-r--r--examples/contentplugin/mycontentadapterplugin.cpp2
-rw-r--r--examples/contentplugin/mycontentadapterplugin.h2
-rw-r--r--examples/contentplugin/plugin.qml2
-rw-r--r--examples/customruntime/main.cpp10
-rw-r--r--examples/customruntime/qml/customruntime-item.qml2
-rw-r--r--examples/customruntime/qml/customruntime-window.qml2
-rw-r--r--header.GPL-QTAS2
-rwxr-xr-xqmllive.pro6
-rw-r--r--src/bench/aboutdialog.cpp6
-rw-r--r--src/bench/aboutdialog.h2
-rw-r--r--src/bench/allhostswidget.cpp2
-rw-r--r--src/bench/allhostswidget.h2
-rw-r--r--src/bench/appearanceoptionpage.cpp2
-rw-r--r--src/bench/appearanceoptionpage.h2
-rw-r--r--src/bench/autodiscoveryhostsdialog.cpp2
-rw-r--r--src/bench/autodiscoveryhostsdialog.h2
-rw-r--r--src/bench/benchlivenodeengine.cpp2
-rw-r--r--src/bench/benchlivenodeengine.h2
-rw-r--r--src/bench/directorypreviewadapter.cpp2
-rw-r--r--src/bench/directorypreviewadapter.h2
-rw-r--r--src/bench/dummydelegate.cpp2
-rw-r--r--src/bench/dummydelegate.h2
-rw-r--r--src/bench/host.cpp2
-rw-r--r--src/bench/host.h2
-rw-r--r--src/bench/hostdiscoverymanager.cpp2
-rw-r--r--src/bench/hostdiscoverymanager.h2
-rw-r--r--src/bench/hostmanager.cpp2
-rw-r--r--src/bench/hostmanager.h2
-rw-r--r--src/bench/hostmodel.cpp2
-rw-r--r--src/bench/hostmodel.h2
-rw-r--r--src/bench/hostsoptionpage.cpp2
-rw-r--r--src/bench/hostsoptionpage.h2
-rw-r--r--src/bench/hostwidget.cpp4
-rw-r--r--src/bench/hostwidget.h2
-rw-r--r--src/bench/httpproxyoptionpage.cpp2
-rw-r--r--src/bench/httpproxyoptionpage.h2
-rw-r--r--src/bench/importpathoptionpage.cpp2
-rw-r--r--src/bench/importpathoptionpage.h2
-rw-r--r--src/bench/main.cpp8
-rw-r--r--src/bench/mainwindow.cpp12
-rw-r--r--src/bench/mainwindow.h2
-rw-r--r--src/bench/newprojectwizard.cpp12
-rw-r--r--src/bench/newprojectwizard.h2
-rw-r--r--src/bench/options.cpp2
-rw-r--r--src/bench/options.h2
-rw-r--r--src/bench/optionsdialog.cpp2
-rw-r--r--src/bench/optionsdialog.h2
-rw-r--r--src/bench/previewimageprovider.cpp2
-rw-r--r--src/bench/previewimageprovider.h2
-rw-r--r--src/bench/qmlpreviewadapter.cpp4
-rw-r--r--src/bench/qmlpreviewadapter.h2
-rw-r--r--src/contentadapterinterface.h2
-rw-r--r--src/contentpluginfactory.cpp2
-rw-r--r--src/contentpluginfactory.h2
-rw-r--r--src/fontadapter.cpp2
-rw-r--r--src/fontadapter.h2
-rw-r--r--src/imageadapter.cpp2
-rw-r--r--src/imageadapter.h2
-rw-r--r--src/ipc/ipcclient.cpp2
-rw-r--r--src/ipc/ipcclient.h2
-rw-r--r--src/ipc/ipcconnection.cpp2
-rw-r--r--src/ipc/ipcconnection.h2
-rw-r--r--src/ipc/ipcserver.cpp2
-rw-r--r--src/ipc/ipcserver.h2
-rwxr-xr-xsrc/lib.pro2
-rw-r--r--src/livedocument.cpp2
-rw-r--r--src/livedocument.h2
-rw-r--r--src/livehubengine.cpp2
-rw-r--r--src/livehubengine.h2
-rw-r--r--src/livenodeengine.cpp8
-rw-r--r--src/livenodeengine.h2
-rw-r--r--src/livert/error_qt5.qml2
-rw-r--r--src/livert/error_qt5_controls.qml2
-rw-r--r--src/livert/folderview_qt5.qml2
-rw-r--r--src/livert/folderview_qt5_controls.qml2
-rw-r--r--src/livert/fontviewer_qt5.qml2
-rw-r--r--src/livert/fontviewer_qt5_controls.qml2
-rw-r--r--src/livert/imageviewer_qt5.qml2
-rw-r--r--src/livert/imageviewer_qt5_controls.qml2
-rw-r--r--src/liveruntime.cpp4
-rw-r--r--src/liveruntime.h2
-rw-r--r--src/logger.cpp2
-rw-r--r--src/logger.h2
-rw-r--r--src/logreceiver.cpp2
-rw-r--r--src/logreceiver.h2
-rw-r--r--src/previewGenerator/main.cpp10
-rw-r--r--src/projectmanager.cpp6
-rw-r--r--src/projectmanager.h2
-rw-r--r--src/qmlhelper.cpp2
-rw-r--r--src/qmlhelper.h2
-rw-r--r--src/qmllive.cpp4
-rw-r--r--src/qmllive.h6
-rwxr-xr-xsrc/qmllive_global.h2
-rw-r--r--src/qmllive_version.h2
-rw-r--r--src/remotelogger.cpp2
-rw-r--r--src/remotelogger.h2
-rw-r--r--src/remotepublisher.cpp2
-rw-r--r--src/remotepublisher.h2
-rw-r--r--src/remotereceiver.cpp10
-rw-r--r--src/remotereceiver.h2
-rw-r--r--src/runtime/main.cpp8
-rw-r--r--src/runtime/qmlsplash/splash-qt4.qml6
-rw-r--r--src/runtime/qmlsplash/splash-qt5.qml6
-rw-r--r--src/watcher.cpp2
-rw-r--r--src/watcher.h2
-rw-r--r--src/widgets/filesystemmodel.cpp2
-rw-r--r--src/widgets/filesystemmodel.h2
-rw-r--r--src/widgets/logview.cpp2
-rw-r--r--src/widgets/logview.h2
-rw-r--r--src/widgets/windowwidget.cpp2
-rw-r--r--src/widgets/windowwidget.h2
-rw-r--r--src/widgets/workspacedelegate.cpp2
-rw-r--r--src/widgets/workspacedelegate.h2
-rw-r--r--src/widgets/workspaceview.cpp2
-rw-r--r--src/widgets/workspaceview.h2
-rw-r--r--testData/qml/explicit-size.qml2
-rw-r--r--testData/qml/no-explicit-size.qml2
-rw-r--r--testData/qml/two-windows.qml2
-rw-r--r--tests/manual_tests/javascript/lib.js2
-rw-r--r--tests/manual_tests/javascript/pragma_main.qml2
-rw-r--r--tests/manual_tests/javascript/pragmalib.js2
-rw-r--r--tests/testipc/tst_testipc.cpp2
-rw-r--r--tests/testsync/tst_testsync.cpp2
137 files changed, 285 insertions, 285 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 2ab5850..5cd126f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-# Build and Install QmlLive
+# Build and Install QML Live
## Dependencies
@@ -20,7 +20,7 @@ Note: Only needed when you want to have live reloading enabled on the target.
$ qmake # from cross compiler toolchain
$ make
-You need to cross-compile QmlLive and copy the `./bin/qmlliveruntime` onto the
+You need to cross-compile QML Live and copy the `./bin/qmlliveruntime` onto the
target.
## Build documentation
diff --git a/README.md b/README.md
index 3f182b0..9d9db69 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# QmlLive
+# QML Live
-QmlLive is a system to automatically reload a QtQuick user interface on every
+QML Live is a system to automatically reload a QtQuick user interface on every
document save.
It is available for the PC but also for an embedded device, which supports Qt5.
diff --git a/doc/concepts.qdoc b/doc/concepts.qdoc
index c23a1eb..f678e23 100644
--- a/doc/concepts.qdoc
+++ b/doc/concepts.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -35,14 +35,14 @@
\page qmllive-concepts.html
\title Concepts
-The following are some concepts that are helpful to understand QmlLive.
+The following are some concepts that are helpful to understand QML Live.
\list
\li \l{Live Reloading}
- \li \l{QmlLive Bench vs QmlLive Runtime}
+ \li \l{QML Live Bench vs QML Live Runtime}
\li \l{Local Sessions}
\li \l{Remote Sessions}
- \li \l{Create Your Own QmlLive Runtime}
+ \li \l{Create Your Own QML Live Runtime}
\li \l{Structure QML Apps For Live Coding}
\endlist
@@ -63,33 +63,33 @@ There is a lot of time consuming editing work needed, to reach a compromise
that satisfies the designer's vision and how the developer realizes it in code.
Each iteration is a small step towards the desired user experience goal. Qt,
with the Qt Quick technology, already shortens the gap between vision and
-product via QML, a more design oriented language. QmlLive aims to close this
+product via QML, a more design oriented language. QML Live aims to close this
gap.
-QmlLive supports live coding with two essential features:
+QML Live supports live coding with two essential features:
\list
\li Allows you to distribute source code modifications, removing the need
- to redeploy your application to see the effect of your changes. QmlLive monitors
+ to redeploy your application to see the effect of your changes. QML Live monitors
changes in the file system. As soon as you save a file, it is preprocessed as
needed, and the live view is refreshed.
\li Loads a particular QML file with your required component instead of the main
component, so that each component can be worked on independently.
\endlist
-After each code change, QmlLive reloads your project on each connected device,
+After each code change, QML Live reloads your project on each connected device,
within seconds.
-\section1 QmlLive Bench vs. QmlLive Runtime
+\section1 QML Live Bench vs. QML Live Runtime
-QmlLive is managed by a central Bench that watches your project workspace. A
+QML Live is managed by a central Bench that watches your project workspace. A
change in a file inside the workspace is automatically detected and immediately
reflected onto one or more local rendering areas, or to connected remote
clients. A team can develop a UI quickly and precisely on a machine and
simultaneously display it on one or more local and/or remote clients. These
clients can run on any desktop or networked embedded device that supports Qt5
-and QmlLive.
+and QML Live.
-For sketching out the scene or working with independent UI elements, the QmlLive
+For sketching out the scene or working with independent UI elements, the QML Live
Bench is sufficient; you can see the live preview on your local machine.
\table
@@ -97,48 +97,48 @@ Bench is sufficient; you can see the live preview on your local machine.
\li Feature
\li Description
\row
- \li QmlLive Bench
+ \li QML Live Bench
\li A GUI server application that populates workspace
updates to each local or remote client.
\row
- \li QmlLive Runtime
+ \li QML Live Runtime
\li A client application that listens to workspace updates from the
- QmlLive Bench.
+ QML Live Bench.
\endtable
If the application being developed should run on any embedded device or
-devices with different display resolutions, then you must launch the QmlLive Runtime
-on each embedded device. But, you only need to launch the QmlLive Bench on the
+devices with different display resolutions, then you must launch the QML Live Runtime
+on each embedded device. But, you only need to launch the QML Live Bench on the
developer's machine.
-QmlLive Bench supports the following features:
+QML Live Bench supports the following features:
\list
\li live reloads a \c main.qml file, or a selected component
\li watches the workspace for updates
\li provides a GUI to set a workspace or project settings, configure host connections,
import paths, and so on
- \li publishes each file change to all local and remote QmlLive Runtimes on the
+ \li publishes each file change to all local and remote QML Live Runtimes on the
embedded devices
- \li lets the user select different files to watch, for certain QmlLive Runtime
+ \li lets the user select different files to watch, for certain QML Live Runtime
instances, on different connected devices
\li follows the currently watched file, on the connected devices
- \li grabs log messages from all connected QmlLive Runtimes, to enable a more
+ \li grabs log messages from all connected QML Live Runtimes, to enable a more
convenient debugging process
\li lets the user select a file to watch, through the Workspace Navigator
\li controls connections to all of the devices
\endlist
-QmlLive Runtime supports the following features:
+QML Live Runtime supports the following features:
\list
\li live reloads a \c main.qml file, or a selected component
- \li listens for workspace updates from QmlLive Bench
+ \li listens for workspace updates from QML Live Bench
\endlist
\image concept.png
\section1 Local Sessions
-For a local session you only need QmlLive Bench. It contains all of the
+For a local session you only need QML Live Bench. It contains all of the
required components in an easy-to-use interface. As you type and save, the
output is displayed on your machine in a fraction of a second. Local sessions
are best suited for a multi-monitor setup where you see your code on one
@@ -157,17 +157,17 @@ appearance, pixel density, font rendering, and proportions. So it is vital to
ensure that a user experience designed on a machine looks just as good on the
embedded device. In the past, this used to be a cumbersome process, requiring
that you copy the code to the embedded device and restart the application. With
-QmlLive Bench and QmlLive Runtime you connect to the device, propagate your
+QML Live Bench and QML Live Runtime you connect to the device, propagate your
workspace, and from there on all changes are reflected on the device's display.
You can always connect more devices, or devices with different sizes.
\image runtime.png
-\section1 Create Your Own QmlLive Runtime
+\section1 Create Your Own QML Live Runtime
Some projects include custom C++ or native code. Those languages require a
-compilation step and cannot be reloaded directly with QmlLive. In this case,
-you can develop your own QmlLive Runtime based on the QmlLive library. For
+compilation step and cannot be reloaded directly with QML Live. In this case,
+you can develop your own QML Live Runtime based on the QML Live library. For
more details see \l{Custom Runtime}.
\section1 Structure QML Apps For Live Coding
diff --git a/doc/examples.qdoc b/doc/examples.qdoc
index 04eb651..e2c7735 100644
--- a/doc/examples.qdoc
+++ b/doc/examples.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -32,8 +32,8 @@
/*!
\group qmllive-examples
- \title QmlLive Examples
- \brief Examples showing how to extend the functionality of QmlLive.
+ \title QML Live Examples
+ \brief Examples showing how to extend the functionality of QML Live.
\list
\li \l{contentplugin}{Content Plugin}
diff --git a/doc/examples/contentplugin.qdoc b/doc/examples/contentplugin.qdoc
index 7334c6c..6a71712 100644
--- a/doc/examples/contentplugin.qdoc
+++ b/doc/examples/contentplugin.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -33,19 +33,19 @@
\example contentplugin
\title ContentPlugin Example
- \brief Demonstrates how to write a Content Plugin for QmlLive.
+ \brief Demonstrates how to write a Content Plugin for QML Live.
\image contentplugin-example.png Screenshot of the Plugin in Action
The plugin written in this example displays images like the
- built-in Imageviewer in QmlLive, but it shows the content rotated
+ built-in Imageviewer in QML Live, but it shows the content rotated
only works on *.png files.
We will start by reviewing the interface defined in \c
- contentadapterinterface.h in the QmlLive source code. This
- interface can be used to add a new ContentAdapter to QmlLive.
+ contentadapterinterface.h in the QML Live source code. This
+ interface can be used to add a new ContentAdapter to QML Live.
The ContentAdapter will be used to display any content that shouldn't be
- handled by the QmlLive Runtime, like displaying an image.
+ handled by the QML Live Runtime, like displaying an image.
\snippet contentadapterinterface.h 0
@@ -54,7 +54,7 @@
given file or directory.
The second function \c adapt(const QUrl& url, QDeclarativeContext* context)
- returns a custom QUrl which will be used by QmlLive to display the given QUrl.
+ returns a custom QUrl which will be used by QML Live to display the given QUrl.
The returned QUrl always has to point to a QML file used to display the content.
To be able to control the returned QML file, \c context can be used to set custom
properties which will be exported to the QML file.
@@ -66,7 +66,7 @@
\snippet contentplugin/mycontentadapterplugin.h 0
- The MyContentAdapterPlugin implements the interface to QmlLive. It subclasses
+ The MyContentAdapterPlugin implements the interface to QML Live. It subclasses
QObject and the required \c ContentAdapterInterface.
\snippet contentplugin/mycontentadapterplugin.h 1
@@ -104,6 +104,6 @@
Because we don't want to fiddle around with paths, we include our QML file into
a resource file. It is important to use a unique prefix in the resource file in
- order to avoid conflicts with QmlLive, which also uses resource files. The best
+ order to avoid conflicts with QML Live, which also uses resource files. The best
approach is to use the plugin name as a prefix.
*/
diff --git a/doc/examples/customruntime.qdoc b/doc/examples/customruntime.qdoc
index 58edada..0182da3 100644
--- a/doc/examples/customruntime.qdoc
+++ b/doc/examples/customruntime.qdoc
@@ -3,7 +3,7 @@
** Copyright (C) 2019 Luxoft Sweden AB
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -32,23 +32,23 @@
\example customruntime
\title Custom Runtime Example
-\brief Demonstrates how to create a Custom QmlLive Runtime.
+\brief Demonstrates how to create a Custom QML Live Runtime.
-\image customruntime-example.png Screenshot of the Custom QmlLive Runtime
+\image customruntime-example.png Screenshot of the Custom QML Live Runtime
-Creating a custom runtime with QmlLive features allows you to use your QML
-view setup, combined with additional C++ code and the QmlLive system.
+Creating a custom runtime with QML Live features allows you to use your QML
+view setup, combined with additional C++ code and the QML Live system.
Start with the \l LiveNodeEngine class. We need to modify this class to be
able to receive workspace changes and active document updates. By default,
the IPC listens to port 10234.
-The code snippet below shows a minimal custom QmlLive runtime:
+The code snippet below shows a minimal custom QML Live runtime:
\snippet customruntime/main.cpp 0
To specify project depedencies on platforms that support \c pkg-config,
-add the following line to your project file. This is assuming QmlLive is
+add the following line to your project file. This is assuming QML Live is
installed on your build host:
\code
diff --git a/doc/images/workbench.png b/doc/images/workbench.png
index be9455c..518c0c0 100644
--- a/doc/images/workbench.png
+++ b/doc/images/workbench.png
Binary files differ
diff --git a/doc/index.qdoc b/doc/index.qdoc
index 0d49d15..5d0e966 100644
--- a/doc/index.qdoc
+++ b/doc/index.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -34,11 +34,11 @@
\page qmllive-index.html
\indexpage
-\title Qt QmlLive
+\title QML Live
\section1 Overview
-Qt QmlLive is a local and remote Qt Quick live reloading system. It allows you
+QML Live is a local and remote Qt Quick live reloading system. It allows you
to change your QML user interface source code and view the result in realtime.
\image workbench.png
@@ -46,7 +46,7 @@ to change your QML user interface source code and view the result in realtime.
Often in User Interface (UI) development you need to edit the placement or
animations to provide the user experience the design team envisions. This
process of trial and error is tedious with the classic \e{edit-save-run-exit}
-cycle. QmlLive makes this cycle more effective: whenever a file changes, the
+cycle. QML Live makes this cycle more effective: whenever a file changes, the
scene reloads automatically.
\list
@@ -56,7 +56,7 @@ scene reloads automatically.
\li \l{qmllive-examples}{Examples}
\li API Reference
\list
- \li \l{qmllive}{QmlLive} - The QmlLive library API
+ \li \l{qmllive}{QML Live} - The QML Live library API
\li \l{ipc}{IPC} - The internal IPC API
\endlist
\endlist
diff --git a/doc/installation.qdoc b/doc/installation.qdoc
index bf351a7..d9461bc 100644
--- a/doc/installation.qdoc
+++ b/doc/installation.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -49,8 +49,8 @@
$ make
\endcode
-To start QmlLive Bench directly from the build directory, run
-\c{./bin/qmllivebench}. Optionally, you can also install QmlLive Bench with
+To start QML Live Bench directly from the build directory, run
+\c{./bin/qmllivebench}. Optionally, you can also install QML Live Bench with
the following command:
\code
@@ -69,10 +69,10 @@ following command:
$ make
\endcode
-You need to cross-compile QmlLive and copy the \c{./bin/qmlliveruntime} binary
+You need to cross-compile QML Live and copy the \c{./bin/qmlliveruntime} binary
onto the target.
-Optionally, you can package QmlLive with the following command:
+Optionally, you can package QML Live with the following command:
\code
$ make install INSTALL_ROOT=...
@@ -100,7 +100,7 @@ The following options can be added to the qmake \c CONFIG variable:
\row
\li skip-bench
- \li Do not build \l{The Workbench}{QmlLive Bench}
+ \li Do not build \l{QML Live Bench}
\row
\li skip-examples
@@ -108,7 +108,7 @@ The following options can be added to the qmake \c CONFIG variable:
\row
\li skip-runtime
- \li Do not build \l{QmlLive Runtime}
+ \li Do not build \l{QML Live Runtime}
\row
\li skip-tests
@@ -116,8 +116,8 @@ The following options can be added to the qmake \c CONFIG variable:
\row
\li static-link-runtime
- \li Produce a single QmlLive Runtime executable binary. If this option is disabled,
- QmlLive Runtime executable requires that the \c libqmllive dynamic library to
+ \li Produce a single QML Live Runtime executable binary. If this option is disabled,
+ QML Live Runtime executable requires that the \c libqmllive dynamic library to
be copied to the target.
\endtable
diff --git a/doc/ipc-group.qdoc b/doc/ipc-group.qdoc
index 8714c20..1542373 100644
--- a/doc/ipc-group.qdoc
+++ b/doc/ipc-group.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/doc/qmllive-group.qdoc b/doc/qmllive-group.qdoc
index 9fad76b..74b5e0e 100644
--- a/doc/qmllive-group.qdoc
+++ b/doc/qmllive-group.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -34,11 +34,11 @@
/*!
\module qmllive
- \title QmlLive Module
+ \title QML Live Module
\brief Classes for watching a workspace, as well as for local and remote
reloading of Qt Quick User Interfaces.
- The QmlLive module allows a developer to quickly create his own instance of
- a QmlLive workbench or a QmlLive runtime.
+ The QML Live module allows a developer to quickly create his own instance of
+ a QML Live workbench or a QML Live runtime.
*/
diff --git a/doc/qmllive-project.qdocconf b/doc/qmllive-project.qdocconf
index 6933d29..d4f45ed 100644
--- a/doc/qmllive-project.qdocconf
+++ b/doc/qmllive-project.qdocconf
@@ -1,9 +1,9 @@
-project = QmlLive
-description = QmlLive Reference Documentation
-url = https://doc.qt.io/QtQmlLive
+project = QMLLive
+description = QML Live Reference Documentation
+url = https://doc.qt.io/QMLLive
version = $QT_VERSION
-moduleheader = QmlLiveDoc
+moduleheader = QMLLiveDoc
includepaths += -I ../src
sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
@@ -24,24 +24,24 @@ sourcedirs += \
imagedirs = images
-qhp.projects = QmlLive
-qhp.QmlLive.file = qmllive.qhp
-qhp.QmlLive.namespace = io.qt.qmllive.$QT_VERSION_TAG
-qhp.QmlLive.virtualFolder = qmllive
-qhp.QmlLive.indexTitle = Qt QmlLive
-qhp.QmlLive.indexRoot =
+qhp.projects = QMLLive
+qhp.QMLLive.file = qmllive.qhp
+qhp.QMLLive.namespace = io.qt.qmllive.$QT_VERSION_TAG
+qhp.QMLLive.virtualFolder = qmllive
+qhp.QMLLive.indexTitle = QML Live
+qhp.QMLLive.indexRoot =
-qhp.QmlLive.filterAttributes = QmlLive $QT_VERSION
-qhp.QmlLive.customFilters.QmlLive.name = QmlLive $QT_VERSION
-qhp.QmlLive.customFilters.QmlLive.filterAttributes = QmlLive $QT_VERSION
+qhp.QMLLive.filterAttributes = QML Live $QT_VERSION
+qhp.QMLLive.customFilters.QMLLive.name = QML Live $QT_VERSION
+qhp.QMLLive.customFilters.QMLLive.filterAttributes = QML Live $QT_VERSION
-qhp.QmlLive.subprojects = manual
-qhp.QmlLive.subprojects.manual.title = Qt QmlLive
-qhp.QmlLive.subprojects.manual.indexTitle = Qt QmlLive
-qhp.QmlLive.subprojects.manual.type = manual
+qhp.QMLLive.subprojects = manual
+qhp.QMLLive.subprojects.manual.title = QML Live
+qhp.QMLLive.subprojects.manual.indexTitle = QML Live
+qhp.QMLLive.subprojects.manual.type = manual
depends = qtcore qtqml qtquick qtnetwork qtautomotivesuite
navigation.homepage = "Qt Automotive Suite"
-navigation.landingpage = "Qt QmlLive"
-buildversion = "Qt QmlLive $QT_VERSION"
+navigation.landingpage = "QML Live"
+buildversion = "QML Live $QT_VERSION"
diff --git a/doc/style/qt5-sidebar.html b/doc/style/qt5-sidebar.html
index 7b6ce39..30b53d9 100644
--- a/doc/style/qt5-sidebar.html
+++ b/doc/style/qt5-sidebar.html
@@ -1,6 +1,6 @@
<div class="sectionlist normallist">
<div class="heading">
- <h2>Qt QML Live</h2>
+ <h2>QML Live</h2>
</div>
<ul>
<li><a href="index.html">Home</a></li>
diff --git a/doc/usage.qdoc b/doc/usage.qdoc
index 6dc7aaf..28dfb54 100644
--- a/doc/usage.qdoc
+++ b/doc/usage.qdoc
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -37,24 +37,24 @@
\section1 Introduction
-QmlLive is structured in a modular way, to be able to meet various usage requirements.
+QML Live is structured in a modular way, to be able to meet various usage requirements.
-In the early phase of a project, normally, you want to use \b QmlLive Bench, which has everything
+In the early phase of a project, normally, you want to use \b {QML Live Bench}, which has everything
included in a typical desktop application.
Later in the project, you may want to test your UI code on a device. For this, you can combine
-QmlLive Bench with \b QmlLive Runtime. This combination provides you a default QML renderer to
+QML Live Bench with \b {QML Live Runtime}. This combination provides you a default QML renderer to
run on the device and a small remote application on the desktop to control it.
-For C++ developers, it's possible to integrate QmlLive into your own custom runtime using the
-\l LiveNodeEngine class with a few lines of code, and then using QmlLive Bench to control it.
+For C++ developers, it's possible to integrate QML Live into your own custom runtime using the
+\l LiveNodeEngine class with a few lines of code, and then using QML Live Bench to control it.
-\section1 QmlLive Bench
+\section1 QML Live Bench
-QmlLive Bench is the all inclusive QML live reloading tool, that allows you to select a workspace
+QML Live Bench is the all inclusive QML live reloading tool, that allows you to select a workspace
to watch over and provides a default QML runtime for the selected QML document.
-\image workbench.png QmlLive Bench
+\image workbench.png QML Live Bench
To launch the Bench, run the following command:
@@ -62,7 +62,7 @@ To launch the Bench, run the following command:
$(QMLIVEPROJECT)/bin/qmllivebench[.exe]
\endcode
-You can pass command line arguments to the QmlLive Bench as follows:
+You can pass command line arguments to the QML Live Bench as follows:
\code
qmllivebench [options] <workspace>
@@ -80,7 +80,7 @@ The following options are supported:
\li Display version information.
\row
\li \c -pluginpath
- \li Specify the path to QmlLive plugins.
+ \li Specify the path to QML Live plugins.
\row
\li \c -importpath
\li Specify the path to the QML import.
@@ -134,34 +134,34 @@ The following arguments are supported:
\section1 Integrate with Qt Creator
-You can integrate the QmlLive Bench into Qt Creator, as an external tool. To do so:
+You can integrate the QML Live Bench into Qt Creator, as an external tool. To do so:
\list
\li From Qt Creator, open the \uicontrol Settings/Options dialog.
\li Open the \uicontrol Environment group. The \uicontrol {External Tools} tab is located here.
- \li Under \uicontrol Executable, enter the path to your QmlLive Bench executable.
+ \li Under \uicontrol Executable, enter the path to your QML Live Bench executable.
\endlist
\image creator_tool.png Qt Creator
-QmlLive Bench is now availabe under \uicontrol{Tool > External > QmlLive Bench}.
-To launch QmlLive Bench easily, you can also assign a shortcut to the tool.
+QML Live Bench is now availabe under \uicontrol{Tool > External > QML Live Bench}.
+To launch QML Live Bench easily, you can also assign a shortcut to the tool.
\image creator_shortcut.png Qt Creator
-Now when you press \uicontrol{Alt+F8} QmlLive Bench launches with the current project root folder
+Now when you press \uicontrol{Alt+F8} QML Live Bench launches with the current project root folder
open, as its workspace.
\image creator_result.png Qt Creator
-\section1 QmlLive Runtime
+\section1 QML Live Runtime
-The QmlLive Runtime tool provides a default runtime, with a default QML viewer, and listens on a
+The QML Live Runtime tool provides a default runtime, with a default QML viewer, and listens on a
given port for IPC calls from the remote. This tool is ideal for development on a target device,
when no extra C++ code is required.
-\image runtime.png QmlLive Runtime
+\image runtime.png QML Live Runtime
To call the runtime, run the following command:
@@ -195,7 +195,7 @@ The following options are supported:
\li Update all workspace documents, initially. This is a blocking option.
\row
\li \c -pluginpath
- \li Specify the path to QmlLive plugins.
+ \li Specify the path to QML Live plugins.
\row
\li \c -importpath
\li Specify the path to the QML import.
@@ -218,7 +218,7 @@ Sometimes, it may be necessary to deploy the whole project to a target device to
updates normally requires write access to the deployed files. But, depending on the target
platform, the project may be deployed to a location which is not writable by the user. In most
cases, modifying the file permissions after deployment can help. However, a more convenient method
-is to let the QmlLive Runtime store all updates in a writable workspace overlay. Use the
+is to let the QML Live Runtime store all updates in a writable workspace overlay. Use the
\c -updates-as-overlay option to enable this feature.
When you update documents later, after application startup, you may encounter other constraints. If
@@ -228,18 +228,18 @@ documents are updated before any QML components are instantiated.
\section1 Custom Runtime
-You can create your own custom runtime with QmlLive features. This way, you can use your QML view
-setup with your additional C++ code together with the QmlLive system.
+You can create your own custom runtime with QML Live features. This way, you can use your QML view
+setup with your additional C++ code together with the QML Live system.
For this, you need to use the \l LiveNodeEngine class to be able to receive workspace changes and
active document updates. By default, the IPC listens on port 10234.
-The code snippet below shows an example of a minimal custom QmlLive runtime:
+The code snippet below shows an example of a minimal custom QML Live runtime:
\snippet ../examples/customruntime/main.cpp 0
On platforms where \c pkg-config is supported, add the following lines to your project file, if
-QmlLive is installed on your build host:
+QML Live is installed on your build host:
\code
CONFIG += link_pkgconfig
diff --git a/examples/contentplugin/mycontentadapterplugin.cpp b/examples/contentplugin/mycontentadapterplugin.cpp
index 1e5b0b6..d816a7e 100644
--- a/examples/contentplugin/mycontentadapterplugin.cpp
+++ b/examples/contentplugin/mycontentadapterplugin.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/examples/contentplugin/mycontentadapterplugin.h b/examples/contentplugin/mycontentadapterplugin.h
index a70bc5c..91a1f22 100644
--- a/examples/contentplugin/mycontentadapterplugin.h
+++ b/examples/contentplugin/mycontentadapterplugin.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/examples/contentplugin/plugin.qml b/examples/contentplugin/plugin.qml
index c0c5ea8..b6969e6 100644
--- a/examples/contentplugin/plugin.qml
+++ b/examples/contentplugin/plugin.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/examples/customruntime/main.cpp b/examples/customruntime/main.cpp
index 1050432..39bbff2 100644
--- a/examples/customruntime/main.cpp
+++ b/examples/customruntime/main.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -34,7 +34,7 @@
#include <QtGui>
#include <QtQuick>
-// Use QmlLive headers
+// Use QML Live headers
#include "livenodeengine.h"
#include "remotereceiver.h"
@@ -61,11 +61,11 @@ int main(int argc, char **argv)
return app.exec();
#if defined(QT_NO_DEBUG)
- qWarning() << "QmlLive support was disabled at compile time";
+ qWarning() << "QML Live support was disabled at compile time";
#else
LiveNodeEngine node;
- // Let QmlLive know your runtime
+ // Let QML Live know your runtime
node.setQmlEngine(&engine);
// Allow it to display QML components with non-QQuickWindow root object
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
node.setWorkspace(app.applicationDirPath(),
LiveNodeEngine::AllowUpdates | LiveNodeEngine::UpdatesAsOverlay);
- // Listen to IPC call from remote QmlLive Bench
+ // Listen to IPC call from remote QML Live Bench
RemoteReceiver receiver;
receiver.registerNode(&node);
receiver.listen(10234);
diff --git a/examples/customruntime/qml/customruntime-item.qml b/examples/customruntime/qml/customruntime-item.qml
index 942a5af..4237bcc 100644
--- a/examples/customruntime/qml/customruntime-item.qml
+++ b/examples/customruntime/qml/customruntime-item.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/examples/customruntime/qml/customruntime-window.qml b/examples/customruntime/qml/customruntime-window.qml
index a722f16..96cb8c7 100644
--- a/examples/customruntime/qml/customruntime-window.qml
+++ b/examples/customruntime/qml/customruntime-window.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/header.GPL-QTAS b/header.GPL-QTAS
index 9a57b98..722d600 100644
--- a/header.GPL-QTAS
+++ b/header.GPL-QTAS
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/qmllive.pro b/qmllive.pro
index 12c7a4d..df74ef5 100755
--- a/qmllive.pro
+++ b/qmllive.pro
@@ -7,9 +7,9 @@ load(configure)
load(config-output)
include(qmllive.pri)
-!skip-bench:!minQtVersion(5, 4, 0): error("You need at least Qt 5.4.0 to build QmlLive Bench")
-!skip-tests:!minQtVersion(5, 4, 0): error("You need at least Qt 5.4.0 to build QmlLive tests")
-!minQtVersion(5, 2, 0): error("You need at least Qt 5.4.0 to build QmlLive Bench and/or tests, 5.2.0 for the rest")
+!skip-bench:!minQtVersion(5, 4, 0): error("You need at least Qt 5.4.0 to build QML Live Bench")
+!skip-tests:!minQtVersion(5, 4, 0): error("You need at least Qt 5.4.0 to build QML Live tests")
+!minQtVersion(5, 2, 0): error("You need at least Qt 5.4.0 to build QML Live Bench and/or tests, 5.2.0 for the rest")
TEMPLATE = subdirs
CONFIG += ordered
diff --git a/src/bench/aboutdialog.cpp b/src/bench/aboutdialog.cpp
index 2fc61b5..c3072a9 100644
--- a/src/bench/aboutdialog.cpp
+++ b/src/bench/aboutdialog.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -42,7 +42,7 @@
AboutDialog::AboutDialog(QWidget *parent)
: QDialog(parent)
{
- setWindowTitle(tr("About Qt QmlLive"));
+ setWindowTitle(tr("About QML Live"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
QVBoxLayout *layout = new QVBoxLayout(this);
@@ -61,7 +61,7 @@ AboutDialog::AboutDialog(QWidget *parent)
#endif
QString about = tr(
- "<h3>Qt QmlLive %1%2</h3>"
+ "<h3>QML Live %1%2</h3>"
"%3"
"<p>%4</p>"
"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, "
diff --git a/src/bench/aboutdialog.h b/src/bench/aboutdialog.h
index 9932757..9643524 100644
--- a/src/bench/aboutdialog.h
+++ b/src/bench/aboutdialog.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/allhostswidget.cpp b/src/bench/allhostswidget.cpp
index 9d0e07d..5d17144 100644
--- a/src/bench/allhostswidget.cpp
+++ b/src/bench/allhostswidget.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/allhostswidget.h b/src/bench/allhostswidget.h
index b4969f5..bdb94c7 100644
--- a/src/bench/allhostswidget.h
+++ b/src/bench/allhostswidget.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/appearanceoptionpage.cpp b/src/bench/appearanceoptionpage.cpp
index ab4da2f..27c8f86 100644
--- a/src/bench/appearanceoptionpage.cpp
+++ b/src/bench/appearanceoptionpage.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2018 Luxoft Sweden AB
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/appearanceoptionpage.h b/src/bench/appearanceoptionpage.h
index f6cc39c..37217ab 100644
--- a/src/bench/appearanceoptionpage.h
+++ b/src/bench/appearanceoptionpage.h
@@ -3,7 +3,7 @@
** Copyright (C) 2018 Luxoft Sweden AB
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/autodiscoveryhostsdialog.cpp b/src/bench/autodiscoveryhostsdialog.cpp
index a161949..f04b853 100644
--- a/src/bench/autodiscoveryhostsdialog.cpp
+++ b/src/bench/autodiscoveryhostsdialog.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/autodiscoveryhostsdialog.h b/src/bench/autodiscoveryhostsdialog.h
index 771126c..d77263c 100644
--- a/src/bench/autodiscoveryhostsdialog.h
+++ b/src/bench/autodiscoveryhostsdialog.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/benchlivenodeengine.cpp b/src/bench/benchlivenodeengine.cpp
index 02f153e..8c481a7 100644
--- a/src/bench/benchlivenodeengine.cpp
+++ b/src/bench/benchlivenodeengine.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/benchlivenodeengine.h b/src/bench/benchlivenodeengine.h
index 1a29c2c..b11d641 100644
--- a/src/bench/benchlivenodeengine.h
+++ b/src/bench/benchlivenodeengine.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/directorypreviewadapter.cpp b/src/bench/directorypreviewadapter.cpp
index 26bd643..e70dabe 100644
--- a/src/bench/directorypreviewadapter.cpp
+++ b/src/bench/directorypreviewadapter.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/directorypreviewadapter.h b/src/bench/directorypreviewadapter.h
index 47f7f59..8df1367 100644
--- a/src/bench/directorypreviewadapter.h
+++ b/src/bench/directorypreviewadapter.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/dummydelegate.cpp b/src/bench/dummydelegate.cpp
index c83305b..7718351 100644
--- a/src/bench/dummydelegate.cpp
+++ b/src/bench/dummydelegate.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/dummydelegate.h b/src/bench/dummydelegate.h
index dc56232..1a49393 100644
--- a/src/bench/dummydelegate.h
+++ b/src/bench/dummydelegate.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/host.cpp b/src/bench/host.cpp
index ffd831d..a674874 100644
--- a/src/bench/host.cpp
+++ b/src/bench/host.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/host.h b/src/bench/host.h
index 03ac3f3..b320e95 100644
--- a/src/bench/host.h
+++ b/src/bench/host.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostdiscoverymanager.cpp b/src/bench/hostdiscoverymanager.cpp
index 401dc44..8bfd5ca 100644
--- a/src/bench/hostdiscoverymanager.cpp
+++ b/src/bench/hostdiscoverymanager.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostdiscoverymanager.h b/src/bench/hostdiscoverymanager.h
index 4c1cb31..4c04b2c 100644
--- a/src/bench/hostdiscoverymanager.h
+++ b/src/bench/hostdiscoverymanager.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostmanager.cpp b/src/bench/hostmanager.cpp
index 947ca14..ea0f88e 100644
--- a/src/bench/hostmanager.cpp
+++ b/src/bench/hostmanager.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostmanager.h b/src/bench/hostmanager.h
index 1aa51b9..9a68c85 100644
--- a/src/bench/hostmanager.h
+++ b/src/bench/hostmanager.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostmodel.cpp b/src/bench/hostmodel.cpp
index dc57abb..4195aaa 100644
--- a/src/bench/hostmodel.cpp
+++ b/src/bench/hostmodel.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostmodel.h b/src/bench/hostmodel.h
index 5c777c7..168ad72 100644
--- a/src/bench/hostmodel.h
+++ b/src/bench/hostmodel.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostsoptionpage.cpp b/src/bench/hostsoptionpage.cpp
index cb98cc2..0036809 100644
--- a/src/bench/hostsoptionpage.cpp
+++ b/src/bench/hostsoptionpage.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostsoptionpage.h b/src/bench/hostsoptionpage.h
index 6321d08..bfe7719 100644
--- a/src/bench/hostsoptionpage.h
+++ b/src/bench/hostsoptionpage.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/hostwidget.cpp b/src/bench/hostwidget.cpp
index 591560c..b1affa5 100644
--- a/src/bench/hostwidget.cpp
+++ b/src/bench/hostwidget.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -38,7 +38,7 @@
#include <QMessageBox>
Q_DECLARE_LOGGING_CATEGORY(csLog)
-Q_LOGGING_CATEGORY(csLog, "QmlLive.Bench.ConnectionState", QtInfoMsg)
+Q_LOGGING_CATEGORY(csLog, "QMLLive.Bench.ConnectionState", QtInfoMsg)
const int LABEL_STACK_INDEX=0;
const int PROGRESS_STACK_INDEX=1;
diff --git a/src/bench/hostwidget.h b/src/bench/hostwidget.h
index 0bceb93..80ea43f 100644
--- a/src/bench/hostwidget.h
+++ b/src/bench/hostwidget.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/httpproxyoptionpage.cpp b/src/bench/httpproxyoptionpage.cpp
index ad025c0..6a05496 100644
--- a/src/bench/httpproxyoptionpage.cpp
+++ b/src/bench/httpproxyoptionpage.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/httpproxyoptionpage.h b/src/bench/httpproxyoptionpage.h
index 1c09b45..e2c11b4 100644
--- a/src/bench/httpproxyoptionpage.h
+++ b/src/bench/httpproxyoptionpage.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/importpathoptionpage.cpp b/src/bench/importpathoptionpage.cpp
index bf6f55e..6796aca 100644
--- a/src/bench/importpathoptionpage.cpp
+++ b/src/bench/importpathoptionpage.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/importpathoptionpage.h b/src/bench/importpathoptionpage.h
index 38874cb..8a57d6a 100644
--- a/src/bench/importpathoptionpage.h
+++ b/src/bench/importpathoptionpage.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/main.cpp b/src/bench/main.cpp
index 5b9c2f9..292f289 100644
--- a/src/bench/main.cpp
+++ b/src/bench/main.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -99,7 +99,7 @@ Options *Application::s_options = 0;
Application *Application::create(int &argc, char **argv)
{
- setApplicationName("QmlLiveBench");
+ setApplicationName("QML Live Bench");
setOrganizationDomain(QLatin1String(QMLLIVE_ORGANIZATION_DOMAIN));
setOrganizationName(QLatin1String(QMLLIVE_ORGANIZATION_NAME));
@@ -203,13 +203,13 @@ void Application::setDarkStyle()
void Application::parseArguments(const QStringList &arguments, Options *options)
{
QCommandLineParser parser;
- parser.setApplicationDescription("QmlLive reloading workbench");
+ parser.setApplicationDescription("QML Live reloading workbench");
parser.addHelpOption();
parser.addVersionOption();
parser.addPositionalArgument("workspace", "workspace folder to watch. If this points to a QML document, than the directory is asssumed to be the workspace and the file the active document.");
parser.addPositionalArgument("document", "main QML document to load initially.");
- QCommandLineOption pluginPathOption("pluginpath", "path to QmlLive plugins", "pluginpath");
+ QCommandLineOption pluginPathOption("pluginpath", "path to QML Live plugins", "pluginpath");
parser.addOption(pluginPathOption);
QCommandLineOption importPathOption("importpath", "path to QML import path. Can appear multiple times", "importpath");
parser.addOption(importPathOption);
diff --git a/src/bench/mainwindow.cpp b/src/bench/mainwindow.cpp
index 9f41c38..dbebae0 100644
--- a/src/bench/mainwindow.cpp
+++ b/src/bench/mainwindow.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -342,7 +342,7 @@ void MainWindow::setupMenuBar()
m_logDockMenu->addAction(m_logDock->toggleViewAction());
QMenu *help = menuBar()->addMenu(tr("&Help"));
- QAction *about = help->addAction(tr("About Qt QmlLive..."));
+ QAction *about = help->addAction(tr("About QML Live..."));
connect(about, &QAction::triggered, this, [this]() { AboutDialog::exec(this); });
about->setMenuRole(QAction::AboutRole);
}
@@ -463,16 +463,16 @@ void MainWindow::takeSnapshot()
img = m_node->activeWindow()->grabWindow();
if (img.isNull()) {
- m_log->appendToLog(LogView::InternalError, tr("QmlLive: could not retrieve snapshot pixmap"));
+ m_log->appendToLog(LogView::InternalError, tr("QML Live: could not retrieve snapshot pixmap"));
} else {
static int counter = 1;
QString fileName = QString::fromLatin1("snapshot%1.png").arg(counter++);
bool ok = img.save(fileName);
if (!ok) // log
- m_log->appendToLog(LogView::InternalError, tr("QmlLive: could not save snapshot as \"%1\"").arg(fileName));
+ m_log->appendToLog(LogView::InternalError, tr("QML Live: could not save snapshot as \"%1\"").arg(fileName));
else
- m_log->appendToLog(LogView::InternalInfo, tr("QmlLive: created snapshot \"%1\"").arg(fileName));
+ m_log->appendToLog(LogView::InternalInfo, tr("QML Live: created snapshot \"%1\"").arg(fileName));
}
}
@@ -623,7 +623,7 @@ void MainWindow::stayOnTop()
void MainWindow::openProject()
{
- QString filter = tr("QmlLive (*.qmllive);; All files (*.*)");
+ QString filter = tr("QML Live (*.qmllive);; All files (*.*)");
QString path = QFileDialog::getOpenFileName(this, "Open Project", filter, filter);
if (path.isEmpty()) {
return;
diff --git a/src/bench/mainwindow.h b/src/bench/mainwindow.h
index 7dc6588..d92868f 100644
--- a/src/bench/mainwindow.h
+++ b/src/bench/mainwindow.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/newprojectwizard.cpp b/src/bench/newprojectwizard.cpp
index 74c7f33..2089917 100644
--- a/src/bench/newprojectwizard.cpp
+++ b/src/bench/newprojectwizard.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2019 Luxoft Sweden AB
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -37,7 +37,7 @@
#include <QFileDialog>
#include "livedocument.h"
-const QString QmlLiveProjectsLocation(QDir(QDir().homePath()).absoluteFilePath("QMLLive"));
+const QString QMLLiveProjectsLocation(QDir(QDir().homePath()).absoluteFilePath("QMLLive"));
NewProjectWizard::NewProjectWizard(QWidget *parent)
: QWizard(parent)
@@ -269,8 +269,8 @@ ProjectPage::ProjectPage(QWidget *parent)
setTitle("Project Name");
QVBoxLayout *vbox = new QVBoxLayout;
- QLabel *hintlabel = new QLabel("This wizard generates a QmlLive project. The QmlLive project file shall describe the "
- "common options for a QmlLiveBench by specifying the workspace folder, the main document "
+ QLabel *hintlabel = new QLabel("This wizard generates a QML Live project. The QML Live project file shall describe the "
+ "common options for a QML Live Bench by specifying the workspace folder, the main document "
"and the import paths relative to the project document location.");
hintlabel->setWordWrap(true);
hintlabel->setAlignment(Qt::AlignJustify);
@@ -283,14 +283,14 @@ ProjectPage::ProjectPage(QWidget *parent)
m_projectField = new QLineEdit;
registerField("projectName*", m_projectField);
- m_projectField->setPlaceholderText("MyQmlLiveProject");
+ m_projectField->setPlaceholderText("MyQMLLiveProject");
layout->addWidget(m_projectField, 1, 1);
QLabel *dirlabel = new QLabel("Create in: ");
layout->addWidget(dirlabel, 2, 0);
layout->addWidget(m_dirField, 2, 1);
- m_dirField->setText(QmlLiveProjectsLocation);
+ m_dirField->setText(QMLLiveProjectsLocation);
QPushButton *button = new QPushButton("Select");
layout->addWidget(button, 2, 2);
diff --git a/src/bench/newprojectwizard.h b/src/bench/newprojectwizard.h
index dcdc0cc..486a392 100644
--- a/src/bench/newprojectwizard.h
+++ b/src/bench/newprojectwizard.h
@@ -3,7 +3,7 @@
** Copyright (C) 2019 Luxoft Sweden AB
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/options.cpp b/src/bench/options.cpp
index d6d866b..fe79e53 100644
--- a/src/bench/options.cpp
+++ b/src/bench/options.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/options.h b/src/bench/options.h
index 14ed97c..410d6a6 100644
--- a/src/bench/options.h
+++ b/src/bench/options.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/optionsdialog.cpp b/src/bench/optionsdialog.cpp
index 9ad1360..4ae3dd3 100644
--- a/src/bench/optionsdialog.cpp
+++ b/src/bench/optionsdialog.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/optionsdialog.h b/src/bench/optionsdialog.h
index 33e02bd..3b9b08d 100644
--- a/src/bench/optionsdialog.h
+++ b/src/bench/optionsdialog.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/previewimageprovider.cpp b/src/bench/previewimageprovider.cpp
index d53ce69..1c9d659 100644
--- a/src/bench/previewimageprovider.cpp
+++ b/src/bench/previewimageprovider.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/previewimageprovider.h b/src/bench/previewimageprovider.h
index bccfc70..d4dd683 100644
--- a/src/bench/previewimageprovider.h
+++ b/src/bench/previewimageprovider.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/bench/qmlpreviewadapter.cpp b/src/bench/qmlpreviewadapter.cpp
index ff41bad..968dd37 100644
--- a/src/bench/qmlpreviewadapter.cpp
+++ b/src/bench/qmlpreviewadapter.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -68,7 +68,7 @@ QImage QmlPreviewAdapter::preview(const QString &path, const QSize &requestedSiz
#else
QStringLiteral("/../libexec/qmllive/previewGenerator");
#endif
- static const QStringList arguments("QmlLiveBench");
+ static const QStringList arguments("QMLLiveBench");
if (proc()->state() != QProcess::Running) {
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
diff --git a/src/bench/qmlpreviewadapter.h b/src/bench/qmlpreviewadapter.h
index bcf0ec9..9942148 100644
--- a/src/bench/qmlpreviewadapter.h
+++ b/src/bench/qmlpreviewadapter.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/contentadapterinterface.h b/src/contentadapterinterface.h
index 520e1ee..3866c40 100644
--- a/src/contentadapterinterface.h
+++ b/src/contentadapterinterface.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/contentpluginfactory.cpp b/src/contentpluginfactory.cpp
index ca8a5b9..b0c390f 100644
--- a/src/contentpluginfactory.cpp
+++ b/src/contentpluginfactory.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/contentpluginfactory.h b/src/contentpluginfactory.h
index 8dd956b..9251b0a 100644
--- a/src/contentpluginfactory.h
+++ b/src/contentpluginfactory.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/fontadapter.cpp b/src/fontadapter.cpp
index 6f2b52f..7ff3ff0 100644
--- a/src/fontadapter.cpp
+++ b/src/fontadapter.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/fontadapter.h b/src/fontadapter.h
index 150ad15..464db98 100644
--- a/src/fontadapter.h
+++ b/src/fontadapter.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/imageadapter.cpp b/src/imageadapter.cpp
index fa90d41..dca2da6 100644
--- a/src/imageadapter.cpp
+++ b/src/imageadapter.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/imageadapter.h b/src/imageadapter.h
index 8dbe8ee..a265d16 100644
--- a/src/imageadapter.h
+++ b/src/imageadapter.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/ipc/ipcclient.cpp b/src/ipc/ipcclient.cpp
index a256bc3..dfc632b 100644
--- a/src/ipc/ipcclient.cpp
+++ b/src/ipc/ipcclient.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/ipc/ipcclient.h b/src/ipc/ipcclient.h
index 0a19f27..f12fd9b 100644
--- a/src/ipc/ipcclient.h
+++ b/src/ipc/ipcclient.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/ipc/ipcconnection.cpp b/src/ipc/ipcconnection.cpp
index 28d4919..81ce41e 100644
--- a/src/ipc/ipcconnection.cpp
+++ b/src/ipc/ipcconnection.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/ipc/ipcconnection.h b/src/ipc/ipcconnection.h
index 2d2092f..325c637 100644
--- a/src/ipc/ipcconnection.h
+++ b/src/ipc/ipcconnection.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/ipc/ipcserver.cpp b/src/ipc/ipcserver.cpp
index d303787..c54a70e 100644
--- a/src/ipc/ipcserver.cpp
+++ b/src/ipc/ipcserver.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/ipc/ipcserver.h b/src/ipc/ipcserver.h
index c0b0ea1..af21114 100644
--- a/src/ipc/ipcserver.h
+++ b/src/ipc/ipcserver.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/lib.pro b/src/lib.pro
index b5f8ab6..d869ff2 100755
--- a/src/lib.pro
+++ b/src/lib.pro
@@ -28,7 +28,7 @@ INSTALLS += headers
!win32 {
CONFIG += create_pc create_prl no_install_prl
QMAKE_PKGCONFIG_NAME = qmllive
- QMAKE_PKGCONFIG_DESCRIPTION = Qt QmlLive Library
+ QMAKE_PKGCONFIG_DESCRIPTION = QML Live Library
QMAKE_PKGCONFIG_PREFIX = $$PREFIX
QMAKE_PKGCONFIG_LIBDIR = ${prefix}/lib
QMAKE_PKGCONFIG_INCDIR = ${prefix}/include/qmllive
diff --git a/src/livedocument.cpp b/src/livedocument.cpp
index 3429636..6c42711 100644
--- a/src/livedocument.cpp
+++ b/src/livedocument.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livedocument.h b/src/livedocument.h
index 4d538e1..b43f49e 100644
--- a/src/livedocument.h
+++ b/src/livedocument.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livehubengine.cpp b/src/livehubengine.cpp
index b3bd56f..62c9415 100644
--- a/src/livehubengine.cpp
+++ b/src/livehubengine.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livehubengine.h b/src/livehubengine.h
index 160ae53..64c9aa0 100644
--- a/src/livehubengine.h
+++ b/src/livehubengine.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livenodeengine.cpp b/src/livenodeengine.cpp
index 9e9258b..f7040e9 100644
--- a/src/livenodeengine.cpp
+++ b/src/livenodeengine.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -90,7 +90,7 @@ const char OVERLAY_PATH_SEPARATOR = '-';
* over the original workspace with the help of
* QQmlAbstractUrlInterceptor. Requires \l AllowUpdates.
*
- * \sa {QmlLive Runtime}
+ * \sa {QML Live Runtime}
*/
class OverlayUrlInterceptor : public QObject, public QQmlAbstractUrlInterceptor
@@ -438,7 +438,7 @@ void LiveNodeEngine::reloadDocument()
checkQmlFeatures();
qInfo() << "----------------------------------------";
- qInfo() << "QmlLive: (Re)loading" << m_activeFile;
+ qInfo() << "QML Live: (Re)loading" << m_activeFile;
emit clearLog();
@@ -656,7 +656,7 @@ void LiveNodeEngine::destroyOverlay()
/*!
* Sets the pluginPath to \a path.
*
- * The pluginPath will be used to load QmlLive plugins
+ * The pluginPath will be used to load QML Live plugins
* \sa {ContentPlugin Example}
*/
void LiveNodeEngine::setPluginPath(const QString &path)
diff --git a/src/livenodeengine.h b/src/livenodeengine.h
index 60ae574..2ce7351 100644
--- a/src/livenodeengine.h
+++ b/src/livenodeengine.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/error_qt5.qml b/src/livert/error_qt5.qml
index c2ead27..ba6199e 100644
--- a/src/livert/error_qt5.qml
+++ b/src/livert/error_qt5.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/error_qt5_controls.qml b/src/livert/error_qt5_controls.qml
index ffd0caf..10b7926 100644
--- a/src/livert/error_qt5_controls.qml
+++ b/src/livert/error_qt5_controls.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/folderview_qt5.qml b/src/livert/folderview_qt5.qml
index 7c98a02..04710f4 100644
--- a/src/livert/folderview_qt5.qml
+++ b/src/livert/folderview_qt5.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/folderview_qt5_controls.qml b/src/livert/folderview_qt5_controls.qml
index 3d359e6..6488ff1 100644
--- a/src/livert/folderview_qt5_controls.qml
+++ b/src/livert/folderview_qt5_controls.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/fontviewer_qt5.qml b/src/livert/fontviewer_qt5.qml
index fb7ecd6..5c4f464 100644
--- a/src/livert/fontviewer_qt5.qml
+++ b/src/livert/fontviewer_qt5.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/fontviewer_qt5_controls.qml b/src/livert/fontviewer_qt5_controls.qml
index 5ffadd0..c2dc17f 100644
--- a/src/livert/fontviewer_qt5_controls.qml
+++ b/src/livert/fontviewer_qt5_controls.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/imageviewer_qt5.qml b/src/livert/imageviewer_qt5.qml
index d31410d..36f0291 100644
--- a/src/livert/imageviewer_qt5.qml
+++ b/src/livert/imageviewer_qt5.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/livert/imageviewer_qt5_controls.qml b/src/livert/imageviewer_qt5_controls.qml
index d31410d..36f0291 100644
--- a/src/livert/imageviewer_qt5_controls.qml
+++ b/src/livert/imageviewer_qt5_controls.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/liveruntime.cpp b/src/liveruntime.cpp
index 48969d0..01f59ed 100644
--- a/src/liveruntime.cpp
+++ b/src/liveruntime.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -37,7 +37,7 @@
/*!
* \class LiveRuntime
- * \brief Collects properties to be used for an enhanced QmlLive runtime.
+ * \brief Collects properties to be used for an enhanced QML Live runtime.
* \inmodule qmllive
*
* This runtime is used in a live enhanced QML project to be able to access more
diff --git a/src/liveruntime.h b/src/liveruntime.h
index a95622f..6a58a90 100644
--- a/src/liveruntime.h
+++ b/src/liveruntime.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/logger.cpp b/src/logger.cpp
index 90a0dca..85f2d5b 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/logger.h b/src/logger.h
index 774c2e1..4b3c533 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/logreceiver.cpp b/src/logreceiver.cpp
index 7b91b1a..3871a97 100644
--- a/src/logreceiver.cpp
+++ b/src/logreceiver.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/logreceiver.h b/src/logreceiver.h
index 86e993e..02a60dd 100644
--- a/src/logreceiver.h
+++ b/src/logreceiver.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/previewGenerator/main.cpp b/src/previewGenerator/main.cpp
index 5c609fc..993d375 100644
--- a/src/previewGenerator/main.cpp
+++ b/src/previewGenerator/main.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -113,7 +113,7 @@ Q_LOGGING_CATEGORY(pg, "PreviewGenerator", QtInfoMsg)
int main (int argc, char** argv)
{
- QGuiApplication::setApplicationName("QmlLivePreviewGenerator");
+ QGuiApplication::setApplicationName("QMLLivePreviewGenerator");
QGuiApplication::setOrganizationDomain(QLatin1String(QMLLIVE_ORGANIZATION_DOMAIN));
QGuiApplication::setOrganizationName(QLatin1String(QMLLIVE_ORGANIZATION_NAME));
@@ -121,12 +121,12 @@ int main (int argc, char** argv)
app.setQuitOnLastWindowClosed(false);
if (app.arguments().count() != 2 ||
- (app.arguments().at(1) != "QmlLiveBench") )
- qFatal("This application is managed by QmlLive and is not supposed to be manually started");
+ (app.arguments().at(1) != "QMLLiveBench") )
+ qFatal("This application is managed by QML Live and is not supposed to be manually started");
PreviewServer preview;
if (!preview.listen()) {
- qFatal("Failed to listen to local socket \"QmlLivePreviewGenerator\": %s",
+ qFatal("Failed to listen to local socket \"QMLLivePreviewGenerator\": %s",
qPrintable(preview.errorString()));
}
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 531f06e..fd6cad9 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -41,7 +41,7 @@
const QLatin1String MainKey("main");
const QLatin1String WorkspaceKey("workspace");
const QLatin1String ImportsKey("imports");
-const QLatin1String QmlLiveExtension(".qmllive");
+const QLatin1String QMLLiveExtension(".qmllive");
ProjectManager::ProjectManager(QObject *parent)
: QObject(parent)
@@ -113,7 +113,7 @@ void ProjectManager::write(const QString &path)
void ProjectManager::create(const QString &projectName)
{
m_projectName = projectName;
- QString path = QString(projectName).append(QmlLiveExtension);
+ QString path = QString(projectName).append(QMLLiveExtension);
qInfo()<<"CREATING Project------ "<<path;
write(path);
}
diff --git a/src/projectmanager.h b/src/projectmanager.h
index 3289aed..575dd05 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/qmlhelper.cpp b/src/qmlhelper.cpp
index 1de9716..d6b5e44 100644
--- a/src/qmlhelper.cpp
+++ b/src/qmlhelper.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/qmlhelper.h b/src/qmlhelper.h
index 07a8ec2..85d5842 100644
--- a/src/qmlhelper.h
+++ b/src/qmlhelper.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/qmllive.cpp b/src/qmllive.cpp
index 8b4c5ce..29abd3e 100644
--- a/src/qmllive.cpp
+++ b/src/qmllive.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -32,6 +32,6 @@
#include "qmllive.h"
-QmlLive::QmlLive()
+QMLLive::QMLLive()
{
}
diff --git a/src/qmllive.h b/src/qmllive.h
index 5948da1..5101742 100644
--- a/src/qmllive.h
+++ b/src/qmllive.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -35,10 +35,10 @@
#include "qmllive_global.h"
-class QMLLIVESHARED_EXPORT QmlLive
+class QMLLIVESHARED_EXPORT QMLLive
{
public:
- QmlLive();
+ QMLLive();
};
#endif // QMLLIVELIB_H
diff --git a/src/qmllive_global.h b/src/qmllive_global.h
index d2bb0f6..5865198 100755
--- a/src/qmllive_global.h
+++ b/src/qmllive_global.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/qmllive_version.h b/src/qmllive_version.h
index f3ecd81..9a50a17 100644
--- a/src/qmllive_version.h
+++ b/src/qmllive_version.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/remotelogger.cpp b/src/remotelogger.cpp
index 31ea3b8..2c83b0d 100644
--- a/src/remotelogger.cpp
+++ b/src/remotelogger.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/remotelogger.h b/src/remotelogger.h
index 234874b..62bbeae 100644
--- a/src/remotelogger.h
+++ b/src/remotelogger.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/remotepublisher.cpp b/src/remotepublisher.cpp
index 5984dae..f4f37eb 100644
--- a/src/remotepublisher.cpp
+++ b/src/remotepublisher.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/remotepublisher.h b/src/remotepublisher.h
index 5c1f930..11c8460 100644
--- a/src/remotepublisher.h
+++ b/src/remotepublisher.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/remotereceiver.cpp b/src/remotereceiver.cpp
index 0cd707e..7ab7457 100644
--- a/src/remotereceiver.cpp
+++ b/src/remotereceiver.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -107,7 +107,7 @@ bool RemoteReceiver::listen(int port, ConnectionOptions options)
m_server->listen(port);
if (m_connectionOptions & BlockingConnect) {
- qInfo() << "Waiting for connection from QmlLive Bench…";
+ qInfo() << "Waiting for connection from QML Live Bench…";
QEventLoop loop;
@@ -119,7 +119,7 @@ bool RemoteReceiver::listen(int port, ConnectionOptions options)
});
loop.exec();
if (!pinOk) {
- qWarning() << "Refused connection from QmlLive Bench: Wrong pin";
+ qWarning() << "Refused connection from QML Live Bench: Wrong pin";
return false;
}
}
@@ -132,12 +132,12 @@ bool RemoteReceiver::listen(int port, ConnectionOptions options)
});
loop.exec();
if (!finishedOk) {
- qWarning() << "Initial workspace synchronization with QmlLive Bench failed";
+ qWarning() << "Initial workspace synchronization with QML Live Bench failed";
return false;
}
}
- qInfo() << "QmlLive Bench connected";
+ qInfo() << "QML Live Bench connected";
}
return true;
diff --git a/src/remotereceiver.h b/src/remotereceiver.h
index 740f8f5..43277ad 100644
--- a/src/remotereceiver.h
+++ b/src/remotereceiver.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/runtime/main.cpp b/src/runtime/main.cpp
index d4a7cf3..a102e28 100644
--- a/src/runtime/main.cpp
+++ b/src/runtime/main.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -69,7 +69,7 @@ static Options options;
static void parseArguments(const QStringList &arguments)
{
QCommandLineParser parser;
- parser.setApplicationDescription("QmlLive reloading runtime");
+ parser.setApplicationDescription("QML Live reloading runtime");
parser.addHelpOption();
parser.addVersionOption();
@@ -79,7 +79,7 @@ static void parseArguments(const QStringList &arguments)
QCommandLineOption ipcPortOption("ipcport", "the port the IPC shall listen on, default is 10234", "ipcport");
parser.addOption(ipcPortOption);
- QCommandLineOption pluginPathOption("pluginpath", "path to QmlLive plugins", "pluginpath");
+ QCommandLineOption pluginPathOption("pluginpath", "path to QML Live plugins", "pluginpath");
parser.addOption(pluginPathOption);
QCommandLineOption importPathOption("importpath", "path to QML import path. Can appear multiple times", "importpath");
@@ -166,7 +166,7 @@ private slots:
int main(int argc, char** argv)
{
QGuiApplication app(argc, argv);
- app.setApplicationName("QmlLiveRuntime");
+ app.setApplicationName("QML Live Runtime");
app.setOrganizationDomain(QLatin1String(QMLLIVE_ORGANIZATION_DOMAIN));
app.setOrganizationName(QLatin1String(QMLLIVE_ORGANIZATION_NAME));
diff --git a/src/runtime/qmlsplash/splash-qt4.qml b/src/runtime/qmlsplash/splash-qt4.qml
index 19943d7..dd1b2ea 100644
--- a/src/runtime/qmlsplash/splash-qt4.qml
+++ b/src/runtime/qmlsplash/splash-qt4.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -67,7 +67,7 @@ Rectangle {
Text {
id: qmllivetext
- text: "QmlLive"
+ text: "QML Live"
font.pixelSize: 70
color: "white"
@@ -78,7 +78,7 @@ Rectangle {
}
Text {
id: pleaseConnectText
- text: "Please connect with QmlLiveRemote"
+ text: "Please connect with QML Live Remote"
font.pixelSize: 40
color: "white"
diff --git a/src/runtime/qmlsplash/splash-qt5.qml b/src/runtime/qmlsplash/splash-qt5.qml
index 4f024fb..1f00d57 100644
--- a/src/runtime/qmlsplash/splash-qt5.qml
+++ b/src/runtime/qmlsplash/splash-qt5.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
@@ -70,14 +70,14 @@ Rectangle {
anchors.top: mantraText.bottom
anchors.horizontalCenter: parent.horizontalCenter
- text: "QmlLive"
+ text: "QML Live"
font.pixelSize: 70
color: "white"
}
Text {
id: pleaseConnectText
- text: "Please connect with QmlLiveRemote"
+ text: "Please connect with QML Live Remote"
font.pixelSize: 40
color: "white"
diff --git a/src/watcher.cpp b/src/watcher.cpp
index e1c4556..f096ac7 100644
--- a/src/watcher.cpp
+++ b/src/watcher.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/watcher.h b/src/watcher.h
index 7db5408..33b3aa3 100644
--- a/src/watcher.h
+++ b/src/watcher.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/filesystemmodel.cpp b/src/widgets/filesystemmodel.cpp
index a66d594..349cadd 100644
--- a/src/widgets/filesystemmodel.cpp
+++ b/src/widgets/filesystemmodel.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/filesystemmodel.h b/src/widgets/filesystemmodel.h
index 758fed6..4572c2d 100644
--- a/src/widgets/filesystemmodel.h
+++ b/src/widgets/filesystemmodel.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/logview.cpp b/src/widgets/logview.cpp
index 3a6e1a5..6edc8fb 100644
--- a/src/widgets/logview.cpp
+++ b/src/widgets/logview.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/logview.h b/src/widgets/logview.h
index 1be6b69..9a5bdb9 100644
--- a/src/widgets/logview.h
+++ b/src/widgets/logview.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/windowwidget.cpp b/src/widgets/windowwidget.cpp
index 1d6f234..d01c752 100644
--- a/src/widgets/windowwidget.cpp
+++ b/src/widgets/windowwidget.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/windowwidget.h b/src/widgets/windowwidget.h
index bff9072..d3a5674 100644
--- a/src/widgets/windowwidget.h
+++ b/src/widgets/windowwidget.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/workspacedelegate.cpp b/src/widgets/workspacedelegate.cpp
index 9b967e9..7df4554 100644
--- a/src/widgets/workspacedelegate.cpp
+++ b/src/widgets/workspacedelegate.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/workspacedelegate.h b/src/widgets/workspacedelegate.h
index 2427d82..8d654f3 100644
--- a/src/widgets/workspacedelegate.h
+++ b/src/widgets/workspacedelegate.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/workspaceview.cpp b/src/widgets/workspaceview.cpp
index 08eb9b4..e147a78 100644
--- a/src/widgets/workspaceview.cpp
+++ b/src/widgets/workspaceview.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/src/widgets/workspaceview.h b/src/widgets/workspaceview.h
index aa0ef1d..dd2df34 100644
--- a/src/widgets/workspaceview.h
+++ b/src/widgets/workspaceview.h
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/testData/qml/explicit-size.qml b/testData/qml/explicit-size.qml
index 222c703..037ada5 100644
--- a/testData/qml/explicit-size.qml
+++ b/testData/qml/explicit-size.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/testData/qml/no-explicit-size.qml b/testData/qml/no-explicit-size.qml
index 0c49e53..19f16a6 100644
--- a/testData/qml/no-explicit-size.qml
+++ b/testData/qml/no-explicit-size.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/testData/qml/two-windows.qml b/testData/qml/two-windows.qml
index 9c26ed0..3b6bed0 100644
--- a/testData/qml/two-windows.qml
+++ b/testData/qml/two-windows.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/tests/manual_tests/javascript/lib.js b/tests/manual_tests/javascript/lib.js
index 625d3ef..5359a67 100644
--- a/tests/manual_tests/javascript/lib.js
+++ b/tests/manual_tests/javascript/lib.js
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/tests/manual_tests/javascript/pragma_main.qml b/tests/manual_tests/javascript/pragma_main.qml
index af1e256..c75e583 100644
--- a/tests/manual_tests/javascript/pragma_main.qml
+++ b/tests/manual_tests/javascript/pragma_main.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/tests/manual_tests/javascript/pragmalib.js b/tests/manual_tests/javascript/pragmalib.js
index 2d97435..5229efb 100644
--- a/tests/manual_tests/javascript/pragmalib.js
+++ b/tests/manual_tests/javascript/pragmalib.js
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/tests/testipc/tst_testipc.cpp b/tests/testipc/tst_testipc.cpp
index 843d46e..6502ee4 100644
--- a/tests/testipc/tst_testipc.cpp
+++ b/tests/testipc/tst_testipc.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/tests/testsync/tst_testsync.cpp b/tests/testsync/tst_testsync.cpp
index 115a2b8..0b553b8 100644
--- a/tests/testsync/tst_testsync.cpp
+++ b/tests/testsync/tst_testsync.cpp
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QmlLive tool.
+** This file is part of the QML Live tool.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage