feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

5173 Commits

Author SHA1 Message Date
Alessandro Portale
bde3629b29 WelcomeScreen: Session layout improvements 
No gaps. Smoother hovering. Some cleanup.

Change-Id: Id4110ab10973a7df8b5c39a90d60878145ad389b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-15 16:11:49 +02:00
Tim Jenssen
6a74c9d4a7 QmlDesigner: fix Section Collapsed size bug 
Change-Id: Iff7016b35aeb763569366400460c12b99689e14f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-15 16:11:06 +02:00
Tobias Hunger
cd0ff57e2f JsonWizard: Replace JsFileWizard with a JsonWizard 
Change-Id: I4da3485ed83fda7f17f3fa9a1f3d59bfabb7ea4d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-14 21:38:50 +02:00
hjk
65ebdc7e03 Debugger: Fix recent typo in putSimpleCharArray 
The joys of scripting languages without compile time checks.

Change-Id: Ic9405d549f3e60d5b834350fa3bce1d4d4609747
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-14 21:09:50 +02:00
Orgad Shaneh
1ff1b8dbfd Debugger: Remove unused values from DebuggerStartMode 
Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-14 18:19:38 +02:00
Thomas Hartmann
d7105cc245 Wizard for ui.qml file based project. 
Change-Id: Id0f61efce0ae47c28eb2f5fbcee5468dc5c339ca
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-14 17:18:48 +02:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Alessandro Portale
65aef999ce WelcomeScreen: Fix font differences in "Projects" tab 
Task-number: QTCREATORBUG-13165
Change-Id: I6ee42792e374d2a80c24871421bcf99ebecab719
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-10-14 14:09:50 +02:00
Alessandro Portale
087d1f5cd5 Update URL to the Qt Account page 
It moved to https://account.qt.io

Change-Id: I54df8eb37d06d2ab5f4d6c3bb489fbdd7d3e5229
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-14 12:23:28 +02:00
hjk
27d3d5140f Debugger: Add QVarLengthArray dumper 
Change-Id: I817ccd432a81ea0bf7432e6660a049fd41c926ec
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-13 21:36:50 +02:00
Thomas Hartmann
c20c20f012 QmlDesigner: Activate anchor target selection 
Change-Id: I5aada9ffa67177b13ec7cf7f3c819f2f0530a822
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-13 18:43:00 +02:00
Alessandro Portale
ee9ba6a32e WelcomeScreen: Adding @2x variants for the icons 
Change-Id: I50ecb0ff07c84033eaede6fd8a5dbcdc2ae5230d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-13 17:05:51 +02:00
Alessandro Portale
9d58d44941 WelcomeScreen: Improve hovering of recent project items 
No gaps inbetween the items. The whole area is click-sensitive.

Change-Id: I269e657ef8940387d9844baf17741c1cb3a50dd9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-13 10:49:48 +02:00
hjk
392b3f65d2 Debugger: Speed up reading of 0 terminated blobs in dumpers 
Change-Id: Iebc64c21f4dd6f4876989e57d3a347b96e1bd449
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-13 09:22:23 +02:00
Thomas Hartmann
47e3c79b88 QmlDesigner: Updating WindowSpecifics 
Change-Id: Ic4bead3e100d00cf532fa10cda42270eb642bb26
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-10 17:00:37 +02:00
Thomas Hartmann
0812718905 Adding new wizards for QtQuick supporting Qt 5.4. 
Change-Id: I2af1cff65032bb583864c1c8ee3a3636a46e3c39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-10-10 16:09:03 +02:00
Sergey Belyashov
f9d5bfe996 Update Russian translation 
Change-Id: If1782c8501353cb953a17f8be43abec987b67e94
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-10-10 15:10:06 +02:00
hjk
1baca8e797 Debugger: Add dumper for Qt3's (sic!) QString 
Change-Id: I24d266587425a5c50ec3dcb548a29877730cbdff
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-10 13:25:02 +02:00
hjk
0691bf93b0 Debugger: Remove unused dumper code 
Change-Id: Idc2d17e34bf5666c56d6f54b657867f1b0ecf943
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-10 11:37:28 +02:00
Tim Jenssen
605e869335 QmlDesigner: fix regression from last filter import fix 
- adding line ending to the import code
 - set correct fileUrl to resolve local directory imports

Task-number: QTCREATORBUG-12625
Change-Id: I2861fc5674ff0fa4f6cc9e308a22cd2853ffa85c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-10 11:16:12 +02:00
Tim Jenssen
ab21b7b67a QmlDesigner: move setObjectOwnership 
- to the same position like in the other methods

Change-Id: Ie12147de0e9030a35928a2c0a5dd38d34f998845
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:10:49 +02:00
Tim Jenssen
fd6afba3c3 QmlDesigner: improve error output of the puppets 
- errors -> warning none false outputs -> debug
 - adding some more error outputs

Change-Id: Ice61d10a87dc5ef789b7913cae166641b18ddf27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-09 18:10:43 +02:00
Tim Jenssen
808094e9e1 QmlDesigner: avoid setContext warning if there is already one 
Change-Id: I2d23f8f18cce11bdfbdcb4a8d9d6d99fec7d20e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:09:37 +02:00
Tim Jenssen
dce26fc29d QmlDesigner: use engine argument like all similar methods 
Change-Id: I1238cbd60e38ade3f54937ca8f901517c543a3ad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:08:44 +02:00
Tim Jenssen
0ecc1114bd QmlDesigner: remove unnecessary spaces/lines 
Change-Id: I867ab5afc82e67644b7004e97886b46250f5d3df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:08:09 +02:00
Tim Jenssen
80bc7f79bc QmlDesigner: remove commented connect 
The connected SLOT is even not existing any more.

