summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-18 20:50:55 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-18 20:50:55 +0200
commita584ce0be29e9cb5cb0b627c71e4147011013418 (patch)
tree16e924295b77c8329010954da2ed3ca4af1b7fd8 /bin
parent0cea0e45523283d6c31998672f97b0343c1388f2 (diff)
parent3341054219a9d58286b8770d4bb4b40fb33b3c09 (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions