Commit Graph

67 Commits

Author SHA1 Message Date
Knut Petter Svendsen
e3c6506ee6 ClearCase: Add some documentation
Change-Id: I6493fa638f10fd961852102913c46c828fa55ee5
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-21 12:59:41 +02:00
Knut Petter Svendsen
19243163d4 ClearCase: Show file name in file operations dialog title.
The file operations dialog did not show which file it operated on.

Change-Id: I90084585441a5e21918da1a1ebcb080456342746
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-21 10:42:59 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6'
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
2012-09-12 17:27:37 +02:00
Orgad Shaneh
80502c610f ClearCase: Fix Check-In for external files
Change-Id: Ic1edf63e7fe1667e7e3b59a610ba77bfe6308a2c
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-12 10:33:06 +02:00
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
Orgad Shaneh
05b7a06bce ClearCase: Fix threading issues
* Menu parameters were set (and enabled/disabled) from non-GUI thread
* Access to statusMap was not thread-safe

Change-Id: I029cb7090af87903c599bb3fcc1cba93e196d45e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-03 12:24:51 +02:00
Orgad Shaneh
e371008cd1 ClearCase: Rename activityMutex -> m_activityMutex
Change-Id: I6bf87d313e5466ad782ed06662d5fe0039a79491
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-03 12:22:45 +02:00
Oswald Buddenhagen
6529e874e4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/remotelinux/deploymentinfo.cpp

Change-Id: I92af9f9f558a76db78f838b0ccdfb8ad3d47af25
2012-08-28 15:13:32 +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
Friedemann Kleint
cb87ce786b Translation fixes in the ClearCase plugin.
- Add translator's comments.
- Capitalize Dialog titles.
- Replace Qt Designer's generated rich text (hardcoded font)
  by simple HTML.
- Remove exclamation marks (do not shout at users).

Change-Id: I01623a336dfd7bdf24f7d5c0d3a2ed48454d8205
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-27 14:25:24 +02:00
Orgad Shaneh
c5745c6e78 ClearCase: Optimize lookup for top level
...when opening files in the same dynamic view

Change-Id: I2713eb613b8077a86aaddf0a2a0eee52959800ac
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-27 14:24:31 +02:00
Orgad Shaneh
03ddd0e540 ClearCase: Trust lsactivity ordering for rebase/deliver activities
lsactivity outputs activities sorted by creation time. Latest rebase/deliver
will be last in this output, so no need to compare it to previous values.

Also place rebase and deliver activities last in the activities list.

Change-Id: I4c90d4210751101a5f53b6d85ff3d0e86bb28d08
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-27 14:23:12 +02:00
Orgad Shaneh
120b932db8 ClearCase: Unlock mutex after locking it
Change-Id: I63fe4afd8b40284ac6f93b746928e5320c8d3244
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-21 15:27:25 +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
f777930a30 ClearCase: Avoid running cleartool if it is not available
Also change isConfigured to use a plain QFileInfo like other VCS

Change-Id: I253d9a7d356a042dbc6c15236d77799b794f29d4
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-21 15:25:36 +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