Commit Graph

14 Commits

Author SHA1 Message Date
Aurindam Jana
7a090b3dd5 TcpPortsGatherer: Refactor code
Use QAbstractSocket::NetworkLayerProtocol enums.
Minor changes in API and internal functionality.

Change-Id: Idd786c71e3474b1010cc5f2d72dc09126bfd2e29
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-03-21 12:30:25 +01:00
Friedemann Kleint
aebf19eabd Clean headers in Utils.
Forward-declare QGraphicsOpacityEffect in DetailsButton,
QProcessEnvironment in Environment, QFileInfo in fileutils,
QUrl in IWelcomePage, FancyLineEdit in PathChooser and
remove unneeded headers.

Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-19 17:19:26 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Orgad Shaneh
55948453cd Utils: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Id600156bb3cef3aeea5d8b4d6bf879e77d755710
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-07 13:46:11 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Kai Koehne
21f8e18eb5 TcpPortsGatherer: Fix compilation with latest MinGW-32
Latest MinGW uses gcc 4.7.1 , but still hasn't the structures defined.

Change-Id: I90c4c0a10d38488c7f3347830391489032a98328
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-09-26 15:54:47 +02:00
Yuchen Deng
b7e57da761 Fix compilation of MinGW-w64
Change-Id: I059dacd10a585e35b34c8e190f6a5e2a9de2f1d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-17 17:50:21 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Friedemann Kleint
232af02fab tcpportsgatherer.cpp: Fix compilation with MinGW/gcc 4.7.1.
Change-Id: If8e49e5ce4a454c03f40f325e2d17d8dd2685430
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-25 14:00:09 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-17 09:53:44 +02:00
Friedemann Kleint
bec17d4b67 TcpPortsGatherer: Fix compilation with MinGW/4.6.
Change-Id: I28666ac73688e937dfe87996b723311a95464ba6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-03-12 16:46:40 +01:00
Andreas Holzammer
97c8781f40 Dynamical get function GetTcp6Table
Windows XP does not support IPV6; if we
directly link against Iphlpapi.lib, Creator
fails to load. To bypass this issue, lookup
IPV6 function dynamically.

Change-Id: Idd49b977b924458cc8cd6fbe646f5c05e853060b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-12 10:50:24 +01:00
Kai Koehne
af205ab25d Add TcpPortsGatherer to utils
Can be used to check (non-intrusively) which TCP ports are still available.

Change-Id: I61300f6b7215cb2c0e4a3e6135de305cfd38b5a9
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 18:37:39 +01:00