Commits · e279c7e00787230dcd89301ebb7a182a35c0531b · Marco Bubke / flatpak-qt-creator

14 Oct, 2014 29 commits

MacroExpander: Allow registering local expansions · e279c7e0

hjk authored Oct 13, 2014

This allows a MacroExpander also to describe an expansion it can
do which was restricted to the global VariableManager only.

The global is now just a thin (unneeded) wrapper about new "standard"
functionality.

Change-Id: Ida7ca70cf3d319eae4220ea8d12f3dd1c0d4042c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

e279c7e0

Debugger: Add auto test for QVarLengthArray dumper · e43af30f

hjk authored Oct 14, 2014

Change-Id: I25af89bea8fe7781ae6b1b21fd294753f8519ee6
Reviewed-by: hjk <hjk121@nokiamail.com>

e43af30f

JsonWizard: Replace JsFileWizard with a JsonWizard · cd0ff57e

Tobias Hunger authored Oct 09, 2014

Change-Id: I4da3485ed83fda7f17f3fa9a1f3d59bfabb7ea4d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

cd0ff57e

JsonWizard: Add a customizeable page · 86ecc7d1

Tobias Hunger authored Oct 09, 2014

Add a way to define custom pages with checkboxes, lineedits, etc.
on it.

Change-Id: I012109eabf00a12abc67ae34514d139b7cd7cf0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

86ecc7d1

Debugger: Fix recent typo in putSimpleCharArray · 65ebdc7e

hjk authored Oct 14, 2014

The joys of scripting languages without compile time checks.

Change-Id: Ic9405d549f3e60d5b834350fa3bce1d4d4609747
Reviewed-by: hjk <hjk121@nokiamail.com>

65ebdc7e

Kit: Rename m_displayName to m_unexpandedDisplayName · 6b28505d

hjk authored Oct 14, 2014

That's what it is.

Change-Id: Ibd19203b30a98eb2b4b57039a8d619c031d2e5e2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

6b28505d

Utils: Add a base for tree like models · 88e4daa8

hjk authored Oct 14, 2014

That kind of boiler plate comes up often enough to justify a wrapper.

Change-Id: I94aa5b1ccbe5a98f091a47087654e59e9e122c1d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

88e4daa8

Debugger: Remove unused values from DebuggerStartMode · 1ff1b8db
Orgad Shaneh authored Oct 14, 2014
```
Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
Reviewed-by: hjk <hjk121@nokiamail.com>
```
1ff1b8db

Help Window: Add missing connect for contents view action · bb497cec

Eike Ziller authored Oct 13, 2014

Change-Id: I4504f00d138e42453132ee7ec7513216ab9e783b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

bb497cec

Help: Remove the now duplicate side bar code for central widget · f4b3f20c

Eike Ziller authored Oct 13, 2014

By adding the open pages widget to the shared help widget for the mode
widget.

Change-Id: Ib2d63134d1e17356a285ad048529c50e151a2354
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

f4b3f20c

Help Window: Add search view to side bar · 8fcf27fd

Eike Ziller authored Oct 13, 2014

Change-Id: If3acbad9694b6d1a3441007a9fa9c13a3738aa5f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

8fcf27fd

Help: Make it possible to duplicate search view · 00209382

Eike Ziller authored Oct 10, 2014

Change-Id: I6fac9f721fc3e2f877d9f600f9dea6650558516a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

00209382

Wizard for ui.qml file based project. · d7105cc2

Thomas Hartmann authored Oct 14, 2014

Change-Id: Id0f61efce0ae47c28eb2f5fbcee5468dc5c339ca
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

d7105cc2

Fix compilation for msvc2012 · cf0f2e46

Thomas Hartmann authored Oct 14, 2014

Change-Id: I2d4d2ed7060acee1cb90f7506f3721f073f49d96
Reviewed-by: hjk <hjk121@nokiamail.com>

cf0f2e46

Merge "Merge remote-tracking branch 'origin/3.2'" · 020c8603
Eike Ziller authored Oct 14, 2014

020c8603
ProjectExplorer: Remove redundant namespace qualifications · c884f3e0
Orgad Shaneh authored Oct 13, 2014
```
Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
Reviewed-by: hjk <hjk121@nokiamail.com>
```
c884f3e0

QtSupport: Add method to query UI class name · c86ef46f

Tobias Hunger authored Oct 13, 2014

Change-Id: Idc1cfd87415093dab4245d84797b0971ec496b45
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

c86ef46f

QtSupport: Code cosmetics · 08227991

Tobias Hunger authored Oct 14, 2014

Avoid one needless level of nesting.

Change-Id: Ied229d59eef03493041fe9e802ec71ca6e40e0a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

08227991

QtSupport: Add missing Q_OBJECT macro · 6c646339

Tobias Hunger authored Oct 14, 2014

Without it this QObject is not accessible from Javascript
as it needs to be.

Change-Id: I6ffdb677cc3c986f0f95bded60f6f097b2c4f3cd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

