Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h

[profile/ivi/qtdeclarative.git] / src / declarative / items / qsgview.h

diff --git a/src/declarative/items/qsgview.h b/src/declarative/items/qsgview.h
index 8e174b7..ede488b 100644 (file)
--- a/src/declarative/items/qsgview.h
+++ b/src/declarative/items/qsgview.h
@@ -8,29 +8,29 @@
 ** This file is part of the QtDeclarative 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.
+** 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.
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
 **
+** 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.
 **
 **
 **
@@ -43,8 +43,9 @@
 #ifndef QSGVIEW_H
 #define QSGVIEW_H
 
-#include <QtCore/qurl.h>
 #include <qsgcanvas.h>
+#include <QtCore/qurl.h>
+#include <QtDeclarative/qdeclarativedebug.h>
 
 QT_BEGIN_HEADER
 
@@ -73,7 +74,6 @@ public:
     virtual ~QSGView();
 
     QUrl source() const;
-    void setSource(const QUrl&);
 
     QDeclarativeEngine* engine() const;
     QDeclarativeContext* rootContext() const;
@@ -92,6 +92,9 @@ public:
     QSize sizeHint() const;
     QSize initialSize() const;
 
+public Q_SLOTS:
+    void setSource(const QUrl&);
+
 Q_SIGNALS:
     void statusChanged(QSGView::Status);