| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: mauricek
(cherry picked from commit 3569a2c930ee171e4f1e05d0407cee7c971c721d)
|
|
|
|
|
|
|
| |
Changed the signature of QT_OPEN to be the same on all platforms.
Reviewed-by: thartman
(cherry picked from commit c9aa65bf79fdd09ad5d6405ba1d127888e26fd26)
|
|
|
|
|
|
|
|
| |
Add the new translations for the string added by
500e71ab649a5053667ff3f9dc7d87730b565756
Update some translations
(cherry picked from commit fb2652f6fb3b0a79daef346a85e50ed0e8e0c2cf)
|
|
|
|
| |
(cherry picked from commit 500e71ab649a5053667ff3f9dc7d87730b565756)
|
|
|
|
| |
(cherry picked from commit ea80fc7a97c39deeca6bb51d8441d755af1e0591)
|
|
|
|
|
|
|
|
|
| |
QCustomScopedPointer was moved to a private header since it's only a
helper class. QScopedSharedPointer wasn't necessary since it can be
replaced with QSharedDataPointer neatly.
Reviewed-by: Jesper Thomschütz
(cherry picked from commit 95db13345cd7b6b7cac8725fe2879aaf80233818)
|
|
|
|
| |
(cherry picked from commit 1a36403e3c21a60f81cd0244b84f21223b4216e9)
|
|
|
|
|
|
| |
Reviewed-By: Espen Riskedal
Task-Number: QTBUG-4748
(cherry picked from commit 3a492b3bcd3898335dd36b46906a5b9cce5120f3)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
DEF files containing the frozen DLL exports are in use for Symbian OS
builds, except developer builds (configured with -developer-build)
The reason for this exception is that developer builds export additional
private interfaces to allow autotests to inject or monitor the internal
data of a class.
These autotest exports are not part of the API or the binary interface,
so they are excluded from DEF files.
Task-number: QTBUG-4436
Reviewed-by: Jason Barron
(cherry picked from commit 7b997d150c35ece3164d7e2b08701c962e6af1ed)
|
|
|
|
|
|
| |
Reviewed-By: Espen Riskedal
Task-Number: QTBUG-4748
(cherry picked from commit 9113737e9011b3cc9d69196650fcc11a7253408e)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| | |
Conflicts:
dist/changes-4.6.0
|
| | |
|
|/
|
|
|
|
| |
Cleanup descriptions + reformat to 80 columns.
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
| |
Explaining the difference between hover events and enter/leave/move events
Task-number: QT-1116
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
| |
Q3MainWindow and Q3TitleBar depend on it.
Reviewed-By: dt
Reviewed-By: Alessandro Portale
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Workaround: fntstore.h has an inlined function
'COpenFont* CBitmapFont::OpenFont()' that returns a private data member.
The header will change between minor SDK versions, thus break BC. But
Qt has to build on any SDK version and run on other versions of Symbian
OS. Also Qt does not want to deliver that BC to Qt based apps.
This hack performs the needed pointer arithmetic to get the right
COpenFont* pointer, no matter if the 'Flexible Memory Model' is already
supported or not.
The author is not proud of this commit.
Task-number: QT-2250
Reviewed-by: Iain
Reviewed-by: Shane Kearns
modified: src/gui/text/qfontdatabase_s60.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QS60Style::setStyleProperty() and QS60Style::styleProperty() were
intended as generic property setter/getters, but are not needed
anymore.
Reviewed-by: Sami Merila
modified: src/gui/styles/qs60style.cpp
modified: src/gui/styles/qs60style.h
modified: src/gui/styles/qs60style_p.h
modified: src/gui/styles/qs60style_s60.cpp
modified: src/gui/styles/qs60style_simulated.cpp
modified: src/s60installs/eabi/QtGuiu.def
|
|
|
|
|
|
|
| |
Changelog update contains all major changes in QtWebkit, QtScript and
brief information about the state machine framework.
Reviewed-by: Simon Hausmann
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: TrustMe
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/corelib/tools/qscopedpointer.h
|
| |
| |
| |
| |
| |
| | |
as in the other tool windows.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTCREATORBUG-239
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The API is internal, so it should live in its private header. The class
was introduced during the lifetime of 4.6 (not in 4.5), so the move is
binary compatible.
Task-number: QTBUG-5617
Reviewed-by: João Abecasis <joao@abecasis.name>
|
| |
| |
| |
| | |
And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-5333
Reviewed-by: ck
|
| |
| |
| |
| | |
Reviewed-by: ck
|
| |
| |
| |
| |
| |
| | |
1. Filter combo box now gets updated on remote setCurrentFilter.
2. Argument to remote setCurrentFilter now gets checked. If there is
no such filter, we reject it.
|
| |
| |
| |
| |
| |
| | |
this makes sense if one uses lupdate only for validation purposes, i.e.
to find out if the code uses only ids which are defined in some external
specification.
|
| |
| |
| |
| |
| | |
when comparing two messages which both have ids, compare only the ids.
this affects finding/reporting duplicates and merging.
|
| |
| |
| |
| | |
preparation work ...
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
in a ts file, the top level categorization are the contexts, so it makes
no sense to make messages adjoint by file when the context is different.
a more clever algorithm which tries to order the entire contexts is
conceivable. that would be advantageous for files which use multiple
contexts subsequentially if each context appears in only one file.
|
| |
| |
| |
| | |
replace the one use case with something more efficient
|
| | |
|
| |
| |
| |
| | |
consistent with all other source parsers
|
| |
| |
| |
| |
| |
| |
| |
| | |
two messages with identical singular but different plural sources simply
make no sense.
this should be quite a bit faster, as it saves lots of QHash<QString,...>
lookups.
|
| |
| |
| |
| | |
it was once needed for QMap, but we don't use that any more
|
| |
| |
| |
| | |
... with gotos :)
|
| | |
|
| | |
|