feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,461 Commits 108 Branches 368 Tags
2776346db43fa6835e495637bc262c47e3719bc0
Commit Graph

128 Commits

Author SHA1 Message Date
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
Daniel Teske
8be83a173a Make sure we pass -after arguments after user arguments 
Otherwise the user can't pass on normal arguments

Task-number: QTCREATORBUG-6346
Change-Id: I986563a75113a6d5acf601b5ccb63d6a35570bad
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-21 11:49:59 +02:00
Kai Koehne
b8ed8f493f Actually delete CONFIG+=declarative from list of user arguments 
Fix incorrect merge in b0efd44d20 .

Change-Id: I7b007cdaf89732336463685a1af7000584a46e6e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-13 15:28:54 +02:00
Daniel Teske
bd32f47269 Fix setToolchain, ups 
Change-Id: Ie300f6786336a663e12e52a2546e8ebf0458e080
Reviewed-by: pending
Reviewed-on: http://codereview.qt-project.org/5728
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-28 15:42:25 +02:00
Daniel Teske
c4f7b0c7b4 Fix endless evaluate loop for invalid qts 
Change-Id: Id4ba165f95876cc0b986f5db7e6a788c3fdb2dc0
Reviewed-on: http://codereview.qt-project.org/5709
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-28 12:11:14 +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
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
 2011-09-15 11:50:29 +02:00
Kai Koehne
a4a05aef2b QMakeStep: Honor declarative_debug configuration for imported builds 
Honor the qmake line that is imported: If it contains declarative_debug
or QMLJSDEBUGGER_PATH, also set the option in the qmake step, if not
not.

Change-Id: Ibc524ff8d39b66f76cc79807264db0dd3534e2d7
Reviewed-on: http://codereview.qt-project.org/4090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-14 11:25:00 +02:00
Tobias Hunger
b96b560634 Qt4: Fix initializiation of tool chain 
Change-Id: I0a37cf56ee3b609c9cabd4926b8a13b962491124
Reviewed-on: http://codereview.qt.nokia.com/4087
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-05 11:21:38 +02:00
Kai Koehne
14ee91dc54 Remove CONFIG+=declarative_debug from imported build line 
Prevent CONFIG+=declarative_debug to show up in "custom arguments"
of an imported build.

Change-Id: Ib598addcb31b65853eea430a086f614c6dd498fd
Reviewed-on: http://codereview.qt.nokia.com/4044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-01 12:55:41 +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
Tobias Hunger
f28dc88e7a Qt4: Find complete arguments passed to qmake 
Change-Id: If49183f2d8ed4ad3086dbdbfc20272127be22c25
Reviewed-on: http://codereview.qt.nokia.com/370
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-07 18:21:54 +02:00
Tobias Hunger
499a49b686 qmake: Skip running qmake when using non-default tool chains 
Do not rerun qmake when using a tool chain which requires a
non-standard mkspec to be used.

Change-Id: I6171790805743251a7867111faa46bd4d4cc890d
Reviewed-on: http://codereview.qt.nokia.com/314
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-07 16:21:41 +02:00
Kai Koehne
be1dee195f Qt4BuildConfiguration: Fix naming of slot 
Change-Id: I8b739afadd19e0f7c3503a11eb250a0662671958
Reviewed-on: http://codereview.qt.nokia.com/309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-06 15:36:41 +02:00
dt_
8b2cebd703 Minor include fix 
Change-Id: I50ba5ceb01a76ccf40ad6920060cbe986084b938
Reviewed-on: http://codereview.qt.nokia.com/245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-31 14:29:58 +02:00
dt_
a078f71872 Add BuildConfiguration::disabledReason() 
Not yet used.

Change-Id: I1f8763163e5f19e41d8e98517cf13d9bbb1e6ff8
Reviewed-on: http://codereview.qt.nokia.com/189
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-05-27 15:16:21 +02:00
Christian Kandeler
64ba06e221 Maemo: Create dedicated plugin. 
No change in functionality for now. More support for generic remote
Linux support is planned to be added.

