feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,521 Commits 108 Branches 368 Tags
3bb7339fd4d7887231db4dc0504c79c1f1594cd3
Commit Graph

21 Commits

Author SHA1 Message Date
Pawel Faron
ec145f36f3 Added new filter into "Import Existing Project" and "Edit Files" 
Extended classes:
- SelectableFilesModel
- SelectableFilesDialog
- FilesSelectionWizardPage

Task-number: QTCREATORBUG-8805
Change-Id: I0ff2f458fce2d7b0ceee24ace7dc2fafddc5ad5d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-04-19 20:41:05 +02: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
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
6d4846a78c GenericProjectManager: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: Iafe507e833d09fe45a24c830d670995c49e3a145
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-11-27 08:56:25 +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
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
Francois Ferrand
ff652f0a59 Generic Project: Better filtering of supported files. 
In the edit files dialog and project wizard, initial filtering of files
was done by checking the file suffix in mime database. This does not
work for all files (e.g. makefiles), and is not needed: filtering is
done afterwards using a user-editable filter string.

Change-Id: I0664aa5b3c52b663d6d94020df4e1986dd7c69a5
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-29 12:02:19 +02:00
Francois Ferrand
a0605523ae Generic Project: improve filtering. 
- When applying filter, always show items which were already in project.
- Store the filter string in settings.

Change-Id: I5b726ed0bde49d8ac48d4f2f4589b194fc557a95
Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-03-15 10:22:23 +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
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils. 
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-09 12:33:10 +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
Daniel Teske
26946ec288 Generic Project: Show symlinked files (but not directories) 
Task-number: QTCREATORBUG-6807
Change-Id: I3d99976444c8fa2882e4218377763ae34a681c18
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Thorbjørn Lindeijer
 2012-01-13 15:23:40 +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
Friedemann Kleint
6cf89dcf65 tr()-fix. Use Plural forms. 
Change-Id: I58612cedf33defa78d1cb58e69c49c62a755d726
Reviewed-on: http://codereview.qt.nokia.com/1287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-07 10:09:15 +02:00
Daniel Teske
be1e4d85ee Generic Project: Preserve out of project files on "Edit Files" 
Change-Id: Ia71ed20f8cd5563f1e7fce7a99cf12fc4e7e62c2
Reviewed-on: http://codereview.qt.nokia.com/1076
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-07-05 15:10:55 +02:00
Daniel Teske
e9a7ec271d Make msvc happy 
Change-Id: If4698dda2ada87b0c51fbee0bcede74700f86959
Reviewed-on: http://codereview.qt.nokia.com/892
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-29 13:10:14 +02:00
Daniel Teske
5fcdc85b91 Genericproject: Add "hide files" option to file selection dialog 
Task-Nr: QTCREATORBUG-2087

Change-Id: Ie6c47b19e5e9214b0978007bf080e7e6e6b52d1f
Reviewed-on: http://codereview.qt.nokia.com/765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-28 19:03:17 +02:00
dt_
8d448b7250 Generic Project Wizard: Fix Icon of root item in edit files 
Change-Id: I4d42bca662207ad9f8ee8db55d88f4618b1ccc2d
Reviewed-on: http://codereview.qt.nokia.com/697
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-24 12:46:19 +02:00
dt_
86889dded8 On new generic project, show progress and dialog 
Task-Nr: QTCREATORBUG-2226

Change-Id: I62e1c740a008663396960cfc12a05202f8800892
Reviewed-on: http://codereview.qt.nokia.com/594
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
 2011-06-22 18:04:02 +02:00
Daniel Teske
edf0424bb8 Add a dialog for editing the file list of generic projects 
Task-Nr: QTCREATORBUG-5112

Change-Id: Ic39c4346f2c64b05c314f3c03d963994e043dc45
Reviewed-on: http://codereview.qt.nokia.com/500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
 2011-06-20 14:38:23 +02:00