Commit Graph

54 Commits

Author SHA1 Message Date
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
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
Daniel Teske
f85c200244 New File/Project Dialog: Don't use &c twice
I'm not sure how the cancel button gets that accelerator, but the
default button should not have a accelarator anyway.

Task-number: QTCREATORBUG-10608
Change-Id: I18899bfa039a82f0cbb2cf6ae0ed21a9f0e619d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-06 12:55:52 +01:00
Thomas Hartmann
ab15d38726 Wizards.Dialog: fix the All Templates case
The "All Templates" case in the comobox did not work as expected
from users.
It still did only show wizards we have a kit installed for
and it was not available for the case of one platform.

The semantics for "All Templates" were actually "All available Platforms".
This was confusing especially in the case of no platform.
Now "All Templates" does show all templates, but the wizard give an error
message, if no corresponding kit is available.

Task-number: QTCREATORBUG-9792
Change-Id: Ia83a0577bde7e726b2638868bcaffbe13499f2f7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 12:32:22 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +02:00
Kai Koehne
7e1a94e59a Remove unneeded typedefs
Fix gcc 4.8.0 warnings like

warning: typedef 'AvahiSimplePollSetFuncPtr' locally defined but not
used [-Wunused-local-typedefs]

Change-Id: I5cc2917958dc8e6a4c31031577ecc66575b8d328
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 11:54:32 +02:00
Friedemann Kleint
cf5e615f6d Clean headers in Core-plugin.
Change-Id: Ie79d334765ca5c6a034fa2f5eccff5d45b481975
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 09:31:54 +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
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
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
d8429000f0 Fix "New" dialog in dark themes.
Don't explicitly use white, use the "base" color.

Task-number: QTCREATORBUG-7435
Change-Id: I3fcfefd958857146b6f9b2ceef3376d2b582b807
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-22 16:10:00 +02:00
Thomas Hartmann
f864df8fd2 Wizards: usablitity fix
If the virtual projectKind item has no children it is deleted.

Change-Id: I5f86b18043ed937b3f38c8e1591a529af934043a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-04-10 14:18:32 +02:00
Thomas Hartmann
ceaa3e7461 Wizards: crash fix
In the case of cancel currentItem is null.

Change-Id: I337bcf9e1873e9f6525c898c7275ec594f9baeb6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-03-15 10:56:33 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01:00
Leena Miettinen
3fff0b2f98 UI text: use book style caps for options in pull-down lists
Change-Id: Id4ada4406d7ea73f9b2f99f2be5187c9ff9415b0
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-03-02 15:32:33 +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
Thomas Hartmann
3aa2b0876c Wizards: add option to show an image for description
IWizard::descriptionImage() can return the path to an image.
An empty string is interpreted as no image available.

Change-Id: Ia2012eecbfdeb9bec123ed666fff2d73d79e05ce
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-10 16:47:12 +01:00
Thomas Hartmann
08e4016886 Wizards: use display names for supported platforms
The display names might be different form the internal string id.

Change-Id: Ib2bf9d0ee2fbf87b2ba20a79e8b456830e7a940e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-10 12:56:11 +01:00
Thomas Hartmann
95a028e835 Wizards: changes the structure of Wizards
This patch introduces platforms as a top level topic when choosing
a wizard. Also I changed the categories and priorities.

Details:

1. I did change the way the dialog/view is structured in newdialog.cpp

2. I added platformName() and supportsPlatform() to BaseQtVersion.
   I needed two functions because the Simulator does not provide a platform
   and therefore has no platformName but supports two platforms.
   I still have to turn the platform names into proper constants.

3. I changed the categories and priorities to get the layout that was
   discussed. (I had to touch quite alot of files but this is mostly trivial)

4. I added a combobox that allows filtering for platforms.

5. I added flags() to IWizard to indicate that a wizard is platform independent.

Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 17:42:27 +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
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +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
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Friedemann Kleint
8e92316a9a Core: Supppress 'WhatsThis' in dialogs. 2011-04-15 11:43:43 +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
Daniel Molkentin
ebb8faae6d New dialog: Replace "Preferred wizards" concept by remembering the last category
Reviewed-by: trustme
2010-05-19 18:40:45 +02:00
con
2d17da65a9 Icon update. 2010-05-18 14:26:33 +02:00
Jens Bache-Wiig
95719bc1b3 Make new dialog description text visible on first show 2010-05-11 11:30:45 +02:00
Jens Bache-Wiig
6a4d08ba17 Fix some layout issues with the new dialog
* Slightly larger row height
* Make the default size slightly nicer
* Fixed a drawing artifact in certain styles

Note that the dialog will be resizable on linux now.

Reviewed-by: mae
2010-05-03 20:21:59 +02:00
Jens Bache-Wiig
fa2d2717a9 Fix broken keyboard navigation in the new file/project dialog
* Enabled proper keyboard navigation
* Skip header items when using arrow keys
* Fixed a static pixmap warning

Task-number: QTCREATORBUG-1237

Reviewed-by: Daniel Molkentin
2010-04-21 13:38:58 +02:00
Daniel Molkentin
239bd54093 Remove orphaned code, reword: & -> and 2010-04-19 18:00:05 +02:00
Daniel Molkentin
b488534306 Redesign the New Projects/Files dialog
- allow for more verbose description
- allow to fit all catagories and subcategories in
- bring more clear separation between projects and files
- expense: one more click

Reviewed-by: jbache
2010-04-19 17:40:53 +02:00
Daniel Molkentin
3bb69df02a Port new dialog from QTreeWidget to QTreeView and QStandardItemModel
This is a preperation towards being able to present the dialog
in a different layout, with slightly improved usability.

Reviewed-by: jbache
2010-04-19 17:40:35 +02:00
Daniel Molkentin
3dc18931a8 New dialog: Renamed Ok -> Create
Task-number: QTCREATORBUG-1117
2010-04-13 19:18:12 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
3527195e85 Fix visual selection for keyboard navigation in New dialog.
Reviewed-by: Erik Verbruggen
2010-03-04 12:44:22 +01:00
Thorbjørn Lindeijer
a6f43a492b Removed the watermark from the wizard pages
Too much Qt branding, looks cleaner without.
2010-02-19 11:50:21 +01:00
con
4a46d0864b Rename IWizard::Kind --> IWizard::WizardKind, add some logic for which wizard kinds to collapse/expand. 2010-01-15 11:07:50 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint
0e554fac91 Wizards: Sort
Introduce new QString id() const-API and sort wizards by
[untranslated] category and id. Introduce respective constants.
Rubber-stamped-by: con <qtc-committer@nokia.com>
2009-11-27 10:33:24 +01: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
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +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