summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase
Commit message (Collapse)AuthorAgeFilesLines
* qtcassert: move actual printing to separate function and enforce stylehjk2012-04-174-12/+12
| | | | | | | This also allows simple setting of breakpoints on failed asserts. Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-04-042-2/+3
|\
| * New File Dialog: Choose right default project for addingDaniel Teske2012-04-032-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | So far we used a heuristic that prefers .pro files in the same directory as the new files. That fails if there are multiple .pro files in the same directory. So instead introduce a mechanism to pass extra data through the wizard. Task-number: QTCREATORBUG-7157 Change-Id: I615f7292e16a0a6cb1e84f090016879f1038409f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Fix wrong cursor in vcs log editorAurélien Gâteau2012-03-151-4/+4
| | | | | | | | | | | | | | | | When cursor leaves a change, reset its shape and remove underline on the change. Change-Id: Idedafefc57338a32fdaa773fc4a41c0f0527a5b8 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Fix another build issue.Erik Verbruggen2012-03-151-0/+1
| | | | | | | | | | Change-Id: Ie9e9f707bb2e89f40064415289aa44770c028ae7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Fix build breakage after making plugins dependent on cpptools.Erik Verbruggen2012-03-152-1/+2
| | | | | | | | | | Change-Id: Iae2c15efe25580fb616bdc3dd4b8ff3581cd481a Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Move the ModelManagerInterface out of the CPlusPlus library.Erik Verbruggen2012-03-142-2/+2
| | | | | | | | | | Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-142-2/+6
|\ \ | |/ | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: Ic24b756b41d2a13f3d696dee69553d2c3241ab95
| * VCS: Handle missing checkout jobsTobias Hunger2012-03-132-2/+6
| | | | | | | | | | | | | | | | Handle missing checkout jobs in the checkout wizard. Task-number: QTCREATORBUG-7082 Change-Id: I8c271ebba1edabb94b5795b2756d316324175151 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-085-12/+43
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/remotelinux/startgdbserverdialog.cpp Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
| * Ui: No spaces before "..."Daniel Teske2012-03-071-2/+2
| | | | | | | | | | Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
| * VCS: Fix indentionTobias Hunger2012-03-061-1/+1
| | | | | | | | | | Change-Id: Ie1d042325f2b1423f9b01ccc1df3c83ba92e0734 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| * VCS: Disable revision bar on annotate/log outputTobias Hunger2012-03-061-0/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-5313 Change-Id: I3dee69028e782c6f87ea1ef8b251d944bcf9be6d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| * VCS: Make dark color schemes work with annotation highlighterTobias Hunger2012-03-064-8/+37
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-6257 Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| * Normalized connect()sRobert Loehning2012-03-061-1/+1
| | | | | | | | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+1
|/ | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-4/+1
| | | | | | | | | * Removed utils, extensionsystem and aggregation dependencies for plugins that depend on Core * Capitalized Find and CPlusPlus Change-Id: I505e5f46976f26da47ad778860f103b173668b1c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* vcsbase: rename VCSBase into VcsBasehjk2012-02-247-7/+7
| | | | | | | | Note that this changes the name of the plugin .so. you might have to remove your old one manually. Change-Id: Icb6c4ff5455aad40182dfcd00a64d80c424c11b7 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+96
| | | | | Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-2011-28/+28
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-1545-184/+184
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make IFile::isReadOnly consistent.Eike Ziller2012-02-146-142/+2
| | | | | | | | | | | It is supposed to refer to the property of the file on disk (if there is any). Task-number: QTCREATORBUG-4998 Change-Id: Iaed62c17d124b364aecec4d1f910046bade42d40 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Wizards: add option to show an image for descriptionThomas Hartmann2012-02-102-0/+7
| | | | | | | | IWizard::descriptionImage() can return the path to an image. An empty string is interpreted as no image available. Change-Id: Ia2012eecbfdeb9bec123ed666fff2d73d79e05ce Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: changes the structure of WizardsThomas Hartmann2012-02-082-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | This patch introduces platforms as a top level topic when choosing a wizard. Also I changed the categories and priorities. Details: 1. I did change the way the dialog/view is structured in newdialog.cpp 2. I added platformName() and supportsPlatform() to BaseQtVersion. I needed two functions because the Simulator does not provide a platform and therefore has no platformName but supports two platforms. I still have to turn the platform names into proper constants. 3. I changed the categories and priorities to get the layout that was discussed. (I had to touch quite alot of files but this is mostly trivial) 4. I added a combobox that allows filtering for platforms. 5. I added flags() to IWizard to indicate that a wizard is platform independent. Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Git: Show deleted files in diff file comboboxTobias Hunger2012-02-031-2/+2
| | | | | | | Task-number: QTCREATORBUG-6886 Change-Id: I99e076d9881bead58cbcb9c66f3e5ab1d1187b6f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Git: Speed up diff/show outputTobias Hunger2012-02-032-8/+12
| | | | | | | | | * Avoid calling git --version repeatedly * Use VcsManager to find toplevel directory which does caching. Task-number: QTCREATORBUG-6906 Change-Id: Ib9ba94751bbecac686a0e116baeded9b2f6f3d90 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* VCS: Never try to run empty binariesTobias Hunger2012-02-031-3/+16
| | | | | | | | Never try to run empty binaries. Task-number: QTCREATORBUG-6849 Change-Id: I591fdb9d39394fc8097908f5934a1a96518859cb Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
* Version control: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2012-01-316-8/+9
| | | | | Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Long live the king!hjk2012-01-2652-52/+52
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* ProjectExplorer: make currentProject statichjk2012-01-242-14/+11
| | | | | | | | This saves one function call compared to the instance()->currentProject() pattern and is typically less to type on the caller site. Change-Id: I65568f30205fc90e2aaca7e8e7f0192241df8c85 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-248-31/+24
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* VCS: Fix warning about hiding a virtual methodTobias Hunger2012-01-202-2/+2
| | | | | Change-Id: I8f314486a50f9b7015572615d2306d5c7e2f1670 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* VcsBase: URL and email support in log editorsHugues Delorme2012-01-202-87/+405
| | | | | | | | | | | | URL and email addresses are recognized in log and annotate editors so the user can interact with as it is usually done with VCS change identifiers. The design of "text cursor handlers" opens the path for further support of other contents like bug id of the form "QTCREATORBUG-XXXX". Change-Id: I88f553cf8ac90678ace52144ba0b43604279a234 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Wizards: allows filtering of wizards based on Qt versionThomas Hartmann2012-01-182-0/+7
| | | | | | | | | | | | | Every wizard now implements requiredFeatures() to define a feature set. If the feature set is not satisfied by the available Qt Versions, the wizard is not shown in the create file/project dialog. Every Qt version can define the provided feature set in availableFeatures() defined in BaseQtVersion. Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Replace Q_ASSERTs with QTC_ASSERTsTobias Hunger2012-01-131-1/+3
| | | | | | | or even with QTC_CHECKs. Change-Id: I6df67f088bb2f944f0a1abd751fdb192db2be298 Reviewed-by: hjk <qthjk@ovi.com>
* core: use Core::Id for IVersionControl::id()hjk2012-01-111-1/+1
| | | | | Change-Id: I54e17c91c3e2a69d598ed485235dbf7ec62b4615 Reviewed-by: hjk <qthjk@ovi.com>
* vcs: s/VCS/Vcs/hjk2012-01-0963-837/+837
| | | | | | | | According to style guide. Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* vcsbase: stylehjk2012-01-0938-241/+216
| | | | | Change-Id: I139d9d46605383f03215c80bd9e9fd965021b435 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove useless virtual keywordsTobias Hunger2011-12-141-8/+8
| | | | | Change-Id: I8a83d5209baf36bad69277535723d41038ca69b7 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* VCSBase: fine-tune auto-completion in commit messageHugues Delorme2011-12-131-62/+19
| | | | | | | | | | Changes: - Completion prefix threshold is 4 chars - Min length for any word to be added to completion model is 7 chars - Only suggest namespace, class, function and file names Change-Id: I24a5f4557718c9ce392e1a61ce584dfe6a60e080 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix building of vcsbase on windows.Bill King2011-12-082-3/+4
| | | | | Change-Id: Iae5f31e0f86c3b27f23d5a453710e1d8e867a558 Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
* VCS: auto-completion in the description text editHugues Delorme2011-12-083-2/+135
| | | | | | | | | | In the description field of the commit editor, class VCSBaseSubmitEditor provides completion of file names and C++ entities (based on QtCreator's internal C++ code model). Change-Id: Ie5323714dbf6f6e635953dfbb35596201d86fc37 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
* Use internal namespace in VCSBase more consistentlyTobias Hunger2011-12-0830-145/+178
| | | | | Change-Id: I61de9796aaeb9484b44029c5f1d46e69834a04c3 Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
* compile fix with namespaceshjk2011-11-243-37/+18
| | | | | Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23 Reviewed-by: hjk <qthjk@ovi.com>
* UI files: Do not polute the global Ui namespaceTobias Hunger2011-11-2413-32/+74
| | | | | | | Make sure all ui-files are in the plugin's internal namespace. Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13 Reviewed-by: hjk <qthjk@ovi.com>
* projectmanager: re-organize New Project categorieshjk2011-11-182-5/+3
| | | | | Change-Id: Ie549f9843db985018af380eb6105e136f21989f7 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-181-2/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri share/qtcreator/templates/qtquickapp/main.cpp src/plugins/analyzerbase/analyzermanager.cpp src/plugins/qmlprofiler/qmlprofilertool.cpp Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
| * VCS: Fix Apply/Revert for last line of chunkOrgad Shaneh2011-11-141-2/+1
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-6487 Change-Id: Id225856e267a4c8ac6dc15d5573175e7f0ce777f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creatorEike Ziller2011-11-111-0/+5
|\ \
View Lorry Controller Status