Commit Graph

31 Commits

Author SHA1 Message Date
Christian Kandeler
3948f9d887 QbsProjectManager: Use qbs::Project as a value.
Those objects are shared data pointers that can (and should)
be used as values. This is now actually possible due to
the newly introduced public default constructor and
isValid() method.

Change-Id: I989e339bd495aa7581b01f17f00cbffe0b617b9c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-11 16:27:26 +02:00
Tobias Hunger
5422b2c4da Introduce Project::projectFilePath()
Use it instead of retrieving this information from the document.

Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-01 11:42:41 +02:00
Eike Ziller
ab0c3da08f Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
2013-07-11 08:02:41 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Tobias Hunger
793dced488 Qbs: Fallback to filename as project name if qbs parsing fails
Use the project filename as a fallback in case qbs parsing fails
without being able to extract the main project data.

Task-number: QTCREATORBUG-9777
Change-Id: Iceedf55c7f5d56a8876c19bcbd94082752c08336
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 12:28:07 +02:00
Eike Ziller
79fbb0db04 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	src/libs/cplusplus/FindUsages.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I20e2002c7b25cc25d8120922fa9b52e59db498e3
2013-07-09 11:04:59 +02:00
Daniel Teske
cc7fe5eac6 Project: Simplfy file adding/removing interface
The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:05:04 +02:00
Christian Kandeler
5728f7e673 qbs updates.
- Make project files buildable with current qbs.
- Update qbs submodule to enable Qt Creator to open these project files.
- Fix an invalid access that caused a soft assert.

Change-Id: I976d19240112d1ff048e51036e6702383735352b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 16:42:42 +02:00
Tobias Hunger
161b818b23 Qbs: Fix crashes when switching QbsRunConfigurations
Do not use pointers to qbs::(Group|Product|Project)Data. Those are
implicitly shared classes, and now have a isValid method so that
default constructed instances can be spotted.

Change-Id: Icd49fa517f2e17bc60cc82d103f479d3a2e7097a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-21 17:54:37 +02:00
Tobias Hunger
98c10460c4 Qbs: Use different Icons for products and groups
With subprojects the tree is getting too confusing when everything
uses the same icons.

Change-Id: Ib1b8559c5f6e8a3c4299498db67d33c9eb916d66
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 14:07:04 +02:00
Tobias Hunger
3d2e40f85f Qbs: Support subprojects
Change-Id: Ic7015b44362b89a14957f7d21540e71d441c860f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 14:06:54 +02:00
Tobias Hunger
834a2687da Qbs: Display line numbers for virtual files
Display line numbers as part of the displayName of nodes in the
Projects view. These are shown for the virtual files we use to
enable navigation to Qbs groups and products and it more clear
that these are actually locations in the build system and not
real files.

Change-Id: If32354ad5ceb79c865cae2951fe470c51718728f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 15:54:16 +02:00
Tobias Hunger
905d0aee15 Qbs: Seriously speed up the update of the Project Tree after reparse
Do not emit an updateNode signal for all existing nodes, but only for
those that actually changed state.

Change-Id: I0a906833a6879e224df0d4be05d3813b8e130083
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 12:15:34 +02:00
Tobias Hunger
f1b60ae7e8 Qbs: More nodes work
* Mark files in FileTreeNode explicitly as the cleanup will fail
  otherwise
* Mangle the basedirectory when moving nodes to unconfuse linux

Change-Id: I84186d13d1342453e9cad4065b5989d199f7a9c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-28 18:25:33 +02:00
Tobias Hunger
2159fc21f8 Qbs: Improve display of absolute directories in Projects view
Change-Id: I89c7764f5eaa066315a00f8d3c38df3d338c2ab3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-28 17:21:53 +02:00
Tobias Hunger
f8b1016312 Qbs: Simplify and fix qbs node management
The code is simpler now and also fixes a reported bug.

