| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added discussion on connecting signals that have default arg values.
Stack overflow when closing a Color panel in Cocoa.
|
| | |\ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Update Polish translations
Assistant: Add documentation for -remove-search-index.
Designer: Handle "visible"-properties of item view headers correctly.
Fix .gitignore to not ignore qdoc.pro
Update polish translations
Fix broken delete key, some cleanup.
Assistant: Fix race condition in index creation.
Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: David Boddie
|
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
Task-number: QTBUG-6898
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | |\ \ \
| | | |/ / |
|
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | |_|/
| |/| |
| | | |
| | | | |
Task-number: QTBUG-3913
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 1627
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|\ \ \ \
| |/ / / |
|
| | |/
| |/|
| | |
| | |
| | | |
Task-number: QTBUG-6574
Reviewed-by: Trust Me
|
|\ \ \
| |/ / |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/getting-started/known-issues.qdoc
src/script/qscriptextqobject.cpp
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Refer to new bug tracker and remove known issue for VS Integration (as
it has been replaced by the VS Add-in).
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added the perl requirement for building from source on Windows and
clarified that the support for OpenGL ES Common Lite 1.0 is being
dropped and not for OpenGL ES Common Lite as a whole.
Reviewed-by: Martin Smith
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/global/qglobal.h
src/gui/dialogs/qfiledialog_win.cpp
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |\ \ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
4.6-staging2
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6211
Reviewed-by: TrustMe
|
| | |/ / / |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | | |
|
| |\ \ \ \
| | |/ / / |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-6175
Reviewed-by: TrustMe
|
| |\ \ \ \ \
| | |/ / / / |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QtScript _is_ JavaScript, there's no need to use a custom extension.
Most of the other examples were already using .js, but there were
two files that still had the .qs extension.
Agreed with Simon.
Reviewed-by: TrustMe
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The transformations QImage->QPixmap are killing the performance of the
tablet example. This is noticeable because of the number of events sent
by the tablet (painting MUST be fast in tabletEvent()).
Reviewed-by: David Boddie
|
|\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | |\ \
| | | | |
| | | | |
| | | | | |
4.6-staging2
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Trust me
|
| | |\ \ \
| | | |/ /
| | |/| | |
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-staging2
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Gareth Stockwell
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
WebKit will not build unless the mentioned variable is set.
RevBy: Aleksandar Sasha Babic
|
| |\ \ \ \ \
| | |/ / / / |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
into 4.6
|