feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
32,373 Commits 108 Branches 368 Tags
fd8f2c6cdb4ffa39da6ef89461260e3001f23ad9
Commit Graph

88 Commits

Author SHA1 Message Date
Petar Perisin
1a8ef7f312 PathChooser - fix handling of predefined path 
predefined path was not set when path chooser was set to select files.

Change-Id: I2a9b3d9f2d84b0c5f048bde8e098c6c17772e957
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-02 13:17:33 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00
Leena Miettinen
efbecf21db Doc: edit utils docs 
Use \a for all attributes in function descriptions
to avoid QDoc errors. Do not use \param, because
it is not a valid QDoc command.

Do not use \returns as it does not exist.

Do not use \brief for functions. It is not obligatory, so
rather than add them for all functions, let's consistenly leave them out.

Fix typos, grammar and style issues, and punctuation.

Change-Id: Ib8f296f93976265bb93dbeab40c5b47156518122
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-09 12:55:00 +02:00
Andrew Knight
e349fb48b4 Improve property offering in Utils::PathChooser 
Add notifier to path property.
Add promptDialogFilter to property list.

Change-Id: Ic0e5dbdc1a2c1ac64477baeee5f55bc4416bc526
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-07-15 09:40:11 +02:00
Leena Miettinen
41411165ba Doc: use standard wording in \brief commands 
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 11:22:47 +02:00
Tobias Hunger
8fc3c8aff0 PathChooser: Update tooltip after change of base directory 
Change-Id: I744ede2c6e011d1b7914b4e2922179fd5c366a69
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:17:28 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
 2013-04-11 18:27:52 +02:00
Rafael Roquetto
d6c6471776 Add SaveFile functionality to Utils::PathChooser 
Change-Id: I4e35c15a16eda924af217a668159cf2f65af0e94
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-09 13:40:57 +02:00
Friedemann Kleint
aebf19eabd Clean headers in Utils. 
Forward-declare QGraphicsOpacityEffect in DetailsButton,
QProcessEnvironment in Environment, QFileInfo in fileutils,
QUrl in IWelcomePage, FancyLineEdit in PathChooser and
remove unneeded headers.

Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-19 17:19:26 +01:00
Mehdi Fekari
b848461891 Utils: Change the minimum width size of PathChooser 
This fixes an alignment issue on the BlackBerry device configuration widget

Change-Id: I8e48432713b14f923715bebc52317e50ff4e304f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-14 18:12:03 +01:00
Leena Miettinen
31ecec10a8 UI text: fix typo 
"a executable" should be "an executable"

Change-Id: I3d1717c893e1dbdc95d7af2477af253234eb0c21
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-13 16:57:14 +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
Daniel Teske
02b4b8c464 Qt4ProjectConfigWidget: Update build directory line edit on build 
That line edit shows a red text if the directory does not exist,
building triggers a recheck and removes the red if the directory exists.

Change-Id: I50e87816a3e1b4ee9ef6ccb91e66eec8f7783242
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-01-17 14:49:58 +01:00
hjk
4e8b5c6dfc Cleanup in PathChooser and FileUtils 
Mostly use HostOsInfo instead of direct macros.

Change-Id: Ic6da7c987268fc8a0d06057e17c5bc0b131cbcb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-12-28 19:50:52 +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
hjk
ec6929434d utils: base PathChooser on FancyLineEdit 
Change-Id: Ibf5e7ca866dca0816efda9f75af2cd17ac61c7c7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-24 13:37:44 +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
d8d5efcd40 Target options layout fixes. 
* smaller icon button (waste less space)
* align manage/choose buttons

Change-Id: Idb2cb111a40353f2405cd964c2ec4f5cf8b24d78
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-23 00:48:02 +02:00
hjk
616e81428d pathchooser: compile fix with stringbuilder 
Change-Id: I6d48a40adcd53c8a9099116f5a8bbc74dd6509d9
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-18 17:45:20 +02:00
Orgad Shaneh
231da017f6 PathChooser: Read version info also from standard error 
Some apps (e.g. OpenSSH) write version info to standard error

