Commit Graph

31 Commits

Author SHA1 Message Date
Christian Kandeler
081bf51848 QbsProjectManager: More fine-grained profile setup.
Setting up a qbs profile, particularly for Qt, can take a measurable
amount of time, so we should not do bulk changes via the kitsChanged()
signal. Instead:
    - For the initial kit loading, delay the profile setup until
      the kit is needed for the first time, i.e. the user attaches it
      to a project.
    - Handle adding, removing and updating a kit separately; in
      particular, do not do anything to other kits.

Change-Id: If09d3c40b21e9a1356dc96089b92a60186a9bcdb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-11 11:59:57 +01: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
Tobias Hunger
e07ea93d89 Qbs: Simplify qbsmanager
Change-Id: I6755e28e1f75788203a0e734cd1b6dabd2308919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-17 13:58:03 +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
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
2014-05-02 10:00:20 +02:00
Yuchen Deng
b45f3ae43d Fix minimum windows version detection
Change-Id: Idba2e5ec81bae1572e6ed8f89055e8bf1ab41ba1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-23 09:02:06 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Leena Miettinen
5a02f4ed20 Qbs: fix punctuation in messages
And capitalization of product name.

Change-Id: Ia021a389dfd3e82a1b09a6e56ba721707013d64a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-03-07 12:41:56 +01:00
Christian Kandeler
ef8b1916dd Update qbs submodule.
And do the necessary adaptation in the Qbs project manager, namely
giving the qbs::Settings object a base directory. The respective change
in the qbs API is necessary for being able to run more than one QtC
instance at the same time without ill effects.

Change-Id: I6859a6616bd744915aa21c3f07b6c45243899de5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-24 15:06:14 +01:00
Christian Kandeler
b59d61e2a4 QbsProjectManager: Set up Qt version numbers.
This was simply forgotten, leading to semi-random behavior in the
profile setup code (e.g. a Qt 4 version being treated like a Qt 5 one).

Change-Id: I6d75cf3c622a0dd520724b25eb9b823d3dcc117d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-01-23 17:14:20 +01:00
Christian Kandeler
eaf75253b4 Update qbs submodule to HEAD of master branch.
Includes some necessary adaptations to the QbsProjectManager plugin,
namely:
    - Use the new library for setting up Qt profiles.
    - Use per-profile preferences.

Change-Id: I0a639bd291d790c6da9cb4ade53841314310d5ef
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-21 17:25:00 +01:00
Christian Kandeler
d72059b1fe QbsProjectManager: Use the qbs::Profile abstraction.
No need to poke around in the settings directly.

Change-Id: I689039a0cb0afd2e3a4c32b2108755d79c8fb4b6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-21 17:05:25 +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
Christian Kandeler
e2fa2d71fd QbsProjectManager: Clean up qbs::Preferences object.
Change-Id: I5921b97b42a94aaa9c06d47f8581538c12c4fcab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-21 16:09:22 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
Tobias Hunger
f17bdffb11 Qbs: Let plugins extend the profiles written into qbs.conf
Provide a way for plugins to extend the profiles that Creator
will write into the Qbs configuration.

This should allow e.g. the Android plugin to add customized settings.

Change-Id: I0de596e2c922280b953c43ea0651b08b8936234c
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-07-18 14:51:44 +02:00
Eike Ziller
273dfa32e2 Adapt Qbs profile generation to recent changes in Qbs
* targetOS for mac is "osx"
* targetOS and toolchain are lists

Change-Id: I53d6c0d3669570c5c35f42a358727128d4d9d827
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-26 18:35:04 +02:00
Tobias Hunger
cf9d340a67 Qbs: Update profile information set by creator
Change-Id: I15948c90a06e60969a4d1d95e80a7394d1a7bb9a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-21 13:27:27 +02:00
Tobias Hunger
116db445bf Qbs: Be more paranoid when setting the log level
Change-Id: I134c6eefeff285ed8953c7b35c249ea757692c34
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 16:31:07 +02:00
Tobias Hunger
a52063ee39 Projects: Improve opening of projects
Move logic to detect already open projects into ProjectExplorer itself,
along with some check for the canonicalFilePath.

Remove the same logic from the individual projectmanagers.

Put check that the path is a file into project managers. So far all of
them assume the project file to be a file (e.g. a xcode project manager
would expect a directory though).

Task-number: QTCREATORBUG-9350
Change-Id: I3901958395e3c594c8cfba9a85dc7d3ec3334afb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-27 13:16:50 +02:00
Joerg Bornemann
6901f678b2 set Qt.core.frameworkBuild only if needed
Change-Id: Iceddd57c82269f4bde1643c6c2f9a3aab164fd47
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-15 11:45:19 +02:00
Joerg Bornemann
3604bdbad2 qbsprojectmanager: fix mkspecPath in profile
qbs.mkspecPath contains the full path to the mkspec,
not the directory containing all mkspecs.

Change-Id: I9407057eff0c587bcc44d393bf4eede1d4263d65
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-15 10:35:03 +02:00
Tobias Hunger
96c2b2702c Qbs: Add frameworkBuild option to qbs configuration
Change-Id: Idf9fe91e1a40b86da3d43fe26119ccb7d88ff190
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 15:54:50 +02:00
Tobias Hunger
0b1d227355 Qbs: Prefix Creator-managed profiles with "qtc_"
Change-Id: I64b5eff31ca7ef7d89d9c50ae2ad300f095532bc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 15:54:45 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Joerg Bornemann
1526011f32 update qbs submodule
Also adjust the qbs plugin to changes.

Change-Id: I26f9beca50ceac1fd6b64ca79fe9881096afa1ce
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-17 16:17:14 +02:00
Friedemann Kleint
fff7c62b8a Fix Krazy warnings about values or keys iteration in project management.
Change-Id: I70674ac326f508b53f50b4dbbc5e051dbdd9017d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-03-15 13:24:29 +01:00
Tobias Hunger
82a1bfe29b Qbs: Add static method to retrieve preferences from QbsManager
Change-Id: Ib18c4a8cf904a998c2a76ae6a7ed10d4d968b396
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-18 12:35:52 +01:00
Christian Kandeler
85387c07e3 QbsProjectManager: Adapt to qbs API change.
Logging API was updated.

Change-Id: I78ce4bfeb441d6b496c3331aebf924e7dc81b9c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-06 12:19:16 +01:00
Tobias Hunger
2cd5010a3f Qbs: Allow for tweaking of Qbs log level via environment
Set QBS_LOG_LEVEL to any number, the higher the more messages you
will get.

Change-Id: I6ae0d3a5bb94ad6865cd57d9ff381d36c8c8e95e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-01 13:04:45 +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