Merge branch 'master' into zoom_button_drag

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 3cdc8c3..9d2bcdd 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -41,7 +41,8 @@ SOURCES += main.cpp \
     map/gpslocationitem.cpp \
     ui/zoombuttonpanel.cpp \
     ui/userinfo.cpp \
-    ui/sidepanel.cpp
+    ui/sidepanel.cpp \
+    ui/zoombutton.cpp
 HEADERS += ui/mainwindow.h \
     map/mapengine.h \
     map/mapview.h \
@@ -82,7 +83,8 @@ HEADERS += ui/mainwindow.h \
     ui/zoombuttonpanel.h \
     common.h \
     ui/userinfo.h \
-    ui/sidepanel.h
+    ui/sidepanel.h \
+    ui/zoombutton.h
 QT += network \
     webkit
 DEFINES += QT_NO_DEBUG_OUTPUT