feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,529 Commits 108 Branches 368 Tags
5e059db065b1680c4f08b901b64f102300eda6e6
Commit Graph

4240 Commits

Author SHA1 Message Date
Eike Ziller
086dd684ab Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
 2012-10-09 14:27:29 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 12:24:24 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia 
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:10:50 +02:00
Leena Miettinen
101085a488 Doc: adding system packages 
Change-Id: I66a91303d7ad683e83aae57fd8d3465ec8506ae3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2012-10-08 15:07:06 +02:00
Leena Miettinen
e78d564242 Doc: update screenshot of Configure Projects tab 
Change-Id: Ifc77d2c35e833def2372315aece4bb47b682df13
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-08 14:21:26 +02:00
Leena Miettinen
480163efb4 Doc: move description of plain C projects 
The projects have been moved to non-Qt projects.

Change-Id: I98721458114c9cc92f7416ac37d6a37c4d77279b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2012-10-08 14:14:36 +02:00
Robert Loehning
bdceb60dd0 Fixed "can not" 
Change-Id: I1ebfee92df0f4bd2e9520a4e831352b780d6b556
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-08 13:34:18 +02:00
Leena Miettinen
43b20f8d75 Doc: fix a typo 
'desigm' should be 'design'

Change-Id: I885a5082c0517cca8e3f6cbe7ca40383ddee0cff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-08 11:41:10 +02:00
Leena Miettinen
22b7450496 Doc: Qt Quick Designer only supports Qt Quick 1 
Change-Id: Ic0e746a053522d494d03e9add6cc4813072d0ec3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-08 10:41:05 +02: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
Eike Ziller
68c796e244 Merge origin/2.6 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
 2012-10-05 20:51:31 +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
Leena Miettinen
6f1f4f014e Doc: added some Mac OS commands 
The screenshots are now taken with a Mac and the text looked wrong.

Change-Id: I3b2358255eee752cdb6b0a21b7fb802916011771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 13:50:01 +02:00
Leena Miettinen
cb01d1cc22 Doc: updated screenshots because of term changes in the new project wizard 
Change-Id: I145f2849db8b1a488b4af51f0f136cfa6ac12b67
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-10-04 15:33:23 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
 2012-10-04 12:23:39 +02:00
Leena Miettinen
52eed97eaf Doc: remove Qt Simulator from the build and run example tutorial 
Change-Id: Iadb961ec0c74529f0afe278e5e46473e22c05979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-04 11:16:02 +02:00
Leena Miettinen
aeca8714b5 Doc: the Qt Quick 2 application wizard 
Change-Id: I586a669995ca173648783bed2f1e6ea675aacda3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2012-09-28 16:07:25 +02:00
Leena Miettinen
fe1f97ce43 Doc: experimental ClearCase plugin 
Change-Id: Ia32913d0fc76700502c7f25f4fcb987b784e104a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2012-09-28 11:52:46 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
Leena Miettinen
2207a9a987 Doc: QML Inspector was integrated in Locals and Expressions view 
Some functionality was removed. Update text and screenshots accordingly.

Change-Id: Iec9057ac17ddb1c3a27244c74038553f5ab46605
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2012-09-27 15:21:56 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
 2012-09-26 10:01:04 +02:00
Leena Miettinen
1b575cb50c Doc: use same terminology as in the changes file 
List supported types of animated images.

Change-Id: Iae12c805db9bc69da97b842e79f1aa18a3d6ff5d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-09-25 16:16:55 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX 
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2012-09-25 10:14:51 +02:00
Sergio Ahumada
9c2afc4f29 doc: Fix some spelling errors 
Change-Id: I22c0de2d1c5277879fe504764c15a76d1d7f198b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2012-09-21 16:26:19 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
Leena Miettinen
069b5a536d Doc: memcheck requires a debug build 
Make terminology more consistent and add link to glossary

Change-Id: I46bbba560e14a917857cd89691986019d90b1550
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-18 16:41:03 +02:00
Leena Miettinen
61fb4f55c8 Doc: creating scratch buffers that use temporary files 
Change-Id: Id7d740ed587841eadfb9937fa6466647731761b6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-09-18 12:37:41 +02:00
Leena Miettinen
b0270f1fde Doc: new Compile Output pane functionality and button 
Change-Id: I0b4f68526b024a8e6c940672d9322822f2f98f76
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-17 16:32:06 +02:00
Leena Miettinen
c44074805f Doc: playing and pausing movies in image viewer 
Change-Id: Iad73768cdb8c0a57a1b8bccd3b9fb3afe1bcbb90
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-17 15:35:38 +02:00
Leena Miettinen
47f077a757 Doc: debugger commands in the Application Output dialog 
Update screenshot.

