diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
| commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
| tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/corelib/global/qfeatures.h | |
| parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
| parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/corelib/global/qfeatures.h')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 160063fa67..90ef47cf5b 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -306,6 +306,11 @@ #define QT_NO_NETWORKDISKCACHE #endif +// QLocalServer +#if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE)) +#define QT_NO_LOCALSERVER +#endif + // QProgressDialog #if !defined(QT_NO_PROGRESSDIALOG) && (defined(QT_NO_PROGRESSBAR)) #define QT_NO_PROGRESSDIALOG |