[med-svn] [beads] 01/01: Configuration changes for Qt4 -> Qt5 migration seem to be fine now, build errors are remaining

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository beads.

commit 3175c549f1ed7bac4679627c9c93098f6e86073e
Author: Andreas Tille <tille at debian.org>
Date:   Thu Oct 19 22:37:39 2017 +0200

    Configuration changes for Qt4 -> Qt5 migration seem to be fine now, build errors are remaining
---
 debian/control           |  3 ++-
 debian/patches/qt5.patch | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c5915ea..be1eddf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10),
                cmake,
-               qtbase5-dev
+               qtbase5-dev,
+               qttools5-dev-tools
 Standards-Version: 4.1.1
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/beads.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/beads.git
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 3213da5..26f4162 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -11,7 +11,7 @@ Description: Port from Qt4 to Qt5
 -FIND_PACKAGE( Qt4 REQUIRED )
 + # this command finds Qt5 libraries and sets all required variables
 +  # note that it's Qt5, not QT5 or qt5
-+FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core Widgets)
++FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core LinguistTools Widgets)
  
    
    # add some useful macros and variables
@@ -38,7 +38,7 @@ Description: Port from Qt4 to Qt5
 -FIND_PACKAGE( Qt4 REQUIRED )
 + # this command finds Qt5 libraries and sets all required variables
 +  # note that it's Qt5, not QT5 or qt5
-+FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core Widgets)
++FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core LinguistTools Widgets)
  
    
    # add some useful macros and variables
@@ -57,3 +57,20 @@ Description: Port from Qt4 to Qt5
  
  
  
+@@ -94,13 +94,13 @@ QT4_ADD_TRANSLATION(QM ${TRANS})
+   
+   # this command will generate rules that will run rcc on all files from SAMPLE_RCS
+   # in result SAMPLE_RC_SRCS variable will contain paths to files produced by rcc
+-QT4_ADD_RESOURCES( QTBEADS_SRCS ${SAMPLE_RCS} )
++QT5_ADD_RESOURCES( QTBEADS_SRCS ${SAMPLE_RCS} )
+   
+   # this will run uic on .ui files:
+-  #QT4_WRAP_UI( SAMPLE_UI_HDRS ${SAMPLE_UIS} )
++  #QT5_WRAP_UI( SAMPLE_UI_HDRS ${SAMPLE_UIS} )
+   
+   # and finally this will run moc:
+-QT4_WRAP_CPP( QTBEADS_MOC_SRCS ${QTBEADS_MOC_HDRS} )
++QT5_WRAP_CPP( QTBEADS_MOC_SRCS ${QTBEADS_MOC_HDRS} )
+   
+   # we need this to be able to include headers produced by uic in our code
+   # (CMAKE_BINARY_DIR holds a path to the build directory, while INCLUDE_DIRECTORIES() works just like INCLUDEPATH from qmake)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beads.git