feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
36,818 Commits 108 Branches 368 Tags
08f12e95d0c0b703ca49c26949d4c23052c30b41
Commit Graph

43 Commits

Author SHA1 Message Date
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements 
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-17 11:11:25 +02:00
Leena Miettinen
41411165ba Doc: use standard wording in \brief commands 
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-06-20 11:22:47 +02:00
Friedemann Kleint
aebf19eabd Clean headers in Utils. 
Forward-declare QGraphicsOpacityEffect in DetailsButton,
QProcessEnvironment in Environment, QFileInfo in fileutils,
QUrl in IWelcomePage, FancyLineEdit in PathChooser and
remove unneeded headers.

Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-19 17:19:26 +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
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
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +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
Christian Kandeler
2b293691aa Do not use qFindChild() and qFindChildren(). 
These are deprecated in Qt 5 and can be trivially rewritten using
a construct compatible with Qt 4 as well.

Change-Id: I9cb9ab8b7b4ee75c7510ec2648b69dd204c87da4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-09-20 17:18:51 +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
6e7e6acba4 Remove some old TODO items 
Change-Id: I43c893176e5a83530f909371fc143dbb0cafd3ba
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-16 14:10:01 +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
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
1f6dc5e5c9 Debug and Analyze mode context menus were reshuffling. 
Sort the items alphabetically to counter measure reordering of
QMainWindow child dockwidgets.

Change-Id: Ia79ffcb2dcd0c313184bc7bcafb7a4482db72a21
Reviewed-on: http://codereview.qt.nokia.com/1557
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-13 10:45:00 +02:00
hjk
92dca7ee7e fancymainwindow: style 
Change-Id: I36975e3aa5365a5294889f08cfb0ff0a95e38235
Reviewed-on: http://codereview.qt.nokia.com/1490
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-12 15:00:38 +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
Friedemann Kleint
505256fab9 API-Documentation: Add the Utils-library. 
Fix API after doc template change.
 2011-03-02 17:14:19 +01:00
con
46ecaecc13 Remove dock widget handles from debugger tool bar. 
Otherwise it's possible to remove the tool bar without ever getting it
back.
 2011-02-17 16:52:06 +01:00
hjk
32f6dd5395 fancydockwidget: save a few allocations 2011-02-08 16:41:02 +01:00
hjk
3212e1152c fancymainwaindow: replace m_dockWidgetActiveState by dynamic property 2011-02-07 15:17:30 +01:00
hjk
7eb5a00f54 fancymainwindow: remove m_dockWidgets member 
Use QMainWindow::dockWidgets() instead.

Done by Milian Wolff
 2011-02-07 15:05: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
Arvid Ephraim Picciani
b6d34c086c Open context menu for MainWindow 
Task-Number: QTCREATORBUG-2406
Reviewed-by: hjk
 2010-09-20 18:32:57 +02:00
con
82cc4b4302 Fix consistency issue with splitter in debug mode. 
Task-number: QTCREATORBUG-598
 2010-06-30 13:43:53 +02:00
Lasse Holmstedt
43b9d1aad1 Fixed strings in qmlinspector and shutdown() issues 2010-04-29 09:09:35 +02:00
Friedemann Kleint
3d6560a10b Move the Debugger/Designer view menus to Window menu. 
Move actions into FancyMainWindow. Register them in
DebuggerUISwitcher and FormEditorW. Manually hide
Debugger actions for Non-Debug modes (as they belong
to the language context).
Acked-by: con
 2010-04-20 16:46:35 +02:00
con
36177b1543 Try to avoid weird debug mode layout when moving from 1.3 to 2.0. 
We don't manage to really restore the layout right, so reset to default
layout.

Task-number: QTCREATORBUG-1105
 2010-04-09 14:56:41 +02:00
Friedemann Kleint
8d384fc6ad Fix QSettings keys of FancyMainWindow in QtCreator.ini. 
Do not use localized Window Titles. Use objectName
or default to dockWidget<n>".

Task-number: QTCREATORBUG-1059
 2010-04-06 11:23:11 +02:00
Jens Bache-Wiig
3ecfc2f343 Fix white text in tool tips and dock widget decorations 
This was a regression in the custom styling. We no longer set
the panel property on the mainwindow but rely on qobject_cast
to style custom mainwindows.

Reviewed-by: thorbjorn
 2010-03-22 13:23:50 +01:00
Friedemann Kleint
5cf8673ce1 Header cleanup in utils/coreplugin. 2010-03-17 17:44:46 +01:00
Jens Bache-Wiig
d58184173e Clean up layouts and use minisplitter everywhere 
This patch replaces all uses of QSplitter with thin 1-pixel
splitters. I also fixed dock widget layouts in main windows
to do the same. Additionally I had to tweak the tabbars so
they look good in mini splitter layouts to avoid a double
left-border.

Reviewed-by: thorbjorn
 2010-03-17 11:23:10 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers 
Reviewed-by: thorbjorn
 2010-01-11 10:26:12 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02: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
con
ba219e2a77 Internally use a fancy mainwindow in form editor. 2009-08-10 17:38:19 +02:00
con
a8cc2f6fa4 Need the settings also in form of non-QSettings. 2009-08-10 17:37:18 +02:00
con
0fee3776e8 Extract the special mainwindow behavior of the debug mode into class. 2009-08-06 16:35:22 +02:00