| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/opengl/samplebuffers/glwidget.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer.cpp
src/gui/gui.pro
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
RevBy: Trust me
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
tests/auto/qfontdialog/tst_qfontdialog.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
tests/auto/qsqldriver/qsqldriver.pro
tests/auto/qsqlquery/qsqlquery.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qstatemachine/tst_qstatemachine.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/global/qglobal.h
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/itemviews/qheaderview.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qgesture.h
src/gui/kernel/qgesturerecognizer.h
src/gui/painting/qpaintengine_raster.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/access/qnetworkcookie.h
src/network/socket/qnativesocketengine_unix.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
info about network interfaces and network routes.
Can be of broader interest.
"By seeking and blundering we learn."
Johann Wolfgang Von Goethe (1749 - 1832)
|
| | |
| | |
| | |
| | |
| | |
| | | |
"Many attempts to communicate are nullified by saying too much."
Robert Greenleaf(1904-1990)
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
config.tests/unix/openssl/openssl.pri
demos/embedded/embedded.pro
examples/itemviews/chart/chart.pro
examples/network/network.pro
examples/painting/painterpaths/painterpaths.pro
examples/threads/mandelbrot/mandelbrot.pro
qmake/project.cpp
src/3rdparty/libtiff/libtiff/tif_config.h
src/corelib/arch/arch.pri
src/corelib/global/qglobal.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcore_unix_p.h
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/corelib/tools/qsharedpointer_impl.h
src/corelib/tools/tools.pri
src/gui/kernel/qaction.h
src/gui/kernel/qapplication.cpp
src/gui/painting/qregion.h
src/gui/widgets/qlineedit.cpp
src/gui/widgets/qlineedit_p.h
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/qdir/tst_qdir.cpp
tests/auto/qdiriterator/tst_qdiriterator.cpp
tests/auto/qhttp/qhttp.pro
tests/auto/qline/qline.pro
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qsharedpointer/qsharedpointer.pro
tests/auto/qstring/qstring.pro
tests/auto/qtcpsocket/qtcpsocket.pro
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
|
| |
| |
| |
| | |
Reviewed-by: Harald Fernengel
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
and then, if needed activate IAP dialog.
|
| |
| |
| |
| |
| |
| |
| |
| | |
has been moved to separate header.
This should make the code shareable among other examples.
The location of the header is not perfect. Unfortunately, there
is no shared include area for Qt examples.
The proper way woud be to have proper API that manages IAP.
|
| |
| |
| |
| |
| |
| | |
It is important to close the RConnection before calling setdefaultif.
This because setdefaultif triesd to open the connection, and if it is
already open it may fail.
|
| |
| |
| |
| | |
The writings were wrong after i.e. ftp -> connect -> disconnect.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
First we ask if there is already active IAP. If yes, we
will use that one, if not IAP dialog will pop-up.
This strategy should save us from some dialogs when
accessing the network.
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | | |
This should remove multiple IAP queries when using FTP example.
The used IAP is now asked from user when application is started.
|
|/ / |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using a OK/Cancel message box is weird for a yes/no question, esp. on a
Windows CE device where such a message box doesn't have real push
buttons but must be OK'ed / cancelled via system buttons in the title
bar.
Task-number: 255112
Reviewed-by: thartman
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| |
| |
| |
| |
| |
| |
| | |
The example was installed in the wrong directory.
Task-number: 254452
Reviewed-by: Kim
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| |
| |
| |
| | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |
|
|
|