a guest Oct 17th, 2018 67 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
- From 4e3759195675b4dd789e3ed0062166640181eb6b Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Michael=20Br=C3=BCning?= <firstname.lastname@example.org>
- Date: Tue, 5 Jun 2012 12:30:13 +0200
- Subject: [PATCH] Fix build breaks after removal of QtDeclarative in Qt 5.0.0.
- Reviewed by NOBODY (yet).
- In qt5 hash 5df103be25453280cdcf5807336546cbf833f133, the QtDeclarative
- namespace has been removed / moved to the QtQuick1 module.
- This is fixed by defining the QtDeclarative classes to their QtQml
- counterparts and adding a QtDeclarative include file for compatibility.
- new file: src/compat/QtDeclarative
- modified: src/compat/compat.pri
- src/compat/QtDeclarative | 20 ++++++++++++++++++++
- src/compat/compat.pri | 5 +++++
- 2 files changed, 25 insertions(+), 0 deletions(-)
- create mode 100644 src/compat/QtDeclarative
- diff --git a/src/compat/QtDeclarative b/src/compat/QtDeclarative
- new file mode 100644
- index 0000000..a6b3ab2
- --- /dev/null
- +++ b/src/compat/QtDeclarative
- @@ -0,0 +1,20 @@
- + Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- + This library is free software; you can redistribute it and/or
- + modify it under the terms of the GNU Library General Public
- + License as published by the Free Software Foundation; either
- + version 2 of the License, or (at your option) any later version.
- + This library is distributed in the hope that it will be useful,
- + but WITHOUT ANY WARRANTY; without even the implied warranty of
- + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- + Library General Public License for more details.
- + You should have received a copy of the GNU Library General Public License
- + along with this library; see the file COPYING.LIB. If not, write to
- + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- + Boston, MA 02110-1301, USA.
- +#include <QtQml>
- diff --git a/src/compat/compat.pri b/src/compat/compat.pri
- index cfaa046..e5aa69a 100644
- --- a/src/compat/compat.pri
- +++ b/src/compat/compat.pri
- @@ -23,7 +23,12 @@ DEFINES += \
- QGraphicsItem=CompatQGraphicsItem \
- QGraphicsObject=CompatQGraphicsObject \
- QGraphicsScene=CompatQGraphicsScene \
- + QDeclarativeComponent=QQmlComponent \
- + QDeclarativeEngine=QQmlEngine \
- + QDeclarativeExtensionPlugin=QQmlExtensionPlugin \
- + QDeclarativeImageProvider=QQmlImageProvider \
- QDeclarativeItem=CompatQDeclarativeItem \
- + QDeclarativePropertyMap=QQmlPropertyMap \
- equals(QMAKE_HOST.os, Darwin): CONFIG += building_on_mac
RAW Paste Data