Commit Graph

192 Commits

Author SHA1 Message Date
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
Pawel Polanski
d1089afcfe Unable to enter slash and backslash manually in PatchChooser
Task-number: QTCREATORBUG-3214
Reviewed-by: Tobias Hunger
2010-12-06 11:37:08 +01:00
dt
5689e904fe New Project Wizard: Recheck existence of directory after browsing
The user might create directories or delete them while in the browsing
interface, thus in the PathChooser trigger a validation after browsing.

Task-Nr: QTCREATORBUG-3105
Reviewed-By: Friedemann Kleint
2010-11-23 15:25:17 +01:00
dt
1e15e030b9 PathChooser: Use QDir::cleanPath() in path()
Reviewed-By: hunger
2010-10-11 16:49:01 +02:00
dt
31aae4056c PathChooser: On changing environment emit changed() if the path changed.
Reviewed-By: hunger
2010-10-11 16:49:01 +02:00
Tobias Hunger
ad008b9b57 Environment: Disable escaping when expanding variables
This breaks too much on windows.

Reviewed-by: dt
2010-10-08 14:30:26 +02:00
Friedemann Kleint
6fabd1b237 PathChooser: Fix Windows.
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2010-09-29 12:03:14 +02:00
Friedemann Kleint
87250689ef PathChooser: Fix: Unable to enter relative command paths.
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2010-09-29 11:33:07 +02:00
Tobias Hunger
656c8691f1 PathChooser: Make use of the environment
* Expand environment arguments
 * Introduce new kind: ExistingCommand
 * Use PATH to look up ExistingCommand

Reviewed-by: dt
2010-09-24 16:35:04 +02:00
dt
2a86cb134a PathChooser: Fix some regressions
Task-Nr: QTCREATORBUG-2409
2010-09-23 10:28:57 +02:00
dt
b97aec31a7 Path Chooser: Add a basedirectory
Reviewed-By: Friedemann Kleint
2010-09-17 15:32:41 +02:00
hjk
c9a47cc5b8 path chooser: provide access to the line edit
To make it work with the HistoryCompleter.
2010-09-16 14:04:29 +02:00
Jarek Kobus
573006f370 Add "Add library wizard" to the pro file editor
Reviewed-by: dt <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-125
2010-08-16 18:25:38 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.
Reviewed-by: ossi
2010-05-14 15:53:56 +02:00
Thorbjørn Lindeijer
c0b42868b0 Preserve the user-set build directory for Generic Projects
Previously it would be converted to an absolute path. Preserving the
original path allows it to be set as relative to the project.

Reviewed-by: dt
2010-03-15 16:27:39 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Daniel Molkentin
60578cb556 Add validChanged(bool) to PathChooser.
This is useful when e.g. connecting directly to the setEnabled() slot of
a Widget.
2009-10-22 18:20:39 +02: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
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
ee524eb1a7 Beautify general build configuration. 2009-07-22 18:18:12 +02:00
Friedemann Kleint
024b548e13 Added a wizard for Qt Designer custom widgets and collections.
Add the wizard. Modify basefilewizard to use be able to handle binary
data. Add some properties to path chooser (filters).

Task-number: 251982
Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2009-06-29 14:47:04 +02:00
con
07187e0a80 Custom signature support.
Not able to give it an additional passphrase yet, though.
2009-06-24 13:41:48 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
2009-06-03 20:54:59 +02:00
Friedemann Kleint
7d41e04884 Split apart debugger options pages, allow specifying a path to CDB.
Modify engine creation funcs to populate a list of option pages
to be able to handle engine enabling independently of the
actual engine creation.
2009-04-17 09:03:32 +02:00
hjk
0b58f1f527 debugger: reorganizing settings and actions in progress 2009-03-19 09:32:47 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
con
0f5de365b9 Fixes: - Some layouting issues 2009-01-28 17:39:31 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
goro
6ef67df88b PathChooser migration for Qt4 build config page 2008-12-19 18:26:01 +01:00
goro
12bcc11389 PathChooser migration for external app debug lanuching 2008-12-19 16:39:53 +01:00
goro
cb7bb2eefe PathChooser migration for Qt version config page 2008-12-19 15:33:15 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
con
c4b222695e Fixes: - Choose... buttons are push buttons on mac 2008-12-11 15:11:15 +01:00
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
hjk
3b315ed4d4 fix file name validation bug 2008-12-09 11:27:17 +01:00
goro
881610dfd2 Migrate subversion plugin to extended PathChooser 2008-12-05 18:51:07 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
hjk
f61e8672db more cosmetic changes 2008-12-02 14:09:21 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00