diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-16 22:38:29 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-16 22:38:29 +0300 |
| commit | c21637a01db7f6958c816bfe2a8b0383b96e8f68 (patch) | |
| tree | 682774f314499b0951e0adf01d3af638025f700d /test cases | |
| parent | 4c02a35fe067d24ce97207a702dd2e46f2203849 (diff) | |
| download | meson-c21637a01db7f6958c816bfe2a8b0383b96e8f68.zip meson-c21637a01db7f6958c816bfe2a8b0383b96e8f68.tar.gz meson-c21637a01db7f6958c816bfe2a8b0383b96e8f68.tar.bz2 | |
Fixed unity builds for Qt5.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/4 qt5/mainWindow.h | 5 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/stuff.qrc | 1 | ||||
| -rw-r--r-- | test cases/frameworks/4 qt5/stuff2.qrc | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/test cases/frameworks/4 qt5/mainWindow.h b/test cases/frameworks/4 qt5/mainWindow.h index fc6b245..82d8c76 100644 --- a/test cases/frameworks/4 qt5/mainWindow.h +++ b/test cases/frameworks/4 qt5/mainWindow.h @@ -1,3 +1,6 @@ +#ifndef MES_MAINWINDOW +#define MES_MAINWINDOW + #include <QObject> #include <QMainWindow> #include "ui_mainWindow.h" @@ -13,3 +16,5 @@ public: private: }; + +#endif diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build index 3f0770e..cda27ae 100644 --- a/test cases/frameworks/4 qt5/meson.build +++ b/test cases/frameworks/4 qt5/meson.build @@ -6,7 +6,7 @@ q5exe = executable('qt5app', sources : ['main.cpp', 'mainWindow.cpp'], # Sources that don't need preprocessing. 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 files for rcc compiler. +qresources : 'stuff.qrc', # Resource file for rcc compiler. deps : qt5dep) # We need a console test application because some test environments diff --git a/test cases/frameworks/4 qt5/stuff.qrc b/test cases/frameworks/4 qt5/stuff.qrc index cd1c6b5..48f8fda 100644 --- a/test cases/frameworks/4 qt5/stuff.qrc +++ b/test cases/frameworks/4 qt5/stuff.qrc @@ -1,5 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file>thing.png</file> + <file>thing2.png</file> </qresource> </RCC> diff --git a/test cases/frameworks/4 qt5/stuff2.qrc b/test cases/frameworks/4 qt5/stuff2.qrc deleted file mode 100644 index b719919..0000000 --- a/test cases/frameworks/4 qt5/stuff2.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>thing2.png</file> -</qresource> -</RCC> |