/[packages]/cauldron/bibletime/current/SOURCES/0001-Fix-bug-#260-Move-DisplayView.qml-to-share_bibletime_qml.patch
ViewVC logotype

Contents of /cauldron/bibletime/current/SOURCES/0001-Fix-bug-#260-Move-DisplayView.qml-to-share_bibletime_qml.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1620371 - (show annotations) (download)
Mon Aug 31 10:09:55 2020 UTC (3 years, 5 months ago) by daviddavid
File size: 3766 byte(s)
- fix bug #260 Move DisplayView.qml to share/bibletime/qml

1 From 15bb1493c5063b5732d59bb93c682be3107bc094 Mon Sep 17 00:00:00 2001
2 From: Gary Holmlund <gary.holmlund@gmail.com>
3 Date: Tue, 4 Aug 2020 22:09:08 -0700
4 Subject: [PATCH] Fix bug #260 Move DisplayView.qml to share/bibletime/qml
5
6 ---
7 ChangeLog | 3 +++
8 cmake/BTApplication.cmake | 4 ++--
9 cmake/BTBinaryPackageMacOS.cmake | 2 +-
10 cmake/BTBinaryPackageWindows.cmake | 2 +-
11 src/frontend/display/modelview/btquickwidget.cpp | 2 +-
12 5 files changed, 8 insertions(+), 5 deletions(-)
13 mode change 100644 => 100755 cmake/BTBinaryPackageWindows.cmake
14
15 diff --git a/ChangeLog b/ChangeLog
16 index c359eac4c..8a1089cb8 100644
17 --- a/ChangeLog
18 +++ b/ChangeLog
19 @@ -1,3 +1,6 @@
20 +2019-08-06 Gary Holmlund <gary.holmlund@gmail.com>
21 + * Fix bug #260 - BIbleTime 3.0 installs /usr/bin/DisplayView.qml
22 +
23 2020-08-02 Jaak Ristioja <jaak@ristioja.ee>
24 * Released 3.0.
25
26 diff --git a/cmake/BTApplication.cmake b/cmake/BTApplication.cmake
27 index 9c5eaa695..59a270a05 100644
28 --- a/cmake/BTApplication.cmake
29 +++ b/cmake/BTApplication.cmake
30 @@ -178,10 +178,10 @@ INSTALL(FILES "docs/license.html"
31 # See QTBUG-55259, Affects windeployqt and macdeployqt
32 IF(APPLE)
33 INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml"
34 - DESTINATION "${BT_BINDIR}/BibleTime.app/Contents/MacOS")
35 + DESTINATION "${BT_BINDIR}/BibleTime.app/Contents/share/bibletime/qml")
36 ELSE()
37 INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml"
38 - DESTINATION "${BT_BINDIR}/")
39 + DESTINATION "${BT_DATAROOTDIR}/bibletime/qml")
40 ENDIF()
41
42 FILE(GLOB INSTALL_TMPL_LIST
43 diff --git a/cmake/BTBinaryPackageMacOS.cmake b/cmake/BTBinaryPackageMacOS.cmake
44 index 3d5b9b9c6..a5c920b43 100644
45 --- a/cmake/BTBinaryPackageMacOS.cmake
46 +++ b/cmake/BTBinaryPackageMacOS.cmake
47 @@ -13,7 +13,7 @@ IF(APPLE)
48 SET(BT_MAC_APP "${CMAKE_INSTALL_PREFIX}/BibleTime.app")
49
50 INSTALL(CODE "
51 - EXECUTE_PROCESS(COMMAND ${QT_MACDEPLOYQT_EXECUTABLE} ${BT_MAC_APP} -qmldir=${BT_MAC_APP}/Contents/MacOS)
52 + EXECUTE_PROCESS(COMMAND ${QT_MACDEPLOYQT_EXECUTABLE} ${BT_MAC_APP} -qmldir=${BT_MAC_APP}/Contents/share/bibletime/qml)
53 ")
54 ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release")
55
56 diff --git a/cmake/BTBinaryPackageWindows.cmake b/cmake/BTBinaryPackageWindows.cmake
57 old mode 100644
58 new mode 100755
59 index 10c7e09bb..8fea71463
60 --- a/cmake/BTBinaryPackageWindows.cmake
61 +++ b/cmake/BTBinaryPackageWindows.cmake
62 @@ -27,7 +27,7 @@ IF(WIN32 AND NOT UNIX)
63
64 FIND_PROGRAM(QT_WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}")
65 MESSAGE(STATUS "Running ${QT_WINDEPLOYQT_EXECUTABLE}")
66 - INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${QT_WINDEPLOYQT_EXECUTABLE} \"\${CMAKE_INSTALL_PREFIX}/bin/bibletime.exe\") ")
67 + INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${QT_WINDEPLOYQT_EXECUTABLE} -qmldir \"\${CMAKE_INSTALL_PREFIX}/share/bibletime/qml\" \"\${CMAKE_INSTALL_PREFIX}/bin/bibletime.exe\") ")
68
69 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
70 SET(ZLIB_LIBRARY ${ZLIB_LIBRARY_DEBUG})
71 diff --git a/src/frontend/display/modelview/btquickwidget.cpp b/src/frontend/display/modelview/btquickwidget.cpp
72 index 5fe3b7e5f..16d3c796b 100644
73 --- a/src/frontend/display/modelview/btquickwidget.cpp
74 +++ b/src/frontend/display/modelview/btquickwidget.cpp
75 @@ -36,7 +36,7 @@ BtQuickWidget::BtQuickWidget(BtQmlScrollView* parent)
76 setAcceptDrops(true);
77
78 namespace DU = util::directory;
79 - QString qmlFile = QCoreApplication::applicationDirPath() + "/" + "DisplayView.qml";
80 + QString qmlFile = QCoreApplication::applicationDirPath() + "/../share/bibletime/qml/" + "DisplayView.qml";
81 setSource(QUrl::fromLocalFile(qmlFile));
82 setupScrollTimer();
83 }

  ViewVC Help
Powered by ViewVC 1.1.30