feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,329 Commits 108 Branches 368 Tags
fd8fcd29a1d70a10864fc5a6e5c6dc5cf1c96ecf
Commit Graph

56 Commits

Author SHA1 Message Date
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Orgad Shaneh
62d98daa58 Utils: Remove unneeded namespace qualifications 
Change-Id: Iacab8410ab4d3b63f96e7541b450e3cc729ab662
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-07-16 14:15:09 +02:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Daniel Teske
856b4b72e5 Utils::DetailsWidget: Implement icon functionality for non checkbox case 
While Qt Checkbox has a convenient api for setting a icon and a text, for
labels we need to do it the hard way.

Change-Id: I9e653b76b08357083a58b558afee5a2c74f1625b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-18 13:12:09 +02:00
Daniel Teske
6355f605e3 Utils::DetailsWidget Fix setUseCheckBox 
The logic was reversed, fix it by calling updateControls() instead

Change-Id: I5433669c8fc5821b73aae0ab4b8e569571bc9b18
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-18 13:12:04 +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
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
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
d452da17a7 DetailsWidget: make cacheBackground public 
Change-Id: Ib3725298f77f8ea878717e31bffceffc8bf1f7c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-16 16:34:07 +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
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
hjk
9589651999 toolchainoptionpage: make name editable next to other fields 
Change-Id: I35bc69c9c26a0cf4a8ed4e1e6044428d24cdb003
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-16 17:11:55 +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
Tobias Hunger
8113465f41 DetailsWidget: Remove useless code 
setAlpha(...) takes an int, so due to rounding the alpha is actually
set to 0. Fixing that adds a rather ugly highlighting effect that we
don't want, so remove the code completely.

Change-Id: I61f06dcff7908ea1527c22e3c61ee6c027ed7553
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-06-07 10:30: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
Daniel Teske
5d0407ef46 Optionaly disable buildsteps 
Task-number: QTCREATORBUG-6713
Change-Id: Ief7f8509572cfa2008209083e5ae9c7763eba42a
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-31 18:04:27 +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
Daniel Teske
90449d10e7 Make BuildStepConfigWidget hideable 
Some steps only want to show a summary text.

Change-Id: I125fa90c13f0757ea78b6b50834c43b1beb484c5
Reviewed-by: Nikolai Kosjar
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-12-08 17:20:55 +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
57c3ab2249 Reduce vertical minimum size of Qt versions settings. 
The main point of the change is to hide the version info while the
details for the helpers are shown.

Change-Id: I02166674d2339a585fda0eebe643289471ca139c
Reviewed-on: http://codereview.qt-project.org/5325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-22 18:04:12 +02:00
Tobias Hunger
b7551b8116 Detailswidget: Force minimum height 
Task-number: QTCREATORBUG-5782
Change-Id: I3cd3584ca1f9878c36d75118302b76980cd8b4bc
Reviewed-on: http://codereview.qt.nokia.com/3506
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-24 15:02:42 +02:00
Tobias Hunger
06ab6e66be Fix graphic glitches in project mode 
Fix rendering issues in the build step lists display of the project
mode: The label got dropped from the layout.

Never drop the widgets from the layout to avoid this issue:-)

Change-Id: I912a8b6d78537f0c395c2bc440387b20b66a4584
Reviewed-on: http://codereview.qt.nokia.com/2126
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-26 16:02:32 +02:00
hjk
a130b98509 utils/detailwidget: style & make stuff private 2011-05-18 18:49:03 +02:00
dt
ffd428f2eb DetailsWidget: Only set the summary on one widget 
That is not on both the label and the checkbox. The label supports html
formatted text, the checkbox not.
 2011-05-12 18:08:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +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
con
be3a2f615f Fix target setup page layout on Mac. 
Reviewed-by: dt
 2011-04-08 15:28:56 +02:00
dt
e945acef45 Environment Widget: Linkfy summary text 
Jumps to the variable on clicking.

Task-Nr: QTCREATORBUG-3316
 2011-03-28 17:58:44 +02:00
dt
773504b2d3 Add a additional summary label to the DetailsWidget 
used by the targetsetuppage

Reviewed-By: hunger
 2011-03-16 17:28:21 +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
dt
ac0cf764fd DetailsWidget: Add a "checked" variant with a icon 
To be used on the new targetsetuppage
 2011-02-22 15:35:23 +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
con
98077818fc Fix tool buttons in details widget on Mac with raster engine. 
Task-number: QTBUG-15170
 2010-11-16 12:31:09 +01:00
dt
070f4df485 No need for special margin treatmeant anymore 
Remove unneded code.
 2010-05-25 13:48:10 +02:00
Jens Bache-Wiig
344b4b3887 Make the toolboxes in Projects Mode nicer 
I did a couple of changes to make these more subtle.
- Moved inside the details widget
- Made them fade in and out
- Hide up/down buttons when not required

Note, there are some pending changes to Qt to disable
the graphicsevent cache that can cause issues when
scrolling items.

Reviewed-by: thorbjorn
 2010-05-07 12:33:48 +02:00
Jens Bache-Wiig
42ebc6b0f2 Redesigned the project settings page 
I redesigned the gradient boxes for a
more subtle an professional look.
 2010-03-11 10:56:20 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
mae
8bd54e3618 Remove more/less-flicker in the projects tab 
Fix works at least on Linux.
 2010-02-23 15:30:25 +01:00
Friedemann Kleint
f52e7cc384 Polish Detailswidget, remove warning of Designer plugin about Q_ENUM. 2010-02-02 09:59:55 +01:00
con
255348643e Remove the summary part from the most commonly used project configuration pages. 
Reviewed-by: dt
 2010-02-01 18:34:46 +01:00
Tobias Hunger
999cf225b0 DetailsWidget cleanup 
* Add expanded signal.
 * Add copyright headers.
 * Improve setExpanded method as well as setting a widget.

Reviewed-by: dt
 2009-12-07 15:14:08 +01:00
Tobias Hunger
491527ab06 Use a custom details button 
* Use a custom details button rendering.
   This should work better on the mac ans looks nicer, too:-)

Reviewed-by: Roberto Raggi
 2009-12-01 17:59:00 +01:00
Tobias Hunger
7d50367ba4 Improve visual appearance of DetailsWidget 
* Make toolswidget appear on hover.
 * Use a cached gradient in the background.
 * Remove layout fixup as that does not help on Linux and Windows
   anymore. Reevaluate after testing on Mac.

Reviewed-by: dt
 2009-12-01 13:45:19 +01:00