summaryrefslogtreecommitdiffstats
path: root/src/testlib/qbenchmark.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 04:25:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 04:25:36 (GMT)
commit2c9417fadf4205c4fcb602ca17b4d729c5466020 (patch)
treeb4f6d65c9ef83ba99829174148ab51ddd4cb1912 /src/testlib/qbenchmark.h
parent155ae1da9dcf11617f412e5c229a2a12a333d7db (diff)
parentfe1a44a850e61d8b64626424b45ef7592ec66589 (diff)
downloadQt-2c9417fadf4205c4fcb602ca17b4d729c5466020.zip
Qt-2c9417fadf4205c4fcb602ca17b4d729c5466020.tar.gz
Qt-2c9417fadf4205c4fcb602ca17b4d729c5466020.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits) Fix compilation on HP-UXi: m_volume is a #define WinCE doesn't have sys/types.h Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds Fix compilation on recent Linux systems: getpid(2) is in unistd.h. Cocoa: calling QEventLoop::exec from mouse up causes problem Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined) Doc: Collected the Declarative UI tutorials together and renamed them. Doc: Simplified Commercial Editions for Qt 4.7. Work around MSVC2008 compiler crash doc: Added "\since 4.7" to a bunch of declarative stuff. Cocoa: event dispatcher eats mouse events Fix an issue about double-click on Mac OS X. qdoc: Finished "Inherited by" list for QML elements. Avoid calling out to public API in the QtScript implementation Move property helper functions to QScriptEnginePrivate Move more script value conversion code to helper functions Cleanup: Move value conversion code to helper functions Move implementation of QScriptValue construction functions to private class Cleanup: Move number conversion functions to QScriptEnginePrivate Move some helper function declarations outside QT_NO_QOBJECT guard ...
Diffstat (limited to 'src/testlib/qbenchmark.h')
0 files changed, 0 insertions, 0 deletions