| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
BTW: somthing shoud be done with layout to make
app usable on small screen devices.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1. Check if there is active connection to use.
2. Look in QSettings for previously used IAP names.
3. Offer native Symbian dialog to select IAP.
Note: Best results are achived if IAP have been already
created using proper means on their devices. Then correct
IAP name string will be returned from selection dialog.
|
| |
| |
| |
| | |
Might be usefull for later.
|
| |
| |
| |
| |
| |
| | |
The access point will not be saved, it didn't exist previously.
Good news is that access point will be saved on 3.2 and newer,
even without prefs.
|
| |
| |
| |
| |
| |
| |
| | |
create & save IAP entry.
Before, we would create temporary one
and we would have to for example enter
again and again WLAN pre-shared key.
|
| |
| |
| |
| | |
after each RConnection::Attac(...) call.
|
| | |
|
| |
| |
| |
| |
| | |
We dont need to link agains 'connmon' library any more.
With this we depend only on Symbina and not S60 (Avkon).
|
| |\ |
|
| | | |
|
| | | |
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
.gitignore
configure.exe
src/corelib/concurrent/qtconcurrentthreadengine.h
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qwidget.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
tests/auto/network-settings.h
tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
tests/auto/qvariant/tst_qvariant.cpp
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Andreas Aardal Hanssen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commercial license headers belong in source packages only. The repo
must have the pre-release license headers.
Reviewed-by: Trust Me
|
| |\ \ \ |
|
| | | | | |
|
| |/ / /
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
We don't want to pull in too much if we can avoid it.
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qapplication_x11.cpp
|
| | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
examples
Reviewed-By: TrustMe
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-By: TrustMe
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some touch devices don't recycle touch id's, so for longer sequences we could easily see
ids that become larger than the color list size. Make sure we constrain the index we use.
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/qnamespace.qdoc
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicsscene.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: 255114
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
added a new example to show how to enable touch for an existing widget (QDial in this case), and that
the mouse event emulation of QWidget does the Right Thing (tm)
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene_p.h
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | |\ \ \
| | | |/ / |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Local includes should use the double-quote form of #include rather than
the angle-bracket form.
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Tor Arne
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
the API for these 2 classes is identical, the implementation is almost
identical, they share the same data structures, so bite the bullet and
merge them.
this means we go back to using screenPos() instead of globalPos()
again
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
rects instead
these are more useful, as already shown in the fingerpaint example
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene_p.h
|
| |\ \ \ \ \ |
|
| | | | | | | |
|
| |\ \ \ \ \ \ |
|