Merge branch 'dev' into androidwip/android

Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc

1 files changed, 0 insertions, 103 deletions

diff --git a/doc/src/snippets/scriptdebugger.cpp b/doc/src/snippets/scriptdebugger.cpp
deleted file mode 100644
index a59ed89..0000000
--- a/doc/src/snippets/scriptdebugger.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include <QtScript>
-#include <QtScriptTools>
-
-// Perhaps shpw entire example for getting debugger up with script
-int main(int argv, char **args)
-{
-    QApplication app(argv, args);
-
-     QString fileName("helloscript.qs");
-     QFile scriptFile(fileName);
-     scriptFile.open(QIODevice::ReadOnly);
-     QTextStream stream(&scriptFile);
-     QString contents = stream.readAll();
-     scriptFile.close();
-
-    QScriptEngine *engine = new QScriptEngine();
-
-    QScriptEngineDebugger *debugger = new QScriptEngineDebugger();
-    debugger->attachTo(engine);
-
-    // Set up configuration with only stack and code
-    QWidget *widget = new QWidget;
-//![0]
-    QWidget *codeWindow = debugger->widget(QScriptEngineDebugger::CodeWidget);
-    QWidget *stackWidget = debugger->widget(QScriptEngineDebugger::StackWidget);
-
-    QLayout *layout = new QHBoxLayout;
-    layout->addWidget(codeWindow);
-    layout->addWidget(stackWidget);
-//![0]
-
-//![1]
-    QAction *continueAction = debugger->action(QScriptEngineDebugger::ContinueAction);
-    QAction *stepOverAction = debugger->action(QScriptEngineDebugger::StepOverAction);
-    QAction *stepIntoAction = debugger->action(QScriptEngineDebugger::StepIntoAction);
-
-    QToolBar *toolBar = new QToolBar;
-    toolBar->addAction(continueAction);
-//![1]
-    toolBar->addAction(stepOverAction);
-    toolBar->addAction(stepIntoAction);
-
-    layout->addWidget(toolBar);
-    continueAction->setIcon(QIcon("copy.png"));
-
-    debugger->setAutoShowStandardWindow(false);
-
-    widget->setLayout(layout);
-    widget->show();
-
-     QPushButton button;
-     QScriptValue scriptButton = engine->newQObject(&button);
-     engine->globalObject().setProperty("button", scriptButton);
-
-//![2]
-     debugger->action(QScriptEngineDebugger::InterruptAction)->trigger();
-     engine->evaluate(contents, fileName);
-//![2]
-
-    return app.exec();
-}
-