diff options
author | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-08 15:23:08 +0900 |
---|---|---|
committer | Tasuku Suzuki <tasuku.suzuki@qbc.io> | 2019-07-08 17:21:28 +0900 |
commit | 84ec8fa02629e348e2bc49e62db2e2c5cb744437 (patch) | |
tree | 582077622ff01d38e802dbe3680ce491ce6553af /src/plugins | |
parent | ef8a27544ac47b0ec2fc8c058d32c5b22650b359 (diff) |
Fix build without features.translation
Change-Id: Ic97c0245f06e3181bc528dbeeaa56cc43a37e67f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins')
4 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp index 5d2684b510..8bb3b95e48 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp @@ -93,7 +93,9 @@ QQmlPreviewHandler::QQmlPreviewHandler(QObject *parent) : QObject(parent) QQmlPreviewHandler::~QQmlPreviewHandler() { +#if QT_CONFIG(translation) removeTranslators(); +#endif clear(); } @@ -223,6 +225,7 @@ void QQmlPreviewHandler::doZoom() m_lastPosition.initLastSavedWindowPosition(m_currentWindow); } +#if QT_CONFIG(translation) void QQmlPreviewHandler::removeTranslators() { if (!m_qtTranslator.isNull()) { @@ -255,6 +258,7 @@ void QQmlPreviewHandler::language(const QUrl &context, const QLocale &locale) for (QQmlEngine *engine : qAsConst(m_engines)) engine->retranslate(); } +#endif void QQmlPreviewHandler::clear() { diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h index 47491b9d8f..f7f343a4ee 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h @@ -81,7 +81,9 @@ public: void loadUrl(const QUrl &url); void rerun(); void zoom(qreal newFactor); +#if QT_CONFIG(translation) void language(const QUrl &context, const QLocale &locale); +#endif void clear(); @@ -115,7 +117,9 @@ private: void frameSwapped(); void fpsTimerHit(); +#if QT_CONFIG(translation) void removeTranslators(); +#endif QScopedPointer<QQuickItem> m_dummyItem; QList<QQmlEngine *> m_engines; @@ -145,8 +149,10 @@ private: FrameTime m_rendering; FrameTime m_synchronizing; +#if QT_CONFIG(translation) QScopedPointer<QTranslator> m_qtTranslator; QScopedPointer<QTranslator> m_qmlTranslator; +#endif }; QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp index 2e2224df47..2e6aaa5858 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp @@ -64,7 +64,9 @@ QQmlPreviewServiceImpl::QQmlPreviewServiceImpl(QObject *parent) : connect(this, &QQmlPreviewServiceImpl::load, &m_handler, &QQmlPreviewHandler::loadUrl); connect(this, &QQmlPreviewServiceImpl::rerun, &m_handler, &QQmlPreviewHandler::rerun); connect(this, &QQmlPreviewServiceImpl::zoom, &m_handler, &QQmlPreviewHandler::zoom); +#if QT_CONFIG(translation) connect(this, &QQmlPreviewServiceImpl::language, &m_handler, &QQmlPreviewHandler::language); +#endif connect(&m_handler, &QQmlPreviewHandler::error, this, &QQmlPreviewServiceImpl::forwardError, Qt::DirectConnection); connect(&m_handler, &QQmlPreviewHandler::fps, this, &QQmlPreviewServiceImpl::forwardFps, @@ -135,6 +137,7 @@ void QQmlPreviewServiceImpl::messageReceived(const QByteArray &data) emit zoom(static_cast<qreal>(factor)); break; } +#if QT_CONFIG(translation) case Language: { QUrl context; QString locale; @@ -143,6 +146,7 @@ void QQmlPreviewServiceImpl::messageReceived(const QByteArray &data) locale.isEmpty() ? QLocale() : QLocale(locale)); break; } +#endif default: forwardError(QString::fromLatin1("Invalid command: %1").arg(command)); break; diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h index 7bdc87ec59..de50e6fc61 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h @@ -99,7 +99,9 @@ signals: void rerun(); void clearCache(); void zoom(qreal factor); +#if QT_CONFIG(translation) void language(const QUrl &context, const QLocale &locale); +#endif private: QScopedPointer<QQmlPreviewFileEngineHandler> m_fileEngine; |