diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-10 00:51:42 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-11 01:51:03 +0530 |
commit | 14c5e17b0a4107e18212f0675ed15d6bda7e94fd (patch) | |
tree | 4caf052c1a73d4a226726f36c385cac39c4558dd /manual tests | |
parent | 19a06d90330756c8b02e7f6f3dfef150d85efd1f (diff) | |
download | meson-14c5e17b0a4107e18212f0675ed15d6bda7e94fd.zip meson-14c5e17b0a4107e18212f0675ed15d6bda7e94fd.tar.gz meson-14c5e17b0a4107e18212f0675ed15d6bda7e94fd.tar.bz2 |
tests: Remove outdated qt4 manual test and rename qt5 automated test
qt5 framework test now also tests qt4, and will test qt6 if/when it
comes out.
Diffstat (limited to 'manual tests')
-rw-r--r-- | manual tests/6 qt4/main.cpp | 20 | ||||
-rw-r--r-- | manual tests/6 qt4/mainWindow.cpp | 8 | ||||
-rw-r--r-- | manual tests/6 qt4/mainWindow.h | 20 | ||||
-rw-r--r-- | manual tests/6 qt4/mainWindow.ui | 34 | ||||
-rw-r--r-- | manual tests/6 qt4/manualinclude.cpp | 20 | ||||
-rw-r--r-- | manual tests/6 qt4/manualinclude.h | 16 | ||||
-rw-r--r-- | manual tests/6 qt4/meson.build | 41 | ||||
-rw-r--r-- | manual tests/6 qt4/q4core.cpp | 10 | ||||
-rw-r--r-- | manual tests/6 qt4/stuff.qrc | 7 | ||||
-rw-r--r-- | manual tests/6 qt4/thing.png | bin | 40303 -> 0 bytes | |||
-rw-r--r-- | manual tests/6 qt4/thing2.png | bin | 40303 -> 0 bytes |
11 files changed, 0 insertions, 176 deletions
diff --git a/manual tests/6 qt4/main.cpp b/manual tests/6 qt4/main.cpp deleted file mode 100644 index 30fcd4b..0000000 --- a/manual tests/6 qt4/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include <QApplication> -#include "mainWindow.h" - -int main(int argc, char **argv) { - QApplication app(argc, argv); - MainWindow *win = new MainWindow(); - QImage qi(":/thing.png"); - if(qi.width() != 640) { - return 1; - } - QImage qi2(":/thing2.png"); - if(qi2.width() != 640) { - return 1; - } - win->setWindowTitle("Meson Qt4 build test"); - - win->show(); - return app.exec(); - return 0; -} diff --git a/manual tests/6 qt4/mainWindow.cpp b/manual tests/6 qt4/mainWindow.cpp deleted file mode 100644 index cc82c4f..0000000 --- a/manual tests/6 qt4/mainWindow.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "mainWindow.h" - -MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - setupUi(this); -} - -MainWindow::~MainWindow() { -} diff --git a/manual tests/6 qt4/mainWindow.h b/manual tests/6 qt4/mainWindow.h deleted file mode 100644 index 7f6d906..0000000 --- a/manual tests/6 qt4/mainWindow.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef MES_MAINWINDOW -#define MES_MAINWINDOW - -#include <QObject> -#include <QMainWindow> -#include "ui_mainWindow.h" - -class NotificationModel; - -class MainWindow : public QMainWindow, private Ui_MainWindow { - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent=0); - ~MainWindow(); - -private: -}; - -#endif diff --git a/manual tests/6 qt4/mainWindow.ui b/manual tests/6 qt4/mainWindow.ui deleted file mode 100644 index 2eb226a..0000000 --- a/manual tests/6 qt4/mainWindow.ui +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>270</width> - <height>115</height> - </rect> - </property> - <property name="windowTitle"> - <string>MainWindow</string> - </property> - <widget class="QWidget" name="centralwidget"> - <widget class="QPushButton" name="pushButton"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>241</width> - <height>91</height> - </rect> - </property> - <property name="text"> - <string>I am a button</string> - </property> - </widget> - </widget> - </widget> - <resources/> - <connections/> -</ui> diff --git a/manual tests/6 qt4/manualinclude.cpp b/manual tests/6 qt4/manualinclude.cpp deleted file mode 100644 index 0602882..0000000 --- a/manual tests/6 qt4/manualinclude.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include"manualinclude.h" -#include<QCoreApplication> - -#include<QObject> - -ManualInclude::ManualInclude() { -} - -class MocClass : public QObject { - Q_OBJECT -}; - -int main(int argc, char **argv) { - ManualInclude mi; - MocClass mc; - return 0; -} - -#include"manualinclude.moc" - diff --git a/manual tests/6 qt4/manualinclude.h b/manual tests/6 qt4/manualinclude.h deleted file mode 100644 index 4a00b6c..0000000 --- a/manual tests/6 qt4/manualinclude.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef MANUALINCLUDE_H_ -#define MANUALINCLUDE_H_ - -#include<QObject> - -class ManualInclude : public QObject { - Q_OBJECT - -public: - ManualInclude(); - -signals: - int mysignal(); -}; - -#endif diff --git a/manual tests/6 qt4/meson.build b/manual tests/6 qt4/meson.build deleted file mode 100644 index 94f78ab..0000000 --- a/manual tests/6 qt4/meson.build +++ /dev/null @@ -1,41 +0,0 @@ -project('qt4 build test', 'cpp') - -# This is a manual test rather than an automatic one -# because during Debian package builds only Qt4 or Qt5 -# can be active. - -qt4 = import('qt4') -qt4dep = dependency('qt4', modules : 'Gui') - -prep = qt4.preprocess(moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. - ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol. - qresources : 'stuff.qrc', # Resource file for rcc compiler. -) - -q5exe = executable('qt4app', -sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. -prep], -dependencies : qt4dep) - -# We need a console test application because some test environments -# do not have an X server. - -qt4core = dependency('qt4', modules : 'Core') - -qt4coreapp = executable('q4core', 'q4core.cpp', -dependencies : qt4core) - -test('qt4test', qt4coreapp) - -# The build system needs to include the cpp files from -# headers but the user must manually include moc -# files from sources. -manpreprocessed = qt4.preprocess( - moc_sources : 'manualinclude.cpp', - moc_headers : 'manualinclude.h') - -q4maninclude = executable('q4maninclude', -sources : ['manualinclude.cpp', manpreprocessed], -dependencies : qt4core) - -test('q4maninclude', q4maninclude) diff --git a/manual tests/6 qt4/q4core.cpp b/manual tests/6 qt4/q4core.cpp deleted file mode 100644 index 706e4dc..0000000 --- a/manual tests/6 qt4/q4core.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include <QCoreApplication> - -int main(int argc, char **argv) { - QCoreApplication app(argc, argv); - - // Don't actually start the main loop so this - // can be run as a unit test. - //return app.exec(); - return 0; -} diff --git a/manual tests/6 qt4/stuff.qrc b/manual tests/6 qt4/stuff.qrc deleted file mode 100644 index 9152500..0000000 --- a/manual tests/6 qt4/stuff.qrc +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE RCC> -<RCC version="1.0"> - <qresource> - <file>thing.png</file> - <file>thing2.png</file> - </qresource> -</RCC> diff --git a/manual tests/6 qt4/thing.png b/manual tests/6 qt4/thing.png Binary files differdeleted file mode 100644 index 4b001bd..0000000 --- a/manual tests/6 qt4/thing.png +++ /dev/null diff --git a/manual tests/6 qt4/thing2.png b/manual tests/6 qt4/thing2.png Binary files differdeleted file mode 100644 index 4b001bd..0000000 --- a/manual tests/6 qt4/thing2.png +++ /dev/null |