Change-Id: I129c73d2281d0a773abbea7ecb38756b1081deba
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-17 10:02:25 +02:00
Leena Miettinen
b933c30275 Doc: building single files or subprojects 
Change-Id: Icfa99aac9af7cb76a2bfc60e3b4be9f7e8bc836e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-14 15:36:38 +02:00
Leena Miettinen
8d48798419 Doc: update screenshot 
Change-Id: I1ef3e519e7816d9995158c5f6baa127b265c6d77
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-14 14:43:16 +02:00
Leena Miettinen
eda3e211c4 Doc: updated changed fieldnames 
Updated screenshot.

Change-Id: I79dab92e7350def539989c62528a13fd9b9eef8f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-14 14:41:28 +02:00
Leena Miettinen
1f8c835310 Doc: replace "targets" with "devices" or "target platforms" 
Try to make the terminology more consistent, where possible.

Change-Id: Ic3f86fcffe845f9a118bb2ee630e706e832e8e05
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-14 13:20:29 +02:00
Eike Ziller
9b6852ff0c Merge remote-tracking branch 'origin/2.6' 2012-09-13 13:16:07 +02:00
Leena Miettinen
c58569e163 Doc: using locator to open a file to the specified line 
Change-Id: Ic732bd32ccc16fe507b42db211e7d34ddb85b3dd
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-13 10:10:31 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6' 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
 2012-09-12 17:27:37 +02:00
Leena Miettinen
f044873fb1 Doc: changes in debugger management for kits 
Change-Id: I3bfd3b0794281a4776437f9498bf4a7251f30c20
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-12 15:28:25 +02:00
Leena Miettinen
5aef98bb66 Doc: changes in the Debugger field in the Kits tab 
Update screenshot.

Change-Id: I980ad1396854ea4e59b26ccbc780de86469276fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-11 17:06:15 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
 2012-09-11 14:02:03 +02:00
Leena Miettinen
f278a87adb Doc: refer to mobile targets in alphabetic order 
Change-Id: I65b46b79757eea2f96e37c910359e62d4a4d0ba5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-07 16:39:51 +02:00
Leena Miettinen
fdd4a81542 Doc: update info about Linux-based devices 
Add info about the kits. Fix changed field names.

Change-Id: Ic8d10e17d3cef4082c0a151d15bfe8da14e7ad66
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-09-07 13:45:33 +02:00
Friedemann Kleint
811f3627d9 ProjectExplorer command line parsing: Handle directories. 
Prevent the editor from complaining about not being able to
open directories. Instead, check whether the directory name
matches a session or the the directory contains a project
file.

The idea is that one can type "qtcreator ." which results in
'Do what I mean'.

Change-Id: I45c5836567f8d1ff1024aca12db3603d6539d376
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-07 13:04:26 +02:00
Friedemann Kleint
5efc4cf00b Template project wizards: Add date and time. 
Task-number: QTCREATORBUG-7827

Initial-patch-by: Christian A. Reiter <christian.a.reiter@gmail.com>

Change-Id: I241887acf0ff8006de74e0d67f3291b5638a54c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-07 12:02:20 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)." 
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-07 10:02:40 +02:00
Leena Miettinen
5bbc6db284 Doc: remove Remote Compiler, as it is no longer supported 
Change-Id: I98c7a66303a7b6c4a6e6a52a2a7fd85aef647d37
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-05 17:00:48 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT). 
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-09-05 16:37:42 +02:00
Eike Ziller
328d205b62 Device type + tool chain + other settings -> Kit 
We called that "Target" before

Change-Id: Ie0d673c643947c26ac2706907f6250fc1739388a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-09-04 15:24:06 +02:00
Leena Miettinen
92113a8bb5 Doc: Tool Chain tab was renamed as Compiler tab 
Fields were also renamed accordingly.

Change-Id: I2f2658cdca2293c10c73d967fe66d520cb6de4d0
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2012-08-31 13:42:43 +02:00