feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,337 Commits 108 Branches 368 Tags
a1e3a5de9ee9b2d4b068ff3568aea8594d1aea65
Commit Graph

561 Commits

Author SHA1 Message Date
Orgad Shaneh
a1e3a5de9e Git: Refactor branch/HEAD access 
Change-Id: I0c9955737033c0f839ac1f6ea053fecc20c24d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-22 12:38:43 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia 
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:10:50 +02:00
Friedemann Kleint
0f27043fe6 Add a timeout to the gerrit query process. 
Task-number: QTCREATORBUG-7977
Change-Id: I35c3e6f916a690595a6fc03ad3a995b361c76f54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-08 15:55:15 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02: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
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin 
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-05 10:18:56 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
 2012-10-04 12:23:39 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files 
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-03 09:26:34 +02:00
Leena Miettinen
174226e21e UI text: write Git in upper case 
Change-Id: I012af35287b0ee478eb99c95c54ba438f8e4e6d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-10-01 14:31:30 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
Orgad Shaneh
69e022d112 Git: Fix binary lookup with path setting 
Task-number: QTCREATORBUG-7889

Change-Id: I251ef68e8dbb0a70565708053e368db89d5999e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-09-27 12:09:13 +02:00
Tobias Hunger
ac6c11ec19 Git: Simplify code a bit 
Change-Id: Iac245c92039f522cc0a599461572f9fd54cf43ae
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2012-09-27 11:50:03 +02:00
Tobias Hunger
9e9dd99310 Remove useless headers 
Change-Id: Iee4a6f549f8a7c028f52a1e6113b33034ef621e2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-09-26 15:44:41 +02:00
Christian Kandeler
89fa7823b3 Replace all remaining functions deprecated in Qt 5, if possible. 
These are:
    - QInputDialog::getInteger() [-> getInt()]
    - QKeySequence::operator QString() [-> toString()]
    - QRegion::intersect() [-> intersected()]
    - qVariantCanConvert() [-> QVariant::canConvert()]

Plus some left-over occurrences of qFindChild() and
QAbstractItemModel::reset() that were missed by the
respective earlier patches.

All deprecated features still left are not trivially
replaceable, i.e. the code using them cannot be made
to compile with both Qt 4 and Qt 5.

Change-Id: I32541681bbf66b0fef78f5c7025521f9ff84f463
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-25 11:01:04 +02:00
Christian Kandeler
aef4280bc1 Do not use QWeakPointer to track QObjects. 
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-09-25 10:45:36 +02:00
Christian Kandeler
1b3d637c1b Replace qVariantValue() with qvariant_cast(). 
qVariantvalue() is deprecated in Qt 5. qvariant_cast() does
the same thing and works in Qt 4 and Qt 5.

Change-Id: I922329d3a47fe394669f5d97a25f0825d3d2dea5
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-20 09:41:37 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
Daniel Teske
ff6e9333ad Make IOutputPane behaviour more granular 
The commit looks big, but it's mostly trivial. Also any build/run
related popups are now "flashes" if the current mode has no placeholder.

Task-number: QTCREATORBUG-7875
Change-Id: I3af40557f7af01798f905c0d1829423c80058cb6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-13 17:37:02 +02:00
Christian Kandeler
3c6f76d16c HostOsInfo: Add some more useful abstractions. 
Namely:
- path list separator
- executable suffix
- file name case sensitivity

All of these are duplicated in various places in the current Creator
code.

Change-Id: I86eb4662fa3c2071759bd728cae1aaf7111ae686
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-09-05 13:54:48 +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
hjk
903eeaf42f fancylineedit: enforce conscious choice between history or special completer 
Change-Id: Ia667895b619d0bb37561dce348adb7269df2fb9c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-24 13:37:59 +02:00
Orgad Shaneh
7ffc4349f8 VCS: Allow use of base name for executable 
Actual path is found on startup and when setting is changed

Change-Id: If2cb0735953b9fb64df7425230c98efb384d9287
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-21 15:31:51 +02:00
Orgad Shaneh
6f32b8e257 Git: Append PATH env variable when locating binary 
Complements d3f889df7d

Change-Id: I9f0186edb11695d3d1607615ce24f238d77ef46e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-16 13:27:49 +02:00
Orgad Shaneh
c1abef38a4 Gerrit: Allow sorting 
Change-Id: I3e84a62b486ea4bde586467fa3e00a453364ae2c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-07 14:56:15 +02:00
Orgad Shaneh
69eeb94b7e Git: Support gitfile on commit 
Change-Id: Ia2b8c7705129937a60585d881e1fbfa7815d858f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-03 18:02:37 +02:00
Friedemann Kleint
87adb49557 tr()-Fixes for 2.6. 
- Remove trailing blanks
- Fix remaining rich texts in Android UI.

