summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* ProjectExplor/Debugger: Header cleanupFriedemann Kleint2010-11-021-0/+1
|
* Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.con2010-11-011-1/+1
| | | | | | qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes it fail in pri files that are used for app pro files. The tests still don't run because of run time linking issues.
* ProjectExplorer: Move ToolChainType enumeration into separate Header.Friedemann Kleint2010-11-011-1/+0
| | | | Acked-By: dt
* QmlProject: Don't use RegExp for simple wildcard matchingKai Koehne2010-10-292-15/+39
| | | | | | | | | | | | QRegExp matching is quite expensive, and has to be done for every file in the project directory tree against all possible suffixes. Optimize for the common case that the pattern is "*.suffix" by doing a fileName.endsWidth(suffix) in this case. This speeds up loading of examples/declarative/declarative.qmlproject by about 30%. Reviewed-by: Christian Kamm
* Merge remote branch 'origin/2.1'Friedemann Kleint2010-10-272-10/+7
|\
| * qmldump: Ensure path and environment are taken from the same Qt version.Christian Kamm2010-10-261-10/+1
| | | | | | | | | | | | Fixes f1fb0bddb11d69355784953a6cc0364f9fa25d3e. Reviewed-by: Kai Koehne
| * Debugger/JS Code model: Set environment for QML tools correctly.Friedemann Kleint2010-10-262-8/+14
| | | | | | | | | | | | | | | | | | Set complete build environment (MinGW). Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Task-number: QTCREATORBUG-2883
* | Merge remote branch 'origin/2.1'Oswald Buddenhagen2010-10-183-4/+38
|\ \ | |/ | | | | | | | | Conflicts: share/qtcreator/templates/qmlapp/app.pro src/libs/utils/filesearch.cpp
| * QML: use Qt4 output formatter to get links in errors to work.Erik Verbruggen2010-10-182-0/+7
| | | | | | | | Reviewed-by: Tobias Hunger
| * QmlProject: Tell the code model about the target Qt's import path.Christian Kamm2010-10-131-0/+16
| | | | | | | | | | Task-number: QTCREATORBUG-2639 Reviewed-by: Thomas Hartmann
| * QmlProject: Refresh the project when the Qt version changes.Christian Kamm2010-10-132-4/+15
| | | | | | | | Reviewed-by: Thomas Hartmann
* | Merge branch '2.1'Bill King2010-10-121-1/+1
|\ \ | |/ | | | | | | Conflicts: tests/auto/fakevim/fakevim.pro
| * Small fix in a textPawel Polanski2010-10-111-1/+1
| | | | | | | | Reviewed-by: Friedemann Kleint
* | Merge remote branch 'origin/2.1'Christian Kamm2010-10-119-356/+191
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README doc/qt-html-templates.qdocconf doc/qtcreator.qdoc doc/qtcreator.qdocconf share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec src/app/Info.plist src/plugins/bineditor/BinEditor.pluginspec src/plugins/bookmarks/Bookmarks.pluginspec src/plugins/classview/ClassView.pluginspec src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec src/plugins/coreplugin/Core.pluginspec src/plugins/coreplugin/coreconstants.h src/plugins/cpaster/CodePaster.pluginspec src/plugins/cppeditor/CppEditor.pluginspec src/plugins/cpptools/CppTools.pluginspec src/plugins/cvs/CVS.pluginspec src/plugins/debugger/Debugger.pluginspec src/plugins/debugger/breakhandler.cpp src/plugins/designer/Designer.pluginspec src/plugins/fakevim/FakeVim.pluginspec src/plugins/find/Find.pluginspec src/plugins/genericprojectmanager/GenericProjectManager.pluginspec src/plugins/git/ScmGit.pluginspec src/plugins/helloworld/HelloWorld.pluginspec src/plugins/help/Help.pluginspec src/plugins/imageviewer/ImageViewer.pluginspec src/plugins/locator/Locator.pluginspec src/plugins/mercurial/Mercurial.pluginspec src/plugins/perforce/Perforce.pluginspec src/plugins/projectexplorer/ProjectExplorer.pluginspec src/plugins/qmldesigner/QmlDesigner.pluginspec src/plugins/qmljseditor/QmlJSEditor.pluginspec src/plugins/qmljsinspector/QmlJSInspector.pluginspec src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec src/plugins/regexp/RegExp.pluginspec src/plugins/resourceeditor/ResourceEditor.pluginspec src/plugins/snippets/Snippets.pluginspec src/plugins/subversion/Subversion.pluginspec src/plugins/tasklist/TaskList.pluginspec src/plugins/texteditor/TextEditor.pluginspec src/plugins/vcsbase/VCSBase.pluginspec src/plugins/welcome/Welcome.pluginspec tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp tests/manual/fakevim/fakevim.pro tests/manual/ssh/errorhandling/main.cpp
| * version bump: 2.0.92 -> 2.0.93hjk2010-10-081-6/+6
| |
| * version bump: 2.0.91 -> 2.0.92v2.1.0-betahjk2010-10-071-6/+6
| |
| * Using import Qt 4.7 (again)Thomas Hartmann2010-10-061-1/+1
| | | | | | | | | | | | We have to support the N900 Reviewed-by: dt
| * QmlDump: Get right Qt version for .qmlprojectKai Koehne2010-10-062-0/+11
| | | | | | | | | | | | | | We're using a QObject property to get the Qt Version Id: QmlDumpTool is in Qt4ProjectManager, which shouldn't have a dependency to QmlProjectManager. Reviewed-by: Christian Kamm
| * QmlProject: Disable debug action if qmlobserver cannot be builtKai Koehne2010-10-053-21/+41
| | | | | | | | | | | | | | | | QmlObserver right now requires 4.7.1 minimum. There's no gain in telling the user that he needs qmlobserver to debug, if it can't be build with 4.7.0 anyway. Reviewed-by: Christiaan Janssen
| * QmlProject: Remove "Import QML Directory" wizardKai Koehne2010-10-044-290/+0
| | | | | | | | Reviewed-by: Christiaan Janssen
| * QmlProject: Always use qmlobserver for debugging projectsKai Koehne2010-10-042-6/+42
| | | | | | | | | | | | | | Also only warn about missing qmlobserver when actually trying to debug a .qmlproject. Reviewed-by: Christiaan Janssen
| * QmlProject: Let user select Qt version to useKai Koehne2010-10-043-54/+112
| | | | | | | | | | | | | | Allow the user to choose which Qt version to use for running a .qmlproject. Reviewed-by: dt
| * QmlWizards: use QtQuick 1.0 instead of Qt 4.7Thomas Hartmann2010-10-041-1/+1
| | | | | | | | Reviewed-by: Kai Koehne
* | Merge remote branch 'origin/2.1'dt2010-10-046-16/+20
|\ \ | |/ | | | | | | | | | | Conflicts: share/qtcreator/templates/mobileapp/app.pro share/qtcreator/templates/qmlapp/app.pro src/plugins/cpptools/cpptools.pro
| * Wizards: Move QML standalone app wizard to QML category.Christian Kandeler2010-10-043-13/+9
| | | | | | | | | | Task-number: QTCREATORBUG-2510 Reviewed-by: Alessandro Portale
| * QmlProject: Stop program when exiting creatorKai Koehne2010-10-041-0/+1
| | | | | | | | Task-number: QTCREATORBUG-2501
| * QmlJS: Try to build qmldump when opening a Qml project.Christian Kamm2010-09-301-1/+1
| | | | | | | | | | | | | | To make plugin dumping work without having to compile the debugging helpers explicitly. Reviewed-by: Kai Koehne
| * QmlProject: Allow files to be deleted / renamedKai Koehne2010-09-301-3/+4
| | | | | | | | | | | | | | | | This might lead to files that 'disappear' from the pane, e.g. when the suffix is changed to something unsupported. Reviewed-by: Daniel Teske Task-number: QTCREATORBUG-2436
| * QmlJS: Fix qmldump not working for qmlproject projects.Christian Kamm2010-09-291-0/+6
| | | | | | | | Reviewed-by: Erik Verbruggen
* | version bump 2.0.91 -> 2.1.81hjk2010-09-301-6/+6
|/ | | | | | Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1 days, and we'd like to have odd subminor for 'working' and even subminor numbers for pure cherry-picking release branches anyway.
* QML Observer: Complain about not having it if debugging .qmlprojectsLasse Holmstedt2010-09-293-1/+10
| | | | Reviewed-by: hjk
* QML Observer: Build together on runtime with debugging toolsLasse Holmstedt2010-09-291-39/+11
| | | | | | | | Moved qmljsdebugger to a dir under qml/, made qmlobserver compile without creator dependencies and made it compile with debugging helpers. Reviewed-by: hjk
* Fix style issues in QmlProject runtime configuration paneKai Koehne2010-09-281-5/+11
| | | | Reviewed-by: Christiaan Janssen
* QML wizards: Change names and descriptions.Christian Kandeler2010-09-281-6/+9
| | | | Reviewed-by: Leena Miettinen
* version bump 2.0.90 -> 2.0.91hjk2010-09-271-6/+6
|
* Use ExistingCommand in PathChooser where it makes senseTobias Hunger2010-09-241-1/+1
|
* QmlProject: Fix memory leakKai Koehne2010-09-241-0/+1
| | | | Explicitly delete the root project item when closing a QmlProject.
* Move ProjectExplorer::Environment to Utils::EnvironmentTobias Hunger2010-09-231-3/+3
| | | | Reviewed-by: dt
* QmlDebugging: Use -qmljsdebugger command line argumentLasse Holmstedt2010-09-202-4/+1
| | | | | | | Adapt to latest changes in qt.git (commit a9e5329168c) Reviewed-by: kkoehne
* UI text - fix capitalizationLeena Miettinen2010-09-171-1/+1
|
* Fix misaligned debugger label in run configuration widgetsLasse Holmstedt2010-09-101-2/+10
| | | | It was badly positioned esp. in OS X and Windows.
* Qml: Allow user to configure port used (all project types)Kai Koehne2010-09-034-69/+11
| | | | Reviewed-by: dt
* removed old & invalid code for switching to debug modeLasse Holmstedt2010-09-021-5/+0
|
* Debugger languages are now runconfiguration dependentLasse Holmstedt2010-09-012-0/+30
| | | | | | | | | | | There's a UI in qml/customexec/cmake/qmake run configs for choosing the debugger languages (C++ and QML). The default for all except .qmlproject is only C++, so default debugging behavior is the same. However, if the user wants to do simultaneous debugging with two languages, or only debug QML, they can select the languages from Run Settings and it will be remembered. Reviewed-by: hunger
* replace version 2.1.80 by 2.0.90hjk2010-08-301-6/+6
|
* Implement adding new project into opened subdirs projectJarek Kobus2010-08-262-0/+8
| | | | Reviewed-by: dt <qtc-committer@nokia.com>
* Moving the "Qml standalone" wizards from qmlpm to qt4pmAlessandro Portale2010-08-2510-1843/+2
|
* Fix File/New in the deployment folders.dt2010-08-251-1/+1
| | | | | | | | | That is tell the user that those files need not be added to any project, and show "<Implicitly Add>" for them on the last wizard page. This fixes Add/New for the QML/OTHER_FILES folder structure, except for the virtual folder itself. Reviewed-By: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Version and checksum checking of stub files. (Ui pending).Alessandro Portale2010-08-242-32/+123
|
* Qml Debugger: Code style and cleanupLasse Holmstedt2010-08-241-1/+1
| | | | Reviewed-by: hjk
View Lorry Controller Status