Commit Graph

141 Commits

Author SHA1 Message Date
Friedemann Kleint
80d3f73319 Compile Qt4ProjectManager with QT_NO_CAST_FROM_ASCII.
Change-Id: If9fd111032975d2a313084f5fedf20561806e268
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-14 21:13:41 +01:00
Kai Koehne
046f25ea7b Fix gcc warning
Fix warning introduced in f8a1b94381

Change-Id: I94f603aa635161892ce0184777368026beb86539
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-15 14:11:07 +01:00
Daniel Teske
f8a1b94381 Don't react to profileUpdated on failure or while still in progress
Change-Id: I88fa7b7e3165d3b89af4e68a1b1c17082f29510a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-08 12:30:18 +01:00
Daniel Teske
f5d4287123 Use Utils::FileName for various bits in QtVersion
Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-07 15:05:31 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Oswald Buddenhagen
0164e1bea2 Merge branch '2.3' into 2.4
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
2011-10-18 13:50:38 +02:00
Jure Repinc
fa4db8d045 Fixed some typos and added some missing ellipises
During translation into Slovenian I noticed some typos in original
string. For example some missing ellipsis characters and some
incorrectly spelled MeeGo names (as Meego)

Change-Id: I48eaa95303f1e82ab9893f713056382e8daaef41
Merge-request: 2200
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-10-05 20:14:59 +02:00
Eike Ziller
5bc6692ee5 Reduce number of categories and minimum size of preferences
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.

Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-29 16:26:48 +02:00
Tobias Hunger
ffa88df344 Toolchain: Allow all tool chains
Allow all tool chains if either the Qt version is invalid or
no Qt modules are not selected.

Change-Id: I9842c30aca0a8752915548dc258f257c3fd39e4d
Reviewed-on: http://codereview.qt-project.org/4990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-23 14:02:59 +02:00
Friedemann Kleint
d4e1d7c6ad Header cleanup in Qt4ProjectManager.
Disentangle the covariant returns and introduce
convenience accessors.
Move internal classes away from Qt4Project.

Change-Id: I6c3158988824d2a159b1b3f8ecdf8432c32be2bc
Reviewed-on: http://codereview.qt.nokia.com/3216
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 16:50:01 +02:00
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 13:47:33 +02:00
Tobias Hunger
70a2f91d77 Crash: Fix crash when importing broken Qt versions
Fix a crash when importing a build, using a qmake that is broken.

I ran into this crash with a 32bit qmake used in a pure 64bit userland.

Change-Id: I08acb8d5f2cd72c873a30be5e45324f6daef702c
Reviewed-on: http://codereview.qt.nokia.com/2181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-26 12:31:12 +02:00
Kai Koehne
8147973965 BuildConfiguration: Adapt name if Qt version changes
Change-Id: I1a34cb51f73af9779d6bdb07324d5dadcb5585b3
2011-05-25 13:22:55 +02:00
Friedemann Kleint
b8734dd727 Fix another crash when BaseQtVersion == 0.
Change-Id: I635bbc5c0120f8bf15b918ef8205cf72298720f0
Reviewed-on: http://codereview.qt.nokia.com/98
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-05-25 10:18:59 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-24 18:35:11 +02:00
Friedemann Kleint
b25373b304 Project page: Add a tooltip for the Qt version.
Change-Id: I092220ade4cb61645e6c17012d294e93759678db
Reviewed-on: http://codereview.qt.nokia.com/42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-20 15:50:34 +02:00
dt
8e171e0be0 Qt Version refactoring
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
dt
1dbe498f86 Qt4ProjectManager: Be more careful in detecing incompatible builds
Task-Nr: QTCREATORBUG-4555

Reviewed-By: hunger
2011-04-20 14:34:35 +02:00
Tobias Hunger
90a02875cf ToolChain: Remove invalid toolchain when not needed
Remove the invalid toolchain from the combobox when it is no longer needed.
2011-04-14 14:57:51 +02:00
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
Tobias Hunger
beb999f38a ToolChain: Update projectsmode on tool chain changes
Update the projects mode on tool chain changes.

