Commit Graph

122 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
Jarek Kobus
d34c81a2a6 Add "Add Library" action to project explorer's context menu
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Task-number: QTCREATORBUG-4127
2011-04-13 13:56:27 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
1738d08ffc projectexplorer: move project{Context,Language} from IProjectManager to Project
Reviewed-by: dt
2011-04-12 12:46:26 +02:00
con
3c8786dfcd Fix CurrentProject:QT_INSTALL_BINS.
This stopped working when renaming the Qt Creator variable.

Reviewed-by: Kai Koehne
2011-03-22 15:06:55 +01:00
dt
1fe6d0299c Qt4ProjectManager: Run qmake on the right project 2011-03-15 19:05:15 +01:00
con
b40500a7bf Add a generic variable chooser widget.
The chooser allows choosing variables from a list, and inserting them
into previously focused line edit, text edit, or plain text edit.
Variables are now registered with a description in the variable manager.
Also make the QT_INSTALL_BINS --> CurrentProject:QT_INSTALL_BINS for
consistency.
2011-02-18 17:15:41 +01:00
con
3ecced27a3 Start implementing "edit in vi" for mac. 2011-02-18 17:15:36 +01:00
con
1d51764103 Variable manager uses "update request" mechanism.
For now that removes the CURRENT_DOCUMENT variable and derivates.
2011-02-18 17:15:35 +01:00
Friedemann Kleint
f37d9b55aa L10n: First round of tr()-Fixes for 2.2 2011-02-14 16:37:20 +01:00
Alessandro Portale
162ffcb19e Update html5 boilerplate code if outdated or changed. 2011-02-06 19:32:39 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00
Alessandro Portale
58ca05efcd More compact template files update message
The content of the update dialog is nor shorter and should not
be cropped on OSX.

Task-number: QTCREATORBUG-3135
2011-02-04 15:05:20 +01:00
hjk
d87ce08880 qt4projectmanager: style 2011-02-04 12:45:32 +01:00
hjk
a4fa2911f0 qt4projectmanager: compile fix on non-windows 2011-02-04 09:44:17 +01:00
Alessandro Portale
efc596170c Refactoring the template code updater. Reusable for html5
Less static functions, more ploymorphism.
2011-02-03 19:48:12 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Friedemann Kleint
b606469ae7 Project managers: Remove dependency to Qt Designer.
(Cmake/Qt4). Use PluginManager invocation facility
for the form class code generation. Do the rest
(testing for form editor, retrieving the editor
contents).

Acked-By: hjk
2011-01-10 16:33:31 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Christian Kandeler
e83ba4d4ec Mobile wizard: Model after QML wizard.
Nodded-at-by: dt
2010-09-13 11:22:38 +02:00
Alessandro Portale
9e012e7dff Prototype Ui for update of QmlApplicationView files.
We may want to implement a proper Ui for this. Maybe not as modal
message box.
2010-08-27 17:53:19 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
2010-08-02 14:21:05 +02:00
dt
ee38a1057c Ask to save all editors before running qmake
Task-Nr: QTCREATORBUG-1732
2010-07-09 16:08:28 +02:00
dt
dd0978796e Also make ProjectLanguage a proper context 2010-07-02 14:01:24 +02:00
dt
0801047287 Make project context a Core::Context
Also properly initialize m_projectContext in Qt4Manager, fixing the
disabled "Run QMake" action
2010-07-02 14:01:24 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
2010-05-17 17:40:40 +02:00
Thorbjørn Lindeijer
2816ccbd37 Don't allow opening the same generic project multiple times
Quick fix by copying code also found in Qt4 and QML project managers.
Would be better to have some common solution...

Task-number: QTCREATORBUG-1383
2010-05-17 16:33:25 +02:00
dt
ff61f2295d Add Clean and rebuild sub dir
Also change the strings slightly.

