feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
36,607 Commits 108 Branches 368 Tags
8a1bb5aeb3adf5962a8e1972091da138a729008a
Commit Graph

27 Commits

Author SHA1 Message Date
hjk
2982a763ac Variables: Use lambdas as callbacks to resolve variables 
Instead of broadcasting for each resolution we ask the code
that knows about a specific variable directly.

Change-Id: I2f0f4f2acceba85a236995d236980594a3166bd8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-06-24 15:25:56 +02:00
Tom Deblauwe
8845683197 Add CurrentProject:VcsTopLevelPath as a variable. 
Change-Id: I46ed1c0711cc9cc23f82628e8e9dcd82b1112fad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-26 15:24:03 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
 2014-05-16 16:54:50 +02:00
Tobias Hunger
6aeb1f99b2 VcsBase: Do not crash when no project is selected 
Task-number: QTCREATORBUG-12242
Change-Id: I96e4ea8a547d3a3a30883efbe41cd63ff624b4c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-14 14:05:17 +02:00
Tobias Hunger
dc61b989ac Project: Use Utils::FileName as return type for projectDirectory(...) 
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 11:48:10 +02:00
Tobias Hunger
3804de5023 Vcs: Add variables containing the Vcs name (Git, etc.) and topic 
This allows to have the git branch names (or tags, etc.) in the
build path or to pass that information to scripts.

Task-number: QTCREATORBUG-10376
Change-Id: I151990bdc7b85abbb427b2afae220adb4e918f4f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-27 11:16:30 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
hjk
a37589d431 Apply 'static' pattern to MimeDatabase 
Also adjust and streamline using and surrounding code.

Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-03 11:41:45 +02:00
Friedemann Kleint
959a75d65e Clean headers in vcsbase-plugin. 
Change-Id: Ibbfd5e0b07b2a06d17f4e3360511d7ad13b49f55
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-26 12:30:36 +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
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +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
hjk
de7f77e219 vcsbase: rename VCSBase into VcsBase 
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>
 2012-02-24 16:35:30 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
hjk
6681d3edee vcs: s/VCS/Vcs/ 
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-09 10:55:41 +01:00
hjk
2eadc22023 vcsbase: style 
Change-Id: I139d9d46605383f03215c80bd9e9fd965021b435
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-09 10:38:55 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Thorbjørn Lindeijer
f9051e6f87 Renamed VCSBaseSettingsPage to CommonSettingsPage 
To free up the name for an upcoming VCSBaseOptionsPage class that forms
the base for all version control option pages.

Reviewed-by: Friedemann Kleint
 2010-04-12 18:54:05 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
1e433cd50c VCS Refactoring: Add missing files. 2009-12-08 14:30:47 +01:00