Commit Graph

1907 Commits

Author SHA1 Message Date
Eike Ziller
f60873a24f Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
2013-03-08 11:39:33 +01:00
Orgad Shaneh
095b7fc206 Describe "Reset warnings" button
Disable the button if no warnings are suppressed

Task-number: QTCREATORBUG-8875
Change-Id: If019550eaf8e8745a506b512d206a2b0fd34dfeb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-06 12:26:59 +01:00
Eike Ziller
bf3aa9bf06 More fixes for non-Latin1 characters in external tools.
Now also for Qt4 based Windows builds.

Task-number: QTCREATORBUG-8603
Change-Id: I2f4ccfe85450f272146cc641023b9232f3514836
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-05 11:46:52 +01:00
Orgad Shaneh
089e58af52 GeneralSettings: Fix indentation in UI file
Change-Id: I77dc67b6697a2c830177a579ffe3eca96ff8f7ec
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-05 09:43:58 +01:00
Eike Ziller
ed7e2ce247 Mac: Don't show icons in editor tool bar context menu.
Task-number: QTCREATORBUG-8870

Change-Id: I41022e9b0156f4ec6a6802501ec1d5b9eadb87b7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-04 18:01:39 +01:00
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
2013-03-04 15:07:19 +01:00
Orgad Shaneh
f4a9f56e3e Always seed pseudo-random number generator
qrand() is used in several places, but it is only seeded in ToolSettings

Change-Id: I72ed3b96315081384c63572566d31dea1a8f8b69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-04 12:56:05 +01:00
Eike Ziller
0e0ce962bf Don't destroy non-Latin1 characters when reading external tools.
Task-number: QTCREATORBUG-8603

Change-Id: Ie8a0265165cf1fc3e806335738185de97a062c4f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-04 11:21:56 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
2013-02-28 12:02:40 +01:00
Fawzi Mohamed
bf73aac39f coreplugin/mac: set menu role before adding menu
improves menu behaviour for qt5 on osx

Task-number: QTCREATORBUG-8152
Change-Id: I6ff7703d45ff5e250c7fae9a8c85f8d8ef078e16
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-02-27 09:50:09 +01:00
Eike Ziller
9e1d58e4db Don't change context if focus widget parent hierarchy doesn't define one
We now keep the current context if the focus is set on a widget with a
parent hierarchy that doesn't define one. This way, toplevels without a
context, like popup windows without parent, will keep the behavior from
before other toplevels could define contexts at all
(2118d542e6)

Task-number: QTCREATORBUG-8667
Change-Id: I8dd04d1f97f6ced10f8fa4269bc91457211396ca
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-25 16:22:32 +01:00
David Schulz
6b62d099dd Editor: Close open editors popup on editor close
Task-number: QTCREATORBUG-8826

Change-Id: I4eaa6e7c2228deb0c10a4c428a2bb7ad1b975230
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-02-25 14:36:44 +01:00
Tobias Hunger
3ae8323d54 Fix warnings introduced by reordering member variables
Change-Id: I37bc8f9bc874de52281b8597838ef8addae1a1a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-22 11:08:20 +01:00
Tobias Hunger
1951c86395 Reduce padding in often-used structs
Reduce the padding in some often-used structs for 64bit machines.
32bit machines should also profit from most changes, but to a
lesser degree.

Change-Id: Ic4c67b94e962731de4f31164c52a372d78944ccc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-21 13:22:21 +01:00
Yuchen Deng
cf026c9f87 Fix a warning found by MSVC2010_64
Change-Id: Ie9ae9a8c8bff87a610606e3a6075987a08ed0644
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-19 14:21:28 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
2013-02-18 14:16:53 +01:00
David Schulz
6ef0cf1a30 Editor: Refactor Open Link in Next Split.
Cleanup code and added shortcuts and menu entries for
- open header/source in next split
- follow symbol under cursor in next split
- open declaration/definition in next split

Change-Id: I2c4347749d26669d88b7c2968f30f60710f442b1
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-14 09:46:16 +01:00
Joerg Bornemann
1742a8970c QtcPlugin.qbs: make every plugin depend on ExtensionSystem
Remove ExtensionSystem from the core plugin's ProductModule.
Every plugin must depend on ExtensionSystem, not only the ones that depend
on Core.

Change-Id: I9f72653c5ef61bfab2b478f61e5723140c0896ec
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-13 15:29:01 +01:00
Joerg Bornemann
76405e41ac remove outdated comment from src/plugins/coreplugin/id.h
This FIXME was done in cfc9b71ecb.

Change-Id: I52e8a04f91fcbe490ca1ee4942c2f8078bf4244c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-12 18:36:19 +01:00
Orgad Shaneh
d8b6c19fef ExternalTools: Use tool tip for effective arguments
Having the same line twice is confusing

Change-Id: Ib85afeb1867cb5bb3fbbdff584fb63f4fe496ea8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-11 11:10:23 +01:00
Leena Miettinen
432aaf005b UI text: fix capitalization in external tool config
Change-Id: I5aeaca7e5c8d9bab910588bbd1925f9a72da4822
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-09 19:39:57 +01:00
Joerg Bornemann
922165d4dc fix typo in Core::Id documentation
Change-Id: I303a4c1790752a4c41bd265994be2e4932e458cc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-08 17:59:05 +01:00
Christian Kandeler
f0c797256e Fix compilation with qbs on non-Linux, non-Mac Unix-like systems.
Change-Id: I075585d43f9e36a50c1945b3da4769744faa3f95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-08 17:26:40 +01:00
Leena Miettinen
419c6de735 Doc: replace deprecated QDoc commands
The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-06 09:44:18 +01:00
Sergey Belyashov
112e97e81d Added comment for "Reset warnings" button
Translation for button and for dialog title may be different.

