feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,182 Commits 108 Branches 368 Tags
1dfa61bf6fd62db25c3df16bd6a890ed909ec3cc
Commit Graph

32182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orgad Shaneh
5e585b9eee Git: Support annotate revision for renamed files 
Change-Id: I6993cdd6f91f29b6f4e990cc5ba332ff63f7ed9f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 19:00:01 +02:00
Orgad Shaneh
2a54270525 Git: Always set working directory for created editors 
Change-Id: Ie4bec25ee56a3832d0c373c045662c13a8520c13
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 18:59:55 +02:00
Orgad Shaneh
2da85dc686 VCS: Rename diffBaseDirectory -> workingDirectory 
Can have other usages than diff

Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 18:59:50 +02:00
Orgad Shaneh
7b08d993bf VCS: Pass workingDirectory for annotate 
Required for supporting renames on annotate.

The renamed file (and possibly its parent directory) doesn't exist
anymore, so it shouldn't be passed as a working directory.

Change-Id: I809e8df17c1dc5199e533b525244a668eccbcd5f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 18:59:43 +02:00
Robert Loehning
0bb9ab131e Normalize connect()s 
Change-Id: I1305abd51cb6ae856215af63807e66c433982c26
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 18:27:57 +02:00
El Mehdi Fekari
7cd279002c Qnx: Add missing titles to install wizard pages 
Change-Id: I9a3948926b0a88ccda181c31db609a39a0d7f2a5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-10 17:34:49 +02:00
Christian Kandeler
69c4770e68 QbsProjectManager: Make sub-project files available in the locator. 
They are currently ignored.

Change-Id: I9a13d37e857d03f988884031bbba81a7f3b95d02
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 17:30:52 +02:00
Robert Loehning
c61610b259 debugger: Avoid NULL-pointer deref 
Change-Id: I25e25ea801c857b7995029bba3963d7d9d73827a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-10-10 16:57:01 +02:00
Thomas Hartmann
7eebe00b61 WelcomePage: adding icons 
Adding icons for Blog, Community, Help and Sessions.
Also removing unused old icons.

Change-Id: I8f2c31ad233b852aed137e280505d26708bc9d28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-10 16:36:54 +02:00
Thomas Hartmann
3ed4293d7c WelcomePage: fixes QTC_ASSERT 
We have to wait for the QtVersionManager until all Qt versions
are loaded.

Change-Id: Ia6f823660d0252fb8e8ee1b8cfaec32e26ebc0bd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-10 16:36:47 +02:00
Tobias Hunger
8d7bd37bbe Android: Remove unnecessary member 
Change-Id: I68f6f7f4a14d7d36ef18d2db354704309fbb0bf4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 16:18:14 +02:00
Fawzi Mohamed
679b8ddb82 ios: fixes for C++11 compilation 
Change-Id: I1d333c623f204a41dc92ebd03cbd67958e4588a7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-10 16:13:17 +02:00
Nikolai Kosjar
3e8919de39 CppEditor: Harden FunctionHelper::overrides 
Task-number: QTCREATORBUG-10333

Change-Id: I2ba7e0d5b8b8eb856445e737dfa21ec8a543f85d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-10-10 16:01:06 +02:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)" 
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 15:56:12 +02:00
Leena Miettinen
a48315ee1f Debugger: fix UI text capitalization and punctuation 
Change-Id: I5f2888750164a6b3cb5ba9bf0cafb457a31a1b6e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 15:31:15 +02:00
Friedemann Kleint
ca603c2404 Fix MSVC64 warning about integer truncation in memcheck-tool. 
Change-Id: Ic19b4ff112e3ac32d8dfb364f42ea7f523cfa2d1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 15:30:47 +02:00
Leena Miettinen
2f7f1d904c Valgrind: fix UI text capitalization and punctuation 
Removed the asterisks from messages.

Change-Id: I1c8e95b6d6f77921f2908c4587af5ebfde5e86af
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 15:29:54 +02:00
Leena Miettinen
3bf7578beb BareMetal plugin: fix UI text capitalization 
Follow capitalization and punctuation guidelines
in UI strings and messages. Replace slashes with "or".