Task-number: QTCREATORBUG-4431
2011-04-13 15:55:21 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Tobias Hunger
3664d20507 Crash: Fix crash when removing a tool chain
Fix crash on trying to debug an application after the last
tool chain for the Qt version used was removed.

Task-number: QTCREATORBUG-4197
Reviewed-by: dt
2011-03-24 15:44:38 +01:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
dt
8a180f71df Qt4ProjectManager: Small refactoring in reportIssues
Do not report project dir specific issues next to each
buildconfiguration. Also move the code to a place the TargetSetupPage
can easily use, without having a hardcoded target list. Note: They
currently aren't shown at all, next step is to show them once per
target.

Reviewed-By: hunger
2011-03-16 17:28:21 +01:00
dt
7edd89ba85 PathChooser: rename Directory to ExistingDirectory, introduce Directory
Existing Directory checks for whether the directory exists, which
Directory does not. Also changes all existing PathChoosers from
Directory to ExistingDirectory as that does not change behaviour.
2011-02-22 15:35:24 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
2011-02-21 18:33:23 +01:00
dt
67cfb7e078 Qt4projectManager: Refactor Qt4Target, split up in per target classes
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.

(*) Noteable missing is the qtversion, which needs to be split up
per target too.

Also fixes
Task-Nr: QTCREATORBUG-2440

Reviewed-By: hunger
Reviewed-By: ck
2011-01-17 14:13:40 +01:00
dt
7f2c4c9b4c Qt4ProjectManager: Fix crash on importing builds
Task-Nr: QTCREATORBUG-2723
2011-01-13 13:39:32 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target
Reviewed-By: hunger
2010-12-06 14:15:06 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
2010-11-17 13:19:07 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor.
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
2010-11-01 16:29:45 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
2010-10-18 20:59:12 +02:00
dt
eb795149f4 Qt Project Config Widget: Correctly dis/enable the Qt Version combobox
Task-Nr: QTCREATORBUG-2722
Reviewed-By: kh
2010-10-12 18:10:25 +02:00
Bill King
9293453ced Merge branch '2.1'
Conflicts:
	tests/auto/fakevim/fakevim.pro
2010-10-12 10:01:27 +02:00
dt
eadd51fa75 Qt4ProjectBuildConfiguration: Handle env vars in working dir correctly.
Task-Nr: QTCREATORBUG-2618

Reviewed-By: hunger
2010-10-11 16:49:01 +02:00
dt
224ca48e84 Qt4ProjectManager: Warn of a existing build for a diffrent project
Task-Nr: QTCREATORBUG-2113

Reviewed-By: hunger
2010-10-07 12:27:56 +02:00
dt
a36dc1d41e Qt4ProjectManager: Support Makefile variable
Pass on the makefile to make, check the right makefile for importing.

Task-Nr: QTCREATORBUG-102
2010-10-05 17:43:35 +02:00
dt
aa8e2e8e0f Allow relative paths in Build directories, Working Directories
Relative to the project's directory.
2010-09-17 15:32:41 +02:00
Tobias Hunger
d1c23f58a5 Preserve invalid Qt versions when loading a project
Now that we have 2.0 out we can be less strict when checking
project consistency when loading .user files.  The strictness
was necessary due to upgrading non-target projects to target
projects.

 * Allow for invalid Qt versions when loading a .user file that was not
   updated from the pre-target era.
 * Update the UI to show invalid Qt versions as invalid. Remove
   the Invalid version as soon as a valid one is imported.

This does preserve the buildsteps, too.
2010-09-13 18:17:51 +02:00
Friedemann Kleint
66ad76de4f I18n: tr-fixes. 2010-09-13 16:51:43 +02:00
dt
b68a57b23e Don't import QMLINSPECTOR_PATH qmake settings.
Task-Nr: QTCREATORBUG-2209
2010-08-30 16:47:34 +02:00
Tobias Hunger
b6f1dbeeb0 Remove obsolete ways to set the display name
* Now that there is a generic way to rename configurations:
   Remove individual renaming methods from all over the codebase

Reviewed-by: dt
2010-08-24 16:04:51 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
2010-08-23 16:00:24 +02:00
Tobias Hunger
ab494a07ad Fix warning about unhandled enum value in switch statement 2010-08-19 16:47:00 +02:00