The changes in decreasing order of magnitude:
1) Move contents of qt4projectmanager/qt-maemo to new "RemoteLinux" plugin.
2) Make some classes in qt4nodes public for now. More decoupling
in that area will follow.
3) Fix some minor problems uncovered by the move.

Change-Id: I51d0c7977c10019eb6080cd6620bc28ecebad3c4
Reviewed-on: http://codereview.qt.nokia.com/106
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-26 13:31:05 +02:00
dt_
0d2313c555 Revert "Fix import of existing builds" 
This reverts commit 8cd3b54949.

Conflicts:

	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qmakestep.ui
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp

Change-Id: I63af95b8dd7010c50318f276ef524c00a58995bb
Reviewed-on: http://codereview.qt.nokia.com/117
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-25 15:45:46 +02:00
Kai Koehne
8147973965 BuildConfiguration: Adapt name if Qt version changes 
Change-Id: I1a34cb51f73af9779d6bdb07324d5dadcb5585b3
 2011-05-25 13:22:55 +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
Pawel Polanski
2d80383db1 Now it's looking better 
Change-Id: Ic6cbc95feb121f09eb2e14c08a9ab680018dc760
Reviewed-on: http://codereview.qt.nokia.com/39
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-05-20 15:15:15 +02:00
dt_
0262795c93 Fix importing builds 
Change-Id: Idbd01ad4cd44e4e1ac168ae112bbe9f9d69eb583
Task-Nr: QTCREATORBUG-4935
Reviewed-on: http://codereview.qt.nokia.com/18
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-05-19 15:26:00 +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_
ee5b2a7dd0 Fix adding buildconfigurations for symbian emualator 
Really fixes
Task-Nr: QTCREATORBUG-4649
 2011-05-06 13:56:15 +02:00
dt_
e008fba554 Do not add a release configuration for Symbian Emulator 
Task-Nr: QTCREATORBUG-4649
 2011-04-27 14:55:36 +02:00
Oswald Buddenhagen
dd0203e921 use environment from build configuration in the project evaluator 
Task-number: QTCREATORBUG-2866
 2011-04-20 21:23:23 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
con
5b02bf94a8 Merge remote branch 'origin/2.2' 
Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2011-04-18 13:57:07 +02:00
dt
77d0637fb6 Qt4BuildConfiguration: Changing qt versions affects the environment 
Reviewed-By: hunger
 2011-04-15 14:17:38 +02:00
Tobias Hunger
7a0c58513a Qt4Bc: Do not store/restore tool chains 
The plain BuildConfiguration aleady does that for us.
 2011-04-14 14:57:54 +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
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
3de823ca62 Merge remote branch 'origin/2.2' 
Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp
 2011-03-28 11:40:45 +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
dt
b45a73ffab Use unique build directories per qt version and debug/release 
Reviewed-By: hunger
 2011-03-23 15:27:02 +01:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
Milian Wolff
d6ea2945f0 add API to query build type (unknown, release, debug) to BuildConfiguration 
Merge-request: 261
Reviewed-by: dt <qtc-committer@nokia.com>
 2011-03-03 16:12:00 +01:00
Friedemann Kleint
87423acca8 Polish target/toolchain warnings a bit. 2011-02-28 12:29:41 +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
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library 
Reviewed-by: dt
 2011-02-18 12:57:45 +01:00
Friedemann Kleint
7bd3bba6ee L10n: Tr-fixes for build configurations. 
Remove duplicate code, proper messages, linguist comments.

Task-number: QTCREATORBUG-3821
 2011-02-18 09:59:49 +01:00
dt
e505604b92 ProjectExplore: Introduce dis/enabling of buildconfigurations 
The build actions are disabled if the buildconfiguration is disabled.
The deploy and run actions are disabled if deploying or running invokes
building automatically.

Qt4BuildConfigurations are disabled while parsing.

Task-Nr: QTCREATORBUG-2576
 2011-01-19 15:47:00 +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