aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager/qt4project.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qt4ProjectManager: Rename the "normal" qt4* files to qmake*hjk2013-10-161-1640/+0
| | | | | | Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Rename namespace Qt4ProjectManager to QmakeProjectManagerhjk2013-10-161-16/+16
| | | | | | | First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qt4Project: Correctly filter kits in targetsetup pageDaniel Teske2013-10-141-0/+5
| | | | | | | | Another brokenness of the target setup page refactoring. Task-number: QTCREATORBUG-10315 Change-Id: I8d35251006f409db0bd1fdb2835712028498929a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectPart: Add meta informationDaniel Teske2013-10-011-0/+3
| | | | | | | | Add displayname and project file path and a pointer back to the project. Change-Id: Ic9a18f52a6291493bd3a95fd3456ed0e1a3c63e3 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* TargetSetupPage: Generalize the pageTobias Hunger2013-09-271-41/+15
| | | | | | | | | | | | | | | | Generalize the target setup page and move it into projectexplorer Move the qmake specific code into a projectimporter class with a specialization for qmake projects in the qt4projectmanager. This change depends heavily on the BuildConfigurationFactory cleanups done earlier and completes that change in such a way that generic build configuration factories are now in theory possible. The remaining problem is how to select the best factory of several that claim to be able to handle a kit and that is left for the next patch. Change-Id: I47134cb1938c52adebcdc1ddfe8dbf26abbbbeee Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* BuildManager: apply 'static' patternhjk2013-09-051-2/+1
| | | | | Change-Id: I00bb591c027a22088d5f1feedc84aa28523dcca2 Reviewed-by: David Schulz <david.schulz@digia.com>
* MessageManager: General cleanup.hjk2013-09-051-1/+1
| | | | | | | Apply 'static' pattern, rename 'printToOutputPane' to 'write' Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7 Reviewed-by: David Schulz <david.schulz@digia.com>
* ProjectManager: Use Core::Id for progress typeshjk2013-09-041-1/+1
| | | | | Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Static pattern for ProgressManager, clean up all usershjk2013-09-021-4/+1
| | | | | Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Remove deprecated accessorshjk2013-08-301-1/+1
| | | | | | | Also adjust user code. Change-Id: I60935942a7012e6a0d6091ffbc89d69289366e35 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* KitManager: Use static API as other singletons doTobias Hunger2013-08-211-3/+3
| | | | | Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155 Reviewed-by: hjk <hjk121@nokiamail.com>
* UiCodeModelManager: Clean up APITobias Hunger2013-08-021-1/+1
| | | | | | | Task-number: QTCREATORBUG-9763 Change-Id: Ie138f63b8abd5333262debf311aa3ebbd88c81d5 Reviewed-by: hjk <hjk121@nokiamail.com>
* UiCodeModel: Simplify usageTobias Hunger2013-08-011-3/+13
| | | | | Change-Id: Id274db9ed3022364e7b65788f8313ae6cfa73326 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Introduce Project::projectFilePath()Tobias Hunger2013-08-011-2/+2
| | | | | | | Use it instead of retrieving this information from the document. Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-07-251-3/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppmodelmanager.cpp Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
| * CppTools: Check if project has changed before reparsingNikolai Kosjar2013-07-221-3/+1
| | | | | | | | | | | | | | | | | | This introduces an API change for the project managers. Those are not expected to call updateSourceFiles() anymore. Task-number: QTCREATORBUG-9581 Change-Id: I77befd29fb851c9acf87204d571da00183c9cd05 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Introduced mime-type for ObjC++.Erik Verbruggen2013-07-181-1/+3
| | | | | | | | | | | | | | | | | | Updated/fixed the code to treat treat text/x-objcsrc and text/x-objc++src correctly. Change-Id: I1ab97577c786a28381398e4e0fac177325d00d7b Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Rename IDocument::fileName --> filePathEike Ziller2013-07-091-6/+6
| | | | | | | | | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Make IDocument::fileName a member with setter.Eike Ziller2013-07-091-17/+2
| | | | | | | | | | | | | | | | | | | | Instead of requiring subclasses to implement a method. Also renames IDocument::rename to IDocument::setFileName, since it doesn't really rename any files or such. Change-Id: I1344025c24d2f74a6a983e04fb0a5245f1f37aad Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Qt4Project: Use exact parse to decide which runconfigurations to createDaniel Teske2013-07-081-13/+15
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-9549 Change-Id: Ib504073a3dfbdf8a66429b3fb6a8930d2284f76a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Qt4Project: Don't update runconfigurations for all targetsDaniel Teske2013-07-081-2/+2
|/ | | | | Change-Id: I383d0c5b7f01bf00be3249dc2721e69ed27dc148 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Qt4Project: Do not trigger updateCodeModels on folderChangedDaniel Teske2013-07-021-5/+18
| | | | | | | | | | | | | | | | This reverts commit 2fdb70bdce77ec0b60847623579af72ddc58da91. Be smarter about what to do on folder changes. Trigger at most one codemodel update per folder change signal. (Thus still fixing the original problem 2fdb70b fixed.) And only trigger one if the actual file list changes. This could be further optimized to only tell the code model about the new files, but that's for another patch. Task-number: QTCREATORBUG-9697 Change-Id: I78d134663f1455254caf812c27c048d4f0828242 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Project managers: Force "Parsing" notificationNikolai Kosjar2013-06-241-1/+2
| | | | | | | | | | ...so parsing progress will also be reported for projects consisting of only one source file. Task-number: QTCREATORBUG-9597 Change-Id: If35a00b6f949258d64921f144919269fa0c81d36 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* implement simple VFS to support caching during project parsingOswald Buddenhagen2013-06-041-1/+18
| | | | | | | | | this tremendously speeds up loading of qt 5.1 based projects (including qt itself) under mac os, as these look up the sdk dynamically, and use caching to avoid doing that in every subproject. Change-Id: I833253f81c3159056fab2ff888f293b36cc2ef56 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* qmljs: adding qrc supportFawzi Mohamed2013-06-031-0/+4
| | | | | | | | | | | | | | | | | | | | | Qmljs now keeps a cache of parsed qrc files, and can resolve "qrc:" links. This breaks the assumption that the name that the qml files has on the filesystem is the one that qml sees, and that contents of directories can be found just looking at file whose path starts with the directory path. Currently the first file is used when multiple qrc files contain the same path, but support for strict and weak path resolving is already there. At the moment only qrc files for projects that call updateQmljsCodeModel are updated. ChangeLog: QmljsSupport: Imports using qrc links are resolved. Task-number: QTCREATORBUG-8953 Change-Id: I695fac2692af2417d49c192c580a1c2e7b4873f4 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Revert "Project: Set QML/C++ languages where both are possible"Kai Koehne2013-05-281-3/+10
| | | | | | | | | This reverts commit 75691393ec9bf87c290fb8e9d199cbeab7e726f8. 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>
* Fix indentationOrgad Shaneh2013-05-061-1/+1
| | | | | | | | | Mostly 3 leading spaces converted to 4 A few other indentation issues Change-Id: Ib0db5925cac4d2999faf5699cd570884cbcd4863 Reviewed-by: hjk <hjk121@nokiamail.com>
* Qt4Project: simplified C++ codemodel interaction.Sergey Shambir2013-05-021-26/+13
| | | | | | | | Now it uses ProjectPart::evaluateToolchain() to read toolchain info with given compiler flags. Change-Id: I9afce7090eba6fc0662981dfd065603ac235a83f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer: extended Toolchain::CompilerFlagsSergey Shambir2013-04-301-1/+1
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-301-1/+0
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
| * qt4project/qmljs: get info from all subprojectsFawzi Mohamed2013-04-251-1/+0
| | | | | | | | | | | | | | | | removes an incorrect break that limited the number of nodes processed in updateQmljsCodeModel. Change-Id: I82c254721ee92765cb65840c428ea08e97f587c6 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | Qt4Project: Fix double restoreSettings on opening projectDaniel Teske2013-04-221-0/+38
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-9151 Change-Id: I9100fbb34eead6d5ef32e7cd0859ce6ed6ea6f78 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Qt4ProFileNode: Split up targetInformationDaniel Teske2013-04-171-9/+56
| | | | | | | | | | | | | | | | TargetInformation now contains no platform specific code anymore. Change-Id: Id7b3b562e1046a1ea18127716532b1fc2614ef91 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | ProjectManagers: Update project languages based on data sent to the codemodelTobias Hunger2013-04-101-0/+4
| | | | | | | | | | Change-Id: Iecf61f66389fff6f3995c4f4bc893ffd190c50e6 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | CppTools: Rename files to comply with coding standardTobias Hunger2013-04-101-1/+1
| | | | | | | | | | | | | | | | Rename ModelManagerInterface.(h|cpp) to cppmodelmanagerinterface.(h|cpp). Rename TypeHierarchyBuilder.(h|cpp) to typehierarchybuilder.(h|cpp). Change-Id: I035d833fd205d7460819bd0fb7031294359032f9 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | CppTools: Use namespace CppTools consistentlyTobias Hunger2013-04-081-8/+8
| | | | | | | | | | | | | | | | | | 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>
* | Project: Set QML/C++ languages where both are possibleTobias Hunger2013-04-051-10/+3
| | | | | | | | | | Change-Id: I4bc5bd7a644c48dfa529f9f9f6052e401de76d40 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Clean headers in Qt4ProjectManager.Friedemann Kleint2013-03-281-21/+0
| | | | | | | | | | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I53fa1aafaf98fd3105ef35b595e4311854cf9cbc Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Qt4Project: Adjust to MessageManager api changeDaniel Teske2013-03-221-1/+1
| | | | | | | | | | | | Change-Id: I795ce7421c752911db7df6a98f315661ef6c9a44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Qt4Projet: handle OBJECTIVE_HEADERS qmake varSergey Shambir2013-03-221-0/+5
| | | | | | | | | | | | | | | | Since there are no separate file extensions for Objective-C and Objective-C++ headers, all headers can be parsed as Objective-C++. Change-Id: I91500c53de0fc14ce7be0c7c534e443d1f1f725a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | CppTools: improved languages support in ProjectPartSergey Shambir2013-03-211-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | s/ProjectExpander/ProjectMacroExpander/gTobias Hunger2013-03-191-1/+1
|/ | | | | | | | | The new name is a better description of what the class is all about, it matches the filename and it does not conflict show up when trying to expand "PE" to ProjectExplorer. Change-Id: Ie6a10b9a83dc8bc529e35e3381f733dbe25847a3 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Qml Debugging: Setting debug option for QML applicationsAurindam Jana2013-03-041-1/+2
| | | | | | | | Skip checking for QML files. A project may be a QML project even though no QML files have been added to pro/pri files. Change-Id: Ifd41093bf69526147e0a3116380a14bfa534f681 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmljs: add infrastructure handling qml dialects betterFawzi Mohamed2013-02-211-38/+4
| | | | | | | | | | | | | | | | | | 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>
* Qml Debugging: Default option for Qt Quick applicationAurindam Jana2013-02-201-1/+18
| | | | | | | | | Qt Quick applications should have Qml Debugging enabled by default. Task-number: QTCREATORBUG-8208 Change-Id: I794249567b15071098f0ac8ba5f2a8e5f2be4ffb Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Move QtProjectExpander to ProjectExplorerDaniel Teske2013-01-171-47/+3
| | | | | | | | | | | | | | | | | | The cmake plugin needs the class, too. Also add a explicit projectName parameter to it, since it differs how to extract that from the path. Change-Id: Ic3d37b3a12ad73f3c7f898d27ad0e85629c38839 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Qt4: Remove some dead codeTobias Hunger2013-01-151-19/+0
| | | | | | | | | | Change-Id: Ia9596fe16af1ea428482977092b58cb5a04db873 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Qt4 project manager: removed extra call of variableValue()Sergey Shambir2013-01-081-2/+2
| | | | | | | | | | Change-Id: I96a68aed65c868a8c57babc501ec746bc27c8781 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 23:09:38 +0000