Change-Id: I603df990c074bb40a8a895c7e630587d0aa89aed
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-05 15:03:56 +01:00
Christian Kandeler
45fd1c248f Remove unneeded #ifdefs.
Change-Id: I66241be77f61a53590b72560fc0afce50bda97d9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-04 14:24:16 +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
Erik Verbruggen
ed600055ab Fix warning about unused static function.
Change-Id: Icc5de3ee0b44a178d6de7a37ce48d5b08fcec5fb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-30 12:03:25 +01:00
Orgad Shaneh
9e1d730f4b External Tools: Show effective arguments
Expand variables to demonstrate what the arguments will be like

Change-Id: I32aed8aed38ada32b0ac6590772ed4d054bd463f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-30 11:43:36 +01:00
Tobias Hunger
98aa0909ac Vcs: Fix cache-checking for non-existing directories
Change-Id: Id314a40372feeddc61de89eae3684d502ea20d02
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 11:38:13 +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
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
Knut Petter Svendsen
f556e8f5f2 Fix: Make sure umask is used when creating new files
When a new file was created from the file menu, the permissions
on *nix was always 0600 regardless of the proess' current umask.
Fixed by letting CorePlugin::initialize() initialize the umask in
Utils::SaveFile. Since getting the system's umask is not thread
safe this can't be done directly in SaveFile::open.

Task-number: QTCREATORBUG-6513
Change-Id: I10d8b2f4ab85574ed3004b5e646664c2255196b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-29 14:50:05 +01:00
hjk
6d31f0b870 ActionManager: Require a valid context for shortcuts
All callers provide one, and the fall-back construction from 0
has not been appropriate for a while.

Change-Id: I8bc5d094b70aac251fff1a7d34f1fad876cbdee2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 17:48:44 +01:00
Tobias Hunger
3e7d00749f Core::Id: Do not warn when reading invalid ids from settings
Change-Id: Ic2fc0df7f3ac5e8006123bf94c4e55a3a7d86593
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 13:08:19 +01:00
David Schulz
2f9574582d Editor: Disable adding UTF-8 BOM for qmake project files
Removes the "Add/Remove UTF-8 BOM" entry in the context menu
of the project file editor. Also ignores the setting
"Add If Encoding Is UTF-8" under
Options -> Text Editor -> Behavior -> File Encodings.

Task-number: QTCREATORBUG-8501

Change-Id: I368966b5235ee60011f2051ebdb82f9fe09bc4cc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-24 15:44:05 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach.
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-24 13:02:32 +01:00
Orgad Shaneh
fcf586974f InfoBar: Suppress warning on close
Change-Id: Ie8c19db3e7569c20c1f8d5c6651f1b9b0f7db9dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-24 11:32:50 +01:00
Tobias Hunger
4e5e6b45fe Core::Id: Fix possible crash in operator ==
Revert a workaround applied earlier

Change-Id: I825bdf6df662a5509166b9b7d12a4fb305cba6cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-23 15:59:19 +01:00
Robert Loehning
1f80a41ffc Fixed Qt version in VersionDialog
QT_VERSION_STR is being read from Qt's source directory
and may differ from the version of the build being used

See also printVersion() in src/app/main.cpp

Change-Id: I1c2f3c66407a6721fe818a2e8504510151cf8d0f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:51:26 +01:00
Eike Ziller
cec327bd4a Close variable chooser when pressing escape.
Even if the variable chooser currently doesn't have focus.

Task-number: QTCREATORBUG-7155
Change-Id: Ie3a7527e13dd6c3f37c1abe86a596753d2b8e286
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-22 17:48:19 +01:00
Montel Laurent
5b4ed5bc45 Initialize DesignMode variable
Change-Id: Ib926e673434877c2771bf885a760df0ad401ae7b
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-21 08:02:29 +01:00
hjk
baffa492d9 Core: simplify ILocator interface
Use data members instead of virtual functions for id, displayName and
priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator.

Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-18 15:51:13 +01:00
hjk
be48a3faff Use Core::Id for IOptionsPage::m_id
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 11:43:04 +01:00
hjk
028fc3dd8c Use Id::fromString instead of the constructor.
Change-Id: Ie18714ac2872a085e8c20d445472901cc9f6b6c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 11:26:49 +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
0017a27581 GeneralSettings: save some concatenation of literals
Change-Id: I1f30d1d99fed4d8fef33523f428395b8c2b6a20d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-17 10:57:10 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
hjk
28f6fec97d Features: Use Core::Id as base
Change-Id: Iab812778f8f924638224ec343cadac70e8854e4f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-15 17:59:53 +01:00
hjk
931627e86c Core: add convenience functions to Core::Id.
These are meant to help the outphasing of the Id(QString) constructor
and generally split the interface into "persistent" and "non-persistent".

Change-Id: Id23f613c304e020044e4996448d68164725c898c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-15 11:23:46 +01:00