diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 12:27:29 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 12:27:29 (GMT) |
| commit | 6de6d4d51f538150e64de35f0bcee0ff20a86261 (patch) | |
| tree | b6048e526373efb9e4cfb2547588f790d3bea977 /src/corelib/global/qglobal.h | |
| parent | 55123a9b94eb38a372a2d285b25c58085921f233 (diff) | |
| parent | eb9d1bb05ca32af2658ad38ea731c9ddf17a4954 (diff) | |
| download | Qt-6de6d4d51f538150e64de35f0bcee0ff20a86261.zip Qt-6de6d4d51f538150e64de35f0bcee0ff20a86261.tar.gz Qt-6de6d4d51f538150e64de35f0bcee0ff20a86261.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Conflicts:
src/opengl/qgl_p.h
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 81271db..e154566 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2615,7 +2615,7 @@ QT_LICENSED_MODULE(DBus) #endif #ifdef Q_OS_NACL -#include <qnaclunimplemented.h> +#include <QtCore/qnaclunimplemented.h> #endif QT_END_NAMESPACE |