Change-Id: Icfe9d0ee4d2bb35423dbe16576150b992d00da4e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 15:28:58 +02:00
Friedemann Kleint
1010bd2924 Android: Fix compilation with Qt 4. 
Change-Id: I8f5e310f14159238079f30dded0e5f0814d20990
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 15:19:58 +02:00
hluk
8e0597687c FakeVim: Don't filter events recursively 
Task-number: QTCREATORBUG-10226
Change-Id: Ic5fdb125cfce603c24e8c88cbcd43f13e8af9d06
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 14:21:57 +02:00
Frank Osterfeld
9ef0b75e88 Use POSIX-compliant "." instead of "source" 
Using "source" to source a script isn't defined by POSIX sh, while "."
is. Using the more portable "." makes it work with QNX's sh.

Change-Id: I948fc562c62789184553d57b949697c2525771f3
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-10-10 13:40:16 +02:00
Friedemann Kleint
da63065337 Fix some tr()-messages in the Debugger plugin. 
Change-Id: Ie3145e90066432074fc44c77eeee027f57edfcf4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 13:36:41 +02:00
hjk
f48d945bd4 ProjectExplorer: de-noise projectfilewizardextension.cpp 
Change-Id: I44b1955c3da43f4c27ef1ed82200a14c5e1afc93
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-10-10 13:25:59 +02:00
Eike Ziller
cd80008a9c Merge remote-tracking branch 'origin/2.8' into 3.0 
Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.h
	src/plugins/qmljseditor/qmljshighlighterfactory.cpp

Change-Id: Iba426e70b768df538393fc3cec96c7bff16a0658
 2013-10-10 12:46:00 +02:00
Friedemann Kleint
ccbfdf0144 Fix MSVC64 warning about integer truncation in qtChooserToQmakePath(). 
Change-Id: Ic3a51fc94e4204c2b97936c0294b054a08fed72f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 12:13:37 +02:00
jkobus
f54b935a61 Use book style capitalization for button labels 
Change-Id: I9d74792f59a1209a3fbbd4fade39eee04d5ce5f4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-10-10 10:45:28 +02:00
Leena Miettinen
e79d764f20 QML Profiler: fix UI text punctuation 
Change-Id: I3950828a0b6a9c12aee4214d7c6db9bc551bd260
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-10-10 09:45:48 +02:00
Leena Miettinen
70c2142dbb Cascades support: fix Qt Creator product name 
Change-Id: I29244b53f515405cff0618c7a012460b56dd2e85
Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-10-10 09:35:19 +02:00
Leena Miettinen
4aeedd4ded BlackBerry: fix UI text capitalization and punctuation 
Reword an info message to fix a language issue.

Change-Id: I42719b2c407c42aad811370dbde8e9d422b7a4bb
Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-10-10 09:34:59 +02:00
Leena Miettinen
2d80699430 Qt Quick Designer: fix UI text capitalization and punctuation 
Fix Qt Quick Designer product name. Fix a typo in a test message.

Change-Id: I668af65da835017ebc876810a8d2c7d638290c77
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-10 09:34:26 +02:00
Leena Miettinen
9230c3b9cd Git: fix UI text capitalization and punctuation 
Change-Id: I855c35e2e30b04c97b45f1eecec86ad4bf86750d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-10-10 09:33:29 +02:00
Leena Miettinen
dad7442caf Macros: fix UI text punctuation 
Make a message clearer.

Change-Id: I067f56f24add91664bb0f88034e6aa825c42c14e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-10 07:56:22 +02:00
Leena Miettinen
feadd0869a Locator: fix UI text punctuation 
Change-Id: I78f6c7144519cb7a278dd0db8ec0e4ca0438854f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-10 07:55:47 +02:00
El Mehdi Fekari
e530071d8d Qnx: Remove BlackBerry Gui templates 
The BlackBerry Gui templates are only adding BlackBerry 10 style
which can be done with a standard Qt Gui Application.

