Merge branch 'master' into context_driven_buttons, review

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 6c35bb4..8cc801c 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -85,7 +85,8 @@ SOURCES += main.cpp \
     ui/userinfopanel.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
-    user/user.cpp
+    user/user.cpp \
+    ui/listitemcontextbuttonbar.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
@@ -172,7 +173,8 @@ HEADERS += application.h \
     ui/userinfopanel.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
-    user/user.h
+    user/user.h \
+    ui/listitemcontextbuttonbar.h
 QT += network \
     webkit
 DEFINES += QT_NO_DEBUG_OUTPUT