| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than
anything else. One of the side effects of this work was that it was
relatively little work to get QtGui compiling when Q_WS_S60 is not
defined.
Based on this we introduce two new configure options that control S60
integration. Currently the -no-s60 option will not work entirely
because the 's60main' module has not yet been refactored and still has
a dependancy on the S60 libraries.
Reviewed-by: axis <qt-info@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Widgets maintain an internal state (inDirtyList) which says whether
that widget is in the backing store's list of dirty widgets.
Naturally this list has to be kept in sync with the actual list
contents. This did not happen if the backing store was destroyed and
recreated; if the list had any contents it would be destroyed without
resetting the widget flags. Destroying and recreating the backing
store is common on S60 where we try to save memory.
Fixed by making sure those flags are reset during backing store
destruction.
Done together with Jason.
RevBy: Jason Barron
RevBy: bnilsen
AutoTest: Included
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task: 257214
The problem happened if a user called setFocus() on an input capable
widget, and then tried to open the input panel by sending an event.
Since the call to InputCapabilitiesChanged is asynchronous, Symbian
would not yet know about the updated state, and the event would be
lost.
Now we generate our own asynchronous event, and ensure that it is
synchronous in the cases where it's needed.
|
|
|
|
|
|
|
|
| |
Task: 257215
The capabilities would not be updated if the IM hints were the same.
We still try to avoid that when we can, but now we update the
capabilities if we really have to.
|
|
|
|
|
|
|
|
|
| |
Timers are constructed with CActive::EPriorityHigh if they are
non-zero timers. If zero timer CActive::EPriorityLow is used.
Task: 256620
Signed-off-by: axis <qt-info@nokia.com>
|
|
|
|
|
|
| |
The 'else' block is not the correct place to add the s60 subdir because
this will also build the plugin for other non-unix platforms which is
not correct. It should be built on symbian.
|
| |
|
|
|
|
| |
Do the same fix as with the OpenGL paint engine.
|
|\
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qkeysequence.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A different codepath was taken when QT_KEYPAD_NAVIGATION was defined,
despite keypad navigation itself being off. Now it should behave the
same in both cases. This helped the autotests to pass on Symbian.
AutoTest: Passed
RevBy: Trust me
|
| |
| |
| |
| |
| | |
It's probably not complete, and most of them were found by trial and
error, so feel free to fix any issues.
|
| |
| |
| |
| |
| |
| | |
This part of the code was not tested on Symbian so it's failure went
unnoticed. This should get it compiling on platforms that use the
OpenGL2 paint engine.
|
| |
| |
| |
| |
| | |
Don't want this enum value to have the same as another enum value
since that obviously doesn't work in a switch statement.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This was done in order to be more in line with what other platforms
(at least X11) do. In addition, it prevents show() from entering
event handlers in Qt. That should only happen in processEvents().
This required the introduction of a new event,
SymbianDeferredFocusChanged, which we post whenever there is a focus
change.
RevBy: Jason Barron
AutoTest: Passed
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| | |
A scope is not an else case unless it is explicitly preceded by the
'else' keyword. This was causing the 'symbian' block to be treated as
a separate block and therefore WinCE was hitting the 'else' case which
caused several subdirs to be added a second time.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/network/access/qhttpnetworkconnection_p.h
tests/auto/qstyle/qstyle.pro
tests/auto/qstyle/tst_qstyle.cpp
tools/configure/configureapp.cpp
configure.exe will be recompiled in next commit. Took ours.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Argh! It's divide by 256 not 265. The worst part was that I used the
same values in Cocoa as well, so they were both "damaged." It should be
good now.
Task-number: 257499
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 257247
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
OK. this is a bit strange. It seems the topdata->resizer value is used
to control whether or not we should show a resize handle based on a
count (0 no, non-zero yes). Since we somehow decided that this value
will never be larger than 15, we made it 4-bits wide. There's a "Qt/Mac"
API, QWidgetPrivate::qt_mac_update_sizer(QWidget *, int = 0) which
would adjust this value by the int passed in.. We use that in several places, not excluding
the QStatusBar where we would pass 1 if we want to show, and -1 if we
didn't. Now if you subtract -1 from zero when you are 4 bits wide, well,
bad things happen. Therefore protect that (since if it's at zero we have
succeeded, we don't want to show the resizer). This seems to work well.
The private API is certainly an interesting way of solving the problem,
but is easy to abuse (for example, this code will break if resizer = 1
and we are passed -2 in the function.
Task-number: 257485
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Seems this was a victim of our cursor fixing. Cocoa does a lot for us
with setting cursors. This meant that we didn't need to do as much
meddling and as a result qt_mac_set_cursor does nothing in Cocoa.
Unfortunately, this broke setOverrideCursor. Luckily Cocoa has a stack
that works exactly like Qt, so we can just use that.
Task-number: 257507
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Looks like this `&&' was meant to be `||'.
QNetworkProxy::FtpCachingProxy is 5 so it's clearly impossible for type
to be less than 0 and greater than QNetworkProxy::FtpCachingProxy.
Reviewed-by: Aaron Kennedy
|
| | |
| | |
| | |
| | |
| | |
| | | |
The comparison was mistakenly only uppercasing one side, so mixed case
table names were reporting back as if they weren't found for both
QSqlDatabase::record() and QSqlDatabase::primaryIndex()
|
| | |
| | |
| | |
| | |
| | | |
When the precisionpolicy is high, and the field is numeric, it was getting
confused as a string field and pulling the wrong length value.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Add unsupportedCompositionMode to the output.
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
After we implemented hitTest for QCocoaView, this function is no longer
used.
Reviewed-by: Norwegian Rock Cat
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Drag and drop events should consider the WA_TransparentForMouseEvents
attribute like the mouse events. If this attribute is set for a widget,
the event has to be passed to right widget under mouse. The widget is
identified by calling hitTest. In such cases the leave event has to be
delivered to the widget which actually accepted the enter event.
Task-number: 252088
Reviewed-by: Norwegian Rock Cat
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Cocoa calls hitTest on our view to determine if
the view should get the mouse press. We always
said, "yes" and did all the logic ourselves. Turns
out that we can say "no" if I'm transparent to
mouse events and remove all that code where we do
all the work ourselves. Big maintenance win!
For the time being I've kept the
"transparentViewForEvent" method since it might be
useful for others, but no one is using it at the
moment and we may just kill it soon. HitTest should
handle this situation correctly.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Tracking of mouse events was only enabled when enableMouseTracking or
Hover or a tooltip had been set explictly on the item, but this meant
that the dynamic QEvent::Tooltips would never get dispatched. So, in
order to help out people that might use this feature, all QCocoaViews
must pay the mouse move event tax *sigh*.
I added comments in the proper places so that we DO the right thing for
a release where we can force the change in behavior.
Task-number: 257320
Reviewed-by: Denis
|
| | |
| | |
| | |
| | |
| | |
| | | |
Reported via qt-bugs.
Reviewed-By: Peter Hartmann
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Tinyint only supports 0-255, so mark it as unsigned despite sign flag,
which have the time is inverted/wrong.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
This ifdef was simply in the wrong place.
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Also. Make sure to call QRasterPaintEngine::end()
Reviewed-by: Donald <qt-info@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move the code from QDirectFBPaintEnginePrivate::(end|begin) into
QDirectFBPaintEngine::(end|begin)
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
Clearifying details on a warning about a function call (setValue())
Task-number: qtp 4.5Workarea
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | | |
Correcting typos
Task-number: 257225
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is related to the following fix:
70137e0601549af1056082cdfbb4f141c70befab
Reviewed-by: trustme
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
- as was not the case for the psqlODBC driver
Reviewed-by: Bill King
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There was a bug in the Carbon code when an item went in full-screen,
than out with a unified toolbar. In those cases the toolbars would end
up getting but into the mainwindow area. The reason this was happening
was that we were calling transferChildren() after we had set up our
toolbar. This cause problems because we end up pulling the QToolbars
right out of the unified toolbar. The easiest way to solve this is to
just update the status on it again. This should solve any issues. I also
added some logic to avoid calling this too many times in that one case.
Luckily, this seems to only affect Carbon.
Task-number: 254462
Reviewed-by: Jens Bache-Wiig
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 256762
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 256818
Reviewed-by: Trenton Schulz
|
| | |
| | |
| | |
| | | |
Reviewed-by: mauricek
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The windowDidResize notification now differentiates an internally
triggered resize from a user triggered resize.
Task-number: 256269
Reviewed-by: Norwegian Rock Cat
|