Task-number: QTCREATORBUG-9378
Change-Id: Ibb8cd7b074e840eb413b8d433405e47dcc63ee06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-28 17:21:41 +02:00
Eike Ziller
d8bd56bcd6 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/qbsprojectmanager/qbscleanstep.cpp
	src/plugins/qbsprojectmanager/qbsnodes.cpp
	src/shared/qbs

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e
2013-05-24 16:20:10 +02:00
Tobias Hunger
7debb350cf Qbs: Fix crashes in project view when reparsing
Change-Id: I64c5e53364716db81d2b708b62da71a8e6adae67
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-24 14:37:15 +02:00
Christian Kandeler
8a0c8081a0 Update qbs submodule.
Plus some minor adjustments in the qbs project manager to an API change.

Change-Id: I41ea8571fee7ec666344464ecc4f808bf92f13ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-23 17:25:45 +02:00
Tobias Hunger
fc6ec40f2f Qbs: Properly report related runconfigurations for Qbs nodes
This fixes the run options in the context menu.

Change-Id: If4911f7357329fcb843206165e20d53bf6717258
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:08:48 +02:00
Tobias Hunger
ff778a6c88 Qbs: Add pointer to the project to QbsProjectNode
Change-Id: I81fe083ee4350efd89c3afb3f70deb46d0409ee2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:08:29 +02:00
Tobias Hunger
82a341da14 Qbs: Rename a couple of members to make them more obviously Qbs related
This is to avoid confusion between methods referring to Qt Creator classes
and Qbs classes of the same name.

Change-Id: I25b40c6fe1d2272a9d9b0f7fab2a4cafa079df8c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:08:00 +02:00
Tobias Hunger
cbfeb36ce7 Qbs: Add icons to Project-/Product- and GroupNodes
Change-Id: Ifedfe50e661320d5a4d26e2ef01a482afb6a76dc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:35:59 +02:00
Tobias Hunger
65f8e1b977 Qbs: Remove implicit Group with the same name as the Product
Task-number: QBS-257

Change-Id: I63d3095a2da171a27611d2c77d4e2ca914908a06
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:35:49 +02:00
Tobias Hunger
20874ca295 Revert "Qbs: Add icons to Project-/Product- and GroupNodes"
This patch got applied in the wrong sequence.

This reverts commit c5a0205a591f6b5ebdd51559d91e1faf7d4955f0

Change-Id: I37e77ae3a15890c73ea2821f6fa07b1fa100176d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:20:32 +02:00
Tobias Hunger
314bc49144 Revert "Qbs: Remove implicit Group with the same name as the Product"
This got applied in the wrong sequence.

This reverts commit 850e3eda14e41884c53932b67dffd573c2616c43

Change-Id: I604ba711e63cf207af6bca6110320632ec3cb72a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:20:00 +02:00
Tobias Hunger
bb8f7a8b88 Qbs: Add icons to Project-/Product- and GroupNodes
Change-Id: Ifedfe50e661320d5a4d26e2ef01a482afb6a76db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:09:32 +02:00
Tobias Hunger
892066cfa6 Qbs: Fix display of project tree
Do not display a folder below the Groups if the files are in the same
directory as the product definition.

The product directory is chosen since the groups can be implemented
elsewhere as done in creator for the pluginspec groups.

Task-number: QBS-257 (partial)
Change-Id: I0e39bbc62f991f2485adb3c4b47dd62dfa72763c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:09:20 +02:00
Tobias Hunger
14b3304148 Qbs: Simplify code a bit
Change-Id: I538f146b395d9908e0b49475ba3b5590db9e495e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-16 13:17:46 +02:00
Joerg Bornemann
1ce8f62cc2 fix source file paths of qbs projects on Windows
Task-number: QBS-238

Change-Id: I8f9279836a10d13998e00dafa830a38748c2aa6a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-26 10:59:02 +01:00
Tobias Hunger
5ed1f71529 Initial version of qbs plugin
Change-Id: I0e0ae07affccfeab167303bb976475649a630e65
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-02-01 13:03:36 +01:00