Commit fc5bae88 authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlDebugging: Fix compilation of debugging libs without private headers

Actually use the copy of the private header in the lib. Also fix
the copyright header to a Qt Creator one.
parent 836fc653
/****************************************************************************
/**************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
** This file is part of Qt Creator
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** $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.
** Contact: Nokia Corporation (info@qt.nokia.com)
**
** 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.
**
** 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
** 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.
**
**
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
**************************************************************************/
#ifndef QDECLARATIVESTATE_H
#define QDECLARATIVESTATE_H
......
......@@ -54,7 +54,7 @@
#include <QtGui/QApplication>
#include <QtCore/QSettings>
#include "QtDeclarative/private/qdeclarativestate_p.h"
#include "qt_private/qdeclarativestate_p.h"
static inline void initEditorResource() { Q_INIT_RESOURCE(editor); }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment