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

203 Commits

Author SHA1 Message Date
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
ck
ad02e86e7a Qt4Projectmanager: Constify some member functions. 
Reviewed-by: dt
 2010-07-07 10:57:08 +02:00
con
1a2a4f6387 Merge remote branch 'origin/2.0' 
Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/fakevim/fakevimhandler.cpp
 2010-07-06 15:34:50 +02:00
con
0862afe357 Fixes wrong internal folder path for first level project subfolder 
Task-number: QTCREATORBUG-1631
 2010-07-06 10:42:59 +02:00
Oswald Buddenhagen
40ef148c30 don't evaluate features in the cumulative pass 
we don't use anything the features may set up, so loading them just
wastes time. this may change if we start processing extracompilers
properly.
 2010-06-24 18:57:50 +02:00
Oswald Buddenhagen
82e10eae3b use once parsed pro file for both exact and cumulative evaluation 2010-06-18 21:27:07 +02:00
Oswald Buddenhagen
2b68df123f ProFileParser instead of a fully-fledged ProFileReader 2010-06-18 21:23:09 +02:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
Oswald Buddenhagen
13bb14dd3c error message delivery threading fixes 
the message manager is not thread-safe, so don't use it outside the main
thread.
 2010-06-18 13:21:18 +02:00
Oswald Buddenhagen
16081c105b use local8Bit instead of latin1 here as well 2010-06-16 15:48:39 +02:00
con
b0040dc858 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
 2010-06-10 15:00:16 +02:00
Oswald Buddenhagen
6a6e0091c8 consolidate the subdir name data path 
every path should be separator-fixed

Reviewed-by: dt
 2010-06-09 11:46:10 +02:00
Oswald Buddenhagen
fc421df12d micro-optimizations 2010-06-09 11:46:10 +02:00
Jarek Kobus
9d77b7c105 When adding a form file to a project add also its qrc files 
Extract qrc paths from ui file by simple xml parsing.

Reviewed-by: dt <qtc-committer@nokia.com>
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-42
 2010-06-08 12:19:00 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
Oswald Buddenhagen
8a07e6a3e1 add "static" 2010-06-04 17:56:47 +02:00
dt
58a5da63a8 Load .pro files with infinite loops 
Task-Nr: QTCREATORBUG-1443
 2010-05-20 16:16:01 +02:00
con
7f4cbe2383 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
 2010-05-20 09:28:00 +02:00
dt
02e1b8694b Check if the file is already used in the .pro file. 
And refuse to add it twice. The check is pretty simplistic in that it
doesn't take scopes or which variable it's exactly in into account.
But in those cases you need to edit the .pro file manually anyway.

Task-Nr: QTCREATORBUG-932
Task-Nr: QTCREATORBUG-891
Task-Nr: QTCREATORBUG-653
 2010-05-18 16:31:22 +02:00
dt
8e11d1d18a Fix comment to be more readeable 2010-05-18 16:31:05 +02:00
dt
435ff5dfe3 For adding files use the "primary" variable for each file type. 
That is e.g. SOURCES instead of whatever variable is used first in the
project file.

Reviewed-By: ossi
 2010-05-18 16:31:05 +02:00
dt
fb3cc11494 Make .pro files writeable if needed. 
Task-Nr: QTCREATORBUG-765
 2010-05-18 13:48:57 +02:00
dt
9bc9fe73e1 File renaming 
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
 2010-05-12 14:14:44 +02:00
con
7d88da6a32 Find created sis files, even if DESTDIR is set. 
Symbian mkspec puts the package file into the build directory,
not the destination directory.
 2010-05-07 10:42:39 +02:00
dt
61e5ce374c Make Q4ProjecConfigWidget more robust 
Task-Nr: QTCREATORBUG-1108
Task-Nr: TOOLS-339
 2010-04-14 14:38:10 +02:00
dt
c58469ce87 Fix ui completion for new projects 
The UI_DIR and MOC_DIR weren't added to the includepath for new
projects, since at the time of parsing the directories don't exist yet.

We now always add UI_DIR and MOC_DIR to the include path, without caring
whether they exist.

Task-Nr:  QTCREATORBUG-1064
Reviewed-By: ossi
 2010-04-13 16:38:11 +02:00