Commit Graph

45 Commits

Author SHA1 Message Date
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
Tobias Hunger
8f1ca2216a IWizardFactory: Add a feature for all running plugins
Get rid of IFeatureProviders that are only telling the wizard factory
that a plugin was loaded.

Change-Id: Id12c669974a6ab98036f070e1adcae35b34ca376
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-21 09:52:13 +02:00
Christian Kandeler
e82a47e5af QbsProjectManager: No more "forced" vs "non-forced" parsing.
This differentiation complicates the code and duplicates checks
already done in qbs.
Just let the library reparse the project; if it turns out that nothing
has to be done, then the operation will be fast.

Change-Id: Ib6406f254e51541c69c948f275fff7877b65b4bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-17 13:11:02 +02:00
Christian Kandeler
473692aa23 QbsProjectManager: Do not reparse the project after every build.
While it is true that additional information about target
artifacts can appear during a build, this data is already
present in the qbs::Project object and can simply be retrieved.
No reparsing is necessary.
The exception is when reparsing was requested while the build
was going on. In that case, we really need to do it after
the build has finished.

Change-Id: Ief3797782ad0ca5651974d4b5d3d64e1199ca9a5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-11 15:05:32 +02:00
Tobias Hunger
d4c62539fd Qbs: Avoid crash when build changes the project tree
Change-Id: I52fe5bb49f762e8837c5ea825adb20650316ff7b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 16:14:31 +02:00
hjk
3089c8b1df QbsProjectManager: Remove some unused code
Change-Id: I5e77f5daeb8d7200e333443b0912c5be6e3b9f81
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-08 17:51:47 +02:00
Tobias Hunger
34711cdccb QBS: Remove mostly useless member variable
Change-Id: Ia5696fa2cf91130acb8c89ff95be0fc42adb22bd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-02 17:08:05 +02:00
Eike Ziller
8c1c106a4f Merge remote-tracking branch 'origin/3.1' 2014-04-14 16:53:23 +02:00
Christian Kandeler
5651465b6f QbsProjectManager: Fix building of single files.
After doing this once, the active file tags were not reset, so
building everything was no longer possible.

Change-Id: I98df5f55e129cc4a72921aff51201e1860ba939a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-14 11:20:25 +02:00
Tobias Hunger
3bcaf23b73 Qbs: Simplify build methods
Use m_editorProject and m_editorNode where possible instead of going through
the current editor, its document and the nodes.

Change-Id: I252cedccf71a3c9884d0202aae394c42a5e96014
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 12:04:45 +02:00
Tobias Hunger
6063d313ef Qbs: Use m_editorProject for signal routing
Change-Id: I6a4453eabd097e81b416f706732926766c7c6c4d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 12:04:37 +02:00
Tobias Hunger
a809ebb9c5 Qbs: Clean up updateBuildActions
Change-Id: Id866a37a61cc9c46dcd8683325c2fafc06cec044
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 12:04:27 +02:00
Tobias Hunger
f15ce3b146 Qbs: Split updateBuildActions
... into a part that sets the internal state and one that updates the
actions.

Change-Id: I78b6b948d2a15aecaeba078d8770a0c52e8ef40d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 12:04:20 +02:00
Tobias Hunger
9e7adadcff Qbs: Fix updateContextActions
Take parsing state into account.

Change-Id: I8b6d7b1d1fc7b9fb61a22cf251ff171a0c3dde1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 11:59:52 +02:00
Tobias Hunger
8f471eda96 Qbs: Split updateContextActions
... into a part that actually updates the context actions and a part
that does the setup of the internal state.

Change-Id: If6b90df98d56b1546e3d0211998d027db27fdf1d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 11:59:46 +02:00
Tobias Hunger
6a20e841c4 Qbs: Make reparseQbs act on the startup project
This was just plain wrong before...

Add m_currentProject, keep it up-to-date and use it for the reparse Qbs
action. Trigger update on the action when appropriate.

Change-Id: I6d9d82d5c5fbdfbd5d28690e16587c66e5c13d06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 11:59:38 +02:00
Tobias Hunger
b246108782 Qbs: Remove activeTargetChanged slot
Changing the build configuration triggers a reparsing of Qbs nowadays,
so that is update is already covered.

Change-Id: I8415fe8e1da71e2c7b044cbf7623362b6cdf4ed3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 11:59:23 +02:00
Tobias Hunger
279756d062 Qbs: Rewire handling of parsingStateChanged slot
Change-Id: Ieba22469249ba86b28d098e59fe7e953033243c9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-11 11:59:15 +02:00
Tobias Hunger
52b7505b68 Qbs: Rename reparseCurrentProject method to reparseSelectedProject
Change-Id: Ic574894d5ba993cb9b2d3dc2731ce169f0d66581
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-09 18:08:47 +02:00
Tobias Hunger
5bf9347cc5 Qbs: Rename m_current(Project|Target|Node) to m_selected*
These are the nodes selected in the project tree, not the current/startup
project or things related to that.

