feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

87 Commits

Author SHA1 Message Date
Kai Koehne
7812f15240 Qt4Target Page: Filter out QMLJSDEBUGGER_PATH when importing build 
Don't add QMLJSDEBUGGER_PATH to the list of customer qmake arguments
when importing a built on the target page.

Task-number: QTCREATORBUG-4694
Reviewed-by: dt
 2011-04-27 17:25:48 +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
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
07c0e56615 TargetSetupPage: Hide "add Build" for shadow incapble targets 
There can't be any builds anywhere

Reviewed-By: hunger
 2011-04-15 14:17:38 +02:00
dt
618fde4cc2 TargetSetupPage: setBuildConfiguraionComboBoxVisible use the parameter 
Instead of assuming that it is true. (Which is actually true, but well.)
 2011-04-14 13:17:29 +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
dt
e3c59a5800 TargetSetupPage: Disable editing build directory for symbian 
Shadow building is not supported so editing the path has no purpose.

Reviewed-By: hunger
 2011-04-12 19:07:40 +02:00
con
be3a2f615f Fix target setup page layout on Mac. 
Reviewed-by: dt
 2011-04-08 15:28:56 +02:00
dt
19e2a2e27e TargetSetupPage: Fix expanding logic 
Reviewed-By: Robert Loehning
 2011-04-05 12:58:23 +02:00
dt
fadc6ef251 TargetSetupPage: On error only expand if selected 
Also on selecting, expand if there are errors

Task-Nr: QTCREATORBUG-4327
 2011-04-01 11:59:20 +02:00
dt
f23679f588 TargetSetupPage: Show shadow build checkbox only for desktop target 
Task-Nr: QTCREATORBUG-4276
 2011-03-29 19:41:50 +02:00
dt
558abed847 TargetSetupPage: Minor string change 
Task-Nr: QTCREATORBUG-4275
 2011-03-29 19:41:50 +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
dt
d998c23a37 TargetSetupPage: Enable the target page on add import 
Task-Nr: QTCREATORBUG-4230
 2011-03-25 17:01:43 +01:00
dt
34417d3258 Target setup page: 2. message box parent 
Give the other message box the right parent too.

Task-Nr: QTCREATORBUG-4192
 2011-03-24 19:27:29 +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
Oswald Buddenhagen
4e2937bf48 Merge remote-tracking branch 'origin/2.2' 
Conflicts:
	src/plugins/debugger/debuggersourcepathmappingwidget.cpp
 2011-03-23 14:42:31 +01:00
dt
b756d30c21 Targetsetuppage: Import failed messagebox hiding dialog 
Give it a better parent.

Task-Nr: QTCREATORBUG-4192
 2011-03-23 13:39:04 +01:00
Friedemann Kleint
866e39a0a2 Target dialog: Set a tooltip containing Qt version info. 
Introduce verbose flag and display QtVersion tooltip on
checkbox.

Reviewed-by: dt
 2011-03-22 12:44:29 +01:00
dt
1e8e9612c3 Qt4ProjectManager: Overhaul desktop target in targetsetuppage 2011-03-21 17:48:27 +01:00
dt
7e8688aff5 TargetSetupPage: Hide add build path until the button is cliked once 
Makes a somewhat even cleaner layout
 2011-03-17 20:27:31 +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
cc335cca97 TargetSetupPage: Incorrect logic for detecting per bc warnings 2011-03-16 17:55:10 +01:00
dt
53b7d91c4a Clarify project setup dialog. 
Task-Nr: QTCREATORBUG-4079
 2011-03-16 17:47:31 +01:00
Tobias Hunger
048c563002 Fix build warning 2011-03-16 17:36:01 +01:00
dt
936e8ebe0d TargetsetupPage: Show per target warnings 
Task-Nr: QTCREATORBUG-3868

Reviewed-By: hunger
 2011-03-16 17:28:21 +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
Friedemann Kleint
3bf818adc0 Qt4ProjectManager: Exported header cleanup. 2011-03-02 15:02:25 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
dt
a552bc8b25 Do not create a widget if no valid qt version was found 2011-02-24 12:33:01 +01:00
dt
0bbe3df6ed Qt4ProjectManager: New Projects had a inverted shadow build checkbox 
Ehm, yeah.
 2011-02-23 12:50:02 +01:00
dt
0609b5b85d Qt4Projectmanager: Do not crash on importing projects without builds 2011-02-22 20:02:02 +01:00
dt
d5e89ceab3 Qt4TargetSetupPage: On adding a import dir, disable default builds 
The user probably wants to have just his builds.
 2011-02-22 15:35:24 +01:00
dt
06ee3aee7f Qt4ProjectManager: New TargetSetupPage 
Rewrite the target setup page to look and baheve better.
Noteable better at:
- Disabling shadow building
- Deselecting whole targets
- Adding import directories

Api-wise, Targets derived from Qt4BaseTarget have two ways to customize
the targetsetuppage.

a) Reimplement availableBuildConfigurations
b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget)
   in their default implementation. (Or only slightly customize like
   the desktop target does.)

Or:
a) Make a dummy implementation for availableBuildConfiguration
b) Replace createTargetSetupWidget and return your own widget
   (It should match the look and feel from the other widgets.)
   It needs to be derived from Qt4TargetSetupWidget
c) Also replace the create create(... Qt4TargetSetupWidget) function
   and set up the target anyway you want.
 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
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
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
Pawel Polanski
051011bc37 Symbian: Adjust Creator to work with CODA 
Reviewed-by: hjk
 2011-01-14 14:21:06 +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
c0efa295af Qt4ProjectManager: set the displayname and icon on creating new projects 
This code is still needed.
 2010-12-07 15:41:35 +01:00
dt
95d7639bb7 Qt4: Move Qt4Target and Qt4BC out of the Internal namespace 
Reviewed-By: hunger
 2010-12-07 13:16:07 +01:00
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target 
Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
dt
f8073770ca Adding Target::supportsTargetId() 
Reviwed-By: hunger
 2010-12-06 14:15:06 +01:00
dt
7d926b475c Fix Qt4TargetFactory to claim the correct target ids. 
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
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header. 
Acked-By: dt
 2010-11-01 14:25:24 +01:00
Tobias Hunger
3d5ec35704 Make sure a display name is set for targets 
* Make sure we have a display name set for targets when restoring
   from Qt creator 1.3.1 .user files.
 2010-09-02 10:41:08 +02:00