comparison generator/qtjambi_masterinclude.h @ 234:1b0e2ee5aedc

Roll back the last change
author SokoL_SD
date Sat, 18 Jul 2009 15:06:12 +0000
parents 47bfb1188dbb
children
comparison
equal deleted inserted replaced
233:47bfb1188dbb 234:1b0e2ee5aedc
38 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 38 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
39 ** 39 **
40 ****************************************************************************/ 40 ****************************************************************************/
41 41
42 #define QT_NO_STL 42 #define QT_NO_STL
43 #include <QtCore> 43 #include <QtCore/QtCore>
44 #include <QtGui> 44 #include <QtGui/QtGui>
45 #include <QtNetwork> 45 #include <QtNetwork/QtNetwork>
46 #include <QtSql> 46 #include <QtSql/QtSql>
47 #include <QtSvg> 47 #include <QtSvg/QtSvg>
48 #include <QtXml> 48 #include <QtXml/QtXml>
49 49
50 #ifndef QT_NO_XMLPATTERNS 50 #ifndef QT_NO_XMLPATTERNS
51 # include <QtXmlPatterns> 51 # include <QtXmlPatterns/QtXmlPatterns>
52 #endif 52 #endif
53 53
54 #ifndef QT_NO_WEBKIT 54 #ifndef QT_NO_WEBKIT
55 # include <QtWebKit> 55 # include <QtWebKit/QtWebKit>
56 #endif 56 #endif
57 57
58 #ifndef QT_NO_PHONON 58 #ifndef QT_NO_PHONON
59 # include <phonon/phonon> 59 # include <phonon/phonon>
60 #endif 60 #endif
1142 #define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC 1142 #define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC
1143 1143
1144 /* For compatibility with OpenGL v1.0 */ 1144 /* For compatibility with OpenGL v1.0 */
1145 #define GL_LOGIC_OP GL_INDEX_LOGIC_OP 1145 #define GL_LOGIC_OP GL_INDEX_LOGIC_OP
1146 #define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT 1146 #define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
1147 #include <QtOpenGL> 1147 #include <QtOpenGL/QtOpenGL>
1148 #endif // QT_NO_OPENGL 1148 #endif // QT_NO_OPENGL