diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-10-01 18:03:41 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-02 11:39:23 +0200 |
commit | 0b82b54c248eebcf87a01fc72d4089787848b7a2 (patch) | |
tree | dd64349301f893c4d9f8b98c3685a6c6cf984b9c /src/libs/qtcomponents/styleitem/qtmenubar.h | |
parent | c148f4fe4f7f98d5bac425e98f0bd3875eaeaf84 (diff) |
Remove remaining usages of Qt Quick 1 / Declarative
Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.
Also removes the unused qtcomponents.
qmlpuppet of course still links against declarative, but that's not run
in the same process.
Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/libs/qtcomponents/styleitem/qtmenubar.h')
-rw-r--r-- | src/libs/qtcomponents/styleitem/qtmenubar.h | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/src/libs/qtcomponents/styleitem/qtmenubar.h b/src/libs/qtcomponents/styleitem/qtmenubar.h deleted file mode 100644 index 1e1421d505..0000000000 --- a/src/libs/qtcomponents/styleitem/qtmenubar.h +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator -** -** 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." -** -**************************************************************************/ - - -#ifndef QTMENUBAR_H -#define QTMENUBAR_H - -#include <QDeclarativeItem> - -#include "qtmenu.h" - -class QtMenuBar: public QDeclarativeItem -{ - Q_OBJECT - - Q_PROPERTY(QDeclarativeListProperty<QtMenu> menus READ menus) -public: - QtMenuBar(QDeclarativeItem *parent = 0); - ~QtMenuBar(); - - QDeclarativeListProperty<QtMenu> menus(); - - //void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); - -private: - QList<QtMenu *> m_menus; -}; - -#endif //QTMENUBAR_H |