diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 6 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.cpp | 6 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerclient.cpp | 4 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerclient.h | 2 | ||||
| -rw-r--r-- | tools/tools.pro | 21 |
6 files changed, 27 insertions, 14 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 73b2700ba4..6cf6ad3b2c 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -55,7 +55,9 @@ #include <QLibraryInfo> #include <qqml.h> #include <qqmldebug.h> -#if QT_CONFIG(animation) + +#include <private/qtqmlglobal_p.h> +#if QT_CONFIG(qml_animation) #include <private/qabstractanimation_p.h> #endif @@ -483,7 +485,7 @@ int main(int argc, char *argv[]) break; else if (arg == QLatin1String("-verbose")) verboseMode = true; -#if QT_CONFIG(animation) +#if QT_CONFIG(qml_animation) else if (arg == QLatin1String("-slow-animations")) QUnifiedTimer::instance()->setSlowModeEnabled(true); else if (arg == QLatin1String("-fixed-animations")) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 04704f9314..3f41707275 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,4 +1,4 @@ -QT = qml core-private +QT = qml-private core-private qtHaveModule(gui): QT += gui qtHaveModule(widgets): QT += widgets diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp index 3ab6741afa..64cd4ec87f 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.cpp +++ b/tools/qmlprofiler/qmlprofilerapplication.cpp @@ -121,6 +121,10 @@ QmlProfilerApplication::~QmlProfilerApplication() logStatus("Killing process ..."); m_process->kill(); } + if (isInteractive()) { + QTextStream err(stderr); + err << endl; + } delete m_process; } @@ -367,7 +371,7 @@ void QmlProfilerApplication::userCommand(const QString &command) m_pendingRequest = REQUEST_NONE; prompt(); } else { - prompt(tr("The application is still generating data. Really quit (y/n)?")); + prompt(tr("Really quit (y/n)?")); } return; } diff --git a/tools/qmlprofiler/qmlprofilerclient.cpp b/tools/qmlprofiler/qmlprofilerclient.cpp index b69c7e73e1..f6cc6f39fe 100644 --- a/tools/qmlprofiler/qmlprofilerclient.cpp +++ b/tools/qmlprofiler/qmlprofilerclient.cpp @@ -57,6 +57,8 @@ QmlProfilerClient::QmlProfilerClient(QQmlDebugConnection *connection, QmlProfile { Q_D(QmlProfilerClient); setRequestedFeatures(std::numeric_limits<quint64>::max()); + connect(this, &QQmlDebugClient::stateChanged, + this, &QmlProfilerClient::onStateChanged); connect(this, &QQmlProfilerClient::traceStarted, d->data, &QmlProfilerData::setTraceStartTime); connect(this, &QQmlProfilerClient::traceFinished, @@ -65,7 +67,7 @@ QmlProfilerClient::QmlProfilerClient(QQmlDebugConnection *connection, QmlProfile d->data, &QmlProfilerData::complete); } -void QmlProfilerClient::stateChanged(State state) +void QmlProfilerClient::onStateChanged(State state) { Q_D(QmlProfilerClient); if ((d->enabled && state != Enabled) || (!d->enabled && state == Enabled)) { diff --git a/tools/qmlprofiler/qmlprofilerclient.h b/tools/qmlprofiler/qmlprofilerclient.h index b9d8ce241f..b4b4ad2b2f 100644 --- a/tools/qmlprofiler/qmlprofilerclient.h +++ b/tools/qmlprofiler/qmlprofilerclient.h @@ -48,7 +48,7 @@ signals: void error(const QString &error); private: - void stateChanged(State state) override; + void onStateChanged(State state); }; #endif // QMLPROFILERCLIENT_H diff --git a/tools/tools.pro b/tools/tools.pro index 20a3600fb8..23d5cb5299 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,16 +1,19 @@ TEMPLATE = subdirs QT_FOR_CONFIG += qml-private -SUBDIRS += \ - qmlmin \ - qmlimportscanner -qtConfig(commandlineparser): SUBDIRS += qmlcachegen +qtConfig(qml-devtools) { + SUBDIRS += \ + qmlmin \ + qmlimportscanner + + qtConfig(commandlineparser): SUBDIRS += qmlcachegen +} !android|android_app { SUBDIRS += \ - qml \ - qmllint + qml + qtConfig(qml-devtools): SUBDIRS += qmllint qtConfig(qml-profiler): SUBDIRS += qmlprofiler qtHaveModule(quick) { @@ -30,8 +33,10 @@ qtConfig(commandlineparser): SUBDIRS += qmlcachegen qtConfig(private_tests): SUBDIRS += qmljs } -qml.depends = qmlimportscanner -qmleasing.depends = qmlimportscanner +qtConfig(qml-devtools) { + qml.depends = qmlimportscanner + qmleasing.depends = qmlimportscanner +} # qmlmin, qmlimportscanner & qmlcachegen are build tools. # qmlscene is needed by the autotests. |