diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:41:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:41:32 (GMT) |
| commit | 530c0a32bf58b382c32806bb6742b6029086c92e (patch) | |
| tree | 5313649cf6f5cac76f4aad58f312204124d9ce6f /mkspecs | |
| parent | 8989702bbe666f67b3bd24753414450dee4688e8 (diff) | |
| parent | 83525ca84ba7adadaeeb65ffa55a6d0f2630caaa (diff) | |
| download | Qt-530c0a32bf58b382c32806bb6742b6029086c92e.zip Qt-530c0a32bf58b382c32806bb6742b6029086c92e.tar.gz Qt-530c0a32bf58b382c32806bb6742b6029086c92e.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (58 commits)
Fine-tune the tests being run on the CI system.
Standardize selection color in visual test
Use GLIBC functions on any GLIBC architecture.
tst_qnetworkreply: Fix ugly test
Fix license text.
Remove pointSize from visual tests
Update visuals for X11
Doc: fix a typo in QML/Qt UI integration
Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
Remove some excess pngs
Update qml visual tests
VisualDataModel::count should be 0 until a valid delegate is set.
Doc: Remove default from PathView path property
Record images on more than just the first frame.
Turn off font antialiasing during tests.
Shrink size of a visual test
doc: Fix documentation of QTextEdit::setDocument
Fixed QGesture autotest for QGesture lazy deletion.
compile with quintptr instead of intptr_t
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index d91db07..23f1f71 100644 --- a/mkspecs/linux-g++-maemo/qmake.conf +++ b/mkspecs/linux-g++-maemo/qmake.conf @@ -22,10 +22,7 @@ QMAKE_LIBDIR_X11 = /usr/lib QMAKE_LIBDIR_OPENGL = /usr/lib # We still need to generate debug symbols in release mode to put into the *-dbg packages: -QMAKE_CFLAGS_RELEASE += -g -fno-omit-frame-pointer -fno-optimize-sibling-calls -QMAKE_CXXFLAGS_RELEASE += -g -fno-omit-frame-pointer -fno-optimize-sibling-calls - -# Work round PowerVR SGX 1.3 driver bug with glScissor & FBOs: -DEFINES += QT_GL_NO_SCISSOR_TEST +QMAKE_CFLAGS_RELEASE += -g -Wno-psabi +QMAKE_CXXFLAGS_RELEASE += -g -Wno-psabi load(qt_config) |