feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,219 Commits 108 Branches 368 Tags
769788a452e67a00d08573eee9dd6988600b91f5
Commit Graph

118 Commits

Author SHA1 Message Date
Leena Miettinen
78fc438372 Doc: location of generated help files 
Change-Id: Ibd2d6f86cd82e98bf9116bc9d5dc14dec1c6d058
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-07-26 13:47:34 +02:00
Eike Ziller
42c9c96361 Merge remote-tracking branch 'origin/2.7' into 2.8 
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
 2013-06-14 16:19:14 +02:00
Leena Miettinen
3ac771ecbf Doc: rename index.html as extending-index.html 
Remove the \contextpage commands, as they are only used
in some of the files.

Task-number: QTBUG-31106
Change-Id: Iacbf15a33ab6cb426c2fbfb6fbed03310095f2ba
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-06-14 15:55:19 +02:00
Leena Miettinen
68a573b62e Doc: do not link to external pages over https 
Replaced "https" with "http" (where redirecting works)
as a workaround for a bug that causes Qt Creator to crash
when trying to open external links using https.

Task-number: QTCREATORBUG-9397
Change-Id: If331eaffd2296a79f6e6f1ee7becd725d2aadb1d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2013-05-31 16:01:49 +02:00
Eike Ziller
54b6607b09 Add documentation for variable chooser. 
Change-Id: I26da0ec0d092ba83a30a4db156d8e5237ab8f001
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-04-02 17:34:48 +02:00
Eike Ziller
f1741032a8 Add document about plugin manager/object pool. 
Change-Id: I60d3a60f2a6933f9b1fe1501bab4dca95dda4d8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-04-02 15:42:07 +02:00
Leena Miettinen
a436ffc0b9 Doc: update info about building the docs 
Change-Id: I80de9d6b13e286f9eb95efc69b5b4b5256541f2f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
 2013-02-28 15:52:49 +01:00
Leena Miettinen
7f6405c46a Doc: taking screen shots 
Change-Id: I8b0be0e822efcd538e5642bdf33b06016294748d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
 2013-02-28 15:52:37 +01:00
Oswald Buddenhagen
853194370f use qt's qdoc templates when building against qt5 
Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
 2013-02-15 11:35:22 +01:00
Oswald Buddenhagen
276320caac make doc generation work cleanly with both qt4 & qt5 
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-06 09:40:03 +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
80631f60f8 CodingStyle: Recommend space after // 
This codifies the practice we have been following for a
while and has been advertised on the mailing list now.

Change-Id: I25cc41a14586e8f6735a689c53007c2800bee963
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-01-14 17:57:37 +01:00
Christian Kandeler
110f0d8a9e Introduce new plugin attribute "disabledByDefault". 
A plugin might be disabled by default for other reasons than being
experimental, e.g. because it is not expected to be needed by the
average user. This is probably becoming more relevant the more plugins
are added, since we want to keep the start-up time reasonable.

Change-Id: I87927596d5c78e14793c5e8d6f0548eff6b58d59
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 13:19:03 +01:00
Eike Ziller
d5fd3b5dd8 Remove unused classic.css 
Change-Id: Id4b5a2bbf3d6498b1439abbb6fe204bd3db39620
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-08 18:32:37 +01:00
Marcel Krems
297afe3b01 Copy plugins to correct user directory under Unix. 
Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-29 10:45:58 +01: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
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
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
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +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
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
Tobias Hunger
13c10c8c14 Document PluginManager::initializationDone() signal 
Change-Id: Ic340992afd3016b10a75dcd4a8dbd9da1b92b69b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-08-24 15:00:05 +02:00
Konstantin Tokarev
32ebcb0297 Coding style: there's no Q_STATIC_GLOBAL. 
Change-Id: Id263db007896ffd26d9e56df2515cb88f4a7dfa9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-08 19:31:12 +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
Christian Kandeler
6f5e48be47 Documentation: Fix coding style bug. 
Enum values never ever start with a lower-case letter.

