feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
30,160 Commits 108 Branches 368 Tags
a1921d91f439f6a5c4d1dd150e52c7841b63a914
Commit Graph

42 Commits

Author SHA1 Message Date
Tobias Hunger
a1921d91f4 Qbs: Adapt to the latest round of API changes in Qbs 
Change-Id: I59fd151a1a485990ca0da7dac4fdc028f915ec6b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-18 12:34:03 +02:00
Tobias Hunger
dce41176d8 Qbs: Avoid useless reparsing when possible 
Do not trigger a reparsing when e.g. changing environment variables
that qbs does not access.

Change-Id: Ieda4f68112d372c561d99c8dffe016af0d31ad41
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-17 18:35:39 +02:00
Tobias Hunger
99ba6fb8da Qbs: Make file list update after reparsing a project 
Change-Id: I1647cfed2a58aa47a545e3a329e0f31142bdc5fd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-12 12:17:12 +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
9db57f3f05 Qbs: Delay reparsing of the project 
Makes the whole thing feel more responsive:-)

Change-Id: I1b3941ab42bb1a281c0923e3826b00d1f1400abe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-06 18:46:33 +02:00
Tobias Hunger
26483b6fa9 Qbs: Update to latest Qbs API 
This also fixes parsing when environment variables are read in
qbs files.

Change-Id: Iad78296986f8700272d6027d2ffa645d4207bdef
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-06 18:32:22 +02:00
Tobias Hunger
531676bc27 Qbs: Remove some useless member variables 
Change-Id: I648984616ebd965e51ebe6ec6f369a6dfa4fc339
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-06 18:32:09 +02:00
Tobias Hunger
4a8fc32665 Qbs: Clear compile issues on rebuild and remove useless comment 
Change-Id: I705564ee422295ec467cd51a62aa71183afa0b63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-06 18:31:51 +02:00
Tobias Hunger
d080c54327 Qbs: Actually emit signal that parsing started 
The logic to disable building depends on this signal.

Change-Id: I2341ddb70eebeb25c8c4ffdbbb1e5a83945fb971
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-30 14:15:50 +02:00
Kai Koehne
17539d670f Revert "Project: Set QML/C++ languages where both are possible" 
This reverts commit 75691393ec. Otherwise
we'd enable QML debugging for virtually all projects.

Change-Id: I5518624a9973a9f61fbef6c680b5a83c74d0b4a9
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-28 13:59:16 +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
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
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
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
Sergey Shambir
6344e2a02b QbsProject: use CFLAGS in addition to CXXFLAGS 
Value will be passed to CppTools::ProjectPart::evaluateToolchain()

Change-Id: Ib365d91e9956fa59cc79107734c5ac8c89b34d4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 18:26:09 +02:00
Sergey Shambir
9a36ec3f39 QbsProject: simplified C++ codemodel interaction. 
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: Ia31aa1e6b9267ceac53c137e1729689046dcc815
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-02 18:26:05 +02:00
Sergey Shambir
6faf45a465 ProjectExplorer: extended Toolchain::CompilerFlags 
Now it provides information about C language standard and C++
extensions. No new behavior added to project managers.

Change-Id: Ib7c19641f452a75c9b14cd7e33d104dcd1603720
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-30 17:31:22 +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
4a58ea11fe Qbs: Add convenience methods to retrieve qbs information to QbsProject 
... and use them.

Change-Id: Ic8e3fdaffa2bc41ccbbc39baa4ef07edb5d9241d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-16 13:21:06 +02:00
Tobias Hunger
aff2518bd7 ProjectManagers: Update project languages based on data sent to the codemodel 
Change-Id: Iecf61f66389fff6f3995c4f4bc893ffd190c50e6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-10 15:30:17 +02:00
Tobias Hunger
ea23948efb CppTools: Use namespace CppTools consistently 
There were quite a few classes using CPlusPlus namespace in the
CppTools plugin. Rename them and do some other small namespace
related coding style fixups.

