From 19a06d90330756c8b02e7f6f3dfef150d85efd1f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 9 Nov 2016 02:25:50 +0530 Subject: qt4, qt5 modules: Improve moc/uic/rcc detection Instead of blindly searching in PATH, use Qt5Dependency.compilers_detect() (same for qt4) to get moc/uic/rcc. This is much more robust, and it improves the chances that the correct ones will be found. We still manually verify for now because the fallback in dependencies.py for searching is stll to look in PATH for backwards-compat, and because people probably have setups like that. Also sync the qt4 module with the qt5 module w.r.t. resource compilation and make the compiled qrc.cpp file unique in terms of the framework version used (4 vs 5). This is needed for the test to work properly, which now covers both Qt4 and 5. --- test cases/frameworks/4 qt5/meson.build | 64 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 30 deletions(-) (limited to 'test cases/frameworks') diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build index 56720719f..1096c7801 100644 --- a/test cases/frameworks/4 qt5/meson.build +++ b/test cases/frameworks/4 qt5/meson.build @@ -1,41 +1,45 @@ -project('qt5 build test', 'cpp') +project('qt4 and 5 build test', 'cpp') -qt5 = import('qt5') -qt5dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets']) +foreach qt : ['qt4', 'qt5'] + qtdep = dependency(qt, modules : ['Core', 'Gui', 'Widgets'], required : qt == 'qt5') + if qtdep.found() + qtmodule = import(qt) -# The following has two resource files because having two in one target -# requires you to do it properly or you get linker symbol clashes. + # The following has two resource files because having two in one target + # requires you to do it properly or you get linker symbol clashes. -prep = qt5.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', 'stuff2.qrc'], # Resource file for rcc compiler. -) + prep = qtmodule.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', 'stuff2.qrc'], # Resource file for rcc compiler. + ) -q5exe = executable('qt5app', - sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. - prep], - dependencies : qt5dep) + qexe = executable(qt + 'app', + sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. + prep], + dependencies : qtdep) -# We need a console test application because some test environments -# do not have an X server. + # We need a console test application because some test environments + # do not have an X server. -qt5core = dependency('qt5', modules : 'Core') + qtcore = dependency(qt, modules : 'Core') -qt5coreapp = executable('q5core', 'q5core.cpp', - dependencies : qt5core) + qtcoreapp = executable(qt + 'core', 'q5core.cpp', + dependencies : qtcore) -test('qt5test', qt5coreapp) + test(qt + 'test', qtcoreapp) -# The build system needs to include the cpp files from -# headers but the user must manually include moc -# files from sources. -manpreprocessed = qt5.preprocess( - moc_sources : 'manualinclude.cpp', - moc_headers : 'manualinclude.h') + # The build system needs to include the cpp files from + # headers but the user must manually include moc + # files from sources. + manpreprocessed = qtmodule.preprocess( + moc_sources : 'manualinclude.cpp', + moc_headers : 'manualinclude.h') -q5maninclude = executable('q5maninclude', - sources : ['manualinclude.cpp', manpreprocessed], - dependencies : qt5core) + qtmaninclude = executable(qt + 'maninclude', + sources : ['manualinclude.cpp', manpreprocessed], + dependencies : qtcore) -test('q5maninclude', q5maninclude) + test(qt + 'maninclude', qtmaninclude) + endif +endforeach -- cgit v1.2.3 From 14c5e17b0a4107e18212f0675ed15d6bda7e94fd Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 10 Nov 2016 00:51:42 +0530 Subject: 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. --- manual tests/6 qt4/main.cpp | 20 ------------ manual tests/6 qt4/mainWindow.cpp | 8 ----- manual tests/6 qt4/mainWindow.h | 20 ------------ manual tests/6 qt4/mainWindow.ui | 34 ------------------- manual tests/6 qt4/manualinclude.cpp | 20 ------------ manual tests/6 qt4/manualinclude.h | 16 --------- manual tests/6 qt4/meson.build | 41 ----------------------- manual tests/6 qt4/q4core.cpp | 10 ------ manual tests/6 qt4/stuff.qrc | 7 ---- manual tests/6 qt4/thing.png | Bin 40303 -> 0 bytes manual tests/6 qt4/thing2.png | Bin 40303 -> 0 bytes test cases/frameworks/4 qt/main.cpp | 20 ++++++++++++ test cases/frameworks/4 qt/mainWindow.cpp | 8 +++++ test cases/frameworks/4 qt/mainWindow.h | 20 ++++++++++++ test cases/frameworks/4 qt/mainWindow.ui | 34 +++++++++++++++++++ test cases/frameworks/4 qt/manualinclude.cpp | 20 ++++++++++++ test cases/frameworks/4 qt/manualinclude.h | 16 +++++++++ test cases/frameworks/4 qt/meson.build | 45 ++++++++++++++++++++++++++ test cases/frameworks/4 qt/q5core.cpp | 10 ++++++ test cases/frameworks/4 qt/stuff.qrc | 6 ++++ test cases/frameworks/4 qt/stuff2.qrc | 6 ++++ test cases/frameworks/4 qt/thing.png | Bin 0 -> 40303 bytes test cases/frameworks/4 qt/thing2.png | Bin 0 -> 40303 bytes test cases/frameworks/4 qt5/main.cpp | 20 ------------ test cases/frameworks/4 qt5/mainWindow.cpp | 8 ----- test cases/frameworks/4 qt5/mainWindow.h | 20 ------------ test cases/frameworks/4 qt5/mainWindow.ui | 34 ------------------- test cases/frameworks/4 qt5/manualinclude.cpp | 20 ------------ test cases/frameworks/4 qt5/manualinclude.h | 16 --------- test cases/frameworks/4 qt5/meson.build | 45 -------------------------- test cases/frameworks/4 qt5/q5core.cpp | 10 ------ test cases/frameworks/4 qt5/stuff.qrc | 6 ---- test cases/frameworks/4 qt5/stuff2.qrc | 6 ---- test cases/frameworks/4 qt5/thing.png | Bin 40303 -> 0 bytes test cases/frameworks/4 qt5/thing2.png | Bin 40303 -> 0 bytes 35 files changed, 185 insertions(+), 361 deletions(-) delete mode 100644 manual tests/6 qt4/main.cpp delete mode 100644 manual tests/6 qt4/mainWindow.cpp delete mode 100644 manual tests/6 qt4/mainWindow.h delete mode 100644 manual tests/6 qt4/mainWindow.ui delete mode 100644 manual tests/6 qt4/manualinclude.cpp delete mode 100644 manual tests/6 qt4/manualinclude.h delete mode 100644 manual tests/6 qt4/meson.build delete mode 100644 manual tests/6 qt4/q4core.cpp delete mode 100644 manual tests/6 qt4/stuff.qrc delete mode 100644 manual tests/6 qt4/thing.png delete mode 100644 manual tests/6 qt4/thing2.png create mode 100644 test cases/frameworks/4 qt/main.cpp create mode 100644 test cases/frameworks/4 qt/mainWindow.cpp create mode 100644 test cases/frameworks/4 qt/mainWindow.h create mode 100644 test cases/frameworks/4 qt/mainWindow.ui create mode 100644 test cases/frameworks/4 qt/manualinclude.cpp create mode 100644 test cases/frameworks/4 qt/manualinclude.h create mode 100644 test cases/frameworks/4 qt/meson.build create mode 100644 test cases/frameworks/4 qt/q5core.cpp create mode 100644 test cases/frameworks/4 qt/stuff.qrc create mode 100644 test cases/frameworks/4 qt/stuff2.qrc create mode 100644 test cases/frameworks/4 qt/thing.png create mode 100644 test cases/frameworks/4 qt/thing2.png delete mode 100644 test cases/frameworks/4 qt5/main.cpp delete mode 100644 test cases/frameworks/4 qt5/mainWindow.cpp delete mode 100644 test cases/frameworks/4 qt5/mainWindow.h delete mode 100644 test cases/frameworks/4 qt5/mainWindow.ui delete mode 100644 test cases/frameworks/4 qt5/manualinclude.cpp delete mode 100644 test cases/frameworks/4 qt5/manualinclude.h delete mode 100644 test cases/frameworks/4 qt5/meson.build delete mode 100644 test cases/frameworks/4 qt5/q5core.cpp delete mode 100644 test cases/frameworks/4 qt5/stuff.qrc delete mode 100644 test cases/frameworks/4 qt5/stuff2.qrc delete mode 100644 test cases/frameworks/4 qt5/thing.png delete mode 100644 test cases/frameworks/4 qt5/thing2.png (limited to 'test cases/frameworks') diff --git a/manual tests/6 qt4/main.cpp b/manual tests/6 qt4/main.cpp deleted file mode 100644 index 30fcd4b28..000000000 --- a/manual tests/6 qt4/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#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 cc82c4fb2..000000000 --- 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 7f6d90601..000000000 --- a/manual tests/6 qt4/mainWindow.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef MES_MAINWINDOW -#define MES_MAINWINDOW - -#include -#include -#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 2eb226a6e..000000000 --- a/manual tests/6 qt4/mainWindow.ui +++ /dev/null @@ -1,34 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 270 - 115 - - - - MainWindow - - - - - - 10 - 10 - 241 - 91 - - - - I am a button - - - - - - - diff --git a/manual tests/6 qt4/manualinclude.cpp b/manual tests/6 qt4/manualinclude.cpp deleted file mode 100644 index 06028823f..000000000 --- a/manual tests/6 qt4/manualinclude.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include"manualinclude.h" -#include - -#include - -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 4a00b6c28..000000000 --- a/manual tests/6 qt4/manualinclude.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef MANUALINCLUDE_H_ -#define MANUALINCLUDE_H_ - -#include - -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 94f78abf1..000000000 --- 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 706e4dc87..000000000 --- a/manual tests/6 qt4/q4core.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include - -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 9152500a3..000000000 --- a/manual tests/6 qt4/stuff.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - - thing.png - thing2.png - - diff --git a/manual tests/6 qt4/thing.png b/manual tests/6 qt4/thing.png deleted file mode 100644 index 4b001bd5c..000000000 Binary files a/manual tests/6 qt4/thing.png and /dev/null differ diff --git a/manual tests/6 qt4/thing2.png b/manual tests/6 qt4/thing2.png deleted file mode 100644 index 4b001bd5c..000000000 Binary files a/manual tests/6 qt4/thing2.png and /dev/null differ diff --git a/test cases/frameworks/4 qt/main.cpp b/test cases/frameworks/4 qt/main.cpp new file mode 100644 index 000000000..4c257a4ba --- /dev/null +++ b/test cases/frameworks/4 qt/main.cpp @@ -0,0 +1,20 @@ +#include +#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 Qt5 build test"); + + win->show(); + return app.exec(); + return 0; +} diff --git a/test cases/frameworks/4 qt/mainWindow.cpp b/test cases/frameworks/4 qt/mainWindow.cpp new file mode 100644 index 000000000..cc82c4fb2 --- /dev/null +++ b/test cases/frameworks/4 qt/mainWindow.cpp @@ -0,0 +1,8 @@ +#include "mainWindow.h" + +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { + setupUi(this); +} + +MainWindow::~MainWindow() { +} diff --git a/test cases/frameworks/4 qt/mainWindow.h b/test cases/frameworks/4 qt/mainWindow.h new file mode 100644 index 000000000..7f6d90601 --- /dev/null +++ b/test cases/frameworks/4 qt/mainWindow.h @@ -0,0 +1,20 @@ +#ifndef MES_MAINWINDOW +#define MES_MAINWINDOW + +#include +#include +#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/test cases/frameworks/4 qt/mainWindow.ui b/test cases/frameworks/4 qt/mainWindow.ui new file mode 100644 index 000000000..2eb226a6e --- /dev/null +++ b/test cases/frameworks/4 qt/mainWindow.ui @@ -0,0 +1,34 @@ + + + MainWindow + + + + 0 + 0 + 270 + 115 + + + + MainWindow + + + + + + 10 + 10 + 241 + 91 + + + + I am a button + + + + + + + diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp new file mode 100644 index 000000000..06028823f --- /dev/null +++ b/test cases/frameworks/4 qt/manualinclude.cpp @@ -0,0 +1,20 @@ +#include"manualinclude.h" +#include + +#include + +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/test cases/frameworks/4 qt/manualinclude.h b/test cases/frameworks/4 qt/manualinclude.h new file mode 100644 index 000000000..4a00b6c28 --- /dev/null +++ b/test cases/frameworks/4 qt/manualinclude.h @@ -0,0 +1,16 @@ +#ifndef MANUALINCLUDE_H_ +#define MANUALINCLUDE_H_ + +#include + +class ManualInclude : public QObject { + Q_OBJECT + +public: + ManualInclude(); + +signals: + int mysignal(); +}; + +#endif diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build new file mode 100644 index 000000000..1096c7801 --- /dev/null +++ b/test cases/frameworks/4 qt/meson.build @@ -0,0 +1,45 @@ +project('qt4 and 5 build test', 'cpp') + +foreach qt : ['qt4', 'qt5'] + qtdep = dependency(qt, modules : ['Core', 'Gui', 'Widgets'], required : qt == 'qt5') + if qtdep.found() + qtmodule = import(qt) + + # The following has two resource files because having two in one target + # requires you to do it properly or you get linker symbol clashes. + + prep = qtmodule.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', 'stuff2.qrc'], # Resource file for rcc compiler. + ) + + qexe = executable(qt + 'app', + sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. + prep], + dependencies : qtdep) + + # We need a console test application because some test environments + # do not have an X server. + + qtcore = dependency(qt, modules : 'Core') + + qtcoreapp = executable(qt + 'core', 'q5core.cpp', + dependencies : qtcore) + + test(qt + 'test', qtcoreapp) + + # The build system needs to include the cpp files from + # headers but the user must manually include moc + # files from sources. + manpreprocessed = qtmodule.preprocess( + moc_sources : 'manualinclude.cpp', + moc_headers : 'manualinclude.h') + + qtmaninclude = executable(qt + 'maninclude', + sources : ['manualinclude.cpp', manpreprocessed], + dependencies : qtcore) + + test(qt + 'maninclude', qtmaninclude) + endif +endforeach diff --git a/test cases/frameworks/4 qt/q5core.cpp b/test cases/frameworks/4 qt/q5core.cpp new file mode 100644 index 000000000..706e4dc87 --- /dev/null +++ b/test cases/frameworks/4 qt/q5core.cpp @@ -0,0 +1,10 @@ +#include + +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/test cases/frameworks/4 qt/stuff.qrc b/test cases/frameworks/4 qt/stuff.qrc new file mode 100644 index 000000000..fdfb58eab --- /dev/null +++ b/test cases/frameworks/4 qt/stuff.qrc @@ -0,0 +1,6 @@ + + + + thing.png + + diff --git a/test cases/frameworks/4 qt/stuff2.qrc b/test cases/frameworks/4 qt/stuff2.qrc new file mode 100644 index 000000000..910e2fbae --- /dev/null +++ b/test cases/frameworks/4 qt/stuff2.qrc @@ -0,0 +1,6 @@ + + + + thing2.png + + diff --git a/test cases/frameworks/4 qt/thing.png b/test cases/frameworks/4 qt/thing.png new file mode 100644 index 000000000..4b001bd5c Binary files /dev/null and b/test cases/frameworks/4 qt/thing.png differ diff --git a/test cases/frameworks/4 qt/thing2.png b/test cases/frameworks/4 qt/thing2.png new file mode 100644 index 000000000..4b001bd5c Binary files /dev/null and b/test cases/frameworks/4 qt/thing2.png differ diff --git a/test cases/frameworks/4 qt5/main.cpp b/test cases/frameworks/4 qt5/main.cpp deleted file mode 100644 index 4c257a4ba..000000000 --- a/test cases/frameworks/4 qt5/main.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#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 Qt5 build test"); - - win->show(); - return app.exec(); - return 0; -} diff --git a/test cases/frameworks/4 qt5/mainWindow.cpp b/test cases/frameworks/4 qt5/mainWindow.cpp deleted file mode 100644 index cc82c4fb2..000000000 --- a/test cases/frameworks/4 qt5/mainWindow.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "mainWindow.h" - -MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - setupUi(this); -} - -MainWindow::~MainWindow() { -} diff --git a/test cases/frameworks/4 qt5/mainWindow.h b/test cases/frameworks/4 qt5/mainWindow.h deleted file mode 100644 index 7f6d90601..000000000 --- a/test cases/frameworks/4 qt5/mainWindow.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef MES_MAINWINDOW -#define MES_MAINWINDOW - -#include -#include -#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/test cases/frameworks/4 qt5/mainWindow.ui b/test cases/frameworks/4 qt5/mainWindow.ui deleted file mode 100644 index 2eb226a6e..000000000 --- a/test cases/frameworks/4 qt5/mainWindow.ui +++ /dev/null @@ -1,34 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 270 - 115 - - - - MainWindow - - - - - - 10 - 10 - 241 - 91 - - - - I am a button - - - - - - - diff --git a/test cases/frameworks/4 qt5/manualinclude.cpp b/test cases/frameworks/4 qt5/manualinclude.cpp deleted file mode 100644 index 06028823f..000000000 --- a/test cases/frameworks/4 qt5/manualinclude.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include"manualinclude.h" -#include - -#include - -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/test cases/frameworks/4 qt5/manualinclude.h b/test cases/frameworks/4 qt5/manualinclude.h deleted file mode 100644 index 4a00b6c28..000000000 --- a/test cases/frameworks/4 qt5/manualinclude.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef MANUALINCLUDE_H_ -#define MANUALINCLUDE_H_ - -#include - -class ManualInclude : public QObject { - Q_OBJECT - -public: - ManualInclude(); - -signals: - int mysignal(); -}; - -#endif diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build deleted file mode 100644 index 1096c7801..000000000 --- a/test cases/frameworks/4 qt5/meson.build +++ /dev/null @@ -1,45 +0,0 @@ -project('qt4 and 5 build test', 'cpp') - -foreach qt : ['qt4', 'qt5'] - qtdep = dependency(qt, modules : ['Core', 'Gui', 'Widgets'], required : qt == 'qt5') - if qtdep.found() - qtmodule = import(qt) - - # The following has two resource files because having two in one target - # requires you to do it properly or you get linker symbol clashes. - - prep = qtmodule.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', 'stuff2.qrc'], # Resource file for rcc compiler. - ) - - qexe = executable(qt + 'app', - sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. - prep], - dependencies : qtdep) - - # We need a console test application because some test environments - # do not have an X server. - - qtcore = dependency(qt, modules : 'Core') - - qtcoreapp = executable(qt + 'core', 'q5core.cpp', - dependencies : qtcore) - - test(qt + 'test', qtcoreapp) - - # The build system needs to include the cpp files from - # headers but the user must manually include moc - # files from sources. - manpreprocessed = qtmodule.preprocess( - moc_sources : 'manualinclude.cpp', - moc_headers : 'manualinclude.h') - - qtmaninclude = executable(qt + 'maninclude', - sources : ['manualinclude.cpp', manpreprocessed], - dependencies : qtcore) - - test(qt + 'maninclude', qtmaninclude) - endif -endforeach diff --git a/test cases/frameworks/4 qt5/q5core.cpp b/test cases/frameworks/4 qt5/q5core.cpp deleted file mode 100644 index 706e4dc87..000000000 --- a/test cases/frameworks/4 qt5/q5core.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include - -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/test cases/frameworks/4 qt5/stuff.qrc b/test cases/frameworks/4 qt5/stuff.qrc deleted file mode 100644 index fdfb58eab..000000000 --- a/test cases/frameworks/4 qt5/stuff.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - - thing.png - - diff --git a/test cases/frameworks/4 qt5/stuff2.qrc b/test cases/frameworks/4 qt5/stuff2.qrc deleted file mode 100644 index 910e2fbae..000000000 --- a/test cases/frameworks/4 qt5/stuff2.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - - thing2.png - - diff --git a/test cases/frameworks/4 qt5/thing.png b/test cases/frameworks/4 qt5/thing.png deleted file mode 100644 index 4b001bd5c..000000000 Binary files a/test cases/frameworks/4 qt5/thing.png and /dev/null differ diff --git a/test cases/frameworks/4 qt5/thing2.png b/test cases/frameworks/4 qt5/thing2.png deleted file mode 100644 index 4b001bd5c..000000000 Binary files a/test cases/frameworks/4 qt5/thing2.png and /dev/null differ -- cgit v1.2.3