Task-number: QTCREATORBUG-10242

Change-Id: Iba29088acc1720318f09138688dd4eae544338a4
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-10-09 23:08:23 +02:00
Thomas Hartmann
b31fcf3354 QmlDesigner.PropertyEditor: adding GridViewSpecifics 
Change-Id: Ia7e48287f833953ae21323658d69ec174fa1d6b2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-09 18:22:02 +02:00
Thomas Hartmann
1169672ea6 QmlDesigner.PropertyEditor: adding GridViewSpecifics 
Change-Id: I93f64fed7341f463379dbb790e28f0f7c5d9d65b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-09 18:21:47 +02:00
Thomas Hartmann
313b4373ac QmlDesigner.PropertyEditor: adding FlickableSpecifics 
Change-Id: I62023cf60ced20378a63746677abf22dff3651c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-09 18:21:38 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property. 
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-10-09 18:08:56 +02:00
Leena Miettinen
b60bbbaec9 Project explorer: fix UI text capitalization and punctuation 
Fix "Qt Creator" product name. Fix minor language issues.

Change-Id: I403e10e7de60b7cf3433efa2cce5647383995da7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 17:51:30 +02:00
Leena Miettinen
e902945b7e Android: fix UI text capitalization and punctuation 
Fix typos and style issues.

Change-Id: I8d1bbccd55e7558e7f8a8bedbab95f4bb8a8478f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 17:50:52 +02:00
Daniel Teske
cf69783c0f Android: Restrict deployment factories to targets with the right qt 
Change-Id: I753023550f76b8b1b56fbdcd5176bcfa855e66bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 17:17:26 +02:00
Nikolai Kosjar
713e4dd5e3 Revert "Pass ShortcutOverride events to base class in BaseTextEditorWidget." 
This reverts commit 36552d17ea because it
broke Ctrl+v among others.

Change-Id: I1c1eecdc9c3e003e96b9c836cd638ead9a3b444d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-09 17:12:16 +02:00
Daniel Teske
a97dd8aba6 AndroidRunConfiguration: Take .pro file parsing into account 
Disable the runconfiguration if the project could not be parsed.

Change-Id: I979315b5e38fd1d8674da68289e021e014070c54
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 16:36:29 +02:00
Daniel Teske
0a43f097de Android: Handle cases where the project is unparsed. 
Change-Id: If1757fff8ff458610dae8cbfcf561154c7d56753
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 16:35:48 +02:00
Daniel Teske
e078321480 Qt4RunConfiguration: Call correct base class in overloaded function 
Even though it makes no difference today.

Change-Id: Ice31667f997526dfecdc6ec096ea61f3d8d481f1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-09 16:32:42 +02:00
Thomas Hartmann
1b59d8e2ce QmlDesigner.PropertyEditor: Adding MouseAreaSpecifics 
Change-Id: I1bbab5f662788644e7190b0880e434c51a380eeb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-09 16:15:41 +02:00
Thomas Hartmann
c70d502934 QmlDesigner.PropertyEditor: Adding FlipableSpecifics 
Change-Id: I9b036c229d1d0b721d8b08b561edb8e074715ac3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-09 16:15:30 +02:00
Thomas Hartmann
b24c094efd QmlDesigner.PropertyEditor: Adding toolTip property to Label 
Change-Id: Id76fa747abaae30336a4c0e2fa2c6f5279553f15
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-09 16:15:22 +02:00
Daniel Teske
37edb06c1e Android Manifest Editor: Fix various issues around min/target sdk level 
Change-Id: I9b9239055301296b572e0c36c40f179b0e98c67d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
 2013-10-09 15:38:40 +02:00
Nikolai Kosjar
0e4deaba23 C++: Parse MEMBER in Q_PROPERTY() 
MEMBER was added in Qt5.

Task-number: QTCREATORBUG-10068

Change-Id: Ic6c15a0e5ee8981ab98e4c12fc1521dc281b731f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-10-09 15:13:31 +02:00