| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: David Boddie
(cherry picked from commit a60259b676743f078178185a6c587381bd957d3c)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit bc0ad71e4d197c594e86cb2a1c27b5008a40f3b4)
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 858c70f768eeb2d65cefd4115f4e9089b588b2d0)
Conflicts:
tests/auto/moc/os9-newlines.h
tests/auto/moc/win-newlines.h
|
|
|
|
| |
This reverts commit e75ef82bc4570c0a6da3da26a1dda5d6e065f23b.
|
|
|
|
|
|
|
|
|
|
|
| |
so "qmake -r && make" worked fine ... but configure does not simply run
"qmake -r".
also, now we have to build lrelease even when we don't build the other
tools.
Reviewed-by: Jason McDonald
Reviewed-by: mariusSO
(cherry picked from commit 98899a4122565090640672d9aae2c37315f186ce)
|
|
|
|
|
|
|
| |
Reviewed-by: TrustMe
Task-number: 254260
Testcase: 323072@p4
(cherry picked from commit 941a03814a5f8f7be93425f71ee65a4222d16899)
|
|
|
|
| |
(cherry picked from commit e6652650fe1de6421b48fab076c5e80c0deddbd8)
|
|
|
|
| |
(cherry picked from commit 8de2e639825d1351f794f50e2cccd846aba7b8d2)
|
|
|
|
| |
(cherry picked from commit f1e471b561012f90938766c00aefff417593e71f)
|
|
|
|
| |
(cherry picked from commit 3e663dcad5e9fbfd2a5466d464747a1a87f036b3)
|
|
|
|
| |
(cherry picked from commit 78b44fdb2b505833a9b60fcd63e1fe8c8a59d9ed)
|
|
|
|
| |
(cherry picked from commit 4cc2d62669b1638d34b6588bd3b164fb17138596)
|
|
|
|
| |
(cherry picked from commit a9472cb582fe155dd21f7bd3189afb64d5b08ab8)
|
|
|
|
| |
(cherry picked from commit 70be10968c8f547b464b3150ba582766e679ec7d)
|
|
|
|
| |
(cherry picked from commit 517ebf6f06db90a46d62c397d8e4c940cd7ac62b)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 8411fe233021f8609250b7cf47353e3128521406)
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31)
|
|
|
|
|
|
|
| |
Task-number: 254451
Reviewed-by: eskil
BT: yes
(cherry picked from commit e08f3e7bf3dbae6036ab89248793b98330971269)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a form is loaded, Designer will set the path to the resource as
an absolute path rather than the path actually stored in the file. There
is code to work around this to make file paths relative when saving the
file later on, but no work around for Qt Jambi. So when saving Qt Jambi
forms, you would get an absolute path to the resource which contains the
location of the resource file (.jar or on disk) This of course breaks
the concept of resources, as the .jui file was no longer portable. The
fix is to special case Qt Jambi resources and set the relative path
when loading them.
The patch has no effect on regular Designer.
Task-number: 254621
Reviewed-by: Kai Koehne
(cherry picked from commit 8ed5931925b4e8ed8f098b5c36e1378f95d7d25a)
|
|
|
|
|
|
|
|
|
|
| |
Additionally we turn -ltcg on by default on Windows CE.
See commit 56191830 for details.
Reviewed-by: mauricek
BT: yes
(cherry picked from commit b2a1e5938e1abf45d70cbfa7ec1ab0c21c01911d)
|
|
|
|
|
|
|
| |
Correcting invalid padding values. none is not a valid padding value.
Rev-by: David Boddie
(cherry picked from commit 8a2ca9b0d8ed23cec44e40f61c0f4983fbc55282)
|
|
|
|
|
| |
Task-number: 249222
(cherry picked from commit b57d3f8169c6f1a1aab7203d79043a5f691b7e3e)
|
|
|
|
|
| |
Task-number: 251486
(cherry picked from commit 1a477dcad1171d2d195422072fce62fc936e56cb)
|
|
|
|
|
|
|
| |
Please do not pull this change into other branches. These headers are
only valid for release branches.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
In Java, "null" is represented as a keyword, not as the integer 0. The
old code assumed the latter. Code such as
translate("fooBar", "fooBar", null);
would thus not be detected by lupdate when parsing Java files.
Reviewed-by: ossi
|
|
|
|
|
|
|
|
| |
immensely increase readability"
This was pushed accidentially.
This reverts commit ffecdf0bf9f25f7ab9aa4f69e37507dd595fecea.
|
|\ |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Restore 4.4 behaviour by using a QStackedLayout as the layout containing
the actual form (as was in 4.4). The difference in behaviour was caused
by insertion of an additional widget with a QVBoxLayout which is supposed
to ease setting of inheritable properties (style, etc).
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: 253236
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDesignerFormWindowCursor::setProperty.
Ensure the text does not get clobbered by the subproperty handling.
Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Task-number: 253278
|
| |
| |
| |
| |
| |
| | |
foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network
Reviewed-by: Samuel
|
|/
|
|
|
|
|
|
|
| |
increase readability
Unfortunately the patch causes quite some regressions and I think some refectoring of this class
would be needed.
I didn't do that since there is no API docs, the variable naming is not very clarifying and the
code is hard to read due to it not using the coding style and mixing tabs as well as spaces.
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Turning on LTCG affected too many projects, where customers applications
would take a long time linking, severly affecting their development time
(even though it was only added for release builds)
We turn it off by default, and add a -ltcg configuration option, and the
possibility to also do CONFIG+=ltcg in projects, should they not want it
for Qt, but in their own projects. (Same, they can build Qt with it, and
do CONFIG-=ltcg for their project)
Reviewed-by: andy
|
|/
|
|
|
|
|
|
|
| |
Task-number: 163220
Added to FormWindowBase. Required among other
things for Qt Creator code completion for
uic-generated-headers.
Acked-by: dt <qtc-committer@nokia.com>
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Also mentioned an important point: If you subclass QUiLoader and
reimplement either createAction(), createActionGroup(), createLayout(),
or createWidget() -- you must call the original implementation first,
within your implementation.
Reviewed-by: João Abecasis <joao@abecasis.name>
|
| |
|
|
|
|
|
|
|
| |
Don't say we produce output when no options are passed if we don't.
Task-number: 222778
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: nrc
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
No need to be excessively clever here.
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: David Boddie
|
|
|
|
|
| |
Task-number: 249001, 236473
Reviewed-by: kh
|