feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,573 Commits 108 Branches 368 Tags
d53454960dc681fdfee6b286ee6d9b440e35d15d
Commit Graph

68 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
hjk
028fc3dd8c Use Id::fromString instead of the constructor. 
Change-Id: Ie18714ac2872a085e8c20d445472901cc9f6b6c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-01-17 11:26:49 +01:00
Francois Ferrand
058d2e8cb5 Support preserving case when replacing. 
When making a case insensitive search, try to keep the string capitalization when doing
the replace:
      - All upper-case matches are replaced with the upper-case new	text.
      - All lower-case matches are replaced with the lower-case new text.
      - Capitalized matches are replace with the capitalized new text.
      - Other matches are replaced with the new text as provided.

Note: this does not work with regexp replace, only plain text.

Change-Id: I87cbc28eb64688bdf3c8c6ec173fcb22f91abcd0
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-12-14 10:22:41 +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
e3c354d8f2 Make PluginManager mostly static. 
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-19 16:11:40 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...) 
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
 2012-06-05 15:19:30 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup. 
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
 2012-05-25 10:08:24 +02: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
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
Friedemann Kleint
fa20c2a95e Find: Compile with QT_NO_CAST_FROM_ASCII. 
- Add missing tr()
- Fix potential crash constructing QString(0).

Change-Id: Ie35c047800a60410ca0886f8e50be1670c8375e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-01-20 15:35:19 +01:00
Eike Ziller
26d8b8753c Disable "Search Again" if file filter is disabled. 
For example disabled it for "All Projects" searches when all projects
are closed.

Change-Id: Icc65a87577ba51f4362791dc8ecdca3c92819553
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-12-20 12:03:50 +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
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +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
Eike Ziller
1e47de1416 Move advanced search dialog into search result pane. 
And move the cancel button into the specific search result widget.

Change-Id: Ide8173e1ec5de091e1c1332a2b0c47d9a30a4c87
Reviewed-on: http://codereview.qt-project.org/4555
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-13 15:38:47 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Daniel Teske
b8b8f167b1 Add "Find in directory" to project tree context menu 
And also to the filesystem view.

Task-Nr: QTCREATORBUG-5879
Change-Id: I27bfe05808182f56deafd6ceab474894631f0a26
Reviewed-on: http://codereview.qt.nokia.com/4185
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-05 14:37:10 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +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
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
con
94a7fd0b99 Make "Use regular expressions" a general option for find filters. 
This was the main goal of the new generalized Find::FindFlags
 2010-07-15 16:42:32 +02:00
con
a8316c4681 Use the Find::FindFlags also for the search dialog. 2010-07-15 16:42:32 +02:00
con
cecf9ac25a Move find flags from IFindSupport to more accessible place. 
For later use in IFindFilter.
 2010-07-15 16:42:31 +02:00
con
9eba87bd92 Add "Advanced..." button to find tool bar that opens the search dialog. 
We had multiple cases where people were assuming that you can't do
project wide search/replace, because they tried Ctrl+f and that is only
single file.

Reviewed-by: Thorbjørn Lindeijer
 2010-07-14 15:27:04 +02:00
con
b3dbc4b4e4 Add flag to IPlugin::aboutToShutdown that allows asynchronous shutdown. 
If a plugin requests asyncronous shutdown, the shutdown sequence does
not continue to deleting the plugins before it has sent a
asynchronousShutdownFinished signal. During that time an event loop
is running.
 2010-07-13 15:25:21 +02:00
con
8c920ee089 One method name slipped the naming convention displayName. 2010-07-12 16:17:31 +02:00
hjk
f56dacc76f Core::Context: remove special handling of C_GLOBAL_ID/C_GLOBAL 2010-06-28 14:30:03 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
con
ca14299790 Rename IPlugin::shutdown --> IPlugin::aboutToShutdown 
Discussed-with: hjk
 2010-04-28 17:32:01 +02:00
Friedemann Kleint
8a58a2fe71 Header cleaning mainly in find/cpaster. 2010-03-24 10:43:01 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Martin Aumüller
f6482a3871 fakevim: implement incremental backward search '?' using Find plugin 
Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-21 17:23:31 +01:00
Martin Aumüller
474d883eac for fakevim mode, terminate incremental search after pressing enter/return 
Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-21 17:23:31 +01:00
con
b182d5ac53 Don't try to add actions to non-existing group. 2009-12-14 17:33:26 +01:00
con
165d25f01c Clearer menu separation between find tool bar and find window. 2009-12-14 15:43:15 +01:00
con
be3fafc311 Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5' 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2009-10-29 18:54:17 +01:00
con
2be0845c74 Find filter actions must use filter id as id, not filter name. 2009-10-29 17:12:57 +01:00
dt
fd0fbddebb Fix a bug with selecting copying the right text to the Find dialog. 
To reproduce:
Split editors.
Select text in first editor.
Select text in second editor.
Invoke the find dialog.
Notice that the text from the first editor was used.

Reviewed-By: mae
 2009-10-21 15:11:46 +02:00
Thorbjørn Lindeijer
6bfd90a31b Added bracket matching to the changes list for 1.3.0 
Plus some minor reformattings.
 2009-10-01 14:03:15 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
eec53984fa Prevent deletion of find tool bar when place holder is deleted. 
This happens for example when removing a split editor.
 2009-07-21 17:52:18 +02:00
Oswald Buddenhagen
9bc155ea65 fix action title 2009-07-06 12:03:47 +02:00