feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,446 Commits 108 Branches 368 Tags
002890fabac0777f4b4d75946afd0841ac80be31
Commit Graph

229 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
5df88137d1 Symbian: Make error concerning capabilities prettier 2010-12-17 11:46:52 +01:00
Christian Kandeler
c3fe628dc9 Remove annoying warnings when loading Creator master. 
The proper fix would be to support the QMAKE_SUBSTITUTES variable.
 2010-12-16 18:05:22 +01:00
Kai Koehne
34846ac499 Qt4ProjectManager: Fix crash when loading $QTDIR/src/src.pro 
Guard access to pointer, which happens to be 0. The regression
was most likely introduced by 057591e0dd.
 2010-12-16 12:46:06 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Pawel Polanski
057591e0dd If capabilities inside pro files do not match the dev cert an error is generated (SymbianOS) 2010-12-14 16:37:50 +01:00
con
519b544f62 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2010-12-08 10:57:21 +01:00
hjk
b9f92c29a0 vcsmanager: coding convention 2010-12-08 07:58:23 +01:00
dt
592b44e9b5 Qt4ProjectManager: Force a qmake run on change in the deploy folder 
On a change to the deployment folder, we need to run qmake again to
recreate the pkg file, we do that by setting a flag on all qmakesteps
for symbian and saving/restoring that flag.

Reviewed-By: hunger
Task-Nr: QTCREATORBUG-3062
 2010-12-06 13:01:18 +01:00
Christian Kandeler
1cbfa220fc INSTALLS element checking: Add more detail to debug message. 
For larger projects, it doesn't make much sense without mentioning
the respective project file.
 2010-12-02 17:04:15 +01:00
con
964236c816 Move some API around and make some IFile based instead of IEditor. 
promptReadOnlyFile: EditorManager-->FileManager
fileFilters: EditorManager-->MimeDataBase
saveFile & saveFileAs --> IFile based
 2010-12-01 13:10:46 +01:00
Oswald Buddenhagen
f3b5c98bf5 Merge remote branch 'origin/2.1' 2010-11-23 15:44:58 +01:00
dt
e4443ef600 Qt4ProjectManager: Show ICON in other files 2010-11-22 15:10:20 +01:00
dt
fa7d22e348 Qt4ProjectManager: Do not enumerate files from cumulatively found folders 
Ignore folders from cumulative parse, we are recursively enumerating all the
files from those folders and add watchers for them, that's too dangerous
if we get the foldrs wrong and enumerate the whole project tree multiple
times.

Task-Nr: QTCREATORBUG-3104

Reviewed-By: con
Reviewed-By: Alessandro Portale
 2010-11-22 15:09:11 +01:00
dt
01592d60d6 FlatModel: forgotten change + compile on windows 2010-11-18 18:20:33 +01:00
dt
bdc0e29241 FlatModel: The simplified tree did not react to hasBuildTarget changes 
Task-Nr: QTCREATORBUG-3014
Task-Nr: QTCREATORBUG-2821
 2010-11-18 17:47:01 +01:00
Christian Kandeler
44f1d14c13 Qt4ProjectManager: Omit .pro file warning if that is requested. 
Normally, we print a debug message about INSTALLS += var
with var.files being empty.
Don't do this if var.CONFIG contains "no_check_exist".
 2010-11-08 17:33:32 +01:00
Oswald Buddenhagen
dd45277a19 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
 2010-11-04 19:18:45 +01:00
dt
61a3aad1e0 Qt4ProjectManager: updateFileList on a external folder change 
Task-Nr: QTCREATORBUG-3001
 2010-11-04 14:05:04 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments 
Krazy was complaining about those.
 2010-11-03 12:45:34 +01:00
dt
c09c5ec988 Qt4ProjectManager: Emit correct state once on restoring 2010-11-02 16:43:11 +01:00
dt
45dd1ad7f5 Disable Run Configurations while parsing .pro files 
Initial patch and idea by hunger.
Reviewed-By: hunger
 2010-10-28 16:09:41 +02:00
Christian Kandeler
dbd3965241 Maemo: Remove additional parsing step. 
Instead, utilize the newly added INSTALLS information of Qt4ProFileNode.

Task-number: QTCREATORBUG-2679
 2010-10-28 09:25:18 +02:00
Christian Kandeler
1dd1fe6a1b Qt4ProFileNode: Make a project's INSTALLS settings available. 
Task-number: QTCREATORBUG-2679
Reviewed-by: dt
 2010-10-27 17:21:34 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
