| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Details: Checking for QRect::isNull() was wrong in the first place, and
checking for isEmpty()/isNull() is overhead after
4a491a84aeba68279927597a261522dcc23bb3ff.
(cherry picked from commit e9fa8ba1ad0b0b2d3363fb33635071677f42b983)
|
|
|
|
|
|
|
|
|
| |
Details: Those cut-offs are extremely important. After few seconds
interaction with the iphone demo, updateRect() was called
approx. 3000 times with an empty rect. Then imagine what
happens when having e.g. FullViewportUpdate. We do
q->viewport()->update() JUST FOR FUN!
(cherry picked from commit be6be8c73929f2ddee9a02f59db05c3ba453a63e)
|
|
|
|
|
|
|
|
|
| |
Task: -
RevBy: Andreas
AutoTest: -
Details: Accumulate the parentToItem transform as we iterate instead of
creating it from bottom-up each time.
(cherry picked from commit e27743bdeda7aa3cb42f2d81a521121f8ee04eae)
|
|
|
|
|
|
|
|
|
|
|
| |
When QString::replace was optimized, this specific overload missed out
on sanity checking of the arguments.
Task-number: 249517
Reviewed-by: Joao
Reviewed-by: hjk
BT: yes
(cherry picked from commit afb3848e0abe0cd2355e7ee7319fd904288e4636)
|
|
|
|
|
| |
Reviewed-by: hjk <qtc-committer@nokia.com>
(cherry picked from commit a59488d4799f6ac9ea034c0a88a468e73a64d517)
|
|
|
|
|
|
|
|
|
|
| |
same value -> crash on SetTitle()
Task: 242484
RevBy: mauricek
AutoTest:
Details: Since we do not respect binary compatibility on Windows CE we just change the enum
(cherry picked from commit c1c30037292711f0fb05677e77ed2eb2112eca78)
|
|
|
|
| |
(cherry picked from commit 3568aeef72bec8333650eb2200b12eba8fac1b71)
|
|
|
|
|
|
|
| |
Error was introduced in change 52f87de53328c661049acf09d5fedc1850aa9bfa.
Reviewed-by: Trust Me
(cherry picked from commit e3462ae7868c679bc88dc01de85ca39454651ff7)
|
|
|
|
|
| |
Reviewed-by: ogoffart
(cherry picked from commit a94b601866740e483f093233f59f43b022a68735)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 94a9f77b41c2d924983e92df30e3e4cc7882cb75)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem here is that we are filling the sceneEventFilters map
when we install evenfilter but we never remove the references of an
item if it has been removed from the scene or deleted. The deletion can
keep stale pointers into the map and a crash can happen.
BT:yes
Task-number:250272
Reviewed-by: bnilsen
Reviewed-by: andreas
(cherry picked from commit 0bb526f8fab33a42df56c8a60c272e2cca4cc792)
|
|
|
|
|
|
|
|
| |
The previous version would get confused because the embedded package
also contains _x11 files.
Reviewed-by: Thiago
(cherry picked from commit 28d2b22a940174b4e64f6fa2f5548a7832fc07e8)
|
|
|
|
|
|
|
| |
contributors.
Reviewed-by: Trust me
(cherry picked from commit 5dda84c32b38051ca64c3641ffaaa807e2406285)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QGLPixelBuffer::generateDynamicTexture() will bind the texture to the
pbuffer regardless. Why this works on Carbon is a mystery, but if we're
to follow our own docs, we should NOT bind the texture to the pbuffer
by default. An explicit call to ::bindToDynamicTexture() is required for
that.
Task-number: 250664
Reviewed-by: Samuel
BT: yes
(cherry picked from commit e8877160e332d12958cf700a8a607c36e6c426e1)
|
|
|
|
|
| |
BT: yes
(cherry picked from commit 36f4460b3d6cc18e737edd7d4b18e4b2636e6ff9)
|
|
|
|
|
|
|
|
|
|
|
|
| |
This regression probably happened because of the fix to task 244485
(see 8d500381), which made QFile follow a rename. This means that
QTemporaryFile removes its target when it is deleted.
This fixes a number of caching autotests that are failing.
Reviewed-by: Markus Goetz
BT: yes
(cherry picked from commit 99ed68cda10355dba5c7a3e2466ee45b59dbb555)
|
|
|
|
|
| |
slower platforms (like WinCE) need some more time to actually update.
(cherry picked from commit 9a41b437be6014c7a671591e2741c5ca7d8c8be8)
|
|
|
|
|
|
|
|
| |
Reviewed-by: Thomas Hartmann
need to check for valid menuBar, otherwise dereferencing will
horribly fail.
(cherry picked from commit f0ceef57b178d4ed71e61a6ce2681f3d401d69fe)
|
|
|
|
|
| |
add additional file to deployment.
(cherry picked from commit e2fa120510584327b7e46ff2a4413aa659a5bd65)
|
|
|
|
|
|
|
|
| |
Discovered in Kopete trunk
BT: yes
Reviewed-by: Thierry
(cherry picked from commit 91aeceb7132f4afae0996443a162a5783d8f17aa)
|
|
|
|
| |
(cherry picked from commit e1a9014cc92091e8371f9a888ff94c694f562df0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
with Cocoa support on Mac.
The Cocoa API doesn't have a concept of Z-ordering of widgets, and it's
implemented by reordering the widget hierarchy for normal widgets. This
does unfortunately not work for GL widgets, and it's not supported by
Apple. This apparently work with the Carbon AGL API though.
Task-number: 244890
Reviewed-by: Gunnar Sletta
BT: yes
(cherry picked from commit eb87a7003153b190d8b635563868717b58ce2faf)
|
|
|
|
|
|
|
|
| |
Setting properties on an invalid printer is not supported. Use isValid() to check if it valid.
Rev-by: Trond Kjernåsen
Rev-by: Geir Vattekar
(cherry picked from commit 4db6f873386e7b21e23efb4a5ca31eb09f3dd94e)
|
|
|
|
|
|
|
|
|
| |
The pen width should not be scaled for cosmetic pens.
Task-number: 247083
Reviewed-by: Trond
BT: yes
(cherry picked from commit c28cb85841fb5be154c2460efdc82dde012407b9)
|
|
|
|
| |
(cherry picked from commit afc51dc4cf5254f6cfb552bc09dd443a8fe0762b)
|
|
|
|
| |
(cherry picked from commit 52f87de53328c661049acf09d5fedc1850aa9bfa)
|
|
|
|
| |
(cherry picked from commit d5a99cff5235ff72f68f57ab0772274d332b118b)
|
|
|
|
|
|
|
| |
This was causing compile warnings.
Reviewed-by: nrc
(cherry picked from commit 69414e5afeb87df2f7a371962f092c2d277aaf6f)
|
|
|
|
|
| |
Reviewed-by: nrc
(cherry picked from commit 91e4f13001a2969ea6311171fb5e7ec0164a3165)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 02f4f244f585868dc1cca208f0caa6f02d734d65)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit d4f23b414c337654d65ba54937e40d46b8510c0a)
|
|
|
|
|
|
|
| |
RevBy: Mauricek
Details: functions needs to be declared outside of the namespace
(cherry picked from commit b273cd322345c54d5cbd6f178791d1ccfcc08e05)
|
|
|
|
|
|
|
|
| |
This improves the look of combo box with gtk style which is somewhat a
regression from 4.5.0 since we did not style this part before.
Reviewed-by: nrc
(cherry picked from commit f2edb497ac2c3ff6f8c004046e216b8bdf7c4347)
|
|
|
|
| |
(cherry picked from commit 27c1edac6769f863549f0940d35cf3f82e778a46)
|
|
|
|
| |
(cherry picked from commit a08d7a675a4e7f61b80a8a92114cda6f8dbacd96)
|
|
|
|
| |
This reverts commit 0d29f576e6a64b61f56b3087fd72b2d21ca65f7f.
|
|
|
|
| |
This reverts commit dcfef78f9a8be49b71512d47e3bbe076c2beb4c8.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that Vim or Xcode or whatever I was using to paste these
in messed up and added an extra space. Now we should be consistent with
the .cpp files and I found a file that we missed too.
(cherry picked from commit be3b8acbd311b9cbeaa7c87b4f34b2e33b4a7fa3)
Conflicts:
src/gui/kernel/qcocoaapplication_mac.mm
src/gui/kernel/qcocoaapplicationdelegate_mac.mm
src/gui/kernel/qcocoamenuloader_mac.mm
src/gui/kernel/qcocoawindow_mac.mm
src/gui/kernel/qcocoawindowdelegate_mac.mm
src/gui/widgets/qcocoamenu_mac.mm
src/gui/widgets/qmaccocoaviewcontainer_mac.mm
src/gui/widgets/qmacnativewidget_mac.mm
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Zero timers on Windows would continue to fire even after being stopped
as long as a new timer was started that reused the pointer address of
the zero timer. Fix this by only re-firing zero timers if the zero
timer hadn't been stopped (we can check this by looking at the
inTimerEvent flag, which is set to false by registerTimer()).
Task-number: 247401
Reviewed-by: Denis Dzyubenko
Reviewed-by: Prasanth Ullattil
(cherry picked from commit 74f092408d1a870e2c1e2a49182c8e09f952055d)
|
|
|
|
|
|
|
|
|
| |
It seems there is a potential for recursion because calling keyDown:
can bubble up to the window which will start the process all over again.
keyDown: will actually call qt_dispatchKeyEvent(), we may as well short
it out here. All the previous cases I tried continue to work and we
don't crash Creator if you are really impatient hitting keys.
(cherry picked from commit c131208e59f5b2dd517b00c4539458760b8fd8aa)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The CustomProxy class installs an event filter on its child to detect
whether it is shadowed by a popup or not. The problem is it does this
regardless of whether it currently has a scene assigned or not. Styles
that assign palettes, or otherwise cause side effects when assigned
to a QGraphicsProxyWidget, will cause the demo to print warnings to the
console and fail to install the event filter. The reason for the failure
to install the filter is that QGraphicsItem only allows scene event
filters to be installed between items that are in the same scene.
So, depending on the style, you either get an ItemSceneHasChanged or an
ItemChildAddedChange first. The demo must account for this, and install
its filter only when the items are guaranteed to be in the scene already.
Reviewed-by: Alexis
(cherry picked from commit 510ce6fa8a3a30063744eaaf004850679610060e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 35c26d696cbff269d551c012a212c09692dd6f6b.
The change to QComboBox introduces a behavior change; whereas before
the view container would always get its palette set as a response
to QEvent::PaletteChange, it would now miss this event and rely on
regular palette propagation to get the right contens. The difference
in behavior is that QWidget::setPalette() also resolves the palette
mask, and after 35c26d69 this would no longer happen.
The bug in the embedded dialogs demo is caused by the embedded
dialogs demo. See upcoming commit.
Reviewed-by: Alexis
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
(cherry picked from commit 3f3d09cf1511dde99797671a7bc848cdabc8d7fa)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit df461a4a1bc7492729f701d38c81916b1be386b0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 7d24c0af8e52687b4e5735950495bb25947ca9f0.
This change removed the accidental recursion leading to console
warnings on Mac OS X by changing the way the scene event filter
is registered for popups. But it also broke the behavior of the
demo with regards to popup handling, in that the custom proxy
no longer can detect popups that close, so dialogs stay zoomed
in after the cursor has left. So before, the demo worked but
printed warnings to the console on Mac OS X, and after, the warnings
were gone but the demo behavior broke on all platforms...
The change also accidentally removed the cache mode from the popup;
I don't think this was intentional.
Reviewed-by: Alexis
(cherry picked from commit ccaf16278f4fd422458d01b80579952846e6cf38)
|
|
|
|
|
|
| |
Reviewed-by: mauricek
BT: yes
(cherry picked from commit f0239a4983dd84b0e23c1e6f796c5c44dfde26b2)
|
|
|
|
|
|
|
|
| |
A Nokia build doesn't require a license.
Reviewed-by: mauricek
BT: yes
(cherry picked from commit 7332065a28577444e7c97617fb03d0f14c706b5b)
|
|
|
|
|
|
| |
This change was performed by a script that was written by the
previous release manager and reviewed by me. Thus
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
We had to revert an earlier fix since it obviously did
not work correctly. However since we do not really need to propagate the
palette on the viewContainer _before_ it is created, we can simply avoid
the issue alltogether as it would happen because we implicitly added
a child widget during the polish of the combo box.
Reviewed-by: nrc
(cherry picked from commit 35c26d696cbff269d551c012a212c09692dd6f6b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Gah, my original change (f5ef0eb1a6543abdd29e07c23de7fa1128f6d623) had
its heart in the right place, but it seems that it can cause crashes
on closing where we refuse to give up the first responder and we end up
with a dangling pointer. This lets that case happen (when we have no
focus widget and are setting a nil first responder, there's no reason to
stop that, but it refuses to do that when we do have a focus widget.
Hopefully we don't get in a situation where our focus widget gets out of
sync.
Reviewed-by: Prasanth Ullattil
(cherry picked from commit 773c4d326c24f8db12ab58e379bd223ce1126d72)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symptom: checkboxes didn't get checked if you press, hold for some
seconds and then release the mouse or stylus.
In QAbstractButton we reacted on the contextMenuEvent that gets sent if
the system recognizes the context menu gesture (tap and hold) and did
call setDown(false).
This change has been done because buttons in tool bars stayed in the
down state when displaying the context menu with this gesture.
I've now moved the handling of this to qtoolbar.cpp.
Task-number: 246619
Reviewed-by: thartman
(cherry picked from commit de007bd2a20a141aefe901408512c806879a2387)
|