Commit Graph

320 Commits

Author SHA1 Message Date
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Daniel Teske
79d35cd886 Qt4ProjectManager: Fix codemodel not finding source files in VPATH
Due to not using VPATH for resolving the absolute paths.
Task-number: QTCREATORBUG-7441

Change-Id: Ifd76e6e782195b6371aac49ed257534184149805
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-06 12:09:19 +02:00
Daniel Teske
7339ab60e6 Qt4PriFileNode: Add const to baseVPaths and fullVPaths
Change-Id: Ia36969f0802c96c657079d6f71d49fb484a600ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-06-05 20:02:41 +02:00
Christian Kandeler
5337b34e87 RemoteLinux: Respect "no_default_install" CONFIG setting.
Files with this configuration will be excluded from the list of
deployables, including the build target.

Change-Id: Id1f31ee356916669eb71e911da92d02d84891087
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-04 16:37:18 +02:00
Christian Kandeler
a577cb2b62 RemoteLinux: Respect "no_deault_target" setting.
I.e. do not consider subprojects with that configuration for
deployment.

Change-Id: Ia04c8168480772ebf4026337ba0c81fba532f346
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-01 12:52:22 +02:00
Orgad Shaneh
5c23c44ed0 Qt4PM: Support "Build File" for debug_and_release configurations
Task-number: QTCREATORBUG-106

Change-Id: I9aef17f8b57051ee4b7d22cc4e454d453ea4c821
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 14:14:25 +02:00
Daniel Teske
a3a7e7081a Qt4Nodes: Fix wrong "Parsing in progress" warning for some cases
Removing a subproject and changing the project type of a parent project
didn't set always the valid parse state nor emitted the parsing finished
signal. Also ensure that removing and then readding a node does update
the runconfiguration for that node.

Note: The error message is now: "The .pro file %1 could not be parsed",
which is better, but can be improved, improving that is QTCREATORBUG-7377

Task-number: QTCREATORBUG-7394

Change-Id: Ie0d9a430ee902bd194179b0512ac8295bc519f2a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 11:33:55 +02:00
Daniel Teske
3e54136629 Fix crash on project loading, .end() detaches
Change-Id: I6bae9d04b745e27437c43b0bf6f96624be3dfd55
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-08 14:54:47 +02:00
Daniel Teske
e8ee898864 ProjectExplorer: Remove hack for virtual folders
Previously virtual folders, that is the "Sources", "Headers" folders used a
hack. This patch removes that hack, by introducing the following changes
- The FlatModel and the ProjectExplorer::Nodes now don't require path() to
  be unique. Thus allowing the virtual folders to all return the same for
  path(). [1]

- Introducing a new node type "VirtualFolder" which is sorted according to
  a priority.

- Introducing a few new virtuals for displayName and toolip(), which can
  be overriden.

[1] Note that all the project managers do require path() to be unique for
some types of nodes.

That also fixes:
Task-number: QTCREATORBUG-7100

Change-Id: I76b730f4c4254e2894467603bbe9a30e356a0bcc
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-08 13:12:17 +02:00
Orgad Shaneh
72bf41b40f Qt4PM: Build current file
Task-number: QTCREATORBUG-106

Change-Id: I3511f57b9128073104f6691a469f9c54d64138c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-07 16:39:18 +02:00
Daniel Teske
1a9b436cc1 Qt4ProjectManager: Cleanup TODOs
Change-Id: I3c274c5b9aa37e14d74da3276d7012983f14fc89
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-03 16:27:55 +02:00
Orgad Shaneh
2c1c89fa35 Qt4PM: Parse object extension and objects dir
Task-number: QTCREATORBUG-106

Change-Id: I01682bbcf19dbe26cc8325fa9ed5999b7f2fe15e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-02 12:13:48 +02:00
Daniel Teske
c976024c26 File renaming: Show a warning message if a project could not be changed
Except if we expect the changing to do nothing, e.g. if the file is
added via a folder deployment.

Change-Id: Ic6a8caa27e6ce3e779ac9cd13a43a6898360bfea
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 11:43:53 +02:00
Eike Ziller
71d9f33bef Merge remote-tracking branch 'origin/2.5' 2012-04-26 07:06:04 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Daniel Teske
bdb5b008aa Qt4Project code model: Also include files from cumulative parse
Task-number: QTCREATORBUG-7321
Change-Id: I3232c8618d13830caf5a511765eea80df9c7449b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-19 16:20:32 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
2012-04-19 16:13:09 +02:00
Daniel Teske
2be819c89e Qt4Project: cpp code model add <configuration> and headers
This makes the data which we pass on to the codemodel similar again to
before 3aab8beaf4

Task-number: QTCREATORBUG-7198
Change-Id: I40a4812b27b69efd788abc85532efbdda1bef7d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-19 15:49:14 +02:00
Alessandro Portale
1da95bc129 Remove usages of Q_GLOBAL_STATIC_WITH_INITIALIZER in Qt Creator
Q_GLOBAL_STATIC_WITH_INITIALIZER will be removed in Qt5, since
it interferes with multi threading.

