feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,243 Commits 108 Branches 368 Tags
5e7cf3f062a0c0342bc774f3ac9ff746bde01417
Commit Graph

51 Commits

Author SHA1 Message Date
hjk
78beacd7b4 Use Core::Id for IOptionPage::category 
Change-Id: I63433edd9118a7aa4ecaef28f40bfc729d90f512
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-29 19:10:59 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02: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
Christian Kandeler
b7a1e87cf4 Utils: Add user name accessor to the Environnment class. 
Change-Id: Ic67381ab185525552eef948af602d00d3800b653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-08-31 19:26:16 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class. 
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-27 17:00:03 +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
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members 
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-23 10:48:04 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 13:51:14 +02: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
Tobias Hunger
0ce9fa2c16 UI files: Do not polute the global Ui namespace 
Make sure all ui-files are in the plugin's internal namespace.

Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-24 10:49:41 +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
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
 2011-10-18 13:50:38 +02:00
Jure Repinc
fa4db8d045 Fixed some typos and added some missing ellipises 
During translation into Slovenian I noticed some typos in original
string. For example some missing ellipsis characters and some
incorrectly spelled MeeGo names (as Meego)

Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-05 20:14:59 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id 
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-08 17:40:53 +02:00
Christian Kamm
779fafcbfe Make C++ code style configurable. 
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-24 12:45:07 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Leandro Melo
ae3b2ab013 Still changes to our options dialog 
We decided to have text-based buttons by default.
 2011-02-28 14:42:32 +01:00
Leandro Melo
a5977bc822 Revert "Make our options dialog a bit more uniform" 
This reverts commit 561f87fcb9.
 2011-02-28 14:37:27 +01:00
Leandro Melo
561f87fcb9 Make our options dialog a bit more uniform 
In terms of buttons, layouts, aesthetics in general.
 2011-02-25 16:29:35 +01:00
Leandro Melo
ea313f3ec8 Text editor: Introduce per project settings 
With some refactorings to make the code look better.

Reviewed-by: con
 2011-02-21 17:22:24 +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
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Erik Verbruggen
a4cbd970e5 Changed license template reading to use the global default encoding. 
Task-number: QTCREATORBUG-3039

Reviewed-by: con
 2010-11-11 11:19:56 +01:00
Francois Ferrand
3b70e944a3 Support new keywords %MONTH% and %DAY% for C++ template file. 
Merge-request: 199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-10-28 12:13:47 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching 
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
 2010-09-14 15:23:11 +02:00
Friedemann Kleint
7ab30d8a63 C++-Settings/License template: Add %FILENAME%, %CLASS% placeholders. 
... for doxygen. Change logic for known empty keywords to be replaced
by an empty string.

Task-number: QTCREATORBUG-1854
 2010-08-09 12:26:48 +02:00
con
2d17da65a9 Icon update. 2010-05-18 14:26:33 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
Thorbjørn Lindeijer
662b27153d Removed redundant group boxes from options dialog pages 
Reviewed-by: Jens Bache-Wiig
 2010-04-13 17:33:36 +02:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories 
Some categories do not have icons yet, unfortunately.
 2010-03-26 17:47:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id. 
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
 2009-11-27 16:12:12 +01:00
Friedemann Kleint
65e11062bb Polish the settings dialog. 
Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.

Task-number: QTCREATOR-26
 2009-11-24 15:05:02 +01:00
Friedemann Kleint
e4a7792d6e Options dialog: Further polishing. 
Task-number: QTCREATOR-26
 2009-11-20 16:55:23 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Daniel Molkentin
acdcf82eae Clarify what the dialog in CppFileSettingsWidget::slotEdit() actually does 2009-07-28 12:05:28 +02:00
Thorbjørn Lindeijer
e51811657b No need to open file for reading when just writing to it 2009-06-29 14:30:43 +02:00
Friedemann Kleint
2f7b3e1257 Fix overwriting of new license header template. 2009-06-22 16:27:06 +02:00
Friedemann Kleint
696cfa0432 Add a license template setting to the CppTools settings. 
Acked-by: con <qtc-committer@nokia.com>
 2009-06-22 16:22:15 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Friedemann Kleint
5740bd6410 Made cpp file suffixes take effect after restart. 
In CppTools, keep cpp file settings in plugin and settings page
via shared pointer and apply to mime DB in
extensionsInitialized() (after CppEditor has loaded
and registered the mime types).

Task-number: 252299
 2009-04-29 09:04:59 +02:00
Friedemann Kleint
70cf2c76a5 Fixes: Use common default for lower casing file names 2009-03-18 17:05:48 +01:00