feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,506 Commits 108 Branches 368 Tags
959a75d65e2d28297aaa4a2efd8f2f1dfb4cc119
Commit Graph

58 Commits

Author SHA1 Message Date
Friedemann Kleint
fff7c62b8a Fix Krazy warnings about values or keys iteration in project management. 
Change-Id: I70674ac326f508b53f50b4dbbc5e051dbdd9017d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-15 13:24:29 +01:00
Daniel Teske
f6b9e90f74 Generic Project: Fix relative paths outside of project directory 
The paths are later split on '/' and thus should not end in '/'.

Task-number: QTCREATORBUG-8840

Change-Id: I3fb1ddd53bb1e33123e20f683c481d56ad651d62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
 2013-03-01 13:30:54 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Daniel Teske
35457f6f2e Fix crash on renaming files in generic project manager 
Task-number: QTCREATORBUG-8638

Change-Id: Ie5b9c237459f4e6d503121331a51821cd812bee8
Reviewed-by: Matthias Blaicher <matthias@blaicher.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-31 16:08:05 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Daniel Teske
16f272e0f6 GenericProject: Make node tree updates smarter 
By not simpy removing all filenodes and foldernodes.
The algorithm is not optimal, since it searches for each difference
instead of traversing the two trees in lockstep, like for example the
qmake project manager does. But it seems good enough.

Task-number: QTCREATORBUG-7410
Change-Id: Ie7c0f4bc57cd3aff4e8b7a26845cfaf213329326
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-25 11:27:29 +02:00
Daniel Teske
dc9f59999b GenericProject: Use Utils::FileName for childOf check 
Using startsWith is wrong

Change-Id: Ib54c62006994e0657576845066ce8ba9d15d2138
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-25 11:11:33 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
hjk
5d5a483961 genericprojectmanager: code cosmetic 
White space, namespaces, include order, comments, literal style,
remove unneded include/declarations etc.

Change-Id: Ifcb4371699c5cde244be1610b67cf81915cad2b2
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-14 15:43:20 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +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
Andre Hartmann
6de2b28130 Implemented rename file feature for generic projects. 
Change-Id: I195c48c5eaa458bdb537a8de4d7b71f17a704f41
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-27 12:11:16 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +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
hjk
4a338a5129 genericproject: pass an essentially temporary variable as parameter 2011-04-12 12:18:11 +02:00
hjk
3df1d524b7 genericproject: cosmetics 2011-04-12 12:18:11 +02:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
dt
063c4ff670 Add "Run" to projectexplorer context menu 
Task-Nr: QTCREATORBUG-2166
 2011-01-21 13:35:23 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01: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
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
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
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
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thorbjørn Lindeijer
da592767be Display files outside of the project directory for generic projects 
Task-number: QTCREATORBUG-372
 2010-02-26 16:14:11 +01:00
con
8c6fc0c454 Don't begin global paths with '/' on windows. 
Doing it creates huge delays, because it resolves to a network path.
Also rename FolderNode::setFolderName to FolderNode::setDisplayName,
because that's the name of the property.

Task-number: QTCREATORBUG-695
 2010-02-24 15:06:48 +01:00
Tobias Hunger
5173c2dc01 s/target/buildtarget/ in projectnodes 
This is in preparation of the addition of "targets" in the sense
of "platforms to develop for" into the codebase.

Reviewed-by: dt
 2010-02-02 12:59:29 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues. 
QString: Use QChar where appropriate.
 2010-02-01 12:43:56 +01:00
dt
0e29cca4cb Adding files for generic project get the right directory now. 
For folder nodes.

Task-number: QTCREATORBUG-374
Reviewed-by: Thorbjorn
 2009-12-09 14:45:16 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Thorbjørn Lindeijer
200b06581a Compile fix for gcc 3.3 2009-07-16 12:28:51 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED 
There were both variants, with and without extra semicolon.
 2009-07-13 17:35:17 +02:00
Kevin Michel
b170e3ba87 Enable 'Remove file...' on Generic project 
Merge-request: 783
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-06-30 15:08:38 +02:00
Kevin Michel
79e2108687 Fix GenericProjectNode filePath, fixes the Add New wizard default path 
Merge-request: 736
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-06-29 18:04:30 +02:00
Kevin Michel
375d81166c Allow adding files in generic project 
Merge-request: 736
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-06-29 18:04:29 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
dt
9428050910 Remove work around for broken currentNode from generic project manager 
Hopefully it was the same bug.
 2009-03-31 15:07:05 +02:00
Thorbjørn Lindeijer
71aeac5915 Use completeBaseName instead of baseName where appropriate 
Fixes issues with handling additional dots in the filename in many
places.

Task: 246390
 2009-03-20 17:04:23 +01:00
Thorbjørn Lindeijer
9c8f4e30a7 Allow specifying the name of a new generic project 
The name is used as the base for files like [project].creator,
[project].files, etc. and is displayed in the Projects mode and the
Projects tree.
 2009-03-19 18:08:16 +01:00
Thorbjørn Lindeijer
93b3dda602 Fixed member variable prefix to be in line with coding standards 2009-03-18 12:20:06 +01:00
Roberto Raggi
af29d0608e --debug 2009-03-16 12:16:10 +01:00
Roberto Raggi
f9308dcc05 Fixed the wizard and removed some obsolete code. 2009-03-16 12:13:00 +01:00
Roberto Raggi
e10bda6f9a Create nodes for the project files. 2009-03-16 11:49:57 +01:00
Roberto Raggi
d690a844b4 Imrpvoed the importer. 2009-03-13 15:12:54 +01:00