QmlDesigner: get tests compiling and running

105 passing, 1 failing, one test seems flaky
I skip many nodeinstance/puppet related tests,
because the tests/test framework cannot deal with the qml2puppet/emulation
layer being out of process.

Change-Id: I5b254c7e6e944b8fbd8ba490c1e8bb43d0eb38c3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/qmldesigner/designercore/rewritertransaction.cpp b/src/plugins/qmldesigner/designercore/rewritertransaction.cpp
index 725469796c..bb1429eaec 100644
--- a/src/plugins/qmldesigner/designercore/rewritertransaction.cpp
+++ b/src/plugins/qmldesigner/designercore/rewritertransaction.cpp
@@ -25,8 +25,13 @@
 
 #include "rewritertransaction.h"
 #include <abstractview.h>
+
+#ifndef QMLDESIGNER_TEST
 #include <designdocument.h>
 #include <qmldesignerplugin.h>
+#endif
+
+#include <QDebug>
 
 namespace QmlDesigner {
 
@@ -88,8 +93,10 @@ void RewriterTransaction::rollback()
     if (m_valid) {
         m_valid = false;
         view()->emitRewriterEndTransaction();
-        QmlDesignerPlugin::instance()->currentDesignDocument()->undo();
 
+#ifndef QMLDESIGNER_TEST
+        QmlDesignerPlugin::instance()->currentDesignDocument()->undo();
+#endif
         if (m_activeIdentifier) {
             qDebug() << "Rollback RewriterTransaction:" << m_identifier << m_identifierNumber;
             m_identifierList.removeOne(m_identifier + QByteArrayLiteral("-") + QByteArray::number(m_identifierNumber));