summaryrefslogtreecommitdiffstats
path: root/src/network/kernel/kernel.pri
Commit message (Collapse)AuthorAgeFilesLines
* Fix for coreservices, it should be part of QPA testsAndy Shaw2012-01-171-1/+2
| | | | | | | | | Since the coreservices test should be part of the QPA ones after all, this reverts d317182e and fixes the original problem correctly by checking if qpa is on before testing for coreservices Change-Id: I476f56924ff2d9bbc2f290563aaff9528fe72766 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Compile fix in network for iosIan2011-06-201-1/+1
| | | | Reviewed-by: Jørgen Lind
* Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-251-0/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnectionchannel.cpp src/network/socket/qlocalsocket.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtTestu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * Use TCP_LOCALSOCKET on INTEGRITYRolland Dudemaine2011-02-221-0/+1
| | | | | | | | | | | | | | Use TCP localsockets on INTEGRITY, and other small INTEGRITY fixes Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-071-0/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
| * QNetworkProxyFactory::systemProxyForQuery() for SymbianJyrki Jaakkola2011-01-121-0/+2
| |
* | Added qnetworkproxy_symbian.cppMarkus Goetz2010-12-071-0/+1
| |
* | Copy qhostinfo_unix.cpp to qhostinfo_symbian.cppMarkus Goetz2010-12-071-1/+1
|/
* Merge commit 'qt/master'Jason Barron2009-08-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
| * Long live Qt!Lars Knoll2009-03-231-0/+30
|
* Long live Qt for S60!axis2009-04-241-0/+31