feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,607 Commits 108 Branches 368 Tags
912cd548c0b0950b3a1e80f2597c99b3bf898c83
Commit Graph

417 Commits

Author SHA1 Message Date
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
 2011-11-01 18:16:38 +01:00
Tobias Hunger
494fbdb0d2 Git: Do the right thing when commiting 
Do the right thing when commiting in git. This allows
staged files to be commited without additional changes, etc.

Change-Id: Ib04c91cf9c105c4a2bbe013926112d6d5d3bade6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-31 11:49:39 +01:00
Jarek Kobus
082243fd96 Fix memory leaks (lacking destructors for uis) 
Change-Id: I07c2708d727d59286b0d625a4c0c318f18b03b93
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-28 17:49:33 +02:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
Tobias Hunger
057bc58d84 Small coding style cleanup 
Change-Id: I4b7a3dbd58cb52f9c6245ed59be2b1be8c98f66d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-21 11:44:36 +02:00
Yuchen Deng
c7d712e8d3 Git: Add support for the i18n.logoutputencoding setting 
Change-Id: I99df9765da1ba68c449f8879c8262c3ca3fbc28c
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-21 11:42:49 +02:00
Yuchen Deng
08f97b50d7 Git: Support encoding convert of commit messages 
We need read i18n.commitEncoding value, to write correct encoding of the commit file.
In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages.

Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-21 11:42:28 +02:00
Yuchen Deng
2ab22fec74 Git: Add branches to locator 
Change-Id: I02803ed9f131ded8748c526e88ca9825944e7057
Merge-request: 408
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 12:27:04 +02:00
Tobias Hunger
aa95055eb0 Git: Update settigspage 
Task-number: QTCREATORBUG-6308
Change-Id: Ie791cee6f132a4aab345d6c9b3cde56053476e8d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 13:32:09 +02:00
Yuchen Deng
854c0f2ed8 Git: Fixed launch gitk failed 
Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6510
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-12 11:50:37 +02:00
Tobias Hunger
433534adb2 Git: Fix string 
Make Blame look like the other file-based options.

Change-Id: I09b8ee9fff2ad3f564daa3922dccce3c5136e4a0
Reviewed-on: http://codereview.qt-project.org/6174
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-06 17:39:36 +02:00
Tobias Hunger
f654d664ef Git: Use indexes to address pretty printing combobox 
This fixes a incompatibility with the config settings.

Change-Id: I518291af2309acfaba7eea78b22519c283114009
Reviewed-on: http://codereview.qt-project.org/6161
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-06 15:48:04 +02:00
Tobias Hunger
f30e1092f3 Git: Fix git.cmd not found on windows 
Change-Id: I89c7743331bb28bbabe946df3da8fede44652414
Reviewed-on: http://codereview.qt-project.org/6138
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-06 12:05:24 +02:00
Tobias Hunger
c6a9de7252 Git: Save settings 
VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(

Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:46 +02:00
Tobias Hunger
ddf01f357b Git: Remove GitCommand 
Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:30 +02:00
Tobias Hunger
41e01f1778 Fix build on windows 
Change-Id: Ifaa6468ca17cba1de808a9cbeba325925985ee10
Reviewed-on: http://codereview.qt-project.org/6077
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:54:26 +02:00
Tobias Hunger
541e61612a Fix rebase issue and warning 
Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:20:54 +02:00
Tobias Hunger
363b230abf git: Reuse more code from vcsbase 
Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:03:32 +02:00
Tobias Hunger
f6068c1ff9 git: coding style fixes 
Change-Id: I554e46cc5e3c1b55bc245f20f7f9541103afb8c5
Reviewed-on: http://codereview.qt-project.org/6070
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:02:18 +02:00
Tobias Hunger
35615426d1 Git: Remove debug code 
Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09
Reviewed-on: http://codereview.qt-project.org/6069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:01:47 +02:00
Tobias Hunger
66f9d21e16 VCS: Unify VCS options pages a bit 
Change-Id: Ibf2e2871a8e7cd61ade67caf0d110359ffba71d5
Reviewed-on: http://codereview.qt-project.org/5999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-05 16:01:02 +02:00
hjk
7bfde77d7c s/error_message/errorMessage/g 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 13:06:52 +02:00
Orgad Shaneh
c20bc6abd1 Git: Added decoration to log and show 
Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-19 16:16:33 +02:00
Tobias Hunger
a323c0d9fb Git: Fix diff/show/blame editors coming to the foreground 
Make sure all the proper arguments are applied when bringing a git
diff/show/blame editor to the foreground.

Task-number: QTCREATORBUG-5176
Change-Id: I4ca603311335ac4e591ba38a690f1f3a27725e8f
Reviewed-on: http://codereview.qt-project.org/5157
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-19 16:09:04 +02:00
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
Tobias Hunger
c5c94206ba VCS: Make initialization of a repo trigger updateActions 
Make initialization/cloning of a repo trigger an updateActions.

This is needed to e.g. enable git actions after a git repo is created.

Reviewed-by: Hugues Delorme
Change-Id: Ia8513a216e584fe8e512fdd5d6215aa96c075f3f
Reviewed-on: http://codereview.qt-project.org/4878
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-14 10:53:20 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id 
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-08 17:40:53 +02: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
Orgad Shaneh
5396124dd7 Git: Fixed Omit Date 
Issue: QTCREATORBUG-5429
Reviewed-by: pending

Change-Id: Id2bb7fa756b7d5f49e8d7a250431f8042d514fd2
Merge-request: 366
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3151
 2011-08-18 10:58:56 +02:00
Eike Ziller
bf8cb5d4fc Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
 2011-08-16 10:21:55 +02:00
Tobias Hunger
bf4ca06c1e Fix possible crash in git branch dialog 
Do not crash when checking out a branch while not currently
on any branch.

Task-number: QTCREATORBUG-5784
Change-Id: I5d007e91c1778e6f09a5d543990d948bc1427599
Reviewed-on: http://codereview.qt.nokia.com/2958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-08-15 15:01:13 +02:00
Friedemann Kleint
b705ff3dab Fix MSVC's class/vs struct warning. 
Change-Id: I5839f979b6fc8687b55dc46917dfc72abd3122a9
Reviewed-on: http://codereview.qt.nokia.com/2913
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-12 13:45:42 +02:00
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
 2011-08-10 16:03:57 +02:00
Tobias Hunger
29cdaccd13 Use classes in favor of structs 
Change-Id: I6ad2df70b7ad9b5fdc5baddc3ef85d0fed0c139c
Reviewed-on: http://codereview.qt.nokia.com/2518
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-02 15:56:55 +02:00
Tobias Hunger
ebb238c885 Git: Fix ignore whitespaces/patience 
Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 13:03:12 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
 2011-07-29 17:57:59 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/) 
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-29 12:19:11 +02:00
Tobias Hunger
2ec4de7ae7 Git: Fix thinko when trying to find merged branches 
Fix thinko when trying to find out whether a branch was merged or not.

