aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2/texteditor
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-03-17 09:54:04 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-03-17 09:54:04 +0100
commitf52b95a96cc8f36f766635f9ddb6c95fa6b3c934 (patch)
tree0a74d23575ae74e93a7b2dedb7a03827c42e8266 /examples/quickcontrols2/texteditor
parent2bd4f5cd587e258227c69b3124757d7b8e019c9f (diff)
parent7da5842647f75fd990f69f400f75d9b090e39306 (diff)
Merge remote-tracking branch 'origin/dev' into wip/cmake
Diffstat (limited to 'examples/quickcontrols2/texteditor')
-rw-r--r--examples/quickcontrols2/texteditor/documenthandler.cpp2
-rw-r--r--examples/quickcontrols2/texteditor/documenthandler.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp
index 5def1b61b5..e840d41135 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.cpp
+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp
@@ -385,3 +385,5 @@ void DocumentHandler::setModified(bool m)
if (m_document)
m_document->textDocument()->setModified(m);
}
+
+#include "moc_documenthandler.cpp"
diff --git a/examples/quickcontrols2/texteditor/documenthandler.h b/examples/quickcontrols2/texteditor/documenthandler.h
index 97e556585a..1a34f0e063 100644
--- a/examples/quickcontrols2/texteditor/documenthandler.h
+++ b/examples/quickcontrols2/texteditor/documenthandler.h
@@ -170,7 +170,6 @@ private:
int m_selectionEnd;
QFont m_font;
- int m_fontSize;
QUrl m_fileUrl;
};