diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
commit | acb5cd795f4ea75794cfd31eaf768ec5a3e62844 (patch) | |
tree | 28064e139d82b1f51c43b67c078855524b52821c /tools/designer/src/lib/shared/qtresourcemodel.cpp | |
parent | 65e00180516eb136c2a7119dfe9e63fc9c66065e (diff) | |
parent | 8e401cd4ae0133531613a3e097acc57979d78f50 (diff) | |
download | Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.zip Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.gz Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/designer/src/lib/shared/qtresourcemodel.cpp')
-rw-r--r-- | tools/designer/src/lib/shared/qtresourcemodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp index a2f368d..37f2cab 100644 --- a/tools/designer/src/lib/shared/qtresourcemodel.cpp +++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp @@ -476,8 +476,8 @@ QtResourceModel::QtResourceModel(QObject *parent) : d_ptr->q_ptr = this; d_ptr->m_fileWatcher = new QFileSystemWatcher(this); - connect(d_ptr->m_fileWatcher, SIGNAL(fileChanged(const QString &)), - this, SLOT(slotFileChanged(const QString &))); + connect(d_ptr->m_fileWatcher, SIGNAL(fileChanged(QString)), + this, SLOT(slotFileChanged(QString))); } QtResourceModel::~QtResourceModel() |