diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-02 20:57:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-02 20:57:51 (GMT) |
| commit | 8a2423cb7cbb4d84809ff62942549143602b7b21 (patch) | |
| tree | 04329c5dc43e406c6019ce69275c67944016b055 /src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp | |
| parent | e0a4c25a2276b998bc1514073bbe68d1eefb4345 (diff) | |
| parent | 210726453ff3ca0f16f036683e17097e1b62d458 (diff) | |
| download | Qt-8a2423cb7cbb4d84809ff62942549143602b7b21.zip Qt-8a2423cb7cbb4d84809ff62942549143602b7b21.tar.gz Qt-8a2423cb7cbb4d84809ff62942549143602b7b21.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:
Load modules from QMAKEPATH
fix windows configure compilation after lighthouse merge
Allow the user to select imageformats to be built as plugin vs internal
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions