diff options
| author | Simo Fält <simo.falt@nokia.com> | 2012-03-28 17:05:48 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@nokia.com> | 2012-03-28 17:05:48 +0300 |
| commit | 064dc31b190f737e2ae83d3629c31512cb69435c (patch) | |
| tree | a73dbe6e68b88bf175e2925e834d6051eb6a90aa /src/widgets/widgets/qfontcombobox.cpp | |
| parent | 9abfe7031db60bb8e2c16e2fbe92b0950089168c (diff) | |
| parent | b754deb055db1b3d74f4ecaed38fa7e59fdcd877 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/widgets/widgets/qfontcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qfontcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 5a8e083e44..09cbfd663d 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -120,8 +120,8 @@ public: QFontFamilyDelegate::QFontFamilyDelegate(QObject *parent) : QAbstractItemDelegate(parent) { - truetype = QIcon(QLatin1String(":/trolltech/styles/commonstyle/images/fonttruetype-16.png")); - bitmap = QIcon(QLatin1String(":/trolltech/styles/commonstyle/images/fontbitmap-16.png")); + truetype = QIcon(QLatin1String(":/qt-project.org/styles/commonstyle/images/fonttruetype-16.png")); + bitmap = QIcon(QLatin1String(":/qt-project.org/styles/commonstyle/images/fontbitmap-16.png")); writingSystem = QFontDatabase::Any; } |