aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2020-01-18 16:33:53 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2020-01-18 17:29:55 +0000
commitd2e5a82fb515bb025222a22b5d52e01cd16b4dd5 (patch)
tree5abe57a9fbd77fdf3fadcfdb7589e54eaad7615e
parentc272c8de386eddbc8d0b01faea0c7a5a89fa37ed (diff)
downloadmeson-d2e5a82fb515bb025222a22b5d52e01cd16b4dd5.zip
meson-d2e5a82fb515bb025222a22b5d52e01cd16b4dd5.tar.gz
meson-d2e5a82fb515bb025222a22b5d52e01cd16b4dd5.tar.bz2
Fix 'qt4test' test executable when only Qt4 is present
This always tries to load a 'qt5core_fr' translation file, when it is actually named 'qtNcore_fr'(where N is the qt version).
-rw-r--r--test cases/frameworks/4 qt/meson.build1
-rw-r--r--test cases/frameworks/4 qt/q5core.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build
index f5bfa95..7934572 100644
--- a/test cases/frameworks/4 qt/meson.build
+++ b/test cases/frameworks/4 qt/meson.build
@@ -83,6 +83,7 @@ foreach qt : ['qt4', 'qt5']
qtcore = dependency(qt, modules : 'Core', method : get_option('method'))
qtcoreapp = executable(qt + 'core', 'q5core.cpp',
+ cpp_args: '-DQT="@0@"'.format(qt),
dependencies : qtcore)
test(qt + 'test', qtcoreapp)
diff --git a/test cases/frameworks/4 qt/q5core.cpp b/test cases/frameworks/4 qt/q5core.cpp
index 25b80b8..44581a6 100644
--- a/test cases/frameworks/4 qt/q5core.cpp
+++ b/test cases/frameworks/4 qt/q5core.cpp
@@ -15,7 +15,7 @@ int main(int argc, char **argv) {
app.installTranslator(&qtTranslator);
QTranslator myappTranslator;
- if(!myappTranslator.load("qt5core_fr") )
+ if(!myappTranslator.load(QT "core_fr") )
return 1;
app.installTranslator(&myappTranslator);