6c646339

QmlJSEditor: warn when editing .ui.qml, activate designer checks · 93c3ee1b

Thomas Hartmann authored Oct 14, 2014

Change-Id: I2f6d39633341bd1197d16c5c097573d4ab090896
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

93c3ee1b

Merge remote-tracking branch 'origin/3.2' · ea271432

Eike Ziller authored Oct 14, 2014

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

ea271432

Squish: Update object for tst_modify_readonly · e2456cf8

Robert Loehning authored Oct 13, 2014

Change-Id: I45814f0e7d7e719c4ea73de658e44bd0e7c17d9a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

e2456cf8

QmlProfiler: Increase minimum size of timeline items to 3px · 10a14ced

Ulf Hermann authored Oct 13, 2014

One pixel wide lines are too hard to spot.

Change-Id: I94f71ba4305078d8682673618be0f5a5e1f85ba8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

10a14ced

QmlProfiler: Pass input events with the same signal as all others · 8e7a95f0
Ulf Hermann authored Oct 10, 2014
```
Change-Id: I1d2e4da0ffe4772acff95ec27d5459309d41aa60
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
```
8e7a95f0

Add ui.qml support to code mode and editor · 419d4e44

Fawzi Mohamed authored Oct 13, 2014

Change-Id: I6d818ddad1e7467578c63161c278455ef6ac743e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

419d4e44

WelcomeScreen: Fix font differences in "Projects" tab · 65aef999

Alessandro Portale authored Oct 13, 2014

Task-number: QTCREATORBUG-13165
Change-Id: I6ee42792e374d2a80c24871421bcf99ebecab719
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

65aef999

Manual tests for UI split · 5847f325

Thomas Hartmann authored Oct 14, 2014

This adds a couple of projects for testing the ui split.

Change-Id: I9056702e724541a43895f28453ce31516a348e70
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

5847f325

Update URL to the Qt Account page · 087d1f5c

Alessandro Portale authored Oct 14, 2014

It moved to https://account.qt.io

Change-Id: I54df8eb37d06d2ab5f4d6c3bb489fbdd7d3e5229
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

087d1f5c

Squish: Don't use deprecated function when having a Qt5 build · ebf03a5f
Christian Stenger authored Oct 13, 2014
```
Change-Id: I8717bda9c4a24effe36a80e689829e93539186c6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
```
ebf03a5f

13 Oct, 2014 11 commits

Debugger: Add QVarLengthArray dumper · 27d3d514

hjk authored Oct 13, 2014

Change-Id: I817ccd432a81ea0bf7432e6660a049fd41c926ec
Reviewed-by: hjk <hjk121@nokiamail.com>

27d3d514

QmlDesigner: Activate anchor target selection · c20c20f0

Thomas Hartmann authored Oct 13, 2014

Change-Id: I5aada9ffa67177b13ec7cf7f3c819f2f0530a822
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

c20c20f0

WelcomeScreen: Adding @2x variants for the icons · ee9ba6a3

Alessandro Portale authored Oct 13, 2014

Change-Id: I50ecb0ff07c84033eaede6fd8a5dbcdc2ae5230d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

ee9ba6a3

Fix that opening qmake projects could result in delayed first parsing · ee9d433c

Eike Ziller authored Oct 13, 2014

Do not set the timer interval while the timer is running.

Change-Id: If72eb77fed88a5dda3f6356b1bd82aab781b160d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

ee9d433c

Squish: Fix Welcome page related tests · 135a0dfb

Christian Stenger authored Oct 10, 2014

Change-Id: Ifbec46c6e695835f9d88d298823e8793ed428409
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

135a0dfb

Squish: Fix some tests due to latest refactorings in QC · 42236fc7

Christian Stenger authored Oct 08, 2014

Refactoring of dialog wizards and editors.

Change-Id: I6604a302b04579519c78698375bc4b1027ac8b02
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

42236fc7

ProjectExplorer: Fix invisible Run submenu · 8fe9df26

Finn Brudal authored Sep 26, 2014

The Run submenu on the Project context menu was never shown.

Change-Id: I4fd29e3b7974114f094d995ef5d31f8bdbc25596
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

8fe9df26

Squish: Improve README · 061392e0

Robert Loehning authored Oct 10, 2014

Change-Id: Id9270613c4760e02af55afc070972a92da56c130
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

061392e0

Utils: Move MacroExpander to file pair of its own · df3d22ef

hjk authored Oct 13, 2014

Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

df3d22ef

Help: Fix "Open Link" context menu item in search pane. · b3f3c96b

Eike Ziller authored Oct 10, 2014

It selected all text in the search result widget, instead of opening the
link.

Change-Id: I264a8cc7ab29e71519d6d10b75a21fcd940d459d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

b3f3c96b

Help Window: Add contents view to side bar · 9e74d064

Eike Ziller authored Oct 10, 2014

Change-Id: Id690c71471ed9a61bd7a926db70e1b1fb9fac8ab
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

9e74d064