diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 19:58:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 19:58:37 (GMT) |
| commit | 0eabf288f6b05c788f547f761c6e7874856d2703 (patch) | |
| tree | 81fbcecc7e715e2ea992deb7ace3f4c90e933b38 /src/gui | |
| parent | 3b705ed3fb5d485171ebd6132846ced88abd7187 (diff) | |
| parent | 8908c2575b76789652aab4f623d60734707c3a54 (diff) | |
| download | Qt-0eabf288f6b05c788f547f761c6e7874856d2703.zip Qt-0eabf288f6b05c788f547f761c6e7874856d2703.tar.gz Qt-0eabf288f6b05c788f547f761c6e7874856d2703.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use 3x3 PMV matrices rather than 4x4 in the GL2 engine
Handle broken shaders better in the GL2 engine's shader manager
Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram
Fix build with neon instructions enabled but not set in mkspec
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/painting.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 0b1e79a..a6cc9c7 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -383,7 +383,7 @@ neon { DEFINES += QT_HAVE_NEON HEADERS += painting/qdrawhelper_neon_p.h SOURCES += painting/qdrawhelper_neon.cpp - QMAKE.CXXFLAGS *= -mfpu=neon + QMAKE_CXXFLAGS *= -mfpu=neon } contains(QT_CONFIG, zlib) { |