Commit Graph

39 Commits

Author SHA1 Message Date
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
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
Orgad Shaneh
a24c1407a3 QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-12-20 14:16:56 +01: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
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
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
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01: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
Kai Koehne
8500d9ced8 QmlProject: Allow files to be deleted / renamed
This might lead to files that 'disappear' from the pane, e.g. when
the suffix is changed to something unsupported.

Reviewed-by: Daniel Teske
Task-number: QTCREATORBUG-2436
2010-09-30 11:34:29 +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
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
Christiaan Janssen
1a9b2dadcf QmlDesigner.ProjectExplorer: New icons for qml file types 2010-04-01 17:21:41 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
004042403f Compile 2010-02-24 15:42:52 +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
Kai Koehne
b5646d35da Don't show error message if file added to qmlproject is picked up
Check for the case that a new file to be added to a .qmlproject
is also automatically covered e.g. by a wildcard filter. In this
case we don't have to do anything.
2010-02-17 11:22:37 +01:00
Kai Koehne
ba9a197e5e Disable adding of files to a .qmlproject
The old code still assumed the old, plain text format, and just added
the file path to the end of the file. This broke the new .qmlproject
file format.

Ideally QmlProject should be clever enough to check whether the file
will be automatically picked up in the monitored directories, and if
not added explicitly e.g. to QmlFiles { paths: ... }. Anyhow, this
quick fix just shows every time an error message instead of destroying
the .qmlproject file.
2010-02-17 10:22:15 +01:00
Kai Koehne
fdd85b7f33 QmlProjectManager refactoring
Putting every class in it's own files + avoid "using namespace"
2010-02-16 13:43:27 +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
Kai Koehne
bafe4468aa Add support for JavaScriptFiles and ImageFiles elements to .qmlproject 2010-01-29 12:15:47 +01:00
Kai Koehne
32ac14c27a Wire up new project file format in Project Manager
Old format is still available as a fallback.
2010-01-29 12:13:11 +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
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
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Roberto Raggi
762384c976 Compile 2009-05-08 15:36:53 +02:00
Roberto Raggi
c32887f6ac Compile. 2009-05-08 13:00:05 +02:00
Roberto Raggi
5b11a292eb Add files to the projects. 2009-05-07 15:43:59 +02:00
Roberto Raggi
9d676f75db Initial work on the QML project manager. 2009-05-04 12:19:22 +02:00