daily pastebin goal
42%
SHARE
TWEET

Untitled

a guest Oct 17th, 2018 67 Never
Upgrade to PRO!
ENDING IN00days00hours00mins00secs
  1. From 4e3759195675b4dd789e3ed0062166640181eb6b Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@nokia.com>
  3. Date: Tue, 5 Jun 2012 12:30:13 +0200
  4. Subject: [PATCH] Fix build breaks after removal of QtDeclarative in Qt 5.0.0.
  5.  
  6. Reviewed by NOBODY (yet).
  7.  
  8. In qt5 hash 5df103be25453280cdcf5807336546cbf833f133, the QtDeclarative
  9. namespace has been removed / moved to the QtQuick1 module.
  10.  
  11. This is fixed by defining the QtDeclarative classes to their QtQml
  12. counterparts and adding a QtDeclarative include file for compatibility.
  13.  
  14.     new file:   src/compat/QtDeclarative
  15.     modified:   src/compat/compat.pri
  16. ---
  17.  src/compat/QtDeclarative |   20 ++++++++++++++++++++
  18.  src/compat/compat.pri    |    5 +++++
  19.  2 files changed, 25 insertions(+), 0 deletions(-)
  20.  create mode 100644 src/compat/QtDeclarative
  21.  
  22. diff --git a/src/compat/QtDeclarative b/src/compat/QtDeclarative
  23. new file mode 100644
  24. index 0000000..a6b3ab2
  25. --- /dev/null
  26. +++ b/src/compat/QtDeclarative
  27. @@ -0,0 +1,20 @@
  28. +/*
  29. +    Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
  30. +
  31. +    This library is free software; you can redistribute it and/or
  32. +    modify it under the terms of the GNU Library General Public
  33. +    License as published by the Free Software Foundation; either
  34. +    version 2 of the License, or (at your option) any later version.
  35. +
  36. +    This library is distributed in the hope that it will be useful,
  37. +    but WITHOUT ANY WARRANTY; without even the implied warranty of
  38. +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  39. +    Library General Public License for more details.
  40. +
  41. +    You should have received a copy of the GNU Library General Public License
  42. +    along with this library; see the file COPYING.LIB.  If not, write to
  43. +    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  44. +    Boston, MA 02110-1301, USA.
  45. +*/
  46. +#include <QtQml>
  47. +
  48. diff --git a/src/compat/compat.pri b/src/compat/compat.pri
  49. index cfaa046..e5aa69a 100644
  50. --- a/src/compat/compat.pri
  51. +++ b/src/compat/compat.pri
  52. @@ -23,7 +23,12 @@ DEFINES += \
  53.      QGraphicsItem=CompatQGraphicsItem \
  54.      QGraphicsObject=CompatQGraphicsObject \
  55.      QGraphicsScene=CompatQGraphicsScene \
  56. +    QDeclarativeComponent=QQmlComponent \
  57. +    QDeclarativeEngine=QQmlEngine \
  58. +    QDeclarativeExtensionPlugin=QQmlExtensionPlugin \
  59. +    QDeclarativeImageProvider=QQmlImageProvider \
  60.      QDeclarativeItem=CompatQDeclarativeItem \
  61. +    QDeclarativePropertyMap=QQmlPropertyMap \
  62.      QDeclarativeView=CompatQDeclarativeView
  63.  
  64.  equals(QMAKE_HOST.os, Darwin): CONFIG += building_on_mac
  65. --
  66. 1.7.5.4
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top