summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-28 09:15:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-28 09:15:41 (GMT)
commitddff256949b93171d4428aaa037051bb5f1fca02 (patch)
treebb900bade37c45210e229bb4cd976c5fc7814cc2 /util
parent369f899e69362b2156800f8c90dfb0bdbe5f2598 (diff)
parent85fa83ac89367bf4f3a85d038ef64a362aa8377e (diff)
downloadQt-ddff256949b93171d4428aaa037051bb5f1fca02.zip
Qt-ddff256949b93171d4428aaa037051bb5f1fca02.tar.gz
Qt-ddff256949b93171d4428aaa037051bb5f1fca02.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Added some changes for 4.6.3 Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined. Allow auto-test to compile when using namespaces Fix regression in QVarLengthArray::operator= Removed unnecessary PlatSec capabilities from spectrum demo DLL Make test work with shadow builds again. Added missing PlatSec capabilities to spectrum demo DLL My 4.6.3 changes Tidy changes file for 4.6.3. My 4.6.3 changes My 4.6.3 changes Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Build fix for spectrum demo when -qtnamespace is used Fixed license headers in spectrum demo Qt app draws background incorrectly when animated wallpaper is used Don't use QAtomicInt in statics because they are non-POD. QTBUG-5955: Qt fails to build on alpha architecture
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions