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
Mehdi Fekari
a4455f3711
Qnx: Do not override IP user input value
...
Change-Id: I3a697cf1392e1ce13310e2af1c3e7d7af1fdf79d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-23 14:53:21 +01:00
Mehdi Fekari
8f4da818c8
Qnx: Set default device host IP for physical device
...
Change-Id: I54fa8af84df8853c32adde1b94bc6096930e29ba
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com >
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com >
2013-01-21 07:47:14 +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
hjk
b906360a34
madde/qnx/remotelinux: adjust after profile changes
...
More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places. Simplify remote linux runconfiguration
Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com >
2012-07-26 12:50:06 +02:00
Tobias Nätterlund
a7ac2bb559
New QNX plugin.
...
This plugin adds support for cross-compiling, deploying, running
and debugging on a PlayBook or QNX Neutrino device.
Change-Id: I0da7ccee40bd7ce4c0d6bdc6884d48ef23167dac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-07-13 15:37:34 +02:00
