Commit Graph

3443 Commits

Author SHA1 Message Date
Konstantin Tokarev
ecbadbce24 Forward declare QFileSystemWatcher
Change-Id: I9ddfe95ea9e0df31c6737e11fe7b4b095b594d18
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-26 15:42:22 +02:00
Daniel Teske
2176599e74 Remove Project::dependsOn(), it's never called
I don't remember why I did leave it alone in the reafctoring some years
ago, but surely it serves no purpose.

Change-Id: Idf920faf3f8f7128cd410501f2c3748e100dfbfb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-16 11:28:00 +01:00
Erik Verbruggen
f1b2100e34 Move the ModelManagerInterface out of the CPlusPlus library.
Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-03-14 11:46:24 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01:00
Friedemann Kleint
4e83fb7953 Port Qt Creator to the new plugin system of Qt 5.
- Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN
  for Qt 4.
- Generate the Json files for Qt 5 from the pluginspec
  files by using a XSLT sheet.

Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-02 14:13:49 +01:00
Eike Ziller
5f86aba16c Merge remote-tracking branch 'origin/2.5' 2012-03-02 09:38:28 +01:00
Konstantin Tokarev
e9ac88ae84 Removed unneeded include
Change-Id: I776780ec781c4325387b39c7c4f34811921d8468
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-01 13:40:24 +01:00
Konstantin Tokarev
b67d761462 Added special context menu for CMakeEditor.
This patch replaces generic context menu in CMakeEditor with
CMake-specific menu, containing action for file navigation
and line commenting.

Change-Id: I30c4ab5e517c77f801d2cc27561ded79dcf977a3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-01 12:55:32 +01:00
Sergey Belyashov
cb6e324738 Added tr() for 2 messages in cmake plugin
Messages: "Build directory:" and "Run cmake"

Change-Id: Id9306d595cf9d539fd7acd22f0759e3726a4c376
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-29 19:07:21 +01:00
Orgad Shaneh
164db0feeb qbs: Cleanup
* Removed utils, extensionsystem and aggregation dependencies
for plugins that depend on Core
* Capitalized Find and CPlusPlus

Change-Id: I505e5f46976f26da47ad778860f103b173668b1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-28 08:58:11 +01:00
Daniel Teske
72d466200a ITargetFactory: Make supportedTargetIds() and canCreate() orthogonal
ITargetFactory::supportedTargetIds should return all targets that this
factory can support, regardless of e.g. installed qt versions.

Whereas canCreate() should check the availability of e.g. a qt version.
This makes supportedTargetIds() have the same meaning as
ITargetFactory::supportsTargetId().

Change-Id: I744abb89e441026d6f3f8de21944d780e9b9fa32
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-02-21 17:39:30 +01:00
hjk
503c6e2684 projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"
This is the first step of a larger refactoring. The plan is to make
debuggersettings more orthogonal to individual runconfiguration
implementation. This patch alone already pushes the settings handling
to the debugger plugin and removes code duplication in the
runconfiguration implementation.

Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 12:21:38 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01: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
3aab8beaf4 Supply c++11 flags and per-project info to c++ code model.
A manual squash/merge of the changes below, plus a couple of subsequent
code fixes.

59085aa5fbb99e2d786cd2c1a06c24a111ccb49f:
    Modify CppModel::ProjectInfo

    Adding per project node information, to pass on the correct
    defines/includes for each file, instead of aggregating them incorrectly.

    Also split up SOURCES and OBJECTIVE_SOURCES.

    Also ask the toolchain to convert the compilerflags to flags the
    codemodel understands, for now only gcc and only c++11.

    Also make the toolchain aware of the flags used to compile, so that it
    can emit the correct defines.

    Note: No header files are passed on.

74028802314cd4e75b41b46407433e07090a304d:
    GCC: Evaluate cxxflags when checking for predefined macros

ebaaa4957e4c02cc9637a998eddae1d0acd74f83:
    MSVC: Take cxxflags into account when checking for predefined macros

9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7:
    Compile fixes

Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-02-16 15:17:17 +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
f916d38dce Make IFile::isReadOnly consistent.
It is supposed to refer to the property of the file on disk (if there is
any).

Task-number: QTCREATORBUG-4998
Change-Id: Iaed62c17d124b364aecec4d1f910046bade42d40
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-14 12:58:11 +01:00
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils.
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-09 12:33:10 +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
Friedemann Kleint
2a2ef450ac tr()-Fixes for 2.5.
Change-Id: I51d3f71e49b7cbd2e7608a11e08f3066ee133776
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-31 12:04:52 +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
Yuchen Deng
d76c09bd12 CMakeWizard: Use better build directories
The "ProjectName-build" is more common, and certainly does not cause
conflict.
Not all of the directories have to be called "qtcreator-build"