Change-Id: I2013091ecb0613a168cd77f56ac88edb3b97fe1d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-27 16:41:08 +02: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
Daniel Teske
f7684f689e Qt4project: Fix crash on changing a .pro file in particular ways
Reported on irc by ckandler

Change-Id: I96133c708e05a8c05d48d67fbcd05637f2a1e241
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-13 15:48:33 +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
e3d14f7c39 Make Open Project wizard skippable
Task-Nr: QTCREATORBUG-6063

Change-Id: Ieace3e9e68b4e0342c35ac7c279f4b0b61076419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-02-03 09:36:46 +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
hjk
21c0cdee40 Core::Filemanager: make some methods static
This follows suit to the ICore changes.

Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-25 19:23:11 +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
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-14 21:13:41 +01:00
Jędrzej Nowacki
500a995930 Don't follow symlinks to directories.
Symlinks may create a directory loop, causing QtCreator to hang.

Change-Id: I701811bc2cc6d3c9efd8b51c1b80c7e5b4aa06ea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-06 13:41:53 +01:00
Daniel Teske
f8a1b94381 Don't react to profileUpdated on failure or while still in progress
Change-Id: I88fa7b7e3165d3b89af4e68a1b1c17082f29510a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-08 12:30:18 +01:00
Daniel Teske
e9c079a648 Add FileName isChildOf/relativePath and endsWith and appendPath
Needed by qtversionmanager

Change-Id: I4d455298e809b744ae3663493914db6e31f372a6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-06 15:54:24 +01:00
Leandro Melo
a985759757 Add . to includePaths() for qt4project
QMake implicitly adds it, so we need to do the same.

Change-Id: Ifa1733e79f8eaa8461906fe23f492fc6e83ad017
Done-by: dt
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-29 16:50:36 +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
Jarek Kobus
7edefec435 Compile fix for Mac 10.5.8 gcc 4.0.1
Change-Id: I77a9ac922ead256c3c58be39ad0383aef67f3133
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-22 15:44:53 +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
Daniel Teske
b0ec3c130e Use Utils::FileName in Qt4ProFileNode
Change-Id: I6c0702caa2259e8fcaae48d1ac91622398ce7696
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-09 12:26:46 +01:00
wongk
ecfb958137 Don't add superfluous newlines to qmake project files.
Task-Number: QTCREATORBUG-5635

Change-Id: If12d6028b41b962e29d4aff38af3ea7ebd0eae41
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-11-04 18:03:25 +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
Daniel Teske
7c9b748f22 Fix double showing of files
Task-Number: QTCREATORBUG-6378

Change-Id: I07983b4201f6c06c3dc823527ba6299101ca50f5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-01 17:13:45 +01:00
Daniel Teske
5d91afda34 Fix bug with unclean paths with multiple .pro files in the same dir
Task-number: QTCREATORBUG-6414

Change-Id: Idb9277e951270688766b1e569c7ae0f962b2e4c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-27 15:23:35 +02:00
Daniel Teske
cc21572b64 Fix -spec parameter not used in profile evaluation nor code model
Task-number: QTCREATORBUG-4723
Change-Id: I845326bdc8726c27502c66c5aeaacb0d286c54c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-10-18 21:21:20 +02:00
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
2011-10-18 13:50:38 +02:00
Jure Repinc
fa4db8d045 Fixed some typos and added some missing ellipises
During translation into Slovenian I noticed some typos in original
string. For example some missing ellipsis characters and some
incorrectly spelled MeeGo names (as Meego)

Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-10-05 20:14:59 +02:00
Tobias Hunger
ffa88df344 Toolchain: Allow all tool chains
Allow all tool chains if either the Qt version is invalid or
no Qt modules are not selected.

Change-Id: I9842c30aca0a8752915548dc258f257c3fd39e4d
Reviewed-on: http://codereview.qt-project.org/4990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-23 14:02:59 +02:00
Daniel Teske
aebcc3c75b Fix proFileUpdated signal
Make sure it is always emitted if the parseInProgress state changes

Change-Id: I0e8dc6df5c68f14bd51885c078e909be10af8efa
Task-Nr: QTCREATORBUG-6057
Reviewed-on: http://codereview.qt-project.org/4657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-16 14:38:07 +02:00
Christian Kamm
940fb1c4ab Qt4Project: Update code models if a folder watch changes the file list.
Fixes: c861af529e

Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-15 12:30:44 +02:00
Daniel Teske
c083bded23 Export Qt4PriFileNode
Change-Id: I4e6dd89a8ddd95aa21ebf5555c05349f541bd83e
Reviewed-on: http://codereview.qt.nokia.com/4335
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-09-07 12:10:03 +02:00