Eike Ziller
887456e38a
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/madde/maemoglobal.cpp
src/plugins/madde/maemoinstalltosysrootstep.cpp
src/plugins/madde/maemopublisherfremantlefree.cpp
src/plugins/madde/qt4maemodeployconfiguration.cpp
src/plugins/qt4projectmanager/librarydetailscontroller.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qtsupport/baseqtversion.cpp
src/plugins/remotelinux/abstractremotelinuxdeployservice.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17
2012-09-04 18:04:16 +02:00
Orgad Shaneh
856b7f15ab
ClearCase: Support systems without external diff
...
CC's internal diff is worthless, just disable multiple files actions
Change-Id: Ia8541e6edc6582777fc141da849819a5a11543b6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com >
2012-09-03 13:17:58 +02:00
Christian Kandeler
e669f05406
Utils: Introduce HostOsInfo class.
...
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.
Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com >
2012-08-27 17:00:03 +02:00
Orgad Shaneh
69268b2aab
ClearCase: Allow use of base name for executable
...
Change-Id: I329aaafd4dee10321c7342925262aadf539d0270
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-08-21 15:26:42 +02:00
Orgad Shaneh
647071d84b
Introduce ClearCase plugin
...
Change-Id: Ib2cebaff0f035f48ca958cad16dedfdd80f4bff9
Reviewed-by: hjk <qthjk@ovi.com >
2012-08-18 19:42:57 +02:00