Task-Nr:   QTCREATORBUG-1295
Task-Nr:   QTCREATORBUG-1296
2010-04-30 11:55:04 +02:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
dt
ab8fc52d0b Use exact and aysnc .pro file evaluate
This is a big change touching almost all of our .pro file parsing.
With this patch we only evaluate once exact for all needs and once
greedy for the filelist. That is the qt runconfigurations don't have own
evaluaters but reuse the project wide exact evaluation.

We reevaluate if the user changes the build directory, the qmake
buildconfiguration or the qmake arguments. That is if you open src.pro
(or projects.pro) of qt with a shadow build you still don't get all the
files, but after correcting the build directory, we reevaluate the .pro
files and find all files. So for a suitable definition of fixed, that
bug is now fixed.

We now get the exact defines of all .pro files instead of all defines for all
buildconfigurations. We still don't distinguish in which
.pro file a DEFINE is set. So the code model now knows about all the
defines set for the given configuration but not for which files it is
actually set. Also that includes all DEFINES set in .qmake.cache or the
mkspecs. This means all defines from .pro files should now work.

The intial loading is still synchronous. I haven't looked into it to
deeply, but it seems possible to make it also async.There are probably a
few issues which need to be solved fist.

Also due to the asynchronous nature of the code, the executable is
updated a few seconds after actually changing the build configuration
2010-03-10 17:02:24 +01:00
Friedemann Kleint
7828bb811c DesignMode/Qt Designer clean-up Part V: Renaming
Re-introduce FormWindowEditor as IEditor used for
Designer. Use SharedTools::WidgetHost directly
for embedding into FormEditorStack, doing the
geometry-changed handling in there as well.
2010-03-10 10:21:52 +01:00
dt
431a276382 Ask for saving when using the context menu 2010-03-05 15:51:30 +01:00
dt
96c1a21a51 Remove unused code emptyProject 2010-03-05 15:51:30 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
fc60d6c62d Designmode/Designer: Fix uic code model support.
...to use new editor.
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
2010-02-26 15:20:50 +01:00
Friedemann Kleint
13a608f86f uic-Codemodel-updating: Decouple form editor.
Pass around contents as string, saving repeated
invocation of FormWindowEditor::contents().
Remove dependency to FormWindowEditor.
Reviewed-by: dt <qtc-committer@nokia.com>
2010-02-26 14:55:39 +01:00
dt
821d49414c remove MessageManager::displayStatusMessage 2010-02-19 17:00:51 +01:00
Tobias Hunger
1ff0a7e03a Add target selection wizard to Qt4 projects 2010-02-17 17:13:23 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
dt
fb3ae97df3 Add Build to the right click menu of sub projects for Qt4 Projects
They do what you expect them to do, that is build only a subtree.
The implementation is a little bit strange. We temporarly set the sub
node to be built on the BuildConfiguration, enqueue that
BuildConfiguration (which calls BuildStep::init()), and then reset that
temporary value.

A more general way would be to have the ability to extend
BuildConfiguration::buildProject() in a way that additional data can be
passed to the BuildSteps.

Task-Nr: QTCREATOR-5
Task-Nr: QTCREATORBUG-44
2010-01-13 18:02:22 +01:00
dt
377e6ff5dd Make runQMake simpler 2009-12-08 13:09:16 +01:00
Tobias Hunger
e386525613 Cleanup Qt4ProjectManager.
* Remove unnecessary headers.
 * Remove hardly used variables.
 * QTC_ASSERT before using a pointer which might be 0.

Reviewed-by: dt
2009-12-08 12:48:43 +01:00
dt
0d162be22f Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
2009-11-19 16:36:48 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
con
acbd4513e3 Changing string based api to BuildConfiguration based api.
Builds, but I'm pretty sure it doesn't *work* :)
2009-10-01 10:05:05 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
cd27fdecd9 Parse the Makefile in the importing case a lot better
We add each command line argument to the Additional Arguments
2009-07-22 16:52:44 +02:00
dt
ecfb6eaf5a Remove the qmakeStep() function from qt4Project 2009-07-21 15:01:16 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00