Change-Id: I8ea5ec6890d76b83257fd1eb79eeb2760b946f0b
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-08-02 16:06:23 +02:00
Friedemann Kleint
a1b696c718 Git: Rename 'Undo uncommitted repository changes' to 'Reset...'. 
'Reset' is in sync with the command line option and more
appropriate to the functionality after the introduction
of the history dialog.

Change-Id: I2328c7137089a5f372b59b4db7074753a16ecbdf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-07-31 15:01:37 +02:00
Friedemann Kleint
236980eaa1 Gerrit: Make column headers and tooltip consistent. 
Use terms from the Gerrit web interface (except '#').

Change-Id: I1a8af47122e17f9e3daf2a19967ee1dc165e0ea5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-07-30 16:25:41 +02:00
Konstantin Tokarev
16cf161d82 Changed URL to qt-project.org in pluginspecs. 
Also, it's 2012 now.

Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-07-30 07:44:48 +02:00
Orgad Shaneh
12a99d476c Git: Do not display invalid commit as blame candidate 
Change-Id: Ia08775b2e4364f405d223a9b49971ae70c04965a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-26 20:57:45 +02:00
Orgad Shaneh
bd7499b896 Git: Do not append formatting when log failed 
Happens for 00000000 for example

Change-Id: I1ab3157dd87744a4b16284d91dd26f42898965e9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 22:24:57 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget* 
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-19 15:15:53 +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
Orgad Shaneh
960bfeb46d Git: Limit length for revisions displayed in context menu 
Change-Id: I335b49ed9af9c3f2ae083a03e4109173b3783f76
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 00:42:54 +02:00
Orgad Shaneh
0fb6aafdc3 Git: Use HEAD as parent revision for 00000000 
Change-Id: I4f583bb184fff00ea49a27de9df96aa348b81004
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 00:40:57 +02:00
Orgad Shaneh
7c77331ea4 Gerrit: Replace 'additional queries' with a query completer 
Change-Id: Idbc3f0a0dc47c63eb02ee105965ec52fda712f84
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-07-04 09:20:39 +02:00
Orgad Shaneh
cb8c8ca19e Gerrit: Allow custom query 
Change-Id: I8ee0967a8f0013c785bc4d6e98ff7b634f488e97
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-07-04 09:20:27 +02:00
Orgad Shaneh
202ce8ad70 Git: Improve Clean dialog 
Check file iff it is not ignored

Change-Id: I16a489bdd772ea9b4df462b449a23324b5ef3b77
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:13:33 +02:00
Orgad Shaneh
3b5c40ba47 Git: Cleanup 
* Remove unused 'silent' argument
* Do not output 'git --version' command

Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:10:34 +02:00
Orgad Shaneh
59417df92a Git: Keep author information on amend 
Change-Id: I15982b746656536ae79a612ee563f69b58a4baa7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-28 22:22:08 +02:00
Orgad Shaneh
ad7874ed87 Git: If stashed before pull, stash pop after it 
Change-Id: Ie983df1ffadac27551bbc51199784c0bc8610c14
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-26 10:30:47 +02:00
Orgad Shaneh
616cb86ea7 Git: Better status resolving 
Do not consider new files as Changed

Change-Id: Id1ddb870e51a974a2d20fc2ecc9fb499d1db6f8c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-26 10:29:20 +02:00
Orgad Shaneh
bd95043c4b Git: Reorder fields in submit panel 
Change-Id: Icd624ce174d9265fe551b9af4089b3660abc4142
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-25 10:28:01 +02:00
Orgad Shaneh
8c77b8c9d7 Git: Support file names with spaces 
Change-Id: I19fa6fbcbf480b4a6c31cf628f8ca392f7bd7ef2
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-20 22:23:10 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style 
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-06-19 11:22:40 +02:00
Orgad Shaneh
e6820b741d Gerrit: Simplify query model 
Use plain QString for queries instead of QStringList

Change-Id: Ia8a9086937fa34bce91d62d7434b26aa33b41163
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-06-11 17:44:15 +02:00
Orgad Shaneh
b25dfed9ff Gerrit: Prevent losing portFlag when changing other settings 
Change-Id: I2ca531b8d9ea9a01739c2f28b7b36e189b0b9b9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-06-07 13:54:54 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...) 
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-05 15:19:30 +02:00
Orgad Shaneh
a452db5055 VCS: Fallback to raw revision if decorate fails 
Change-Id: I64537306723dc1bd3c979f22af2213f0f5cd8f84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-05 10:43:47 +02:00