diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
| commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
| tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /tools | |
| parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
| parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmleasing/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | tools/qmleasing/segmentproperties.cpp | 2 | ||||
| -rw-r--r-- | tools/qmleasing/splineeditor.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlprofiler/commandlistener.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerclient.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerdata.cpp | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/tools/qmleasing/mainwindow.cpp b/tools/qmleasing/mainwindow.cpp index d36ab5fd75..627e23ac87 100644 --- a/tools/qmleasing/mainwindow.cpp +++ b/tools/qmleasing/mainwindow.cpp @@ -155,3 +155,5 @@ void MainWindow::importData(int result) .arg(ii*is,0,'f',3).arg(1-oi, 0, 'f', 3).arg(1-(oi*os), 0, 'f', 3); ui_properties.plainTextEdit->setPlainText(generatedString); } + +#include "moc_mainwindow.cpp" diff --git a/tools/qmleasing/segmentproperties.cpp b/tools/qmleasing/segmentproperties.cpp index d2ab00d518..01123d3e97 100644 --- a/tools/qmleasing/segmentproperties.cpp +++ b/tools/qmleasing/segmentproperties.cpp @@ -113,3 +113,5 @@ void SegmentProperties::invalidate() m_blockSignals = false; } + +#include "moc_segmentproperties.cpp" diff --git a/tools/qmleasing/splineeditor.cpp b/tools/qmleasing/splineeditor.cpp index cd0c0b3ae0..af5c519b04 100644 --- a/tools/qmleasing/splineeditor.cpp +++ b/tools/qmleasing/splineeditor.cpp @@ -704,3 +704,5 @@ void SplineEditor::setEasingCurve(const QString &code) } } } + +#include "moc_splineeditor.cpp" diff --git a/tools/qmlprofiler/commandlistener.cpp b/tools/qmlprofiler/commandlistener.cpp index 88800c5e49..079ea9b3bd 100644 --- a/tools/qmlprofiler/commandlistener.cpp +++ b/tools/qmlprofiler/commandlistener.cpp @@ -34,3 +34,5 @@ void CommandListener::readCommand() { emit command(QTextStream(stdin).readLine()); } + +#include "moc_commandlistener.cpp" diff --git a/tools/qmlprofiler/qmlprofilerclient.cpp b/tools/qmlprofiler/qmlprofilerclient.cpp index 217942244f..0c031db914 100644 --- a/tools/qmlprofiler/qmlprofilerclient.cpp +++ b/tools/qmlprofiler/qmlprofilerclient.cpp @@ -198,3 +198,5 @@ void QmlProfilerClient::complete() Q_D(QmlProfilerClient); d->data->complete(); } + +#include "moc_qmlprofilerclient.cpp" diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp index bcda0bb7fe..7dcfa4cdaa 100644 --- a/tools/qmlprofiler/qmlprofilerdata.cpp +++ b/tools/qmlprofiler/qmlprofilerdata.cpp @@ -683,3 +683,4 @@ void QmlProfilerData::setState(QmlProfilerData::State state) return; } +#include "moc_qmlprofilerdata.cpp" |