diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-18 13:13:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-18 13:13:12 +0200 |
| commit | d7e26cffac1c52f18be40acd354e9066aea68b9f (patch) | |
| tree | ae73e70d857165082376453dbb7d9ee7536f24f4 | |
| parent | c9d1965c7c3bd8bca73158d1c07cc888f013b0bd (diff) | |
| parent | 7d02c5e2e9329ef8075d965ce675515345b24dab (diff) | |
| download | qttools-d7e26cffac1c52f18be40acd354e9066aea68b9f.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
| -rw-r--r-- | src/linguist/linguist/messagemodel.cpp | 8 | ||||
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp index d95e2e25c..fc74a4f29 100644 --- a/src/linguist/linguist/messagemodel.cpp +++ b/src/linguist/linguist/messagemodel.cpp @@ -266,7 +266,7 @@ bool DataModel::load(const QString &fileName, bool *langGuessed, QWidget *parent MessageItem tmp(msg); if (msg.type() == TranslatorMessage::Finished) c->incrementFinishedCount(); - if (msg.type() == TranslatorMessage::Unfinished) { + if (msg.type() == TranslatorMessage::Finished || msg.type() == TranslatorMessage::Unfinished) { doCharCounting(tmp.text(), m_srcWords, m_srcChars, m_srcCharsSpc); doCharCounting(tmp.pluralText(), m_srcWords, m_srcChars, m_srcCharsSpc); c->incrementNonobsoleteCount(); @@ -1229,9 +1229,11 @@ int MessageModel::rowCount(const QModelIndex &parent) const return 0; } -int MessageModel::columnCount(const QModelIndex &) const +int MessageModel::columnCount(const QModelIndex &parent) const { - return m_data->modelCount() + 3; + if (!parent.isValid()) + return m_data->modelCount() + 3; + return m_data->modelCount() + 2; } QVariant MessageModel::data(const QModelIndex &index, int role) const diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index d2eeea094..e500bcbb0 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -163,8 +163,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs) if (state == QtPath) { // Check for library name part if (part < parts.count() && parts.at(part).contains(".dylib ")) { - state = DylibName; - info.installName += "/" + (qtPath + "lib/").simplified(); + info.installName += "/" + (qtPath + currentPart + "/").simplified(); info.frameworkDirectory = info.installName; state = DylibName; continue; |