diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 11:18:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-09 11:18:32 (GMT) |
| commit | 7ce5c2b88b5523e97deb4f95d236e37666f4818e (patch) | |
| tree | 2a3ebf862df326231f7d4b10302785ead82ff1cb /util/unicode/unicode.pro | |
| parent | b18ed8179f7289f700e7e8c280b3f68fefc7097d (diff) | |
| parent | 49bcf035d428d9d8bd2c4d546fc935e9d4ca0a2a (diff) | |
| download | Qt-7ce5c2b88b5523e97deb4f95d236e37666f4818e.zip Qt-7ce5c2b88b5523e97deb4f95d236e37666f4818e.tar.gz Qt-7ce5c2b88b5523e97deb4f95d236e37666f4818e.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: (80 commits)
doc: Fixed several qdoc errors.
Carbon: Native filedialog does not apply filters on app-bundles
Cocoa: Native filedialog does not apply filters on app-bundles
Improve performance of QTimer::singleShot
Add a benchmark comparing single shot timer with invokeMethod
use Qt's private mac functions, reduce code redundancy
Assistant: Fix compile warning for empty header.
Doc: mark QEasingCurve support functions as new in 4.7.
Modify the XML test suite not to use non-characters.
Autotest: Fix failing QTextCodec tests
Doc: mark methods as internal (as they were in previous releases)
Doc: add image for Qt Quick to "What's New" page.
qdoc: Clear a static multimap after each qdocconf file.
qdoc: Added some debug output to track down a crash
Fixed mouse wheel handling in scrollareas.
Added two missing keys for X11
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
Fix build
JPEG plugin: Use switch() instead of if()
...
Diffstat (limited to 'util/unicode/unicode.pro')
| -rw-r--r-- | util/unicode/unicode.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/unicode/unicode.pro b/util/unicode/unicode.pro index a53f70a..0250c2a 100644 --- a/util/unicode/unicode.pro +++ b/util/unicode/unicode.pro @@ -1,2 +1,3 @@ SOURCES += main.cpp QT = core +CONFIG += console |