feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,532 Commits 108 Branches 368 Tags
cc05c1637778db8210ea901b8da71aeef1bde05e
Commit Graph

121 Commits

Author SHA1 Message Date
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
 2013-03-12 10:56:52 +01:00
Joerg Bornemann
7f4eabc24f qbs files: remove superfluous version specifications from imports 
Change-Id: I5f439e850cbfbb0a1a4802e2dd063687a75afc68
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-03-11 10:41:23 +01:00
Eike Ziller
e0ba5d955c Version bump 
Change-Id: I97f84d16a092348332c18ad6ce34acc96d9a540f
 2013-03-07 14:22:20 +01:00
Eike Ziller
c938b7ddf0 Version bump. 
Change-Id: Ic3a6cf5d4ddb16034e7ba86c95870feee0713b6a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-06 15:47:53 +01:00
Christian Kandeler
5cd2c63f75 Fix qbs build. 
Commit 7bf21ea94f changed "import" to
"Import" in qtcreator.qbs for some reason.

Change-Id: Ica2425ffa0331be51a0847ef4d3b3b2736fc323f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 14:19:19 +01:00
Orgad Shaneh
7bf21ea94f Add qbs submodule 
Change-Id: I24952ea89519cf37c021d79f480c1ae907789161
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:48:56 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
 2013-02-28 12:02:40 +01:00
Christian Kandeler
030186965f Adapt qbs files to new module property access syntax. 
Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-21 10:32:27 +01:00
jkobus
0e91d10878 Experimental integration of DiffEditor 
After enabling the plugin go to Tools|Diff...

Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-18 18:15:51 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
 2013-02-18 14:16:53 +01:00
Christian Kandeler
a9754611f6 Add Core as dependency for the qtcreator executable in the qbs build. 
Rationale: "qbs run -p qtcreator" will otherwise fail on a clean
build dir, because Creator cannot run without the Core plugin.

Change-Id: I87c16847189fc09bcc4903e865b99b6ba472f1f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-02-14 15:53:33 +01:00
Kai Koehne
5be5542756 Version bump. 
Change-Id: I8d00f000c618d1d781ca93efb3dd2fac60ab3507
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-02-11 12:04:00 +01:00
Christian Kandeler
f0c797256e Fix compilation with qbs on non-Linux, non-Mac Unix-like systems. 
Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-02-08 17:26:40 +01:00
Kai Koehne
1329b92ae9 Version bump 
Change-Id: I86e238f87756e66fec1b8f3355ce289c55aa4f22
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-07 11:43:05 +01:00
Sergey Shambir
04b9d7614e Added PythonEditor plugin 
Contains lexical highlighter, indenter and file wizard.
Icon loaded from theme, if possible.
Class wizard will be added later since it needs to extend libUtils.

Change-Id: If723867c01e9be83371424e406d116805c88c2b0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-07 10:17:09 +01:00
Kai Koehne
2dfc3ce2e1 Bump Qt Creator version 
Change-Id: If7972209cb9346217af43f9c1faa667bf644a54a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-05 14:23:57 +01:00
Tobias Hunger
5ed1f71529 Initial version of qbs plugin 
Change-Id: I0e0ae07affccfeab167303bb976475649a630e65
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-02-01 13:03:36 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach. 
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-01-24 13:02:32 +01:00
Orgad Shaneh
1011a486f4 qbs files: Remove src/share/share.qbs 
Merged into share/share.qbs

Change-Id: Ia60124a851d234c69e5bc1a57a9e390863327f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-11-12 11:01:31 +01:00
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
 2012-10-25 10:45:58 +02:00
Joerg Bornemann
f542911896 qtcreator.qbp renamed to qtcreator.qbs 
The .qbp file extension is deprecated.

Change-Id: I8729b7a4a35ffe0359d9eb81354dbe8b7fcfce6d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-24 15:03:05 +02:00