Change-Id: I093fc1f3fc394fd9923e3f18d5f66522e288f21d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-04-08 13:21:31 +02:00
Tobias Hunger
75691393ec Project: Set QML/C++ languages where both are possible 
Change-Id: I4bc5bd7a644c48dfa529f9f9f6052e401de76d40
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 14:56:59 +02:00
Friedemann Kleint
dbcf8f4e42 QtSupport: Forward-declare some classes. 
Change-Id: I7f0eb6c4ea8620c8405f6d13c554c0ec913edd63
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-27 12:51:30 +01:00
Friedemann Kleint
d8ab5465cc Build fix after ProjectExplorer header cleanup. 
Change-Id: I2fdae3d79be303d6d6c28ea938f6043a56857cab
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-26 15:21:35 +01:00
Tobias Hunger
3a95f5cb77 Qbs: Fix defines passed on to the code model 
Change-Id: Ibd3cd39578cd08b48c38b888677f04c3e17d24f8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-03-22 10:43:44 +01:00
Sergey Shambir
63fe568b9b CppTools: improved languages support in ProjectPart 
Please, read blueprint here:
http://qt-project.org/wiki/Blueprint-for-language-specs-system

Removed feature from QbsProjectManager: it not longer splits project on
separate C and C++ parts, because Qt version used only by clang parser
(not native) and can be ignored for pure C and Objective-C without C++.

Change-Id: I1c561f7f9f915cc6cb8579d19db74e8352f54c1e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-21 17:22:18 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
 2013-03-18 10:19:14 +01:00
Christian Kandeler
cea78fccbd Fix qbs submodule installation. 
We want the qbs library and resources to be placed in
the canonical places when installing Qt Creator. This
also makes it necessary to change the location of the
respective files in the build directory.

Change-Id: I8e78ec5aa0e8b728ccca96d45a647c1488961ea0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-03-14 08:20:15 +01:00
Tobias Hunger
072f93bc30 Qbs: Consider .qbs files to be part of the project 
Change-Id: I308efcff9ca8d27fee744c74540a77e1075c2458
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-05 12:59:28 +01:00
Christian Kandeler
34fdf9082b QbsProjectManager: Adapt to qbs API change. 
Use new type CleanOptions.

Change-Id: I2a096015b571bf3066135b642e497abcd5d1eb87
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:46:39 +01:00
Christian Kandeler
5e2e09c045 Qbs: Read QBS_BUILD_DIR also at runtime. 
This is necessary for people using the binary release.

Change-Id: I3e8821175c00812bdb8c65f0aedb8208894d08b2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-25 10:36:46 +01:00
Christian Kandeler
605b62d69d Qbs: Use new API for retrieving module properties. 
Change-Id: Iceeb1af4c5e54ba9fa297ac74d141480e9d5d5e2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-22 11:35:46 +01:00
Tobias Hunger
8bb7a8e2ed Qbs: Fix build after recent QmlJs refactoring 
Change-Id: I049deda46c8cb8bbe4bf15000315c4271c05e11c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-22 11:21:54 +01:00
Fawzi Mohamed
942326ae9b qmljs: add infrastructure handling qml dialects better 
QmlBundles enables us to treat the different qml
dialects differently.

Add imports completion.

Change-log: [Qml/JS Support] Corrected handling of QtQuick2 only features.
Change-log: [Qml/JS Support] Added import completion in editor.
Task-number: QTCREATORBUG-8750
Task-number: QTCREATORBUG-8624
Task-number: QTCREATORBUG-8584
Task-number: QTCREATORBUG-8583
Task-number: QTCREATORBUG-8429

Change-Id: I1384b1b23136a85b4d077895ea86f92960da9e71
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-21 17:22:16 +01:00
Tobias Hunger
bb3d0db28a Build fix 
Change-Id: I861ed80059b8586d1c1cfbab0b06fd783b7979da
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-02-21 14:01:17 +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
d53454960d QbsProjectManager: Tell qbs where to find plugins and modules. 
Without this information, qbs cannot work at all.

Change-Id: Ib99193fb38649e0bb5bbb8392ce378a6cd28a344
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-06 14:33:30 +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
44c9cd8fe2 Qbs: Fix build 
Change-Id: I284f814ac63eb489a6b0a39dce85008de742237a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-01 13:43: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