diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | OWNCLOUD.cmake | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/mirall/owncloudtheme.cpp | 9 | ||||
| -rw-r--r-- | src/mirall/owncloudtheme.h | 1 | ||||
| -rw-r--r-- | test/owncloud_add_test.cmake | 2 |
6 files changed, 11 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 629b8a24b..1a6df09d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,10 @@ else () include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake ) endif() +if (NOT DEFINED APPLICATION_SHORTNAME) + set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} ) +endif() + include(${CMAKE_SOURCE_DIR}/VERSION.cmake) configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" ) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/") diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake index ffbb5b1fd..d0beb9c16 100644 --- a/OWNCLOUD.cmake +++ b/OWNCLOUD.cmake @@ -1,9 +1,9 @@ -set( APPLICATION_SHORTNAME "owncloud" ) set( APPLICATION_NAME "ownCloud" ) -set( APPLICATION_EXECUTABLE "owncloud" ) -set( APPLICATION_DOMAIN "owncloud.com" ) -set( APPLICATION_VENDOR "ownCloud, Inc" ) -set( THEME_CLASS "ownCloudTheme" ) +#set( APPLICATION_SHORTNAME ${APPLICATION_NAME} ) +set( APPLICATION_EXECUTABLE "owncloud" ) +set( APPLICATION_DOMAIN "owncloud.com" ) +set( APPLICATION_VENDOR "ownCloud, Inc" ) +set( THEME_CLASS "ownCloudTheme" ) set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" ) set( WIN_SETUP_BITMAP_PATH "${CMAKE_SOURCE_DIR}/admin/win/nsi" ) # set( THEME_INCLUDE "${OEM_THEME_DIR}/mytheme.h" ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2117bdfd1..de506ec7b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,7 @@ else() set(theme_dir ${CMAKE_CURRENT_SOURCE_DIR}/../theme) endif() -set(synclib_NAME ${APPLICATION_SHORTNAME}sync) +set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) set(mirall_UI mirall/folderwizardsourcepage.ui diff --git a/src/mirall/owncloudtheme.cpp b/src/mirall/owncloudtheme.cpp index eaffa80f9..8abb1346d 100644 --- a/src/mirall/owncloudtheme.cpp +++ b/src/mirall/owncloudtheme.cpp @@ -33,15 +33,6 @@ ownCloudTheme::ownCloudTheme() // qDebug() << " ** running ownCloud theme!"; } -QString ownCloudTheme::appName() const -{ - /* If this is changed, existing configs are not found any more - * because the value is used by QDesktopServices to find the config - * file. Be aware. - */ - return QLatin1String("ownCloud"); -} - QString ownCloudTheme::configFileName() const { return QLatin1String("owncloud.cfg"); diff --git a/src/mirall/owncloudtheme.h b/src/mirall/owncloudtheme.h index 9dbf39d1a..df6736166 100644 --- a/src/mirall/owncloudtheme.h +++ b/src/mirall/owncloudtheme.h @@ -25,7 +25,6 @@ class ownCloudTheme : public Theme public: ownCloudTheme(); - virtual QString appName() const; QString configFileName() const; QString about() const; QPixmap splashScreen() const; diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake index 1521b600a..9ce18143e 100644 --- a/test/owncloud_add_test.cmake +++ b/test/owncloud_add_test.cmake @@ -10,7 +10,7 @@ macro(owncloud_add_test test_class) add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${${OWNCLOUD_TEST_CLASS}_MOCS}) target_link_libraries(${OWNCLOUD_TEST_CLASS}Test - ${APPLICATION_SHORTNAME}sync + ${APPLICATION_EXECUTABLE}sync ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ) |