Change-Id: I6c4d600508af8a68fe0bac7e61f0b912c43cec32
Reviewed-on: http://codereview.qt.nokia.com/2200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-07-26 17:15:09 +02:00
Tobias Hunger
94a71d2e8c Git: Fix addition of tracking branches 
The dialog is always hidden by the time the tracking state is queried,
so all new branches were done in non-tracking mode.

Change-Id: I11cdbec6af1c756c1449d68a2efeb31a1c5bd0ec
Reviewed-on: http://codereview.qt.nokia.com/2196
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-26 14:42:15 +02:00
Tobias Hunger
255c5799f2 Git: Fix assert 
Refresh button states after running a checkout: The operation changes
the currently active branch and thus needs to disable e.g. the remove
action.

Change-Id: Id060ec63dbcf3c3132a832c2801073df5f9e91f1
Reviewed-on: http://codereview.qt.nokia.com/2195
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-26 14:40:37 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Daniel Molkentin
49b5556921 Refactor: Move NAM to utils, rss model to welcome. 
Change-Id: I0dddedd820e75df05c3a028e7fbb02b642c79659
Reviewed-on: http://codereview.qt.nokia.com/1902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-21 08:30:58 +02:00
hjk
82bbac7f90 Remove unneeded defines. 
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 12:15:38 +02:00
Tobias Hunger
c7c1ba32f7 Add copyright headers 
Change-Id: Ib21b9467ff6a692df56bc5cdac6ee768dae0d2a1
Reviewed-on: http://codereview.qt.nokia.com/1226
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-07-06 11:56:33 +02:00
Daniel Molkentin
497dd323ea Introduce QML-based welcome screen using desktop components 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 00:31:47 +02:00
Tobias Hunger
3463a813c7 Git: Limit size of git blame output when using omit-date 
* Do not use setPlainTextData on VCSBaseEditor only as that one implements
  the size limits on VCS output.

* Rework removal of date data from lines to limit copying

Change-Id: Ic1f507eb7bdabdb82b4a37a3d3e6f9381775b680
Reviewed-on: http://codereview.qt.nokia.com/780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-27 17:10:12 +02:00
Tobias Hunger
5f6a91e009 Git: Rework branch dialog 
* Make adding new branches more discoverable
 * Make adding tracking branches more discoverable
 * Update UI

Task-number: QTCREATORBUG-4943
Task-number: QTCREATORBUG-4944
Change-Id: Idcbf5f8321a3bd04c925e33d094bb479788a7d9b
Reviewed-on: http://codereview.qt.nokia.com/588
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-22 10:46:48 +02:00
Tobias Hunger
01463e9bdf Git: Shrink down remote dialog 
Task-number: QTCREATORBUG-5036
Change-Id: I9fc973acfb73c5da0489073a2130f5738656670d
Reviewed-on: http://codereview.qt.nokia.com/356
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-06-07 16:22:28 +02:00
Tobias Hunger
c54575e670 Git: remote dialog improvements 
* Add shortcuts
 * Add refresh button

Change-Id: Idfe5c86459d654ea75fb90542eaa4d9cc1405d33
Reviewed-on: http://codereview.qt.nokia.com/220
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-07 11:35:07 +02:00
Tobias Hunger
4a7a121436 Git: Avoid running unnecessary git commands 
Change-Id: I09d6ac15a53e29a7a916be4b80ff2b99372eb079
Reviewed-on: http://codereview.qt.nokia.com/219
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-07 11:34:05 +02:00