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

49 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
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +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
Orgad Shaneh
a131793f51 Search: Allow empty prefix for completer 
Change-Id: Ia3a77c4512c03496cac492d401c2bff3eee7a980
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-10 08:31:55 +02:00
hjk
903eeaf42f fancylineedit: enforce conscious choice between history or special completer 
Change-Id: Ia667895b619d0bb37561dce348adb7269df2fb9c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-08-24 13:37:59 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget* 
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-19 15:15:53 +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
529c0a8fe2 Merge remote-tracking branch 'origin/2.5' 2012-05-07 15:18:39 +02:00
Konstantin Tokarev
3872597d09 Restore state of find flags in FindToolWindow. 
There was an issue with checkboxes "Case Sensitive", "Whole Word", and
"Regular Expression": their state was properly saved in
FindPluginPrivate::m_findFlags, but was not properly restored in GUI of
FindToolWindow on the next run of Qt Creator. This patch fixes this issue.

Change-Id: I31e1e14a4117fbf4f4d17e82b3fa2b90973be339
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-07 14:00:11 +02:00
Konstantin Tokarev
cb5a9d9d0f Use FilterLineEdit in FindToolWindow (to add clear button). 
Change-Id: Ib6238471e50a361d52c71d13df39730b17bcea75
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-04-26 17:08:40 +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
b0b0842b03 Fix the height of the new search result pane. 
For the bigger search filters like C++ Symbols & Files on File System
it was unusable e.g. on Mac.

Change-Id: I1839238660cc7508ada4e580388ee08d8eca8a6a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-12-06 18:21:42 +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
b2cc1a9d4e Allow usage of keypad 'enter' key for initiating searches. 
Change-Id: Ida418646a35c51cc848abfeb8fd598f13d56b7dc
Reviewed-on: http://codereview.qt-project.org/5541
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-26 14:52:37 +02:00
Eike Ziller
a70c767b92 Fixes: Pressing return in search panel didn't run the search. 
It did so only if the focus was on the search term line edit.

Task-number: QTCREATORBUG-6114
Change-Id: I0cf051ed0f5f4e7403d7c36eb2173a71de370276
Reviewed-on: http://codereview.qt-project.org/5252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-21 15:12:41 +02: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
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
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
dt
faba06b553 Search Dialog: Make canceling possible 
Task-Nr: QTCREATORBUG-2243
 2010-09-02 16:13:46 +02:00
dt
f9504cd3c6 Find Dialog: Update en/disabled state on finishing searching 
Makes QTCREATORBUG-2243 easier to do.
 2010-09-02 16:13:46 +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
8c920ee089 One method name slipped the naming convention displayName. 2010-07-12 16:17:31 +02:00
con
225a827b0d Let search dialog open the completion box at cursor down. 
Similar to what we do in the find tool bar.

Task-number: QTCREATORBUG-1543
 2010-07-06 11:21:46 +02:00
Friedemann Kleint
8a58a2fe71 Header cleaning mainly in find/cpaster. 2010-03-24 10:43:01 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
d2e5b19438 Fix crash with empty search term. 
Also disable "Search" buttons in this case.
 2010-02-26 15:46:43 +01:00
con
1a95f6f205 Implement string based search & replace in multiple files. 
This uses the same UI as "Rename Symbol".
Moves the actual rename implementation to a static method in
BaseFileFind and uses it for rename symbol and search & replace.
Moves the signal notification for the code model from VCSManager to
the more general FileManager.
Note that as for rename symbol, there's no undo yet.

Task-number: QTCREATORBUG-73
 2009-12-21 11:08:52 +01:00
Friedemann Kleint
74a3828f19 Purge out include files in exported headers 2009-10-01 16:38:08 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
con
286d809194 Fix the crash fix d03b5714c7. 2009-05-06 17:42:13 +02:00
dt
d03b5714c7 Fix obscure crash in Find when no FindFilter exist. 
Can only happpen if the user disables all plugins...
 2009-04-24 13:34:02 +02:00
con
cd14b9f197 Find dialog doesn't remember last selected scope. 
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2009-04-03 15:53:51 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
con
19670c5beb Fixes: - Crash on searching in "current project" 
Task:     - 243147
RevBy:    - Thorbjørn
Details:  - Crash occurred in case there actually is no "current
project", e.g. because the current file doesn't appear in a project.
 2009-02-10 12:15:32 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
df7aacd637 more file cosmetics 2008-12-02 15:08:31 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00