feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
29,977 Commits 108 Branches 368 Tags
e40308ab1b89346e3f7072f160b2cb5b799f8789
Commit Graph

44 Commits

Author SHA1 Message Date
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
Orgad Shaneh
9bf654743e QmlJSEditor: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: I899c26e028efe355d4673b55ac9718e103c7d7ec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2012-12-03 13:40:51 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
David Schulz
354b51fda0 Set focus to the editor after selection change in outline 
now also if the selection is changed in qmljsoutline

Task-number: QTCREATORBUG-6306
Change-Id: I07365de90cc932bcc5d0ccf021b3dd7daf3bc17a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-18 14:30:42 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +01:00
Kai Koehne
5e6496f664 QmlJsEditor: Add copyright header 2011-02-18 11:50:28 +01:00
Kai Koehne
94fc750a45 Outline: Double click should jump to text even in non-sync mode 2010-12-20 09:45:29 +01:00
Friedemann Kleint
77008bc45f Exported Header cleanup: QmlJSEditor 
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-02 11:10:27 +01:00
Leena Miettinen
86dc1fb6e8 UI text - fix capitalization 2010-09-28 17:29:05 +02:00
Kai Koehne
9caecbaeff QmlOutline: Prevent warnings about invalid offset for 'setPosition' 
Check in advance whether position is still valid. This can be false if
the text has already changed, but the outline hasn't been yet updated.
 2010-09-14 11:58:06 +02:00
Kai Koehne
68f6d162f0 QmlOutline: Update selection if filter is toggled 2010-09-03 12:49:05 +02:00
Kai Koehne
7c365061a4 QmlOutline: Ensure that element is always selected 
Select parent element if the property isn't shown in outline (due to
filter).
 2010-09-03 12:41:22 +02:00
Kai Koehne
3a87261193 QmlOutline: Don't scroll to (horizontal) center when auto-selecting 2010-08-25 15:32:02 +02:00
Kai Koehne
6cf563bb25 QmlOutline: Cut down update times considerably 
Cut down update times of Outline by a magnitude by only emitting
itemChanged signal if absolutely needed. This doesn't include the change
of the icon, because QIcon is missing a comparison operator ...
 2010-08-25 13:28:04 +02:00
Kai Koehne
42708807a5 QmlOutline: Make sure that currently selected item is always visible 2010-08-24 14:35:04 +02:00
Kai Koehne
2d64eb846b QmlOutline: Replace WeakPointer by normal one 2010-08-16 13:29:00 +02:00
Kai Koehne
258a212d73 QmlOutline: Center cursor 
Do the same as in CppOutline
 2010-08-16 13:29:00 +02:00
Kai Koehne
72862dcc61 QmlOutline: Show id/name/property values only if filter is active 2010-08-12 15:10:53 +02:00
Kai Koehne
0783b1e40a QmlOutline: Show non-leaf bindings even when filter is active 
Otherwise we would filter out also e.g. all States elements.
 2010-08-12 15:10:53 +02:00
Kai Koehne
7fac110d75 QmlOutline: Move QmlOutlineTreeView into it's own file 2010-08-10 14:34:55 +02:00
Kai Koehne
40e36e0cd0 QmlOutline: Treat grouped property items as properties 
E.g. "anchors {}" is represented in the AST as a UiObjectDefinition.
Treat it nevertheless like a property in the outline, such that it
isn't shown in the outline if you deactivate showing bindings.
 2010-07-22 10:14:05 +02:00
Kai Koehne
0b5b1ef7ce QmlOutline: Fix issues when 'filter bindings' is activated 
Make sure the filter reevaluates all items when they change.
 2010-07-21 14:51:02 +02:00
Kai Koehne
e708eb3d83 Qml Outline: Support rearrangement of the items via drag&drop 2010-07-21 14:14:11 +02:00
Kai Koehne
4b504323ec Show horizontal scrollbar in navigator views (if needed) 
Requested by con.
 2010-07-16 16:27:14 +02:00
Kai Koehne
97ca483d33 QmlJSOutline: Store the filter settings when switching files 2010-07-16 14:10:02 +02:00
Denis Mingulov
5af6f15f7c Utils::NavigationTreeView is created - as a base class for any Navigation Widget (Side Bar) tree view 
Merge-request: 2167
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2010-07-16 11:24:02 +02:00
Kai Koehne
679ccc3b74 QmlOutline: Add filter for hiding bindings (properties) 2010-07-14 16:56:14 +02:00
Kai Koehne
fe82dd7ff7 QmlOutline: Make sure tree view is always expanded 2010-07-14 13:34:18 +02:00
Kai Koehne
5aea93028f Add position to navigation history when navigating through outline 2010-07-14 12:55:58 +02:00
Kai Koehne
503f720f85 Outline: Make recalculation of current model index more robust 2010-07-12 16:40:43 +02:00
Kai Koehne
94264617bf QmlJSEditor: Use QmlOutline model also in combo box 
The drop down combo box and the Outline in the sidebar now share
the same model.
 2010-07-12 14:46:29 +02:00
Kai Koehne
ecf2a703e2 QmlJSEditor: Moving QmlOutlineModel to it's own class 2010-07-12 14:46:29 +02:00
Kai Koehne
0f8a491e7a Make sure current index is always visible in Outline QTreeViews 2010-07-09 15:27:32 +02:00
Kai Koehne
02923cf258 Support Outline sidebar for QML files 2010-07-08 14:02:51 +02:00