Merge "VIGS: introduce frontends" into features/qt_dr
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 13 Aug 2014 05:17:08 +0000 (22:17 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 13 Aug 2014 05:17:08 +0000 (22:17 -0700)
1  2 
tizen/src/display/qt5_supplement.cpp
tizen/src/ui/mainwindow.cpp
tizen/src/ui/mainwindow.h

Simple merge
Simple merge
index 43906dba592c8c650e04eabd30c3bf8a96e9ace2,281c99a277aa21130561e05dbbff2c36eed63c7a..fce8b77eab68f7555fbc04c50cebeb255d3afca3
@@@ -60,10 -59,9 +55,9 @@@ public slots
  
  protected:
      void resizeEvent(QResizeEvent *event);
 +    void closeEvent(QCloseEvent *);
  
-     void updateSkin();
      void setRegion(QImage baseImage);
 -    void closeEvent(QCloseEvent *);
      QLabel *label;
  
  private: