AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ctor and dtor of QAbstractMenuBarImpl inline

Browse Source 
This way the class does not need to be exported

Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit a624a4011adca00d7334462c4d33f574c465110a)
This commit is contained in:
Aurélien Gâteau 2011-04-14 10:00:33 +02:00 committed by Olivier Goffart
parent 9317fee1d9
commit 5d6d23f118
3 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/widgets/qabstractmenubarimpl_p.cpp
View File

@ -1,44 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** 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.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <private/qabstractmenubarimpl_p.h>
QAbstractMenuBarImpl::~QAbstractMenuBarImpl()
{}

5
src/gui/widgets/qabstractmenubarimpl_p.h
View File

@ -69,10 +69,11 @@ Q_DECLARE_INTERFACE(QMenuBarImplFactoryInterface, QMenuBarImplFactoryInterface_i
/**
* The platform-specific implementation of a menubar
*/
class Q_GUI_EXPORT QAbstractMenuBarImpl
class QAbstractMenuBarImpl
{
public:
virtual ~QAbstractMenuBarImpl();
QAbstractMenuBarImpl() {}
virtual ~QAbstractMenuBarImpl() {}
// QMenuBarPrivate::init()
virtual void init(QMenuBar *) = 0;

1
src/gui/widgets/widgets.pri
View File

@ -85,7 +85,6 @@ HEADERS += \
widgets/qprintpreviewwidget.h
SOURCES += \
widgets/qabstractbutton.cpp \
widgets/qabstractmenubarimpl_p.cpp \
widgets/qabstractslider.cpp \
widgets/qabstractspinbox.cpp \
widgets/qcalendarwidget.cpp \