summaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-18 09:46:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-18 09:46:27 (GMT)
commitb6d03bb2658c9926f2e8ad424e3014a5db0451ec (patch)
tree0eea339c7408437aadf551cdc684aebc8cb2d450 /translations
parent6dcdab8d9ee66f420a525400d873cfccf78c7003 (diff)
parente5c386c39065c640b938b33994af28a6589e4523 (diff)
downloadQt-b6d03bb2658c9926f2e8ad424e3014a5db0451ec.zip
Qt-b6d03bb2658c9926f2e8ad424e3014a5db0451ec.tar.gz
Qt-b6d03bb2658c9926f2e8ad424e3014a5db0451ec.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (46 commits) Build and run QElapsedTimer test. Fix license headers. Add flag to indicate that network sessions are expected on a platform. Don't fail unit test when there is no default network configuration. Make destructor virtual. Optimized QLocale to access system locale on demand. Remove unwanted code in f8d5f2594a9b268b9eeecf95b24b23fc940c71ce Compile fix on keypad-navigation systems Force qt-zlib to be used for host system when cross compiling. qmake: fix to create proper install target in Makefile at first run compile fix for Windows Fixed focus handling when Qt is embedded into Cocoa app. Do not beep on Mac when pressing some keys. Do not deliver the same key event multiple times in Cocoa. Implement Idle-priority threads for Linux. Improved qt_x11_wait_for_window_manager Doc: document QElapsedTimer Added missing "const" for mac. qdoc3: Fixed some ifdef typos and removed some whitespace. Manual test for QTBUG-8933. ...
Diffstat (limited to 'translations')
0 files changed, 0 insertions, 0 deletions