diff options
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/settings/cmdexecsettings_impl.h | 2 | ||||
| -rw-r--r-- | src/settings/diffmergesettings_impl.h | 2 | ||||
| -rw-r--r-- | src/settings/dispcolorsettings_impl.h | 2 | ||||
| -rw-r--r-- | src/settings/displaysettings_impl.h | 2 | ||||
| -rw-r--r-- | src/settings/revisiontreesettingsdlg_impl.h | 2 | ||||
| -rw-r--r-- | src/settings/subversionsettings_impl.h | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt index 7676ef5..bd1ee7e 100644 --- a/src/settings/CMakeLists.txt +++ b/src/settings/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src/settings ${CMAKE_CURRENT_BINARY_DIR} ) @@ -25,8 +26,6 @@ link_directories( ##### tdesvncfgreader ########################### -file (GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h") - tde_add_library( tdesvncfgreader STATIC AUTOMOC SOURCES dispcolor_settings.ui display_settings.ui revisiontree_settings.ui @@ -34,7 +33,7 @@ tde_add_library( tdesvncfgreader STATIC AUTOMOC diffmergesettings.ui dispcolorsettings_impl.cpp displaysettings_impl.cpp revisiontreesettingsdlg_impl.cpp subversionsettings_impl.cpp cmdexecsettings_impl.cpp - diffmergesettings_impl.cpp tdesvnsettings.kcfgc ${hdr} + diffmergesettings_impl.cpp tdesvnsettings.kcfgc # LINK kio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h index 13e61d9..2f0fe19 100644 --- a/src/settings/cmdexecsettings_impl.h +++ b/src/settings/cmdexecsettings_impl.h @@ -21,7 +21,7 @@ #ifndef CMDEXECSETTINGS_IMPL_H #define CMDEXECSETTINGS_IMPL_H -#include "src/settings/cmdexecsettings.h" +#include "cmdexecsettings.h" class CmdExecSettings_impl : public CmdExecSettings { diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h index 198ffe6..8c08d05 100644 --- a/src/settings/diffmergesettings_impl.h +++ b/src/settings/diffmergesettings_impl.h @@ -20,7 +20,7 @@ #ifndef DIFFMERGESETTINGS_IMPL_H #define DIFFMERGESETTINGS_IMPL_H -#include "src/settings/diffmergesettings.h" +#include "diffmergesettings.h" class DiffMergeSettings_impl: public DiffMergeSettings { Q_OBJECT diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h index dd97247..03030b5 100644 --- a/src/settings/dispcolorsettings_impl.h +++ b/src/settings/dispcolorsettings_impl.h @@ -20,7 +20,7 @@ #ifndef DISPCOLORSETTINGS_IMPL_H #define DISPCOLORSETTINGS_IMPL_H -#include "src/settings/dispcolor_settings.h" +#include "dispcolor_settings.h" class DispColorSettings_impl: public DispColorSettings { Q_OBJECT diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h index 7b731c0..f1be11b 100644 --- a/src/settings/displaysettings_impl.h +++ b/src/settings/displaysettings_impl.h @@ -20,7 +20,7 @@ #ifndef DISPLAYSETTINGS_IMPL_H #define DISPLAYSETTINGS_IMPL_H -#include "src/settings/display_settings.h" +#include "display_settings.h" class DisplaySettings_impl: public DisplaySettings { Q_OBJECT diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h index dcf69c2..1ff54e5 100644 --- a/src/settings/revisiontreesettingsdlg_impl.h +++ b/src/settings/revisiontreesettingsdlg_impl.h @@ -20,7 +20,7 @@ #ifndef REVISIONTREESETTINGSDLG_IMPL_H #define REVISIONTREESETTINGSDLG_IMPL_H -#include "src/settings/revisiontree_settings.h" +#include "revisiontree_settings.h" class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg { diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h index 5bb84c2..bba2713 100644 --- a/src/settings/subversionsettings_impl.h +++ b/src/settings/subversionsettings_impl.h @@ -21,7 +21,7 @@ #ifndef SUBVERSIONSETTINGS_IMPL_H #define SUBVERSIONSETTINGS_IMPL_H -#include "src/settings/subversion_settings.h" +#include "subversion_settings.h" class SubversionSettings_impl : public SubversionSettings { |