From: Kevin Krammer <kevin.krammer@kdab.com>
Date: Thu, 3 Oct 2013 14:57:29 +0000 (+0200)
Subject: Adding support for creating pixmaps from files
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=web%2Fkonrad%2FDeclarativeWidgets.git

Adding support for creating pixmaps from files
---

diff --git a/lib/declarativewidgetsdocument.cpp b/lib/declarativewidgetsdocument.cpp
index 089ff28..a0ecea8 100644
--- a/lib/declarativewidgetsdocument.cpp
+++ b/lib/declarativewidgetsdocument.cpp
@@ -40,6 +40,7 @@
 #include "declarativeitemviewextension_p.h"
 #include "declarativeloaderwidget_p.h"
 #include "declarativemessagebox_p.h"
+#include "declarativepixmap_p.h"
 #include "declarativeseparator_p.h"
 #include "declarativestackedlayout_p.h"
 #include "declarativestatusbar_p.h"
@@ -127,6 +128,7 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject
   qmlRegisterExtendedType<QFileSystemModel, DeclarativeFileSystemModelExtension>("QtWidgets", 1, 0, "FileSystemModel");
   qmlRegisterType<DeclarativeIcon>("QtWidgets", 1, 0, "Icon");
   qmlRegisterType<QItemSelectionModel>();
+  qmlRegisterType<DeclarativePixmap>("QtWidgets", 1, 0, "Pixmap");
   qmlRegisterExtendedType<DeclarativeSeparator, DeclarativeObjectExtension>("QtWidgets", 1, 0, "Separator");
   qmlRegisterExtendedType<QStringListModel, DeclarativeStringListModelExtension>("QtCore", 1, 0, "StringListModel");
   qmlRegisterType<QTextDocument>();
diff --git a/lib/lib.pro b/lib/lib.pro
index 55fe924..b3d5737 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -28,6 +28,7 @@ HEADERS = \
   declarativemessagebox_p.h \
   declarativeobjectextension.h \
   declarativeobjectproxy_p.h \
+  declarativepixmap_p.h \
   declarativeseparator_p.h \
   declarativestackedlayout_p.h \
   declarativestatusbar_p.h \
@@ -77,6 +78,7 @@ SOURCES = \
   declarativelayoutextension.cpp \
   declarativemessagebox.cpp \
   declarativeobjectextension.cpp \
+  declarativepixmap.cpp \
   declarativeseparator.cpp \
   declarativestackedlayout.cpp \
   declarativestatusbar.cpp \