diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-11 21:11:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-11 21:11:40 +0200 |
| commit | 720cb9f35e74b9e8f6d6ca0aca714fa6b9cc8f06 (patch) | |
| tree | dcd6907f941af0d495ee36b780ee78747f2d8969 /src/plugins/locator/locatorwidget.cpp | |
| parent | c7f1aeac11806214b448b251e8c76185cdcac855 (diff) | |
| parent | 236bd842b5d093053eb96eca8301ffb783ec425a (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbp
src/libs/ssh/sshconnection.cpp
Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
Diffstat (limited to 'src/plugins/locator/locatorwidget.cpp')
| -rw-r--r-- | src/plugins/locator/locatorwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index 8d59455f8d..343b1e7cd8 100644 --- a/src/plugins/locator/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp @@ -49,6 +49,7 @@ #include <utils/runextensions.h> #include <QtConcurrentRun> +#include <QColor> #include <QFileInfo> #include <QFile> #include <QTimer> @@ -194,7 +195,7 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const } return entry.displayIcon; } else if (role == Qt::ForegroundRole && index.column() == 1) { - return Qt::darkGray; + return QColor(Qt::darkGray); } else if (role == Qt::UserRole) { return qVariantFromValue(mEntries.at(index.row())); } |