Change-Id: I5860ccf9cc3a088a1bc047f4a2b6a909c72d4eca
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-09 18:08:36 +02:00
Tobias Hunger
bab9ed3e76 Qbs: Unify naming of actions
Change-Id: I82c697bfdf191d915009410b783c712dd741d0e8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-09 18:08:11 +02:00
Tobias Hunger
40d6a2bf57 Qbs: Fix reparsing after building
Change-Id: Ic06718ddc6813fbe02078976e4bc571fb382d96a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-03 14:16:07 +01:00
Tobias Hunger
65670b1f24 Qbs: Allow to build subprojects
Change-Id: Ic0cda90d3402c4ba406548c6b5b26f11800d8855
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-12 12:07:31 +01:00
Tobias Hunger
2e45c1d8d4 Qbs: WS cleanup.
Change-Id: I2f0fbba63f7a61f541dc4d78f4bee24ef2369dc8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-10 17:36:37 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01: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
Tobias Hunger
b9813b7c91 Qbs: Make "Reparse Qbs" force a reparsing
... even if Qt Creator thinks all is well.

Change-Id: I40fa61d51c8e18a389bedf7d8afb927bbb88acd5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-12-04 13:15:17 +01:00
hjk
65cc8ae4c2 Core: Clean up FileIconProvider interface
Change-Id: I98c3c8796cb887f5bb3c5184854562ff36727836
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-13 14:06:16 +02:00
hjk
ad58c2bb44 BuildManager: apply 'static' pattern
Change-Id: I00bb591c027a22088d5f1feedc84aa28523dcca2
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 15:37:43 +02:00
hjk
aadb6f16af SessionManager: Apply 'static' pattern
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:28:12 +02:00
Tobias Hunger
d18b61b85d Core::Id: Remove some explicit casts to Core::Id
Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:57:23 +02:00
Joerg Bornemann
c883498e3b let "build file" only run one build step
For example, C++ source files will be compiled but the build
stops before linking.

Task-number: QBS-283

Change-Id: If0573ea58b9a047980aab0fd8e4828f3d0c315b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-30 09:09:59 +02:00
Christian Kandeler
824c6a5c56 QbsProjectManager: Support the "plain C" and "plain C++" wizards.
Change-Id: Idcc8459660526f972949a6f6908acc19bd52a4f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:39:29 +02:00
Tobias Hunger
2cfaa2db5b Qbs: Small header cleanup
Change-Id: Ie8972395d7a0f2af18810954c3d8311357afd1cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 14:14:44 +02:00
Eike Ziller
354cd410b0 Make document model static and add some document related methods
Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:55:59 +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
61552f87ce Qbs: Fix crash when handling files not belonging to a project
Change-Id: I8631ac0677205412306cb26a85b5b04e6f82fdd2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 17:01:10 +02:00
Tobias Hunger
f5d7707188 Qbs: Allow for building products
Change-Id: Id6fcdbdb0c776458eb16c7fc6765046969c2658e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 15:41:26 +02:00
Tobias Hunger
9dda7c28e3 Qbs: Add build file command to Build menu
Task-number: QTCREATORBUG-9353

Change-Id: I221689ae6a37ff22528b5e009615db5bdb192488
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-28 18:19:53 +02:00
Tobias Hunger
2dc7b28896 Qbs: Add QbsRunConfiguration
Change-Id: Ibb5791e10ee2e08ef824fb0bad3d3f4769ee2adb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-15 17:17:17 +02:00
Tobias Hunger
9fa9c227db Qbs: Add QbsDeployConfigurationFactory
Add QbsDeployConfigurationFactory and mark the QbsProject to not
work with the default deployment for Desktop projects.

Change-Id: I9230d5017b475d53cf13e86b4a073c248fedfaf0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-13 14:06:19 +02:00
Tobias Hunger
e3ecf4232c Qbs: Add Qbs install step
Change-Id: I0fb96cf2f3ba90d226203703f755025020680ac2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-19 12:05:27 +02:00
Tobias Hunger
e255f15ac3 Qbs add Qt overlay icon to qbs files
Change-Id: I9cd6ec7144dc1afce9d8193f5aa6719ed8d29af4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-17 12:41:32 +02:00
Tobias Hunger
f24d878ba4 Fix warning about unused variable
Change-Id: Iaeb962b46fc2b9bc6f3461263e42b5fe4a0d4f9e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-06 14:48:23 +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