| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
(cherry picked from commit d2b1c2d1c9cf5375d7e1cb7e1b08420eb00bada8)
|
|
|
|
|
|
|
| |
documentation.
Reviewed-by: TrustMe
(cherry picked from commit 82a32d2e0fb603d5ebe4e0958ff68501b1f1b75b)
|
|
|
|
|
|
|
|
|
|
| |
consequently, remove the qm files from the repository
this uses some really black magic to convince qmake to do the right
thing. this will be fixed properly in a later version.
Reviewed-by: mariusSO
(cherry picked from commit 5717e44d47bf5f6be59a59844223ce71b094b08e)
|
|
|
|
|
|
|
|
|
|
| |
use relative path for include (like every other subtree does), otherwise
$$fromfile() does not find the file, thus the template is unknown and
thus the generic "first" target is used instead of "debug", which tries a
generic build against non-existing release libs - boom.
Reviewed-by: TrustMe
(cherry picked from commit dfb61e59f0a1c2113cc01c99c3fd052efa2b6c8e)
|
|
|
|
|
|
|
| |
Reviewed-by: TrustMe
Task-number: 254260
Testcase: 323072@p4
(cherry picked from commit 941a03814a5f8f7be93425f71ee65a4222d16899)
|
|
|
|
| |
(cherry picked from commit e6652650fe1de6421b48fab076c5e80c0deddbd8)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 5c7042862c74dd3a5666bb266eaed922407e9711)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Basically we need to revert more of Oliviers change. The reason
is that we just cannot run the demo on mac without timer based
updates (as opposed to graphics view itself tries to figure out
when to update). The reason is that the demo uses QItemAnimations
extensivelly, which again uses QTimelines, wich again uses
separate timers. And on mac, because of coalesced updated, each
item animation will result in an individual redrawing of the scene.
Task-number: 255751
Reviewed-by: Olivier
(cherry picked from commit 7886888d3e873500dd1ea7d3f450f7d7f87c0ea6)
|
|
|
|
|
|
|
|
| |
The QT_BUILD_TREE variable only works in the source or build dir, but fails
in the demo which *install* the sources that should be buildable too.
Reviewed-by: Marius Storm-Olsen
(cherry picked from commit c0becf8cb47312ec14a2b28e2a76a1d87a8e183e)
|
|
|
|
|
| |
qt3support.
(cherry picked from commit b2b0ac2f9abf58456e2dad2340c77c6004464a34)
|
|
|
|
|
|
|
|
|
| |
Change 259b65c2f5d736dd7f6d81b6390f54464dd5f183
prevents the animation from running on Windows. This is a partial
revert that still preserves most of the performance fixes.
Reviewed-by: ogoffart
(cherry picked from commit 31f52b2354f5bb5044592ad93cb4e9f7a9d43ae6)
|
|
|
|
|
| |
the line edit was deleted when we press enter
(cherry picked from commit f4548a337bbc348065e8341df9445bf0fc7bc241)
|
|
|
|
| |
(cherry picked from commit c93f69f95a8c0a4eb3cd390c11266057b77c78b5)
|
|
|
|
|
|
| |
after installing
(cherry picked from commit c87d03e01a01fa84c7a14e9b330219f2a80f8ffa)
|
|
|
|
| |
(cherry picked from commit 8de2e639825d1351f794f50e2cccd846aba7b8d2)
|
|
|
|
|
| |
Allow more variance for the benchlibtickcounter selftest.
(cherry picked from commit bbc0850742f4f926876dc55478ff74aaa121846b)
|
|
|
|
|
|
| |
"QTableWidget::setModel() - Changing the model of the QTableWidget is
not allowed."
(cherry picked from commit ebbfbe432671d899fb08ac8775e6e36d86f1c010)
|
|
|
|
| |
(cherry picked from commit d6d586d4b05f416d89fcaf59c863245f1cb7d9ae)
|
|
|
|
| |
(cherry picked from commit b9c4f8fec2a009003029dd95b20d0342271c0473)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit 76bcfd8fcd61164cec8abd04c0056e5aedb6c10b)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 6a2202b544e3d7809312f74b0cf0b2b392bd78b7)
|
|
|
|
| |
(cherry picked from commit ec110c41175daae436d49b1e2369f80587ba5b65)
|
|
|
|
| |
(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)
|
|
|
|
|
|
|
| |
otherwise PeekNamedPipe() may block in threaded environments.
Reviewed-by: thiago
(cherry picked from commit 4948f4b188c6aa40e628d74d6d6fce747ee535bd)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 8411fe233021f8609250b7cf47353e3128521406)
|
|
|
|
| |
(cherry picked from commit f2b307342a0effed58436dd199a0d80c5e651755)
|
|
|
|
| |
(cherry picked from commit dabeec5e1d3f43b54a58b2f8667ac552a7c24685)
|
|
|
|
|
|
|
|
|
|
|
| |
We didn't actually check the depth of the target window before
calling the qt_x11_drawImage() fu, that will only work with
depths >= 24.
Task-number: 255311
Reviewed-by: Samuel
BT: yes
(cherry picked from commit d29da4699a2887cdf0836ff39652524d015431c0)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit b59d84fe67caedeb8c11d2530ddee2017a376920)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit 4515b690829a639283a9b660893ff3f0f7ff598b)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit f6fc34ea5b247d1b56e113663958176b095a58a6)
|
|
|
|
| |
(cherry picked from commit 2734d8fa8c26c8498091348305b2616ecacfad85)
|
|
|
|
| |
(cherry picked from commit 5455f9c7a3ec8ed591666a2f4384c10de31f6a60)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
events."
This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e.
As reported by Eike, this patch caused several problems for Qt Creator.
Potentially it may cause problems for other (external) applications as well.
An alternative fix (scheduled for 4.5.x) needs to be found for tasks
254456 and 254460.
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit a45ba34ead80d7e19e62eff571d094c9417fd876)
|
|
|
|
|
|
|
|
|
|
|
|
| |
There were several problems with antialiased text in 16 bit mode
under Windows. No gamma correction was done, yet we prepared the
cached glyphs for gamma correction. The mask format we rendered
the glyphs into was also set to the desktop depth, which implied
that information was lost and the text looked rather odd.
Reviewed-by: Samuel
BT: yes
(cherry picked from commit 35bdd8942716c716113e5b795186ca76199e8d96)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit 799a9ddf0a53ecdd6e097b2efd7418fd6ab9b655)
|
|
|
|
|
|
|
|
|
|
|
| |
Some of the tests (including the httpsServer one) requested that the
server close the connection (Connection: close). It could happen that,
well, the server did close the connection and we noticed it while doing
the waitForBytesWritten in the doSocketFlush function. Then we'd create
an error in the next step because the socket wasn't connected.
Reviewed-by: TrustMe
(cherry picked from commit 95ceabf52d79b922a87f7c023c9606e633ab1ea2)
|
|
|
|
|
| |
Reviewed-By: TrustMe
(cherry picked from commit 6fff92a31c4acd270d0ecb4cda336ba098801ffb)
|
|
|
|
| |
(cherry picked from commit cdb0222129a139dfe1b7e4fb4b401556989901b4)
|
|
|
|
|
|
|
| |
We need to set alpha to the right value when copying pixmaps.
Reviewed-by: Donald <qt-info@nokia.com>
(cherry picked from commit f7338759ef86deba18b27ee72b3afcf40f3a5aaf)
|
|
|
|
| |
(cherry picked from commit 398c022e8adefc6e71a6048da40c19f6169be831)
|
|
|
|
| |
(cherry picked from commit 5ad68ce1cb5e80fa14e549f087e957030ef4baf0)
|
|
|
|
|
|
|
| |
We were saying that it connected to accepted it all these cases, but it
actually is doing some nice magic that makes sense assuming you document
it.
(cherry picked from commit df5c557e7777c8844ac866d730346178ad33a0a6)
|
|
|
|
|
|
|
|
|
| |
No progress bars on the mac show text and it would be bad if we allowed
it. There's nothing stopping people from connecting the valueChanged()
signal to a slot and have a real label layed out correctly that actually
updates with the amount of time it takes to complete, etc. This is more
what they do on Mac OS X if they decide to show a label.
(cherry picked from commit c755c1d3c6fe60a9018308e1ce13bae6821bc214)
|