From 328df640f39906e4af17d5b8aca888289c3535ba Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 5 Dec 2012 14:40:38 +0100 Subject: Fix compile with -DQT_NO_TRANSLATION Change-Id: Ia6929f871485476e8b5bb14e7bf8117d0c562841 Reviewed-by: David Faure --- examples/examples.pro | 1 + examples/widgets/dialogs/classwizard/main.cpp | 2 ++ examples/widgets/dialogs/licensewizard/main.cpp | 4 +++- examples/widgets/dialogs/standarddialogs/main.cpp | 2 ++ examples/widgets/dialogs/trivialwizard/trivialwizard.cpp | 3 ++- examples/widgets/tools/tools.pro | 2 ++ 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 7c149ff7ac..db444b5d12 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -24,3 +24,4 @@ contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):!contains(QT_CONFIG contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent +contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= linguist diff --git a/examples/widgets/dialogs/classwizard/main.cpp b/examples/widgets/dialogs/classwizard/main.cpp index ec95d9d8d3..55fdf0fbb6 100644 --- a/examples/widgets/dialogs/classwizard/main.cpp +++ b/examples/widgets/dialogs/classwizard/main.cpp @@ -51,11 +51,13 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); +#ifndef QT_NO_TRANSLATION QString translatorFileName = QLatin1String("qt_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(translator); +#endif ClassWizard wizard; wizard.show(); diff --git a/examples/widgets/dialogs/licensewizard/main.cpp b/examples/widgets/dialogs/licensewizard/main.cpp index 9217d4f49e..a84c6241d4 100644 --- a/examples/widgets/dialogs/licensewizard/main.cpp +++ b/examples/widgets/dialogs/licensewizard/main.cpp @@ -51,12 +51,14 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); +#ifndef QT_NO_TRANSLATION QString translatorFileName = QLatin1String("qt_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(translator); - +#endif + LicenseWizard wizard; wizard.show(); return app.exec(); diff --git a/examples/widgets/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp index 15f18d7af1..96863e3aab 100644 --- a/examples/widgets/dialogs/standarddialogs/main.cpp +++ b/examples/widgets/dialogs/standarddialogs/main.cpp @@ -49,11 +49,13 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); +#ifndef QT_NO_TRANSLATION QString translatorFileName = QLatin1String("qt_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(translator); +#endif Dialog dialog; dialog.show(); diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp index a49e17e104..f302c0e390 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp @@ -115,12 +115,13 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); +#ifndef QT_NO_TRANSLATION QString translatorFileName = QLatin1String("qt_"); translatorFileName += QLocale::system().name(); QTranslator *translator = new QTranslator(&app); if (translator->load(translatorFileName, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) app.installTranslator(translator); - +#endif QWizard wizard; wizard.addPage(createIntroPage()); diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index aaf4440d23..f08f7fd6d2 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -14,6 +14,8 @@ SUBDIRS = \ undo \ undoframework +contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n + plugandpaint.depends = plugandpaintplugins # install -- cgit v1.2.3