dt
af7b39e3a7 Qt4ProjectManager: Add some safety code 
Might, or might not fix
Task-Nr: QTCREATORBUG-2361
 2010-10-25 17:26:41 +02:00
dt
90c1b182b7 Fix double listing of files 
Reviewed-By: con
Task-Nr: QTCREATORBUG-2729
 2010-10-25 14:14:36 +02:00
dt
3cd9c59679 Optimize which folders we recursively enumerate 
Reviewed-By: hunger
 2010-10-25 14:14:30 +02:00
con
8f647ca9ca Wizards editing pro files would sometimes ask for reloading open editors 
Task-number: QTCREATORBUG-2205
Reviewed-by: dt
 2010-10-20 12:10:01 +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
Christian Kamm
427f775489 QmlJS: Allow setting import paths in Qt4Projects using QML_IMPORT_PATH. 
Introduced new Creator-specific qmake variable QML_IMPORT_PATH that
lists the import paths required by the QmlJS engine.

Done-with: Alessandro Portale
 2010-09-21 14:56:25 +02:00
Leena Miettinen
8337094aa2 UI text - Fix capitalization 2010-09-20 11:14:36 +02:00
Oswald Buddenhagen
7322900692 make ProFileParser API less bug-prone 
QString::isNull() vs. isEmpty() discrimination is a time bomb ...
 2010-09-02 18:08:22 +02:00
dt
9f68456b65 Give our Profile parser more information from the qmakestep 
e.g. DEFINES+=bla on the qmakestep command line now work

Task-Nr: QTCREATORBUG-2091
 2010-09-01 12:37:29 +02:00
Jarek Kobus
a7bb5f2541 Add "Remove Project" action to the project explorer 
Reviewed-by: dt <qtc-committer@nokia.com>
 2010-08-27 15:45:40 +02:00
dt
1e680bd19f Fix for not showing Add Exising Files 
Patch by Jarek
 2010-08-27 13:37:57 +02:00
Jarek Kobus
1cefde9e45 Implement adding new project into opened subdirs project 
Reviewed-by: dt <qtc-committer@nokia.com>
 2010-08-26 18:35:05 +02:00
dt
ece749c30e Fix context menu for the QML virtual folder. 
That is: a) Figure out a suitable default location for Add New on a
virtual folder.
b) If that default location is deployed, don't show a Add Existing Files
option, since that is confusing.
 2010-08-25 11:54:57 +02:00
dt
e5f8a31b9e Fix File/New in the deployment folders. 
That is tell the user that those files need not be added to any project,
and show "<Implicitly Add>" for them on the last wizard page.
This fixes Add/New for the QML/OTHER_FILES folder structure, except for
the virtual folder itself.

Reviewed-By: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2010-08-25 11:53:43 +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
dt
e05ba37ac3 Show files added to INSTALL / DEPLOYMENT 2010-08-12 15:05:05 +02:00
dt
a1760fc84a Fix lots of QFileSystemWarnings about empty lists 
Also only watch folders not files.
That also removes files that are directly listed in INSTALLS /
DEPLOYMENT, I'll readd them in a later commit.
 2010-08-12 13:38:34 +02:00
dt
91ec3dd50a Show QML Folder only once, where it is set. 
That's a child of the .pri file for our new wizard. To be improved.
 2010-08-12 13:38:34 +02:00
dt
178f18d910 Add a prelimary icon 2010-08-11 16:28:50 +02:00
dt
60b663d558 Filter non existing folders 2010-08-11 15:39:59 +02:00
dt
3ccc079cd3 Compile on Windows 
Some windows header have a define for DeleteFile.
 2010-08-11 14:49:55 +02:00
dt
b02add2490 Add QML folder in project tree, show files there 
Use the full path for folders to sort in the project tree.

For virtual folders ensure that the path ensures the sorting we want.

Reviewed-By: kkoehne
 2010-08-11 12:10:43 +02:00
dt
f3de5fb610 Fix DESTDIR=. case 
Qmake treats "." special, we need to do the same
 2010-07-27 14:28:24 +02:00
Friedemann Kleint
a96cc1a332 VCS[Perforce]: Add a setting to automatically open files 
when attempting to save a file under Perforce.

Reviewed-by: con
Task-number: QTCREATORBUG-1823
 2010-07-09 12:22:58 +02:00