diff --git a/src/plugins/qmldesigner/components/integration/integration.pri b/src/plugins/qmldesigner/components/integration/integration.pri index d7f6d3a18f4..d7e2ce12ad6 100644 --- a/src/plugins/qmldesigner/components/integration/integration.pri +++ b/src/plugins/qmldesigner/components/integration/integration.pri @@ -5,7 +5,6 @@ SOURCES += \ multipledocumentscontroller.cpp \ designdocumentcontroller.cpp \ designdocumentcontrollerview.cpp \ - navigatorcontroller.cpp \ utilitypanelcontroller.cpp \ widgetboxcontroller.cpp \ stackedutilitypanelcontroller.cpp \ @@ -20,7 +19,6 @@ HEADERS += \ multipledocumentscontroller.h \ designdocumentcontrollerview.h \ designdocumentcontroller.h \ - navigatorcontroller.h \ utilitypanelcontroller.h \ widgetboxcontroller.h \ stackedutilitypanelcontroller.h \ diff --git a/src/plugins/qmldesigner/components/integration/navigatorcontroller.cpp b/src/plugins/qmldesigner/components/integration/navigatorcontroller.cpp deleted file mode 100644 index 131f2bd874a..00000000000 --- a/src/plugins/qmldesigner/components/integration/navigatorcontroller.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** Commercial Usage -** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** -**************************************************************************/ - -#include - -#include "designdocumentcontroller.h" -#include "navigatorcontroller.h" - -namespace QmlDesigner { - -NavigatorController::NavigatorController(QObject* parent): - StackedUtilityPanelController(parent) -{ - setObjectName("navigatorController"); - contentWidget()->setObjectName("navigatorStack"); -} - -QWidget* NavigatorController::stackedPageWidget(DesignDocumentController* designDocumentController) const -{ - if (designDocumentController) - return designDocumentController->navigator(); - else - return 0; -} - -} // namespace QmlDesigner - diff --git a/src/plugins/qmldesigner/components/integration/navigatorcontroller.h b/src/plugins/qmldesigner/components/integration/navigatorcontroller.h deleted file mode 100644 index d0bd17a7dba..00000000000 --- a/src/plugins/qmldesigner/components/integration/navigatorcontroller.h +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** Commercial Usage -** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** -**************************************************************************/ - -#ifndef NAVIGATORCONTROLLER_H -#define NAVIGATORCONTROLLER_H - -#include "stackedutilitypanelcontroller.h" - -namespace QmlDesigner { - -class NavigatorController : public StackedUtilityPanelController -{ -public: - NavigatorController(QObject* parent = 0); - -protected: - class QWidget* stackedPageWidget(class DesignDocumentController* designDocumentController) const; -}; - -} // namespace QmlDesigner - -#endif // NAVIGATORCONTROLLER_H