Change-Id: I21171ad424078a18d276d206571ec81cdcd73fe1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-30 11:11:39 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup. 
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-25 10:08:24 +02:00
Leena Miettinen
9ead32dbf1 Doc: when to use three dots at end of menu items 
Change-Id: I177128b393a7360ce9eb0059ff0a418a39c0b19b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
 2012-05-16 14:29:46 +02:00
Eike Ziller
f1d3b432d5 Adapt coding rules for file names to point to the FileName class. 
Change-Id: Ic28c3b0647a353f50c092782ae689ed6173b067b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-05-15 14:18:29 +02:00
Tobias Hunger
2ef2532bf6 Update coding style 
Since Qt modules are changing between Qt4 and Qt5 we no longer
include them when including Qt headers.

Change-Id: I3ed8649faa20b7f7bcd4180c79219f24fdbba026
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-11 13:50:41 +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
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01: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
Eike Ziller
da4b62e1db Add documentation about recently added IPlugin::delayedInitialize. 
Change-Id: Ifce2624e7843c720826e594d441bd80785cd8ffc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-02-10 16:45:35 +01:00
Eike Ziller
5ab221aed6 Add missing information about optional plugin dependencies 
Change-Id: I845dbd32534f544980d2cc3f1da3f3bf47b65e4e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-02-10 11:04:33 +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
Leena Miettinen
faf65803c2 Doc: fix typo 
Color reduction should optional, and not done if image
quality deteriorates.

Change-Id: I3e64cc74d9138388fcfe18cabadfdac770a6d6e8
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-01-09 14:29:03 +01:00
Leena Miettinen
a389bc2a8d Doc: writing documentation for Qt Creator 
Change-Id: I462db7cc1bd61d0d3c20f7f9273d251dfde7407e
Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2012-01-09 11:10:18 +01:00
hjk
6681d3edee vcs: s/VCS/Vcs/ 
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-09 10:55:41 +01:00
Leena Miettinen
b7cee1fc2e Doc: script for checking UI text capitalization 
The script can also be used to check the capitalization of
headings in Qt docs.

Change-Id: If338d0ee7fd2c764171bf9e70091721d0397e86b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2012-01-05 16:49:07 +01:00
Eike Ziller
76136202e3 Add cross reference. 
Change-Id: I0f5a0eaf69c8b0388dc2d42451a6b50fefa7d055
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-12-02 10:42:06 +01:00
Eike Ziller
855e4eac4f Add document on plugin life cycle. 
Change-Id: Iec868cdb8158726d91bcece935a9d6269219c056
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-12-01 16:42:36 +01:00
Eike Ziller
9df405ba86 Add a document about plugin specs. 
Mostly moved from the IPlugin API documentation,
and adapted and extended.

Change-Id: I9e71fd387d831dea4f650b64cd931b3043c7b4cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-28 15:37:10 +01:00
Eike Ziller
d0c0c0628d Start on Creating Plugins documentation. 
Change-Id: Ic75775473cfb405cee5c53b2dc24144dba51a25c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-28 14:52:04 +01:00
hjk
cd0673f787 codingstyle: add namespace rules 
Change-Id: Ib6b3e37376084e2305143e42c85d13ce66ec9f2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-11-14 10:02:43 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Joerg Bornemann
9a191b5b81 Doc: add handling of the preprocessor's "defined" op to coding style 
Change-Id: I3d6e732ad45e3fcceb8d899c28ac4c4a02bb9e23
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 13:36:07 +01:00
Christian Kamm
a51120b7db QmlJS: Documentation. 
Change-Id: I2a095e38b7d79a5fb39a16d8f32b48c8e28132f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-11-07 15:16:59 +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
cfb8417dec Adapt to new project location. 
Change-Id: I13de0363d36095faa2554c5b41cdb7fb3e7c42f2
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-26 15:41:35 +02:00