Change-Id: Iee671f6091756c09be4ab1192faf244f74cac034
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-25 13:24:43 +01:00
hjk
b0b105d575 ProjectExplorer: make currentProject static
This saves one function call compared to the instance()->currentProject()
pattern and is typically less to type on the caller site.

Change-Id: I65568f30205fc90e2aaca7e8e7f0192241df8c85
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 19:20:13 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Daniel Teske
f05c27537e CMake Settings: Make cmake executable field grow.
Task-number: QTCREATORBUG-6791

Change-Id: I1e3df08a2217c105b3c905e3ea4cd9b960353396
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-13 15:25:06 +01:00
Daniel Teske
f5d4287123 Use Utils::FileName for various bits in QtVersion
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-07 15:05:31 +01:00
tomdeblauwe
a3e101639d fix whitespace in cmakeproject
Change-Id: I62e1f14793fbf994273a838f19b8a4846dcec466
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-05 10:59:40 +01:00
Daniel Teske
d13fca02a4 Readding MakeSteps to the clean step list should set them up correctly
That is set the argument to "clean" and ensure that the return value is
ignored.

Change-Id: I1f15ad464e6f4608d7eb698365846a4c765f1d22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
2011-11-25 11:08:50 +01:00
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
2011-11-25 09:48:25 +01:00
Nicolas Arnaud-Cormos
84aa93c2bb Fix copyright header.
Change-Id: I9d0791ed519949be820e737d43669ca899a5cef6
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-25 08:50:17 +01:00
Daniel Teske
ed8441a2e4 Fix size of cmake project wizard
Task-Nr: QTCREATORBUG-6581

Change-Id: I391df32dc49a7ee7a34ba4b47bf02d1c1690647a
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-11-22 17:16:59 +01:00
Daniel Teske
97dc1d4ab4 More robustness in reading .cbp files
Instead of choosing the first one, choose the most recently modified one.
Also smallish fix to the title if no .cbp file exists

Task-Number: QTCREATORBUG-6553
Task-Number: QTCREATORBUG-6532
Change-Id: I34e2d7ca6d8242356e92099ed29ca0f0a4a11574
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-16 17:47:47 +01:00
Eike Ziller
d1d85ba912 more s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: I5eecac63f45cf5bd192bd2ee42370d6338c1ec9f
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-11 10:53:34 +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
hjk
82f5573626 more Id type fixes
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-10 15:57:09 +01:00
Daniel Teske
13c3736832 CMake Wizard: Do not show non existent build directories in red
We do create them, when necessary.

Change-Id: I2eb8e2f9c37db2e73058a5f1b5ff060d651a4995
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-04 14:02:14 +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
hjk
29279ab8c7 more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 18:20:19 +01:00
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
2011-11-01 18:16:38 +01:00
Eike Ziller
3cb6c23334 Fix showing of "Debugging Helper Missing" warning.
It was only showing up if one had a helper library that was outdated.

Change-Id: I8d0ffcd16434dc6cfeadd408a2bdb59aa3ec73ba
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-31 16:03:15 +01:00
Nicolas Arnaud-Cormos
ba15f8ec2c Add an enabled property in locator, and used it instead of hidden.
Disabled locator won't be displayed in the filter list, but will be
visible in the option page.

Change-Id: I4d39bb8ed04ce49fc34aa84c229b51f26fc70733
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-31 11:53:40 +01:00
Nicolas Arnaud-Cormos
aef4a8fbaf Add a locator to compile a specific cmake target
The locator will show all the targets for the cmake projects, even the /fast one.
It allows people to build a specific target without reloading the whole project.
It's using the make prefix.

Change-Id: Ia6701bb19c1ae390af647d94d0a2834b05a1772a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-27 12:16:47 +02:00
Daniel Teske
42b56788ea Fix a crash with cmake and no toolchains configured
Task-number: QTCREATORBUG-6252
Change-Id: I8b7237c23cd70fe8dd20724ffb3ebdef18f5bf13
Reviewed-on: http://codereview.qt-project.org/6320
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-10-10 13:35:22 +02:00
hjk
7bfde77d7c s/error_message/errorMessage/g
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 13:06:52 +02:00
hjk
5295e05310 minor style
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-19 11:24:14 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:53 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
Daniel Teske
4e41308a0f Better error feedback on Open project
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995

Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-05 15:10:01 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3'
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
2011-08-30 15:59:07 +02:00