[med-svn] [clustalx] 03/04: Porting to Qt5

[Andreas Tille]

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

tille pushed a commit to branch master
in repository clustalx.

commit aca070a9bdadab38515a619c4aacd5f0a8a05d9f
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 11 13:24:05 2017 +0200

    Porting to Qt5
---
 debian/patches/qt5.patch | 243 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series    |   1 +
 2 files changed, 244 insertions(+)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
new file mode 100644
index 0000000..684c3cc
--- /dev/null
+++ b/debian/patches/qt5.patch
@@ -0,0 +1,243 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 11 Sep 2017 09:30:38 +0200
+Description: Porting to Qt5 following the hints at
+   https://wiki.qt.io/Transition_from_Qt_4.x_to_Qt5#QtWidgets_as_a_Separate_Module
+
+--- a/clustalx.pro
++++ b/clustalx.pro
+@@ -6,6 +6,7 @@ TEMPLATE = app
+ TARGET = clustalx
+ CONFIG += release static
+ QT += xml
++QT += widgets
+ VERSION = 2.1
+ win32 {
+    DEFINES += OS_WINDOWS
+--- a/AlignOutputFileNames.cpp
++++ b/AlignOutputFileNames.cpp
+@@ -20,7 +20,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <iostream>
+ #include "AlignOutputFileNames.h"
+--- a/AlignmentFormatOptions.cpp
++++ b/AlignmentFormatOptions.cpp
+@@ -5,7 +5,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include "AlignmentFormatOptions.h"
+ #include "clustalW/general/userparams.h"
+--- a/AlignmentParameters.cpp
++++ b/AlignmentParameters.cpp
+@@ -11,7 +11,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <QButtonGroup>
+ #include <QLineEdit>
+--- a/AlignmentViewerWidget.cpp
++++ b/AlignmentViewerWidget.cpp
+@@ -60,7 +60,7 @@
+  *****************************************************************************/
+ 
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QFile>
+ #include <QTextStream>
+ #include "AlignmentViewerWidget.h"
+--- a/AlignmentWidget.cpp
++++ b/AlignmentWidget.cpp
+@@ -45,7 +45,7 @@
+  *
+  ****************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include "AlignmentWidget.h"
+ #include "clustalW/general/userparams.h"
+ #include "ClustalQtParams.h"
+--- a/BootstrapTreeDialog.cpp
++++ b/BootstrapTreeDialog.cpp
+@@ -12,7 +12,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <iostream>
+ #include "BootstrapTreeDialog.h"
+--- a/ColorFileXmlParser.cpp
++++ b/ColorFileXmlParser.cpp
+@@ -1,4 +1,4 @@
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include "ColorFileXmlParser.h"
+ #include "ClustalQtParams.h"
+--- a/ColumnScoreParams.cpp
++++ b/ColumnScoreParams.cpp
+@@ -11,7 +11,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <QButtonGroup>
+ #include <QLineEdit>
+--- a/HelpDisplayWidget.cpp
++++ b/HelpDisplayWidget.cpp
+@@ -16,7 +16,7 @@
+ #include <QTextEdit>
+ #include <iostream>
+ #include <fstream>
+-#include <QtGui>
++#include <QtWidgets>
+ #include "Resources.h"
+ 
+ const string HelpDisplayWidget::helpFileName = "/usr/share/clustalx/clustalx.hlp";
+--- a/HistogramWidget.cpp
++++ b/HistogramWidget.cpp
+@@ -21,7 +21,7 @@
+  ****************************************************************************/
+ 
+ #include "HistogramWidget.h"
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QImage>
+ //#include <QPixmap>
+ #include <QPoint>
+--- a/LowScoringSegParams.cpp
++++ b/LowScoringSegParams.cpp
+@@ -12,7 +12,7 @@
+ #include <QHBoxLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <QButtonGroup>
+ #include <QLineEdit>
+--- a/PSPrinter.cpp
++++ b/PSPrinter.cpp
+@@ -16,7 +16,7 @@
+ #include <ctime>
+ #include <iomanip>
+ #include <sstream>
+-#include <QtGui>
++#include <QtWidgets>
+ #include "PSPrinter.h"
+ #include "ColorFileXmlParser.h"
+ #include "clustalW/general/userparams.h"
+--- a/PairwiseParams.cpp
++++ b/PairwiseParams.cpp
+@@ -18,7 +18,7 @@
+ #include <QRadioButton>
+ #include <QMessageBox>
+ #include <QHBoxLayout>
+-#include <QtGui>
++#include <QtWidgets>
+ #include "clustalW/general/userparams.h"
+ #include "clustalW/substitutionMatrix/globalmatrix.h"
+ #include "FileDialog.h"
+--- a/ProteinGapParameters.cpp
++++ b/ProteinGapParameters.cpp
+@@ -5,7 +5,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <QString>
+ #include <QMessageBox>
+--- a/SaveSeqFile.cpp
++++ b/SaveSeqFile.cpp
+@@ -18,7 +18,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include "SaveSeqFile.h"
+ #include "clustalW/general/userparams.h"
+--- a/SecStructOptions.cpp
++++ b/SecStructOptions.cpp
+@@ -5,7 +5,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <QLineEdit>
+ #include "SecStructOptions.h"
+--- a/SeqNameWidget.cpp
++++ b/SeqNameWidget.cpp
+@@ -55,7 +55,7 @@
+  * 
+  ****************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include "SeqNameWidget.h"
+ #include "KeyController.h" //- nige
+ #include "clustalW/alignment/Alignment.h"
+--- a/TreeFormatOptions.cpp
++++ b/TreeFormatOptions.cpp
+@@ -4,7 +4,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <QCheckBox>
+ #include "TreeFormatOptions.h"
+--- a/TreeOutputFileNames.cpp
++++ b/TreeOutputFileNames.cpp
+@@ -11,7 +11,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <iostream>
+ #include "TreeOutputFileNames.h"
+--- a/WritePostscriptFile.cpp
++++ b/WritePostscriptFile.cpp
+@@ -18,7 +18,7 @@
+ #include <QGridLayout>
+ #include <QSizePolicy>
+ #include <QComboBox>
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QLabel>
+ #include <iostream>
+ #include "WritePostscriptFile.h"
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -87,7 +87,7 @@
+  *
+  ****************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QPixmap>
+ #include <QFile>
+ #include <iostream>
diff --git a/debian/patches/series b/debian/patches/series
index 3f16c45..cfc28ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardcode-accessory-file-locations.patch
 spelling.patch
+qt5.patch

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