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

58 Commits

Author SHA1 Message Date
Leena Miettinen
26c412deac Doc: fix function signatures in code documentation 
QDoc cannot find functions if the signature in the \fn command
is not identical to the declaration, including 'const' qualifiers.

Removed the \fn where the documentation comes immediately before the
function, as qdoc does not need it in that case.

Change-Id: If6a2a2e2d58b394905c803787d2a93489049e4ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-23 16:30:35 +02:00
Friedemann Kleint
cf5e615f6d Clean headers in Core-plugin. 
Change-Id: Ie79d334765ca5c6a034fa2f5eccff5d45b481975
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-27 09:31:54 +01:00
Christian Kandeler
17765de169 Core: Remove unneeded ifdefs. 
Replace compile-time checks for host OS by run-time checks.

Change-Id: I9f237389171586786c2609f81314bcb1bc17b01e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-15 10:00:08 +01:00
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
hjk
42c16ff7d3 Core: Use the new Id methods in a few places 
There are a lot more left.

Change-Id: I97d32629aa6deef0f4819f70cc0b8437f2814257
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-17 10:57:22 +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
cdd44befff Add ActionContainer::addSeparator(...) 
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-05 15:19:30 +02:00
Christian Kandeler
dfcd427900 Fix compile warning on non-Mac platforms. 
Change-Id: I46d0cabe5883269c286a7d0078479c7ed2d3485f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-07 08:38:34 +02:00
Eike Ziller
359b0a092b Mac: Build menu stays disabled with Qt 4.8.1 and later 
Works around QTBUG-25544

Change-Id: I136aaa403f78e9c3903abc013c3267bc3585f54b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-05-02 12:19:35 +02:00
Eike Ziller
2547d9a7d9 Add ActionContainer::insertGroup 
Change-Id: I1a7047e0ccc074bb38661ecd34e2c0e64469d843
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2012-02-17 12:28:08 +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
Adam Treat
01d8907ea9 Fix a crash when loading the qt4projectmangerplugin. 
This crash can happen when enabling/disabling a certain combination
of plugins and restarting.

There was a null pointer de-reference that was occurring because the
qt4projectmanagerplugin was referencing an action that it believed
to have been registered by the texteditorplugin when it was initialized.

However, apparently the texteditorplugin was not initializing its actions
at plugin initialization, but rather when 'extensionsInitialized' was called.
I do not know the call graph for when this is to be called, but I encountered
at least one situation where the qt4projectmanagerplugin was being initialized
before this.

Change-Id: Iede1831e0ac9c92b80a079157e1bdc8c66473470
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-27 15:49:22 +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
Friedemann Kleint
2892f13b8c CorePlugin: Compile with QT_NO_CAST_FROM_ASCII. 
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
  QString construction.
- Fix repeated invocation of Container.end() in loops.

Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-22 14:47:29 +01:00
hjk
8e236db9f5 mostly core and analyzer: more id-fication 
Change-Id: Ic794fdc6a582f4a03d84b6220c59111044c753b9
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 18:25:19 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +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
Eike Ziller
160498b032 More useful warning text 
Change-Id: I6e84b3da2f97863a144e95bf0e79a4318ef59986
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-02 12:51:13 +01: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
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
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
con
eaea867e53 Implement renaming of tools and categories. 
Not possible to reset them yet.
Saves the change in the settings instead of writing new tools xml files.
This probably needs to be adapted for tools that are "local" from the
beginning.
 2011-02-18 17:15:39 +01:00
con
6593c4a726 Remove some unused code. 2011-01-24 13:51:29 +01:00
con
3f0a4446f3 Make action containers aware of deleted commands. 
They need to remove them from their internal structure.
 2011-01-20 16:36:55 +01:00
con
06acd2cc25 Refactor ActionContainer internals. 
Make groups explicit instead of magic integer stuff.
That also makes group ordering explicit instead of magically working
(the way we happened to use it and the way unique id manager is
implemented).
 2011-01-20 16:36:55 +01:00
con
684f8725e1 Remove unused internal "CommandLocation". 2011-01-17 18:24:11 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
4321e01efb Some API beautification in action container. 
Done-with: Daniel Molkentin
 2010-12-17 16:05:47 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con
d7e7c3427d Fix updating of menus with EA_Hide. 2010-11-12 13:48:03 +01:00
con
081743a064 Some api documentation adaptions. 2010-07-15 16:42:31 +02:00
con
40623d008d Handle action containers with custom QActions more gracefully. 
Related to QTCREATORBUG-1764.
 2010-06-28 17:28:10 +02:00
con
3d1a97e6df Fix updating the state of menus. 
The menus were only updated during context changes
(not if action states where updated directly),
and didn't take into account that the active action for a context
might still be disabled.
Also, enabled separators should not automatically lead to enabled menus.
 2010-04-23 04:30:47 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
6a88525aa3 Some more QToolBar changes. 2009-07-16 18:08:41 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
con
c6a0d43d7f Remove unused/unnecessary code. 2009-05-06 17:42:14 +02:00
con
38d7c52d49 Some more documentation about contexts and action containers. 2009-05-04 15:10:23 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Thorbjørn Lindeijer
5b50ffc20d Cleaned up usages of CoreImpl::instance 
The instance method has been moved to ICore, so there is generally no
need to include coreimpl.h anymore. Many objects accessed through this
core instance also had their own static instance methods.
 2009-01-21 13:37:58 +01:00
con
fbfcc9a484 Fixes: - ICommand --> Command 
Details:  - Naming convention
 2009-01-14 13:18:25 +01:00
con
d9f97aa179 Fixes: - Command --> CommandPrivate 
Details:  - Preparation for ICommand rename
 2009-01-14 13:18:24 +01:00
con
1e4c48a173 Fixes: - IActionContainer --> ActionContainer 
Details:  - Conform to naming convention
 2009-01-14 13:18:24 +01:00
con
28acadf899 Fixes: - ActionContainer --> ActionContainerPrivate 
Details:  - Preparation for IActionContainer --> ActionContainer
 2009-01-14 13:18:23 +01:00
con
08e7b0f447 Fixes: - Remove unused tool bar container, and unnecessary enum 
Details:  - I'm still not too happy with the whole construction but anyway.
The ToolBarActionContainer was never really used anymore (e.g. you
couldn't create one)
 2009-01-14 11:33:10 +01:00