diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-09 15:55:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 16:54:03 +0200 |
| commit | 526f111b059e18414e3a03c7f9a2b8c2ed65be7a (patch) | |
| tree | d4006eb9b88fae752345be33a8b74889908d9562 /src/imports | |
| parent | 48f278f723cc1527b1e785c416192083e67dc292 (diff) | |
Allow QtQuick private headers to be used with QT_NO_KEYWORDS.
This is necessary for the QtWebEngine module.
This also adds an empty nokeywords test using the same mechanism
as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts
at compile time.
Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/dialogs/qquickfiledialog_p.h | 2 | ||||
| -rw-r--r-- | src/imports/widgets/qquickqfiledialog_p.h | 2 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel_p.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/dialogs/qquickfiledialog_p.h b/src/imports/dialogs/qquickfiledialog_p.h index 0176bc3fe4..a4c7939fda 100644 --- a/src/imports/dialogs/qquickfiledialog_p.h +++ b/src/imports/dialogs/qquickfiledialog_p.h @@ -68,7 +68,7 @@ public: ~QQuickFileDialog(); virtual QList<QUrl> fileUrls(); -signals: +Q_SIGNALS: public Q_SLOTS: void clearSelection(); diff --git a/src/imports/widgets/qquickqfiledialog_p.h b/src/imports/widgets/qquickqfiledialog_p.h index 8bf7c73882..2bd364eba0 100644 --- a/src/imports/widgets/qquickqfiledialog_p.h +++ b/src/imports/widgets/qquickqfiledialog_p.h @@ -90,7 +90,7 @@ public: bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) Q_DECL_OVERRIDE; void hide() Q_DECL_OVERRIDE { m_dialog.hide(); } -private slots: +private Q_SLOTS: void currentChanged(const QString& path); void directoryEntered(const QString& path); void fileSelected(const QString& path); diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h index ca4b7cf811..cd75d16902 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel_p.h +++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h @@ -161,7 +161,7 @@ public: if (name == m_name) return; m_name = name; - emit nameChanged(); + Q_EMIT nameChanged(); } QString query() const { return m_query; } @@ -174,7 +174,7 @@ public: if (m_query == query) return; m_query = query; - emit queryChanged(); + Q_EMIT queryChanged(); } bool isKey() const { return m_isKey; } @@ -182,7 +182,7 @@ public: if (m_isKey == b) return; m_isKey = b; - emit isKeyChanged(); + Q_EMIT isKeyChanged(); } bool isValid() { |