summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/wizards
Commit message (Collapse)AuthorAgeFilesLines
* Rename plugins/qt4projectmanager to qmakeprojectmanagerhjk2013-10-2971-8019/+0
| | | | | | | This finally renames the plugin itself. Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Qt4ProjectManager: Rename QT4PROJECTMANAGER_{LIBRARY,EXPORT}hjk2013-10-292-4/+4
| | | | | Change-Id: I6be91281667f7f26740e7b62b08ce9d646bbc85e Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qt4ProjectManager: Rename Qt4Manager, QmakeProjectManagerPlugin, ...hjk2013-10-292-3/+3
| | | | | Change-Id: I22dd15b10a6b06b380f19eda31925951f4566ecf Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode}hjk2013-10-293-5/+5
| | | | | | Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Update file/directory names for Qt Quick 1 templateKai Koehne2013-10-241-8/+24
| | | | | | | | | | Make the names in line with the Qt Quick 2 ones. Also, changing the directory/filename makes sure the update mechanism of Qt Creator doesn't update apps generated by the 2.x wizard any more, which might break stuff. Change-Id: I4621d5f35eae2102aeba7e77c5cd903511be249f Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Library wizard: Don't use base class unless it is a plugin.Friedemann Kleint2013-10-221-1/+2
| | | | | | Task-number: QTCREATORBUG-10444 Change-Id: Iae6559e27573dcdfdde70292f637eb820bf99c93 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Doc: replace Qt GUI Application with Qt Widgets ApplicationLeena Miettinen2013-10-222-2/+2
| | | | | | | | | | | Qt GUI application could also be a Qt Quick application. Update screenshots. Task-number: QTCREATORBUG-10263 Change-Id: I8c0dd34e1222c3b42fddaf3f562e402490ce1037 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove Meego support from QtQuickApp project templatehjk2013-10-161-2/+2
| | | | | | | Also bump the minimum Qt version required for new Qt Quick apps to 4.8 Change-Id: Ieeabc8475ccfa7f9fec7ca08cd88384ed88f0d1d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Qt4ProjectManager: Rename the "normal" qt4* files to qmake*hjk2013-10-166-9/+9
| | | | | | Change-Id: I5e173900a4008c72c67a30eaa9c101027c1b43af Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Warning--BogDan Vatra2013-10-161-0/+1
| | | | | Change-Id: I2fffb7778501a90b8530482900343a5f44f999ff Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Rename namespace Qt4ProjectManager to QmakeProjectManagerhjk2013-10-1665-132/+132
| | | | | | | First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove support for Madde-based platforms.Christian Kandeler2013-10-1516-470/+18
| | | | | | | | With Nokia's decision to stop support for Harmattan applications in their app store, the last remains of a use case have disappeared. Change-Id: Ia036112de01c8c3a866da3529b4a941db11c7358 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Wizards: Adding application wizards for Qt Quick ControlsThomas Hartmann2013-10-014-7/+38
| | | | | | Task-number: QTCREATORBUG-9477 Change-Id: I4eaf70089e19f0fcab8d85d9a101f74e119bbae0 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Qt4ProjectManager: Fix wrong include.Christian Kandeler2013-09-271-1/+1
| | | | | Change-Id: I403cfcef7c99e2963c60f332ecd24eb8e07db89a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* TargetSetupPage: Generalize the pageTobias Hunger2013-09-2710-1045/+23
| | | | | | | | | | | | | | | | 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>
* Core: Clean up some ICore::instance() useshjk2013-09-241-1/+1
| | | | | Change-Id: I888b30094ed75818ee3af58c94ebf8468afa5eb9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Cleanup IWizard interface and usershjk2013-09-2420-281/+158
| | | | | | | Added 639 lines, removed 1391. Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectExplorer: Clean up KitsManager APIhjk2013-09-113-12/+12
| | | | | Change-Id: Ib0b11918fbae9577928b6209a913afb3eccc48b5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-025-10/+11
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QtVersionManager et al: Code cosmeticshjk2013-08-301-17/+16
| | | | | | | Apply static 'pattern' for QtVersionManager, de-noise using code. Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Library-Wizard: Add QGenericPluginTakumi Asaki2013-08-221-1/+2
| | | | | | | | Add QGenericPlugin to Library-Wizard. And change default to this. Change-Id: Iad21e4c66ef9a47e7ac5e437ed11af7e50d91112 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* KitManager: Use static API as other singletons doTobias Hunger2013-08-213-11/+10
| | | | | Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155 Reviewed-by: hjk <hjk121@nokiamail.com>
* TargetSetupPage: Prefer the default kit for the active targetDaniel Teske2013-08-081-2/+9
| | | | | Change-Id: Ia57685e7ffc5f9d45777731d24e5c8d218a4d5a5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by: David Schulz <david.schulz@digia.com>
* Remove changeEvent(QEvent::LanguageChange) implementationhjk2013-05-272-17/+4
| | | | | | | | | This was implemented only for a small set of widgets. It's unlikely that we will ever have or even want a dynamic language selection, until then this code is only dead freight. Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove outdated Mobile App Wizardhjk2013-05-152-213/+0
| | | | | Change-Id: Ifc5076021a7ef4f49e3dc9048d40becfa5080edd Reviewed-by: hjk <hjk121@nokiamail.com>
* Qt Quick Wizards: Prefer mobile to desktop kitsDaniel Teske2013-05-151-1/+8
| | | | | | | | | | | This also affects the Html5Wizard. Compare to code in BaseQt4ProjectWizardDialog::addTargetSetupPage Note: The selected platform refers to the "filter" combobox in the top right of the new project wizard. Change-Id: I0d7d5162a2693ea0ced03f928fa7c4d67a4ac164 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-301-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
| * QNX: Corrected path to qml files for pure QNX devicesTobias Nätterlund2013-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | For pure QNX (non-BlackBerry) devices, the path to the QML files are decided by the user. Only adjust the path for BlackBerry devices. Change-Id: I909ed0a06bc6985a5a353aab61bda395afcfb7aa Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Mehdi Fekari <mfekari@rim.com>
* | Qt Quick Wizard: Fix text in wizard descriptionDaniel Teske2013-04-231-6/+6
| | | | | | | | | | | | Change-Id: I9f8b110e3d88fa3e9fc02a1c82e8bad0bf670d8b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-231-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h tests/auto/treeviewfind/treeviewfind.pro Change-Id: I1ec788373656c947b50d72df6c26c91312469692
| * QtQuick2ApplicationViewer: properly resolve install pathsTobias Nätterlund2013-04-231-1/+1
| | | | | | | | | | | | | | | | | | This is a port of commit 2982545d to also apply it to the qtquick2applicationviewer.cpp template. Change-Id: Ia9d964d9fc98ea957c52aea783c6148449552755 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Qt4PM: Move icons and mimetypes into QtSupportTobias Hunger2013-04-171-3/+1
| | | | | | | | | | Change-Id: I285b30d71951ad849e31c56daaa8d162a8efea9f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Clean headers in Qt4ProjectManager.Friedemann Kleint2013-03-2830-89/+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>
* | Qt4ProjectManager: Forward-declare some classes.Friedemann Kleint2013-03-288-11/+32
| | | | | | | | | | | | Change-Id: Ia05cbfec090bf42d8b9c0475e8904dbad12486d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-03-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h src/plugins/debugger/debuggerplugin.cpp src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp src/plugins/qmldesigner/components/debugview/debugview.cpp src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h src/plugins/qmldesigner/components/formeditor/formeditorview.cpp src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp src/plugins/qmldesigner/components/navigator/navigatorview.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp src/plugins/qmldesigner/designercore/include/abstractview.h src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h src/plugins/qmldesigner/designercore/include/rewriterview.h src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp src/plugins/qmldesigner/designercore/model/abstractview.cpp src/plugins/qmldesigner/designmodewidget.cpp Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
| * Support deployment to android-no-sdk platformRainer Keller2013-03-191-1/+1
| | | | | | | | | | Change-Id: Ia7dad81e4998e04cbcda51de420ca677f56aa63f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Doc: replace "element" with "QML type" or "item"Leena Miettinen2013-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | Try to make terminology more consistent, by using "QML type" when describing the types, "item" when describing instances of QML types, and "component" when describing objects built by using QML types. Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Fix Krazy warnings about includes/header guards in Qt support.Friedemann Kleint2013-03-126-7/+2
|/ | | | | Change-Id: I82d54d4011beb6d0ca6f3da21885440af422a5a2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QtQuickAppWizard: adding missing wizardThomas Hartmann2013-02-142-4/+19
| | | | | | | | Adding Qt Quick 2 Application (from Existing QML File) wizard. Task-number: QTCREATORBUG-8755 Change-Id: I3f5bdac5356ec31a4f6c1cd8e2a21f61982b04ee Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Library-Wizard: Write plugins compatible with Qt 4 / 5.Friedemann Kleint2013-02-135-12/+57
| | | | | | | | Add json-file and #ifdef plugin export for use with Qt 4 and 5. Change-Id: Ib04f2e56be08634f00c8aa2cde45837b9a138cbe Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* qmake project wizards: Hide if no qt is configuredDaniel Teske2013-02-123-3/+6
| | | | | | Task-number: QTCREATORBUG-8708 Change-Id: Ia3f842cd4171c11307d3278aa5a1c85adc6e1fa7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add QtPrintSupport conditionally if Qt4 / 5 are supported.Friedemann Kleint2013-02-111-0/+5
| | | | | Change-Id: If8445b9f1b194bb3148108e4eb79cd80ad520c52 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Library-Wizard: Do not write module-include.Friedemann Kleint2013-02-113-11/+1
| | | | | | | | Remove baseClassModule which was used for that purpose only. Change-Id: Id86c9cfc160b76f936cc6b716a1e4c3e93a5261f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Qt Quick Wizard: Increase the stub versionDaniel Teske2013-02-111-1/+1
| | | | | | | | Needed by 1a0bed277db3238d46715c2ec8a3be1635355e7c Change-Id: Ie0f521cd9e366be15b69a53e7a2d4d80873e369a Reviewed-by: Alessandro Portale <alessandro.portale@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Library-Wizard: Offer Qt plugin instead of Qt 4 plugin.Friedemann Kleint2013-02-111-1/+1
| | | | | Change-Id: I752283166197f00aa540ce6a3de0561318865d01 Reviewed-by: hjk <hjk121@nokiamail.com>
* HTML5: Make wizard work with Qt 5hjk2013-02-082-2/+2
| | | | | Change-Id: I465cb1ae5fa94cc81441d45ac4e0afe1d9245fa8 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-3166-66/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2966-66/+66
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
View Lorry Controller Status