diff options
| author | Frank Reininghaus <[email protected]> | 2014-06-29 20:26:17 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-06-29 20:28:46 +0200 |
| commit | 81b84a1eaf9fcfc3c2318b7ab4d30c7c578e9680 (patch) | |
| tree | cac867ccfa59547b10ce37b14a363403fb6ee81c /src/CMakeLists.txt | |
| parent | 81d5335060dd640298c62e7fc4fd6a32a34c3e9d (diff) | |
| parent | 74d8522ac63199b702a09610ca7b1a7071a7215b (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/dolphinmainwindow.cpp
dolphin/src/dolphinmainwindow.h
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3a8bc025..3eb529b0d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -150,6 +150,7 @@ set(dolphin_SRCS dolphinmainwindow.cpp dolphinviewcontainer.cpp dolphincontextmenu.cpp + dolphinrecenttabsmenu.cpp filterbar/filterbar.cpp main.cpp panels/information/filemetadataconfigurationdialog.cpp @@ -328,6 +329,7 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg settings/dolphin_versioncontrolsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin ) +install( FILES dolphin.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata ) install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) |