| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
This reverts commit bcbb66df3d517cfb0bac63b041f666ee9db0e42d.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It turns out that the fix 7bf4512659113f8cc78e72f1c84158ce4f70a526
caused the QCompleter popup from appearing for a split second on
Windows. This is because the popup is shown as a toplevel window
on this platform. On other platforms than Mac and Windows it doesn't
seem to matter, but be on the safe side, the fix is modified to
apply for Mac only.
Reviewed-by: Daniel Molkentin
Task-number: 255374
(cherry picked from commit 6e022c5c21a44a25b1579f03498ecaeba6da9024)
|
|
|
|
|
|
|
|
|
|
|
| |
On Mac, a new completer popup must initially have its show()
method called rather than its hide() method. Otherwise the event
handling done by the completer results in a bad state.
On other platforms it doesn't matter.
Reviewed-by: Richard Moe Gustavsen
Task-number: 255374
(cherry picked from commit 7bf4512659113f8cc78e72f1c84158ce4f70a526)
|
|
|
|
|
|
|
| |
Changed to QIODevice::isSequential()
Reviewed-by: TrustMe
(cherry picked from commit 6e4fbda4938ba17a398d15ec0697c8dbb9b9fc40)
|
|
|
|
|
| |
Reviewed-by: trustme
(cherry picked from commit dfe63cc0056a6592a4fb4e5c725c4ea0ed10ba20)
|
|
|
|
|
|
|
|
|
|
| |
search path
unlike moc and uic, lrelease is not statically built, so when building
without RPATH, we need to ensure that our libraries are found first.
Reviewed-by: mariusSO
(cherry picked from commit c185a351d7b72812b5f93163ee43edd73784522c)
|
|
|
|
|
| |
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit e4c224f0ef1b57a1389148b78d236349603503a5)
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit b3743d1df735d4b46f45e034818bbfe45bf8d22e)
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3
due to forward binary compatibility issues in a point release.
(cherry picked from commit b8430baeadd62b643ff07a2588c62141146c08fd)
Conflicts:
tests/auto/qsqldriver/tst_qsqldriver.cpp
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 1be9e07987388195b8c4ff7d0101cb3e32ee6acc)
|
|
|
|
|
| |
Reviewed-by: David Boddie
(cherry picked from commit d5c16071ac414e4dd40d8742403b675b2cdefa55)
|
|
|
|
| |
(cherry picked from commit 304bf2ef0a99882d2d969347f85a330523086fb3)
|
|
|
|
|
|
|
|
|
| |
Forwarding the ignoreOpacity flag to children in QGraphicsItemPrivate::fullUpdateHelper.
This is a complementary fix to task 252913, partly fixed in commit 2e3a5ea44...
Reviewed-by: bnilsen
BT: yes
(cherry picked from commit 8d1f218f6b11cff798bcd0b3123a2fe38c4a4142)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to subscribe to xfixes selection notify events on all
available screens.
Also implemented delayed subscription to xfixes events since we don't
really need clipboard change notifications unless the application
explicitely asked for by (i.e. created a qclipboard object).
Task-number: 255609
Reviewed-by: Bradley T. Hughes
(cherry picked from commit 8a745d2a1048ba922232530d36c2fd01d4c92159)
|
|
|
|
| |
(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)
|