Sophie

Sophie

distrib > Mageia > cauldron > i586 > by-pkgid > e7a7909d53b524ebea0a88551e9c52f2 > files > 2

basetest-1.3-13.mga9.src.rpm

diff -ur basetest-1.3.orig/src/basetest.pro basetest-1.3/src/basetest.pro
--- basetest-1.3.orig/src/basetest.pro	2012-01-21 01:28:50.000000000 +0400
+++ basetest-1.3/src/basetest.pro	2016-01-23 22:26:27.000000000 +0300
@@ -37,6 +37,12 @@
 
 QT += core gui
 QT -= phonon
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+  QT += widgets
+  DEFINES += HAVE_QT5
+}
+
 OBJECTS_DIR += ../.obj
 MOC_DIR += ../.moc
 RCC_DIR += ../.rcc
diff -ur basetest-1.3.orig/src/main.cpp basetest-1.3/src/main.cpp
--- basetest-1.3.orig/src/main.cpp	2012-01-21 01:28:50.000000000 +0400
+++ basetest-1.3/src/main.cpp	2016-01-23 22:27:10.000000000 +0300
@@ -19,7 +19,7 @@
 /*    along with basetest.  If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                              */
 /********************************************************************************/
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "mainwindow.h"
 int main(int argc, char *argv[])
 {
diff -ur basetest-1.3.orig/src/mainwindow.cpp basetest-1.3/src/mainwindow.cpp
--- basetest-1.3.orig/src/mainwindow.cpp	2012-01-21 01:28:50.000000000 +0400
+++ basetest-1.3/src/mainwindow.cpp	2016-01-23 22:28:00.000000000 +0300
@@ -25,11 +25,11 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QSettings>
-#include <QtGui/QMenuBar>
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QStyle>
-#include <QtGui/QDesktopWidget>
+#include <QMenuBar>
+#include <QApplication>
+#include <QMessageBox>
+#include <QStyle>
+#include <QDesktopWidget>
 #include <QtEndian>
 #include "vconfdlg.h"
 
diff -ur basetest-1.3.orig/src/mainwindow.h basetest-1.3/src/mainwindow.h
--- basetest-1.3.orig/src/mainwindow.h	2012-01-21 01:28:50.000000000 +0400
+++ basetest-1.3/src/mainwindow.h	2016-01-23 22:28:42.000000000 +0300
@@ -22,16 +22,16 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QGridLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
+#include <QMainWindow>
+#include <QVBoxLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QMenu>
+#include <QAction>
+#include <QActionGroup>
 #include <QtCore/QList>
 #include <QtCore/QTranslator>
 
diff -ur basetest-1.3.orig/src/vconfdlg.cpp basetest-1.3/src/vconfdlg.cpp
--- basetest-1.3.orig/src/vconfdlg.cpp	2012-01-21 01:28:50.000000000 +0400
+++ basetest-1.3/src/vconfdlg.cpp	2016-01-23 22:29:12.000000000 +0300
@@ -21,8 +21,8 @@
 /********************************************************************************/
 #include "vconfdlg.h"
 #include <QtCore/QSettings>
-#include <QtGui/QApplication>
-#include <QtGui/QInputDialog>
+#include <QApplication>
+#include <QInputDialog>
 
 int VConfDlg::maxRangeValue = 65535;
 int VConfDlg::baseSource = 2;
diff -ur basetest-1.3.orig/src/vconfdlg.h basetest-1.3/src/vconfdlg.h
--- basetest-1.3.orig/src/vconfdlg.h	2012-01-21 01:28:50.000000000 +0400
+++ basetest-1.3/src/vconfdlg.h	2016-01-23 22:29:57.000000000 +0300
@@ -22,15 +22,15 @@
 #ifndef VCONFDLG_H
 #define VCONFDLG_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QGroupBox>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-#include <QtGui/QCheckBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QPushButton>
+#include <QDialog>
+#include <QGroupBox>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QHBoxLayout>
+#include <QPushButton>
 
 #define PROGRAM_NAME	"basetest"
 #define CFG_NAME	"config"