| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: 259136
Reviewed-by: kh
|
|
|
|
|
| |
Task-number: 251278
Reviewed-by: kh
|
|
|
|
| |
Reviewed-by: kh
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/tools/qsharedpointer.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/dialogs/qcolordialog.cpp
src/gui/painting/qwindowsurface_raster.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qsharedpointer/externaltests.cpp
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| | |
|
| |
| |
| |
| |
| |
| | |
Reading a help project was unacceptably slow with pattern matching.
Now we do it only for filenames that contain wildcard symbols.
Also, we cache the results of QDir::entryList() calls.
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| |
| |
| |
| |
| |
| |
| |
| | |
The AdpReader checked for a version attribute == 3.2.0.
This has been replaced by a check for >= 3.2.0
Task-number: 258551
Reviewed-by: kh
|
| |
| |
| |
| |
| |
| |
| | |
Moved common parts of QHelpSearchIndexReader{Default,Clucene} into
a new common base class QHelpSearchIndexReader.
Reviewed-by: kh
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need this to support the behavior in Gtk+ where, when
Qt::ToolButtonTextBesideIcon is used, only text labels
for important actions are shown. It will also enable us to
prioritize actions in the future when for instance collapsing
a toolbar.
Task-number: 258290
Reviewed-by: thierry
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
KDE and GNOME has the concept of a default tool button style that
can be set system-wide. Qt currently allways default to IconOnly.
I have added an optional Qt::ToolButtonSystemDefault value so you
can opt-in to respect the system setting. We did not change the
default because a lot of apps will look odd when for instance
text is beside icons and the descriptive text is too long.
Task-number: 237864
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| | |
On Windows, the FileDescription part of the version information is used
as a caption for the grouped taskbar button.
Task-number: 253065
Reviewed-by: Prasanth Ullattil
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| |
| |
| |
| |
| | |
Task-number: 257441
Reviewed-by: kh
|
| |
| |
| |
| |
| |
| | |
The qhelpgenerator auto test was also updated to test the new feature.
Reviewed-by: kh
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Noticed while looking into task 256903, since in case there are no
recent shown pages,we would start Assistant only showning the search.
Task-number: 256903
Reviewed-by: kh
|
| |
| |
| |
| | |
Reviewed-by: kh <qtc-committer@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 758
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| |
| |
| |
| |
| | |
Merge-request: 689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: kh
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/linguist/shared/cpp.cpp
translations/linguist_ja.qm
translations/qt_ru.qm
|
| |
| |
| |
| |
| | |
Task-number: 255888
Reviewed-by: kh
|
| |
| |
| |
| |
| | |
Task-number: 255875
Reviewed-by: kh
|
| |
| |
| |
| | |
Reviewed-by: kh
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
in atomic operations, we declare Interlock... functions in the namespace
That can confuse the compiler because they are also declared in another
header outside the namespace.
Same problem in clucene where we include windows.h from within the NS.
Task-number: 254214
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Thomas Sondergaard (2):
Danish translations
Updated danish translations. Added them to relevant project files.
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: kh
|