diff options
| author | Kevin Funk <kfunk@kde.org> | 2014-08-07 15:42:16 (GMT) |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2014-08-11 15:18:23 (GMT) |
| commit | f5231b768e9986b9519af1a0d2eff1891adaeba2 (patch) | |
| tree | 6dc2744965394449f5b3f108eda8ab2bdc0efca7 /src/corelib/io/qfilesystemwatcher_inotify.cpp | |
| parent | bfa0be8a1bf68200f1ba98888deff4a9215ee066 (diff) | |
| download | Qt-f5231b768e9986b9519af1a0d2eff1891adaeba2.zip Qt-f5231b768e9986b9519af1a0d2eff1891adaeba2.tar.gz Qt-f5231b768e9986b9519af1a0d2eff1891adaeba2.tar.bz2 | |
Remove use of 'register' from Qt.
It is deprecated and clang is warning about it [-Wdeprecated-register].
Original patch from Stephen Kelly,
see commit d9fb6e6dbb2b322556d581265da2442e3b91a6a3 in qt5/qtbase
This is a backport of this commit + additional manual replacements in
header files. There are still some 'register' uses inside implementation files left,
but headers are all 'register'-free now.
Change-Id: I7225381df1f093073583d62fa86f7bd7cca869c7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_inotify.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_inotify.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp index b05a228..dd8ddc4 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp @@ -229,7 +229,7 @@ QT_BEGIN_NAMESPACE QInotifyFileSystemWatcherEngine *QInotifyFileSystemWatcherEngine::create() { - register int fd = -1; + int fd = -1; #ifdef IN_CLOEXEC fd = inotify_init1(IN_CLOEXEC); #endif |