diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2024-07-02 12:51:06 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2024-07-02 10:53:39 +0000 |
| commit | 47f356cc29672b7fe49844d9c117a5fd9a506481 (patch) | |
| tree | 4fd4fbfe34b3ceb1e9bb1fdf3bbd248bfcd2a503 | |
| parent | 95945541d41cc627cfadd98db7bf9e05ede3f2e1 (diff) | |
Fix symbol redefinition error in unity builds
Task-number: QDS-13162
Change-Id: Ib83b3acb40e57a902638a710a514dd4c9f2044b2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/imports/utils/quickstudiocsvtablemodel.cpp | 7 | ||||
| -rw-r--r-- | src/imports/utils/quickstudiofilereader.cpp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/imports/utils/quickstudiocsvtablemodel.cpp b/src/imports/utils/quickstudiocsvtablemodel.cpp index e3dbc87..3aa8d19 100644 --- a/src/imports/utils/quickstudiocsvtablemodel.cpp +++ b/src/imports/utils/quickstudiocsvtablemodel.cpp @@ -155,8 +155,9 @@ static QString urlToLocalPath(const QUrl &url) return localPath; } -static Q_LOGGING_CATEGORY(texttomodelMergerDebug, "qt.StudioCsvTableModel.debug", QtDebugMsg) - QuickStudioCsvTableModel::QuickStudioCsvTableModel(QObject *parent) +static Q_LOGGING_CATEGORY(quickStudioCsvTableModelDebug, "qt.StudioCsvTableModel.debug", QtDebugMsg) + +QuickStudioCsvTableModel::QuickStudioCsvTableModel(QObject *parent) : QAbstractTableModel(parent) , m_fileWatcher(new QFileSystemWatcher(this)) { @@ -289,7 +290,7 @@ void QuickStudioCsvTableModel::checkPathAndReload(const QString &path) void QuickStudioCsvTableModel::startWatchingSource() { - qCDebug(texttomodelMergerDebug) << Q_FUNC_INFO << "Load file: " << source(); + qCDebug(quickStudioCsvTableModelDebug) << Q_FUNC_INFO << "Load file: " << source(); const QStringList oldWatchingFiles = m_fileWatcher->files(); if (oldWatchingFiles.size()) diff --git a/src/imports/utils/quickstudiofilereader.cpp b/src/imports/utils/quickstudiofilereader.cpp index 874bd73..1764c26 100644 --- a/src/imports/utils/quickstudiofilereader.cpp +++ b/src/imports/utils/quickstudiofilereader.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -static Q_LOGGING_CATEGORY(texttomodelMergerDebug, "qt.Studiofilereader.debug", QtDebugMsg) +static Q_LOGGING_CATEGORY(quickStudioFileReaderDebug, "qt.Studiofilereader.debug", QtDebugMsg) QuickStudioFileReader::QuickStudioFileReader(QObject *parent) : QObject(parent) @@ -51,7 +51,7 @@ static Q_LOGGING_CATEGORY(texttomodelMergerDebug, "qt.Studiofilereader.debug", Q QString QuickStudioFileReader::loadFile(const QString &path) { - qCDebug(texttomodelMergerDebug) << Q_FUNC_INFO << "Load file: " << path; + qCDebug(quickStudioFileReaderDebug) << Q_FUNC_INFO << "Load file: " << path; QFile file(path); bool ok = file.open(QIODevice::ReadOnly); @@ -73,7 +73,7 @@ QString QuickStudioFileReader::loadFile(const QString &path) void QuickStudioFileReader::reload() { - qCDebug(texttomodelMergerDebug) << Q_FUNC_INFO << "Load file: " << m_filePath; + qCDebug(quickStudioFileReaderDebug) << Q_FUNC_INFO << "Load file: " << m_filePath; QString localPath; |