summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/global/qconfig-nacl.h4
-rw-r--r--src/gui/opengl/qopengl.h4
-rw-r--r--src/gui/opengl/qopengles2ext.h1
-rw-r--r--src/gui/opengl/qopenglext.h1
-rw-r--r--src/gui/painting/qt_mips_asm_dsp.h4
-rw-r--r--src/network/kernel/qnetworkfunctions_wince.h4
6 files changed, 16 insertions, 2 deletions
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index d62b12fba5..d5172aac29 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -39,6 +39,10 @@
**
****************************************************************************/
+#if 0
+#pragma qt_sync_stop_processing
+#endif
+
#define QT_FONTS_ARE_RESOURCES
/* Data structures */
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index 291c23b85f..5928b0be2f 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -63,7 +63,7 @@ QT_BEGIN_HEADER
*/
typedef char GLchar;
-# include "qopengles2ext.h"
+# include <QtGui/qopengles2ext.h>
# ifndef GL_DOUBLE
# define GL_DOUBLE GL_FLOAT
# endif
@@ -96,7 +96,7 @@ typedef GLfloat GLdouble;
# include <QtCore/qt_windows.h>
# endif
# include <GL/gl.h>
-# include "qopenglext.h"
+# include <QtGui/qopenglext.h>
# endif // Q_OS_MAC
#endif
diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h
index 564bbc8484..61bfb595cc 100644
--- a/src/gui/opengl/qopengles2ext.h
+++ b/src/gui/opengl/qopengles2ext.h
@@ -3,6 +3,7 @@
#if 0
#pragma qt_no_master_include
+#pragma qt_sync_stop_processing
#endif
/* $Revision: 18481 $ on $Date:: 2012-07-11 18:07:26 -0700 #$ */
diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h
index 070dd993d9..5d21cb6eea 100644
--- a/src/gui/opengl/qopenglext.h
+++ b/src/gui/opengl/qopenglext.h
@@ -3,6 +3,7 @@
#if 0
#pragma qt_no_master_include
+#pragma qt_sync_stop_processing
#endif
#ifdef __cplusplus
diff --git a/src/gui/painting/qt_mips_asm_dsp.h b/src/gui/painting/qt_mips_asm_dsp.h
index af724bf7bb..c2fd234d08 100644
--- a/src/gui/painting/qt_mips_asm_dsp.h
+++ b/src/gui/painting/qt_mips_asm_dsp.h
@@ -42,6 +42,10 @@
#ifndef QT_MIPS_ASM_DSP_H
#define QT_MIPS_ASM_DSP_H
+#if 0
+#pragma qt_sync_stop_processing
+#endif
+
#define zero $0
#define AT $1
#define v0 $2
diff --git a/src/network/kernel/qnetworkfunctions_wince.h b/src/network/kernel/qnetworkfunctions_wince.h
index ebbdebb2f1..09caab06eb 100644
--- a/src/network/kernel/qnetworkfunctions_wince.h
+++ b/src/network/kernel/qnetworkfunctions_wince.h
@@ -42,6 +42,10 @@
#ifndef QNETWORKFUNCTIONS_WINCE_H
#define QNETWORKFUNCTIONS_WINCE_H
+#if 0
+#pragma qt_sync_stop_processing
+#endif
+
#ifdef Q_OS_WINCE
#include <qt_windows.h>