feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,209 Commits 108 Branches 368 Tags
d3341b996cac995f7f14b117f4c6f85f45422ef5
Commit Graph

50 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
a44aa55502 Add whitespace after control keywords 
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:20:46 +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
aef4280bc1 Do not use QWeakPointer to track QObjects. 
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-09-25 10:45:36 +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
kh1
d762373b95 Make it possible to Show/Hide the sidebar in help mode. 
Task-number: QTCREATORBUG-1533

Change-Id: I0ac767db5bcbda12a9d8ba1572ee75881308d0d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 15:14:07 +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
Friedemann Kleint
2892f13b8c CorePlugin: Compile with QT_NO_CAST_FROM_ASCII. 
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
  QString construction.
- Fix repeated invocation of Container.end() in loops.

Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-22 14:47:29 +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
77070354f2 QMutableMapIterator uses map in destructor, use foreach. 
Change-Id: Ie8737acaea614fdda66cb7642eaed21be41cae64
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-28 08:25:31 +02:00
hjk
58cb19e55e all: less QScopedPointer 
Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:44 +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
Friedemann Kleint
d6057ae600 Header cleanup in coreplugin, part 1 2010-09-16 12:26:28 +02:00
kh1
7b52a2ab2a Add QActions instead of QToolButtons. Makes the "Expand Toolbar"button 
work.

Task-number: QTCREATORBUG-2255
 2010-09-06 15:55:04 +02:00
Lasse Holmstedt
d00045bdab Sidebar: Prevent items turning to top-level windows 
Sometimes, this behavior occurred especially on OS X, and to lesser
extent on Linux and windows too.

Reviewed-by: Thomas Hartmann
 2010-08-06 14:03:33 +02:00
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor 
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
 2010-07-30 22:17:14 +02:00
Lasse Holmstedt
0cf8209936 fixed a crash with sidebar when using old settings files 
If the user uses old QtC settings files (QtCreator.ini), sidebar item
names are there translated. Because the new settings uses id's instead
of translated names, old sidebar items will not exist on save, causing
crashes. this fixes that issue.

Reviewed-by: con
 2010-05-14 12:15:28 +02:00
Lasse Holmstedt
7ba6fc8834 Fixed localization issues with SideBar 
When changing the language, the sidebar items would break because
their localized window titles were used for storing the settings. Now,
id's are used.

Reviewed-by: con
 2010-04-29 13:50:21 +02:00
Lasse Holmstedt
73f1a30714 Added weakpointers to Sidebar to make sure things aren't double-deleted 
Reviewed-by: con
 2010-04-26 14:27:49 +02:00
Lasse Holmstedt
3be86bb828 Added Window->Views menu entry for restoring Qt Quick Designer layout 2010-04-26 14:27:49 +02:00
Lasse Holmstedt
fd549343fc unified left & right sidebars in bauhaus 
SideBar was patched to give it extra functionality:
 - closeWhenEmpty: when all sidebar widgets are closed, the whole
   sidebar will disappear, too.
 - unavailableItems: a list of non-openable windowTitles can be given
   to the sidebar.

Reviewed-by: con
 2010-04-26 14:27:48 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02: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
Erik Verbruggen
4416dda243 Added a name component to the SideBar's saveSettings/restoreSettings to allow for multiple instances in a plug-in. 2010-01-04 14:36:29 +01:00
con
3ab0a28cca Less use of slow methods. 2009-12-09 15:31:01 +01:00
Roberto Raggi
6ccc08fb40 Restore the state of QObject::blockSignals() 2009-10-05 12:45:14 +02:00
con
de3d6db229 Fix wrong connect for splitting sidebar widgets. 2009-08-20 20:05:11 +02:00
dt
beb2916ea6 Fix warnings that a signal conflicts with a slot of base classes. 
In NavigationSubWidget and SideBarWidget
 2009-08-20 17:40:12 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
8ed85f1eb6 Unify tool button appearance in "panelWidgets". 
Reviewed-by: Jens Bache-Wiig
 2009-07-17 13:13:32 +02:00
Kai Koehne
6f6fafe1f9 Insert default sidebar items in the order of the argument list 2009-07-16 17:52:50 +10:00
Kai Koehne
084d3d7839 Allow repeated calls of SideBar::readSettings 
Remove any existing SideBarItems before adding the ones stored
in the settings.

Reviewed-by: Thorbjørn Lindeijer
 2009-07-01 11:56:00 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
con
fbfcc9a484 Fixes: - ICommand --> Command 
Details:  - Naming convention
 2009-01-14 13:18:25 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
con
c9889120c3 Fixes: - Rename ActionManagerInterface --> ActionManager 
Details:  - To make it conform to naming convention.
 2009-01-13 15:44:25 +01:00
Thorbjørn Lindeijer
6c1e557d70 Changed coreplugin resource prefix to "/core" 
It still read "/qworkbench", the research project name for Qt Creator.

Reviewed-by: con
 2009-01-12 15:23:22 +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