summaryrefslogtreecommitdiffstats
path: root/applications
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-05 13:14:56 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-05 13:14:56 +0200
commita5b1c1c4bd44741a54895c4e84846c045facce70 (patch)
treecca1263b04351ccc8a964705b0ba06c3a7d47eea /applications
parentd7e3a79c0f3692031c4f039077faa7667bc5d696 (diff)
downloadkube-a5b1c1c4bd44741a54895c4e84846c045facce70.tar.gz
kube-a5b1c1c4bd44741a54895c4e84846c045facce70.zip
kube-mail is now kube
Diffstat (limited to 'applications')
-rw-r--r--applications/CMakeLists.txt2
-rw-r--r--applications/kube/CMakeLists.txt (renamed from applications/mail/CMakeLists.txt)8
-rw-r--r--applications/kube/main.cpp (renamed from applications/mail/main.cpp)2
-rw-r--r--applications/kube/org.kde.kube.appdata.xml (renamed from applications/mail/org.kde.kube.appdata.xml)2
-rwxr-xr-xapplications/kube/org.kde.kube.desktop (renamed from applications/mail/org.kde.kube.desktop)2
5 files changed, 8 insertions, 8 deletions
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index f7e6f1d6..1c4b36aa 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -1 +1 @@
add_subdirectory(mail) add_subdirectory(kube)
diff --git a/applications/mail/CMakeLists.txt b/applications/kube/CMakeLists.txt
index 56bbf98a..36ce6a34 100644
--- a/applications/mail/CMakeLists.txt
+++ b/applications/kube/CMakeLists.txt
@@ -1,4 +1,4 @@
1project(kube-mail) 1project(kube)
2 2
3cmake_minimum_required(VERSION 2.8.12) 3cmake_minimum_required(VERSION 2.8.12)
4cmake_policy(SET CMP0063 NEW) 4cmake_policy(SET CMP0063 NEW)
@@ -32,15 +32,15 @@ set (QT_MIN_VERSION "5.6.0")
32find_package(KF5 REQUIRED COMPONENTS Package) 32find_package(KF5 REQUIRED COMPONENTS Package)
33 33
34# install executable 34# install executable
35set(kube_mail_SRCS main.cpp) 35set(SRCS main.cpp)
36 36
37if(APPLE OR WIN32) 37if(APPLE OR WIN32)
38 # Sets the icon on Windows and OSX 38 # Sets the icon on Windows and OSX
39 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../../icons/*-apps-kube_icon.*") 39 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../../icons/*-apps-kube_icon.*")
40 ecm_add_app_icon(kube_mail_SRCS ICONS ${ICONS_SRCS}) 40 ecm_add_app_icon(SRCS ICONS ${ICONS_SRCS})
41endif() 41endif()
42 42
43add_executable(${PROJECT_NAME} ${kube_mail_SRCS}) 43add_executable(${PROJECT_NAME} ${SRCS})
44qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine) 44qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine)
45target_link_libraries(${PROJECT_NAME} KF5::Package) 45target_link_libraries(${PROJECT_NAME} KF5::Package)
46 46
diff --git a/applications/mail/main.cpp b/applications/kube/main.cpp
index b02c62d2..c893e029 100644
--- a/applications/mail/main.cpp
+++ b/applications/kube/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
61 QQuickWebEngineProfile::defaultProfile()->setRequestInterceptor(wuri); 61 QQuickWebEngineProfile::defaultProfile()->setRequestInterceptor(wuri);
62 QIcon::setThemeName("kube"); 62 QIcon::setThemeName("kube");
63 63
64 auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.mail"); 64 auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.kube");
65 Q_ASSERT(package.isValid()); 65 Q_ASSERT(package.isValid());
66 QQmlApplicationEngine engine; 66 QQmlApplicationEngine engine;
67 engine.addImageProvider(QLatin1String("kube"), new KubeImageProvider); 67 engine.addImageProvider(QLatin1String("kube"), new KubeImageProvider);
diff --git a/applications/mail/org.kde.kube.appdata.xml b/applications/kube/org.kde.kube.appdata.xml
index 90bef45b..1946cac5 100644
--- a/applications/mail/org.kde.kube.appdata.xml
+++ b/applications/kube/org.kde.kube.appdata.xml
@@ -18,6 +18,6 @@
18 </screenshots> 18 </screenshots>
19 <project_group>KDE</project_group> 19 <project_group>KDE</project_group>
20 <provides> 20 <provides>
21 <binary>kube-mail</binary> 21 <binary>kube</binary>
22 </provides> 22 </provides>
23</component> 23</component>
diff --git a/applications/mail/org.kde.kube.desktop b/applications/kube/org.kde.kube.desktop
index 83d57dd8..290fd503 100755
--- a/applications/mail/org.kde.kube.desktop
+++ b/applications/kube/org.kde.kube.desktop
@@ -1,7 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Name=Kube 2Name=Kube
3Type=Application 3Type=Application
4Exec=kube-mail 4Exec=kube
5Icon=kube_icon 5Icon=kube_icon
6GenericName=Mail Client 6GenericName=Mail Client
7Comment=Send, receive and manage your mail with Kube 7Comment=Send, receive and manage your mail with Kube