Change-Id: Iea352ca4929146c20b897e1a8fbb00a601364068
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:07:29 +02:00
Alessandro Portale
b1176b97dd New Qt Creator logo 
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-10-09 15:43:28 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Tobias Hunger
3191aac828 JsonWizard: Replace QmlFileWizard with JsonWizards 
Change-Id: If1079db1f4e3eb4fc62d0066a43aa58c072e2290
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-10-09 10:13:21 +02:00
Marco Bubke
f3c6200513 Welcome: Keep sidebar and headers static on scrolling 
Task-number: QTCREATORBUG-12872
Change-Id: I8ab9a88203fcce60fa9f9cdf06369eb0c572a0bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-02 12:08:03 +02:00
Tobias Hunger
3277180b0c JsonWizard: Replace Python FileWizard with a JsonWizard 
Change-Id: Iebeae1f52cf856e009a0910118829c89dd3ea222
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-01 12:15:03 +02:00
Tobias Hunger
ac02f6fb89 JsonWizard: Replace TextFileWizard with JsonWizard 
Change-Id: Iae2833554529c2f333d9781eb0f7fa28f3bfde79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 17:29:16 +02:00
Tobias Hunger
ed8a9cba2b JsonWizard: Replace Java wizard with JsonWizard 
Change-Id: I93fc26e48b39635662662a9ab4040f45fa874876
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 17:29:08 +02:00
Tobias Hunger
161f33d08a JsonWizard: Replace GLSL wizards with JsonWizard 
Change-Id: Ieeeec4d1a023b7cca19e3bd23ba1aa6dd1d76e72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 17:28:58 +02:00
Tobias Hunger
989ed95c1f CppEditor: Replace CppFileWizard with two JsonWizards 
Change-Id: If39ed6d2711fa4cc144d1b1f9738acf3d04ac225
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-09-30 15:14:29 +02:00
Tobias Hunger
31b83d27e8 ResourceEditor: Replace ResourceWizard with a JsonWizard 
Change-Id: I0fb76c8627f65329d1bfebecf44cc3c75e6b07b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 10:56:32 +02:00
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
 2014-09-29 13:40:53 +02:00
Tobias Hunger
3af3878ace JsonWizard: Make wizards translatable 
Change-Id: Ia496829dd3070ef65b2cec31ecaf30955b2900c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-09-29 12:10:50 +02:00
Eike Ziller
0aecf9c195 Merge remote-tracking branch 'origin/3.1' into 3.2 
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
 2014-09-29 10:31:12 +02:00
Tim Jenssen
2bd550f3fd QmlDesigner: import only working imports 
Change-Id: Ic7d74237eeb86e34925f1b048befa5da9420c278
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-26 15:13:39 +02:00
hjk
bf5f14a4e1 Debugger: Fix QHash display of "compact" keys 
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
(cherry picked from commit 2776536a7e)
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-26 09:35:36 +02:00
hjk
86918e9a28 Debugger: Add dumper for CPlusPlus::Symbol 
Change-Id: I25404bff6b53e29fa13ee35787fb6c98209a408e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-25 17:18:29 +02:00
Tobias Hunger
9a3a3d4711 JsonWizard: Remove scratchfile wizard 
Replace it with a json wizard based implementation.

Todo: This removes the keyboard shortcut available to trigger
this wizard. We should make sure all wizards are available
for binding keyboard shortcuts to them instead.

Change-Id: I1aa76222d08371e79c40b52aeb26705f3ccb4899
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-25 10:55:40 +02:00
hjk
4d12c017de Debugger: Wiggle LLDB startup 
LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
(cherry picked from commit 1af0f77ea9)
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-23 10:41:19 +02:00
Eike Ziller
d6c73653ed Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
	src/plugins/texteditor/basetexteditor.h

Change-Id: I556a7661872b90b329a46694e335e18cddc28677
 2014-09-23 10:10:09 +02:00
hjk
1af0f77ea9 Debugger: Wiggle LLDB startup 
LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-09-22 18:07:16 +02:00
hjk
68106a7d31 Debugger: Show at least sizes for libc++'s std::map 
Change-Id: I91f3ece335ef660e62e93dcbbeff18dc5b0c46f0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-22 18:00:56 +02:00
hjk
245d4b253d Debugger: Fix warn() calls in LLDB bridge 
Change-Id: I7e8a571daae6a81efb52e153c8b19e724aa56c55
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-22 18:00:44 +02:00
hjk
dbab3dc2e9 Debugger: Add a README to help with dumper command line use 
Not exactly the intended use, and whence not part of the docs.

Change-Id: I622c3aef637700c895e37f79cc6ffac7b2cd5205
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-18 13:33:57 +02:00
Robert Loehning
5f1440f322 German translation for late strings 
Change-Id: I40ab7dc02492d9e71ebb8c209ab645a5bf095c94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-17 12:08:38 +02:00