Merge branch 'master' into new_panels_with_context_buttons

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 8a3b76e..aeb675e 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -71,7 +71,9 @@ SOURCES += main.cpp \
     ui/zoombuttonpanel.cpp \
     ui/searchdialog.cpp \
     ui/panelbar.cpp \
+    ui/panelbase.cpp \
     ui/panelcontentstack.cpp \
+    ui/panelcontextbuttonbar.cpp \
     ui/paneltab.cpp \
     ui/paneltabbar.cpp \
     ui/tabbedpanel.cpp \
@@ -150,8 +152,10 @@ HEADERS += application.h \
     ui/listitemdelegate.h \
     ui/searchdialog.h \
     ui/panelbar.h \
+    ui/panelbase.h \
     ui/panelcommon.h \
     ui/panelcontentstack.h \
+    ui/panelcontextbuttonbar.h \
     ui/paneltab.h \
     ui/paneltabbar.h \
     ui/tabbedpanel.h \