feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
58,574 Commits 108 Branches 368 Tags
6ee855a2bc2678d477109f1370a8c73ea044cb90
Commit Graph

171 Commits

Author SHA1 Message Date
Nikolai Kosjar
273c3fa0af PluginManager: Extract some functions 
Change-Id: I1f47f9542729fde338a11180ccaeed3d537a337d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-01-15 17:05:15 +01:00
hjk
0a9195a1a9 PluginSpec cosmetics 
De-noise loops, use QVector for items bigger than a pointer.

Change-Id: Idae68dc51a02cb6df9bdf2d920ae2de99c7bde6c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-15 16:48:35 +01:00
Nikolai Kosjar
422b579032 Plugin Tests: Exit code returns number of failures 
...as it's done in e.g. QTEST_MAIN.

Change-Id: I7056f3204d0ed76d21f09e5c1f3dc79e83c6cd48
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-06 10:21:06 +01:00
Nikolai Kosjar
ad323e4cfd PluginManager: Clean up 
* Remove unused testDataDirectory()
* Move startTests() to PluginManagerPrivate

Change-Id: I3ad582a7ea35c8f08d1455ea3536baed88ecb2ad
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-06 10:20:36 +01:00
Orgad Shaneh
486aac4556 PluginManager: Fix potential leak 
Detected by valgrind

Change-Id: Id8de8e8f5e3f4e691be818ff0224676345227156
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-11-21 11:34:16 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks. 
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-08 10:33:25 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files 
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-02 15:11:24 +02:00
Eike Ziller
aa6495a261 ExtensionSystem: Remove Qt4 support 
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.

Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-27 08:44:34 +02:00
hjk
6431ab2c79 Use Qt 5's QStringList::join(QChar) 
Less typing and less cycles than join(QString) where appropriate

Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-08-25 08:21:14 +02:00
Christian Kandeler
1f1eb5e4ba ExtensionSystem: Compile fix. 
Change-Id: I61bf9597a7532230a897e0f609ded37a105eb9a2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-07-12 13:57:08 +02:00
Nikolai Kosjar
72ecbb7255 PluginManager: Skip test run in case of plugin errors 
...otherwise it might happen that no test functions will be executed,
which is highly confusing, especially since no error dialog will be
shown.

If there are errors, just print a warning and quit. If we do not quit,
the error dialog will be shown which might block build machines.

Change-Id: Ic347dfba8fefc0e0f375cf2363265008df56ee53
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-07-11 16:35:15 +02:00
Eike Ziller
20c4a9f262 PluginSpec platforms: It is "OS X" 
Change-Id: Ibb3c2be1401b3c09d38f0fd689658b409ff52f7b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-07-11 15:40:41 +02:00
Eike Ziller
21fb7eb471 PluginSpec platform: More deterministic name for Linux 
There is not even a guarantee that VERSION from os-release contains
"Linux" anywhere. Prepend "Linux" or "Unix" and add the version details
in parentheses instead.
Also remove unnecessary (and wrong) /etc/issues fallback.

Change-Id: I0457ad9e8cedeea35e0cad5ea8093652eb8428e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-11 13:29:58 +02:00
Daniel Teske
ce1a691abe PluginManager: Introduce a getObjects() function taking a predicate 
Change-Id: I8a822d76a3dc358de48e96801e4e531f3bbb8669
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-12 14:54:36 +02:00
Daniel Teske
cf8cae595c PluginManager::getObject(): Remove special support for aggregates 
Since no one is using it and it's faster this way.

Change-Id: Ib60d3a54aed98011b2fb4bb7d159e219abebfa7e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-12 12:29:00 +02: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
Eike Ziller
3948eeafb2 Support enabling experimental plugins from installer. 
Change-Id: Id5f383f58125c44496a3d6936b27638bce48622d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-11-14 16:34:57 +01:00
Friedemann Kleint
50f522b2f7 Remove most trailing newlines from translated messages. 
They are a hassle for translators and reviewers alike.

Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-10-22 08:05:09 +02:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)" 
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 15:56:12 +02:00
hjk
f17d9f01dc Use the canonical version of defining string literals 
Change-Id: If36658de6f68f552f93830ba4f1cfa9994a2e44c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-27 14:36:10 +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
0f492fb4ad Doc: edit extensionsystem documentation 
Use standard wording and fix some and style issues.

Change-Id: I6c226f8b8600833666f1da34f1f1e71cb333f30a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-09 16:45:45 +02:00
Friedemann Kleint
1d56d718cd Add <platform> element to pluginspec-files. 
The <platform> element may contain a regular expression
matching the names of the platforms on which the plugin works.

