No commit message

zccrs · Nov 23, 2014 · 0e540a3 · 0e540a3
1 parent 957ae51
commit 0e540a3
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/src/mywidgets/myimage.cpp b/src/mywidgets/myimage.cpp
@@ -3,8 +3,13 @@
 #include <QBitmap>
 #include <QDebug>
 
+#if(QT_VERSION>=0x050000)
 MyImage::MyImage(QQuickItem *parent) :
     QQuickPaintedItem(parent)
+#else
+MyImage::MyImage(QDeclarativeItem *parent) :
+    QDeclarativeItem(parent)
+#endif
 {
     m_cache = true;
     m_grayscale = false;

diff --git a/src/mywidgets/myimage.h b/src/mywidgets/myimage.h
@@ -1,20 +1,33 @@
 #ifndef MYIMAGE_H
 #define MYIMAGE_H
 
-#include <QQuickPaintedItem>
 #include <QImage>
 #include <QPixmap>
 #include <QBitmap>
 
+#if(QT_VERSION>=0x050000)
+#include <QQuickPaintedItem>
+#else
+#include <QDeclarativeItem>
+#endif
+
+#if(QT_VERSION>=0x050000)
 class MyImage : public QQuickPaintedItem
+#else
+class MyImage : public QDeclarativeItem
+#endif
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QUrl maskSource READ maskSource WRITE setMaskSource NOTIFY maskSourceChanged)
     Q_PROPERTY(bool cache READ cache WRITE setCache NOTIFY cacheChanged)
     Q_PROPERTY(bool grayscale READ grayscale WRITE setGrayscale NOTIFY grayscaleChanged)
 public:
+#if(QT_VERSION>=0x050000)
     explicit MyImage(QQuickItem *parent = 0);
+#else
+    explicit MyImage(QDeclarativeItem *parent = 0);
+#endif
 
     QUrl source() const;
     QUrl maskSource() const;

diff --git a/src/mywidgets/mysvgview.cpp b/src/mywidgets/mysvgview.cpp
@@ -3,8 +3,13 @@
 #include <QQuickWindow>
 #include <QDebug>
 
+#if(QT_VERSION>=0x050000)
 MySvgView::MySvgView(QQuickItem *parent) :
     QQuickPaintedItem(parent)
+#else
+MySvgView::MySvgView(QDeclarativeItem *parent) :
+    QDeclarativeItem(parent)
+#endif
 {
     m_defaultSize = QSize(0,0);
     svg = new QSvgRenderer(this);

diff --git a/src/mywidgets/mysvgview.h b/src/mywidgets/mysvgview.h
@@ -1,10 +1,19 @@
 #ifndef MYSVGVIEW_H
 #define MYSVGVIEW_H
 
-#include <QQuickPaintedItem>
 #include <QSvgRenderer>
 
+#if(QT_VERSION>=0x050000)
+#include <QQuickPaintedItem>
+#else
+#include <QDeclarativeItem>
+#endif
+
+#if(QT_VERSION>=0x050000)
 class MySvgView : public QQuickPaintedItem
+#else
+class MySvgView : public QDeclarativeItem
+#endif
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -15,7 +24,11 @@ class MySvgView : public QQuickPaintedItem
 
     void setDefaultSize( QSize arg );
 public:
+#if(QT_VERSION>=0x050000)
     explicit MySvgView(QQuickItem *parent = 0);
+#else
+    explicit MySvgView(QDeclarativeItem *parent = 0);
+#endif
     QUrl source() const;
     QSize defaultSize() const;
 

diff --git a/src/utility/downloadimage.cpp b/src/utility/downloadimage.cpp
@@ -137,6 +137,6 @@ void DownloadImage::getImage(QObject *caller, QByteArray slotName, QUrl url, QSt
         queue_data<<data;
         httpRequest->get (this, SLOT(downloadFinished(QNetworkReply*)), url);//去获取
     }else{
-        qDebug()<<"DownloadImage:"<<slotName<<"不是一个规范的函数，所以不可能是一个槽";
+        qDebug()<<"DownloadImage:"<<slotName<<"不是槽函数";
     }
 }