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

1374 Commits

Author SHA1 Message Date
Eike Ziller
e9c63aade6 Fix build 
Change-Id: I22b1a24e619a9cb851f99c03792141a8b64e7b74
Reviewed-on: http://codereview.qt-project.org/5808
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-29 16:50:45 +02:00
Eike Ziller
5bc6692ee5 Reduce number of categories and minimum size of preferences 
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.

Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-29 16:26:48 +02:00
hjk
373d51a1ed IOutputPane: constify some member functions 
Change-Id: I023b7f5976b30fc950d2dd5a76f749ef4720ac2f
Reviewed-on: http://codereview.qt-project.org/5618
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-28 15:21:19 +02:00
Eike Ziller
3955df7855 Move wizards' cancel button to the left on Mac. 
It is too far to the left now, but that can't be helped
(it's a Qt limitation).

Task-number: QTCREATORBUG-6156
Change-Id: I0201356234abb618dc3b573673d512c0a97c4839
Reviewed-on: http://codereview.qt-project.org/5406
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-22 19:01:21 +02:00
hjk
58cb19e55e all: less QScopedPointer 
Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:44 +02:00
hjk
dbe1653775 more style 
Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:31 +02:00
hjk
28535f7571 utils, qmljstools, vcsbase: s/\bm_d\b/d/g 
Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 14:11:09 +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
Marco Bubke
72056e3570 Wizards: Refactor GeneratedFile in a extra file 
Change-Id: I58f7053405c79774154c2f0447944533e6b10152
Reviewed-on: http://codereview.qt-project.org/4685
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-13 09:52:40 +02:00
hjk
bfd9fcbb3c all: some m_d -> d style 
Change-Id: Iac1f12980bf47666007817cfb2c64a6d1e9b780e
Reviewed-on: http://codereview.qt-project.org/4477
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-08 17:42:14 +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
hjk
9447f903ba editormanager: style 
Change-Id: I3536ba31d8be8bcd8330fb7b4174a6ae3cd95cb5
Reviewed-on: http://codereview.qt.nokia.com/4214
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 16:04:48 +02:00
hjk
df2858bb6c core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManager 
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:28:46 +02:00
hjk
e684960523 core: remove usages of Core::ICore::instance()->modeManager() 
The function is still there but should be remove in my opinion.

Change-Id: I739fe942e74f459faccb80b5bcb8a5721c6bb9bf
Reviewed-on: http://codereview.qt.nokia.com/4200
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:23:45 +02:00
hjk
61a887a755 helpmanager: cleanup 
Change-Id: I7bd885e9e64f8be99a040b14151cd8fba5249235
Reviewed-on: http://codereview.qt.nokia.com/4202
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:10:00 +02:00
hjk
9fd44abcf1 actioncontainer: style 
Change-Id: I8f83b11250817425a06c063532e5662cb72fb7dc
Reviewed-on: http://codereview.qt.nokia.com/4204
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:08:34 +02:00
Tobias Hunger
eacb2e7263 Fix warning 
Do not hide symbols of base class

Change-Id: If35d662b0ce3680b0a46e47d55564d46c8740625
Reviewed-on: http://codereview.qt.nokia.com/3999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-31 17:48:45 +02:00
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h 
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-08-31 13:48:00 +02:00
Robert Loehning
662c66ef6b Moved class FileUtils out of Internal namespace 
...because it is being exported.

Change-Id: If2892f8455b7c7fb9a78a8cde27642901ae4bf3a
Reviewed-on: http://codereview.qt.nokia.com/3676
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-29 12:17:31 +02:00
Friedemann Kleint
bd5a1a9bce Extract Core::TextFile from TextEditor::BaseTextDocument. 
Use it in BaseTextEditor and Designer to preserve CRLF
of the files.

Task-number: QTCREATORBUG-5901
Change-Id: I7599ce78649a3b09f2e5118d02f8cbf3db27ed31
Reviewed-on: http://codereview.qt.nokia.com/3591
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-26 08:23:16 +02:00
hjk
ee4aa00bbb core: compile fix with namespaces 
Change-Id: Ibbf2711d7d7ce2b0ec56c93bb0ceac3dfa785756
Reviewed-on: http://codereview.qt.nokia.com/3106
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-17 15:17:35 +02:00
Friedemann Kleint
2f92eae7bc Utils/Coreplugin: Clean headers. 
Change-Id: I1e0d432127651622d40ff990e1866eac9fac46a0
Reviewed-on: http://codereview.qt.nokia.com/3091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-17 12:58:38 +02:00
Robert Loehning
738544768b Improved editor menus 
Access native filemanager and terminal from Open documents view
and Editor menu

Task-number: QTCREATORBUG-389

Change-Id: Id6cd8839cdbd270a4ac53ccad1ae1db94d48e900
Reviewed-on: http://codereview.qt.nokia.com/2974
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-17 12:36:33 +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
Eike Ziller
47f6cb398a Fix translation of external tools. 
Change-Id: I21541c579f3be75537763ad65b63f6804c329e50
Reviewed-on: http://codereview.qt.nokia.com/2951
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-08-15 16:37:14 +02:00
Eike Ziller
d636140ea4 Add Close/Close Others/Close All items to editor list's context menu 
Move the context menu actions from the "Open Documents" pane to the
editor manager and use these for both the open documents pane and the
editor combo box in the editor tool bar.

Change-Id: If2a8cb4cf0498c78bd06053919b3cb74692b7cd8
Reviewed-on: http://codereview.qt.nokia.com/2973
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-15 15:23:24 +02:00
Friedemann Kleint
4d81efda31 VCS: Add a 'Apply patch chunk' pairing 'Revert chunk' to VCS editor. 
Fix "Open With" editor-by-mimetype search to return all (diff) editors.

Change-Id: I8d9d3cee9e5fcee5555d6e301818ed22ad4390ac
Reviewed-on: http://codereview.qt.nokia.com/2912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-12 13:45:25 +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
Eike Ziller
86e2b72486 Send missing visibilityChanged signals to output panes. 
Change-Id: Ic2de484904c8be2f3110c7e083c3691a174a5781
Reviewed-on: http://codereview.qt.nokia.com/2785
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-09 15:44:01 +02:00
Jarek Kobus
be40d9ca93 Apply code style settings to templates 
Task-number: QTCREATORBUG-169

Change-Id: I380c956d3256c186ff9497463ab845228017ff87
Reviewed-on: http://codereview.qt.nokia.com/2671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-09 12:01:06 +02:00
hjk
ca7d5942a2 coreplugin: simplify VariableManager 
Change-Id: Id89dba3be538a29953b374e58df961835ea4207a
Reviewed-on: http://codereview.qt.nokia.com/1298
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-05 11:26:16 +02:00
Tobias Hunger
7efb3c35a5 VCS: Fix auto-opening on files in VCS 
Fix auto-opening of files under version control for VCSes that need it
(e.g. Perforce).

Task-number: QTCREATORBUG-5312
Change-Id: Ifc26d062c0f2a92a06d83ccc8664640699e5dc5d
Reviewed-on: http://codereview.qt.nokia.com/2450
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-08-02 12:44:55 +02:00
Fawzi Mohamed
17c88cb2e7 filemanager: fix regression when trying to save read-only file 
When saving a read-only file, a dialog should appear with
Make Writable / Save As / Cancel should open.
Avoids relying on permission error to detect read-only files as
qfsfileengine_unix.cpp treats errno == EACCESS as a QFile::OpenError.

Change-Id: Icdffdc4617c8ef2b58d58aeedbb2b454d0da9465
Task-Number: QTCREATORBUG-5066
Reviewed-on: http://codereview.qt.nokia.com/2442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-01 18:51:41 +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
Eike Ziller
dd91cbcf80 Work around wrong click area of output buttons on Mac. 
For some reason using push buttons in the status bar will make
the clickable area of the buttons too small (half of the button isn't
clickable). Using QToolButtons instead.

Task-number: QTCREATORBUG-4513
Change-Id: I8b0f97552ec9b2471d570d577522b7ce5f382fb9
Reviewed-on: http://codereview.qt.nokia.com/2193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-07-26 16:07:04 +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
Leena Miettinen
8aea021dc3 UI text: fix capitalization and terminology 
Change-Id: Ieb52b4e2e6e8b5835219ecc4f6fe7907539e5bdb
Reviewed-on: http://codereview.qt.nokia.com/1827
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-19 15:54:50 +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
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
Jarek Kobus
5418a137dd Fix original string messages 
Change-Id: Icc7819585a8382a02b02a28f39dcea8ec1c6a7e6
Reviewed-on: http://codereview.qt.nokia.com/1142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-07-05 12:10:50 +02:00
con
050fdf9d52 Set focus to variable chooser when it opens. 
Task-number: QTCREATORBUG-4307

Change-Id: I8dff162c01ced12f1b715ce6c803f7b611625abf
Reviewed-on: http://codereview.qt.nokia.com/918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-07-01 17:17:11 +02:00
con
18ca223447 Unmaximizing output pane should restore previous size. 
It was resetting to the default instead.

Task-number: QTCREATORBUG-4849
Change-Id: Ibe3acf7045dd051cca3bff94888b155e00fec81b
Reviewed-on: http://codereview.qt.nokia.com/954
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-30 17:08:34 +02:00
hjk
c43f3c848f analyze: create a top level menu entry 
Change-Id: I17c4d17583d401fb537d5956f5b07a1dc12906e1
Reviewed-on: http://codereview.qt.nokia.com/893
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 13:19:24 +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
con
2707f7a74b Close variable chooser on escape (if it has focus). 
Task-number: QTCREATORBUG-4307

Change-Id: Ib85f5fda1310fe6fb0e0824488fb6c79962ae35b
Reviewed-on: http://codereview.qt.nokia.com/624
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-06-28 14:01:12 +02:00
con
52b2dd1578 Better name for enum value. 
Change-Id: Ic89535081fca147727d12d77e1427d8240cde6d5
Reviewed-on: http://codereview.qt.nokia.com/713
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 16:04:34 +02:00