diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /src/corelib/kernel/qcoreapplication.h | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 622139e6f8..46eab4e740 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -166,8 +166,16 @@ public Q_SLOTS: static void quit(); Q_SIGNALS: - void aboutToQuit(); - void unixSignal(int); + void aboutToQuit( +#if !defined(qdoc) + QPrivateSignal +#endif + ); + void unixSignal(int +#if !defined(qdoc) + , QPrivateSignal +#endif + ); protected: bool event(QEvent *); |