Task-number: QTCREATORBUG-9002
Change-Id: Ic816cfed69a5dd2c4112c976843b9106ba2cbd22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-05 16:40:24 +02:00
Nikolai Kosjar
f3ca72f989 Plugin tests: Run in separate settings path 
...if no settings path is specified by the user.

The default settins path for tests will be set to the system's temporary
directory + "/qtc-${IDE_VERSION_LONG}-test-settings".

Change-Id: Ibeaf8883c80169b4d6a3a97020a16f910292d67a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-04 09:56:12 +02:00
Tobias Hunger
50945b0a18 PluginManager: Small docs update 
Change-Id: I0d0e021a272f818746d2482a5ba0c536bf125539
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 12:46:00 +02:00
hjk
8749eee578 PluginManager: Clean up interface a bit 
Change-Id: I6ce4443115c359c2c9588ffa615d13c29c249df2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 11:18:22 +02:00
Nikolai Kosjar
0dce5de6fd Plugin tests: Specify test functions with wildcards 
Example:
    ./qtcreator -test CppTools,"test_cpplocatorfilters_*"

If test data is specified, it will be applied to all matching test
functions.

Change-Id: I579d9aa6ac3d3808ea7e71db3c067d468125569b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-26 17:34:04 +02:00
Oswald Buddenhagen
6896546ba5 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
 2013-07-25 13:18:31 +02:00
Nikolai Kosjar
871c9cfd3f Tests: Fix race condition when executing plugin tests 
Usually the plugin tests are executed after the session manager
evaluated the command line arguments. This is just fine for the file and
token tests of the CppEditor (fileandtokenactions_test.cpp) since these
depend on the files and projects passed in via command line.

Running qtcreator within valgrind reverses the sequence and makes it
impossible to execute the mentioned tests. Fixed by starting the tests
after the plugin initialization is done.

Change-Id: I7cc392b7da7e0d98e0ce44edba2e3abceb84fad8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-25 09:33:17 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements 
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-17 11:11:25 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
 2013-06-25 10:14:14 +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
Eike Ziller
a503f8bee0 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/extensionsystem/pluginmanager.cpp
	src/plugins/coreplugin/documentmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0
 2013-06-05 14:19:43 +02:00
Orgad Shaneh
81fc8ff210 Doc: Remove \fn lines adjacent to functions 
They are unneeded, some of them are unmaintained

Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-05 10:07:14 +02:00
Leena Miettinen
26c412deac Doc: fix function signatures in code documentation 
QDoc cannot find functions if the signature in the \fn command
is not identical to the declaration, including 'const' qualifiers.

Removed the \fn where the documentation comes immediately before the
function, as qdoc does not need it in that case.

Change-Id: If6a2a2e2d58b394905c803787d2a93489049e4ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-23 16:30:35 +02:00
Eike Ziller
43969c4e56 Rename PluginManager::runningTests() --> testRunRequested() 
Change-Id: I209ebb85ad2a3cc32be0c45ee37ba4918ec42828
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-04-04 14:58:52 +02:00
Nikolai Kosjar
646527b65a Plugin tests: Specify test functions in same parameter as plugin name 
Some tests will explicitly depend on the project/session provided on the
command line.

Change-Id: I6ee9388caf54683a3e055378eda990c8f9bbcdcf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-21 13:38:36 +01:00
Nikolai Kosjar
7dee10f49c Plugin tests: Unlimit number of warnings to output 
Change-Id: I7e7894c7e436d7eae62429ebc3f97bba4d6e3205
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-18 14:45:42 +01:00
Orgad Shaneh
14e35b5dc4 Client: Block until editor is closed 
Change-Id: I06bd4425008103be3a4c8f64b6dff8f7df30c552
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-15 12:24:52 +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
Daniel Teske
d3aaa76932 PluginManager: Implement -load %plugin% option 
This loads a plugin that is disabled by default.

Change-Id: Ibbc9849c417519904fe1e69a46f93a7cc1c7edc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-02-19 15:09:47 +01:00
Daniel Teske
89126edfab Rename PluginSpec::isEnabled() into isEnabledInSettings 
This is what it actually is.

Change-Id: I2ea2e77edc3fd80eb1e25156edc7a59e86dfac9a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-02-18 14:26:46 +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
hjk
548f953295 PluginManager: Add percentages when running with -profile 
Change-Id: If47c615eb6e7e5f927f514c7c6fd8c8bbe595fa0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-02-12 17:22:27 +01:00
Friedemann Kleint
4aef34e9e0 Fix crash in profiling: spec may be 0 for common reports. 
Change-Id: I1f7a07bc08f07c3f3bcb95e56ab4258e3e0b9ab0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-07 13:34:42 +01:00
hjk
edfd651f87 Show summary when using -profile command line option 
Change-Id: Ieeec4be993b1c53a59407349d365a6aaf1a92e32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-02-06 14:19:44 +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
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