Change-Id: I8dee64709930f4984dba23e71a54ab47faac0778
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-05-18 09:18:28 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-17 09:53:44 +02:00
Tobias Hunger
a3d244e970 Pathchooser: Add method to get/set base dir using a FileName 
Change-Id: I29f09197f98ad12f3508ff2357dc294b2f820050
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-27 15:07:18 +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
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC. 
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-26 11:06:12 +01:00
Tobias Hunger
f77dfaddd1 Add API for FileName to PathChooser 
Add a API to enable use of Utils::FileName in the PathChooser.

Change-Id: I787ef0e23001188fda10497c8ee22a5c2352de4d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-17 12:01:37 +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
Daniel Teske
9c85a77aa8 Fix buddy for Utils::PathChooser 
Task-number: QTCREATORBUG-4966
Change-Id: I848f8fbdc6fa613e7308bb5700b9cbc305f36c73
Reviewed-on: http://codereview.qt-project.org/4760
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-13 13:13:35 +02:00
hjk
bfd9fcbb3c all: some m_d -> d style 
Change-Id: Iac1f12980bf47666007817cfb2c64a6d1e9b780e
Reviewed-on: http://codereview.qt-project.org/4477
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-08 17:42:14 +02:00
Friedemann Kleint
a56162ec6e tr()-Fixes for 2.3: No contractions, spelling. 
Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-14 17:18:48 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
dt_
f6148f6d45 Environment, expandVariables() can return native separators 
Convert to '/' at the right place.
 2011-04-29 13:39:43 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Tobias Hunger
7c469ae68b PathChooser: Always return path for existing commands 
Always return pathes for existing commands, even if the path is invalid.

Task-number: QTCREATORBUG-4130
 2011-04-01 13:30:18 +02:00
Tobias Hunger
f6ceffb0d9 PathChooser: Make error messages more informative 2011-04-01 13:30:18 +02:00
Oswald Buddenhagen
219c3372ae revalidate when the expected kind changes 
otherwise the initial value set before the kind was set will be
displayed as validated by the default kind's rules.
 2011-03-08 20:46:12 +01:00
Oswald Buddenhagen
e26b631a5a remove dead code 2011-03-08 20:46:11 +01:00
Friedemann Kleint
505256fab9 API-Documentation: Add the Utils-library. 
Fix API after doc template change.
 2011-03-02 17:14:19 +01:00
Leandro Melo
e6d10c86ec Make PathChooser always use QPushButtons 
It might look a little bigger, but since we are using
QPushButtons by default in the options pages it's more
uniform considering the buttons around.

If we "conclude" it looks weird or unpleasant in other
places (like in the wizards, for example) we can consider
an alternative approach.

Reviewed-by: con
 2011-02-28 16:25:42 +01:00
Leandro Melo
b3791e52d7 Fix setReadOnly method in PathChooser 
Reviewed-by: dt
 2011-02-28 16:25:42 +01:00
dt
aa66684b62 PathChooser: Introduce read-only mode. 
In that mode the lineedit is readonly and the browse button is
disabled. To be used in the new targetsetuppage
 2011-02-22 15:35:24 +01:00
dt
7edd89ba85 PathChooser: rename Directory to ExistingDirectory, introduce Directory 
Existing Directory checks for whether the directory exists, which
Directory does not. Also changes all existing PathChoosers from
Directory to ExistingDirectory as that does not change behaviour.
 2011-02-22 15:35:24 +01:00
Friedemann Kleint
086c993ac9 Path Chooser: Introduce tooltip displaying the version. 
Add a string-list type property specifying the version argument
for command type Path Choosers. Use it prototypically in
GccToolChainWidget.

Rubber-stamped-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-02-22 12:28:29 +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
Pawel Polanski
d1089afcfe Unable to enter slash and backslash manually in PatchChooser 
Task-number: QTCREATORBUG-3214
Reviewed-by: Tobias Hunger
 2010-12-06 11:37:08 +01:00
dt
5689e904fe New Project Wizard: Recheck existence of directory after browsing 
The user might create directories or delete them while in the browsing
interface, thus in the PathChooser trigger a validation after browsing.

Task-Nr: QTCREATORBUG-3105
Reviewed-By: Friedemann Kleint
 2010-11-23 15:25:17 +01:00